Changeset 785 for trunk

Timestamp:

Mar 14, 2023 6:24:45 PM (14 months ago)

Author:

anonymous

Message:

Add App::unsetCookie(). Quench some PHP 8 depreciation notices.

Location:

trunk

Files:

• lib/App.inc.php (modified) (5 diffs)
• lib/Utilities.inc.php (modified) (1 diff)
• services/login.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -429 +429 @@
                 $this->setParam(array('db_pass' => $_SERVER['DB_PASS']));
             }
+            unset($_SERVER['DB_SERVER'], $_SERVER['DB_NAME'], $_SERVER['DB_USER'], $_SERVER['DB_PASS'], $_SERVER['SIGNING_KEY']);
 
             // DB credentials for CLI scripts stored in a JSON file with read rights given only to the user who will be executing the scripts: -r--------
@@ -594 +595 @@
                 if ($this->getParam('http_cache_headers') > 0) {
                     // Allow HTTP caching, for this many seconds.
-                    header(sprintf('Cache-Control: no-transform, public, max-age=%d', $this->getParam('http_cache_headers')));
+                    header(sprintf('Cache-Control: max-age=%d', $this->getParam('http_cache_headers')));
                     header('Vary: Accept-Encoding');
                 } else {
@@ -643 +644 @@
             }
         }
-
-        // Unset environment variables we're done with.
-        unset($_SERVER['DB_SERVER'], $_SERVER['DB_NAME'], $_SERVER['DB_USER'], $_SERVER['DB_PASS'], $_SERVER['SIGNING_KEY']);
 
         $this->running = true;
@@ -1839 +1837 @@
 
     /*
+    * Delete a cookie previously created by setCookie().
+    *
+    * @access   public
+    * @param    string  $name       The name of the cookie.
+    * @return   bool                True on success, false on error.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @since    14 Mar 2023 12:12:15
+    */
+    public function unsetCookie($name)
+    {
+        $ret = setcookie($name, '', 1);
+        if (false === $ret) {
+            $this->logMsg(sprintf('Failed to unset cookie (%s) probably due to output before headers.', $name), LOG_NOTICE, __FILE__, __LINE__);
+        }
+        return $ret;
+    }
+
+    /*
     * Set timezone used internally by PHP. See full list at https://www.php.net/manual/en/timezones.php
     *
@@ -1910 +1926 @@
         $format = $format ?: $this->getParam('lc_date_format');
         if ($format && mb_strpos($format, '%') !== false) {
-            // The data format is localized for strftime(). It only accepts a timestamp, which are always in UTC, so we hack this by offering the date from the user's timezone in a format without a TZ specified, which is used to a make a timestamp for strftime (we can't use DaateTime->format('U') because that would convert the date back to UTC).
+            // The date format is localized for strftime(). It only accepts a timestamp, which are always in UTC, so we hack this by offering the date from the user's timezone in a format without a TZ specified, which is used to a make a timestamp for strftime (we can't use DaateTime->format('U') because that would convert the date back to UTC).
             return strftime($format, strtotime($dt->format('Y-m-d H:i:s')));
         } else {

trunk/lib/Utilities.inc.php

@@ -230 +230 @@
 {
     $app =& App::getInstance();
+
+    if ('' == $text) {
+        return '';
+    }
 
     $search = array();

trunk/services/login.php

@@ -33 +33 @@
 // We may want to use the add/edit interface from another script, so this
 // allows us to remember which page we came from so we can go back there.
-if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER']) || preg_match('!^(https?://\w+|/\w+)!', getFormData('boomerang'))) {
-    $url = preg_match('!^(https?://\w+|/\w+)!', getFormData('boomerang')) ? getFormData('boomerang') : $_SERVER['HTTP_REFERER'];
+if (getFormData('boomerang', false) && (isset($_SERVER['HTTP_REFERER']) || preg_match('!^(?:https?:/)?/\w!', getFormData('boomerang')))) {
+    $url = preg_match('!^(?:https?:/)?/\w!', getFormData('boomerang')) ? getFormData('boomerang') : $_SERVER['HTTP_REFERER'];
     $app->setBoomerangURL($url, 'login');
 }