Changeset 22 for trunk/lib/App.inc.php

Timestamp:

Nov 23, 2005 9:29:33 PM (19 years ago)

Author:

scdev

Message:

More bugs and shifting things about.

File:

• trunk/lib/App.inc.php (modified) (10 diffs)

trunk/lib/App.inc.php

@@ -152 +152 @@
         }
         
-        if (!isset($_SESSION[$this->app])) {
-            $_SESSION[$this->app] = array();
-        }
-
         // Initialize default parameters.
         $this->_params = array_merge($this->_params, $this->_param_defaults);
@@ -296 +292 @@
             session_name($this->getParam('session_name'));
             
-            // Start the session. Access session data using: $_SESSION['...']
+            // Start the session.
             session_start();
+            
+            if (!isset($_SESSION[$this->app])) {
+                // Access session data using: $_SESSION['...'].
+                // Initialize here _after_ session has started.
+                $_SESSION[$this->app] = array(
+                    'messages' => array(),
+                    'boomerang' => array('url'),
+                );
+            }
         }
         
@@ -374 +379 @@
         
         if (!in_array($type, array(MSG_NOTICE, MSG_SUCCESS, MSG_WARNING, MSG_ERR))) {
-            App::logMsg(sprintf('Invalid MSG_* type: %s', $type), LOG_DEBUG, __FILE__, __LINE__);
+            $this->logMsg(sprintf('Invalid MSG_* type: %s', $type), LOG_DEBUG, __FILE__, __LINE__);
         }
     }
@@ -752 +757 @@
         if (preg_match('!^/!', $url)) {
             // If relative URL is given, prepend correct local hostname.
-            $my_url = parse_url($_SERVER['SCRIPT_URI']);
-            $url = sprintf('%s://%s%s', $my_url['scheme'], $my_url['host'], $url);
-        }
-    
+            $scheme = 'on' == getenv('HTTPS') ? 'https' : 'http';
+            $host = getenv('HTTP_HOST');
+            $url = sprintf('%s://%s%s', $scheme, $host, $url);
+        }
+
         $url = $this->oHREF($url, $carry_args, $always_include_sid);
         
@@ -787 +793 @@
             if (isset($id) && isset($_SESSION[$this->app]['boomerang']['url'][$id])) {
                 $url = $_SESSION[$this->app]['boomerang']['url'][$id];
+                $this->logMsg(sprintf('dieBoomerangURL(%s) found: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             } else {
                 $url = end($_SESSION[$this->app]['boomerang']['url']);
-            }
-        } else if (!refererIsMe() && !preg_match('/admin_common/', getenv('SCRIPT_NAME'))) {
+                $this->logMsg(sprintf('dieBoomerangURL(%s) using: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+            }
+            // Delete stored boomerang.
+            $this->deleteBoomerangURL($id);
+        } else if (!refererIsMe()) {
             // Ensure that the redirecting page is not also the referrer.
-            // admin_common is an alias of 'admin', which confuses this function. Just here for local testing.
             $url = getenv('HTTP_REFERER');
+            $this->logMsg(sprintf('dieBoomerangURL(%s) using referrer: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
         } else {
-            $url = '';
-        }
-    
-        $this->logMsg(sprintf('dieBoomerangURL: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
-    
-        // Delete stored boomerang.
-        $this->deleteBoomerangURL($id);
+            // If URL is not specified, use the redirect_home_url.
+            $url = $this->getParam('redirect_home_url');
+            $this->logMsg(sprintf('dieBoomerangURL(%s) not found, using redirect_home_url: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+        }
+    
             
         // A redirection will never happen immediatly twice.
@@ -825 +833 @@
             return false;
         }
-        
         // A redirection will never happen immediatly after setting the boomerangURL.
         // Set the time so ensure this doesn't happen. See App::validBoomerangURL for more.
     
-        if (isset($url) && is_string($url)) {
+        if ('' != $url && is_string($url)) {
             // Delete any boomerang request keys in the query string.
             $url = preg_replace('/boomerang=[\w]+/', '', $url);
             
-            if (is_array($_SESSION[$this->app]['boomerang']['url']) && !empty($_SESSION[$this->app]['boomerang']['url'])) {
+            if (isset($_SESSION[$this->app]['boomerang']['url']) && is_array($_SESSION[$this->app]['boomerang']['url']) && !empty($_SESSION[$this->app]['boomerang']['url'])) {
                 // If the URL currently exists in the boomerang array, delete.
                 while ($existing_key = array_search($url, $_SESSION[$this->app]['boomerang']['url'])) {
@@ -845 +852 @@
                 $_SESSION[$this->app]['boomerang']['url'][] = $url;
             }
-            $this->logMsg(sprintf('setBoomerangURL: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
+            $this->logMsg(sprintf('setBoomerangURL(%s): %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             return true;
         } else {
+            $this->logMsg(sprintf('setBoomerangURL(%s) is empty!', $id, $url), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -895 +903 @@
         }
         
+        $this->logMsg(sprintf('deleteBoomerangURL(%s): %s', $id, $this->getBoomerangURL($id)), LOG_DEBUG, __FILE__, __LINE__);
+
         if (isset($id) && isset($_SESSION[$this->app]['boomerang']['url'][$id])) {
             unset($_SESSION[$this->app]['boomerang']['url'][$id]);
@@ -927 +937 @@
         $boomerang_time = isset($_SESSION[$this->app]['boomerang']['time']) ? $_SESSION[$this->app]['boomerang']['time'] : 0;
         
+        $url = '';
         if (isset($id) && isset($_SESSION[$this->app]['boomerang']['url'][$id])) {
             $url = $_SESSION[$this->app]['boomerang']['url'][$id];
@@ -934 +945 @@
         }
     
-        $this->logMsg(sprintf('validBoomerangURL testing url: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
-        if (empty($url)) {
+        $this->logMsg(sprintf('validBoomerangURL(%s) testing: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
+
+        if ('' == $url) {
+            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, empty!', $id), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
         if ($url == absoluteMe()) {
             // The URL we are directing to is the current page.
-            $this->logMsg(sprintf('Boomerang URL not valid, same as absoluteMe: %s', $url), LOG_WARNING, __FILE__, __LINE__);
+            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, same as absoluteMe: %s', $id, $url), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
         if ($boomerang_time >= (time() - 2)) {
             // Last boomerang direction was more than 2 seconds ago.
-            $this->logMsg(sprintf('Boomerang URL not valid, boomerang_time too short: %s', time() - $boomerang_time), LOG_WARNING, __FILE__, __LINE__);
-            return false;
-        }
-        
-        $this->logMsg(sprintf('validBoomerangURL found: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
+            $this->logMsg(sprintf('validBoomerangURL(%s) not valid, boomerang_time too short: %s', $id, time() - $boomerang_time), LOG_NOTICE, __FILE__, __LINE__);
+            return false;
+        }
+        
+        $this->logMsg(sprintf('validBoomerangURL(%s) is valid: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
         return true;
     }