Changeset 242 for trunk

Timestamp:

Apr 5, 2007 12:16:27 AM (17 years ago)

Author:

quinn

Message:

Fixed some warnings in Prefs.
Fixed boomerang=\w+ removal code.
Added feature to disable trans_sess_id.

This will be the last changes of final version 2.1

Location:

trunk/lib

Files:

• App.inc.php (modified) (4 diffs)
• Prefs.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -63 +63 @@
         // Use php sessions?
         'enable_session' => false,
-        'session_name' => 'Strangecode',
+        'session_name' => '_session',
         'session_use_cookies' => true,
+        'session_use_trans_sid' => false,
 
         // Use database?
@@ -670 +671 @@
         $delim = strpos($url, '?') !== false ? ini_get('arg_separator.output') : '?';
 
-
         $q = '';
         if ($do_carry_queries) {
@@ -700 +700 @@
                         || !$this->getParam('session_use_cookies')
                     )
+                    && $this->getParam('session_use_trans_sid')
                     && $this->getParam('enable_session')
                     && isMyDomain($url)
-                    &&
-                    (
+                    && (
                         !ini_get('session.use_trans_sid')
                         || preg_match('!^(http|https)://!i', $url)
@@ -908 +908 @@
 
         if ('' != $url && is_string($url)) {
-            // Delete any boomerang request keys in the query string.
-            $url = preg_replace('/[&?]?boomerang=[\w]+/', '', $url);
+            // Delete any boomerang request keys in the query string (along with any trailing delimiters after the deletion).
+            $url = preg_replace(array('/([&?])boomerang=\w+[&?]?/', '/[&?]$/'), array('$1', ''), $url);
 
             if (isset($_SESSION['_app'][$this->_ns]['boomerang']['url']) && is_array($_SESSION['_app'][$this->_ns]['boomerang']['url']) && !empty($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {

trunk/lib/Prefs.inc.php

@@ -203 +203 @@
     {
         $app =& App::getInstance();
-        if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent'])) {
+        if (isset($_SESSION['_prefs'][$this->_ns]['persistent']) && array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent'])) {
             $app->logMsg(sprintf('Found %s in persistent', $key), LOG_DEBUG, __FILE__, __LINE__);
             return $_SESSION['_prefs'][$this->_ns]['persistent'][$key];
-        } else if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults'])) {
+        } else if (isset($_SESSION['_prefs'][$this->_ns]['defaults']) && array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults'])) {
             $app->logMsg(sprintf('Found %s in defaults', $key), LOG_DEBUG, __FILE__, __LINE__);
             return $_SESSION['_prefs'][$this->_ns]['defaults'][$key];