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

Timestamp:

Jun 8, 2006 5:36:10 AM (18 years ago)

Author:

scdev

Message:

${1}

File:

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

trunk/lib/App.inc.php

@@ -152 +152 @@
     {
         // Set namespace of application instance.
-        $this->_ns = '_app_' . $namespace;
+        $this->_ns = $namespace;
 
         // Initialize default parameters.
@@ -281 +281 @@
             session_start();
 
-            if (!isset($_SESSION[$this->_ns])) {
+            if (!isset($_SESSION['_app'][$this->_ns])) {
                 // Access session data using: $_SESSION['...'].
                 // Initialize here _after_ session has started.
-                $_SESSION[$this->_ns] = array(
+                $_SESSION['_app'][$this->_ns] = array(
                     'messages' => array(),
                     'boomerang' => array('url'),
@@ -363 +363 @@
         // Save message in session under unique key to avoid duplicate messages.
         $msg_id = md5($type . $message . $file . $line);
-        $_SESSION[$this->_ns]['messages'][$msg_id] = array(
+        $_SESSION['_app'][$this->_ns]['messages'][$msg_id] = array(
             'type'    => $type,
             'message' => $message,
             'file'    => $file,
             'line'    => $line,
-            'count'   => (isset($_SESSION[$this->_ns]['messages'][$msg_id]['count']) ? (1 + $_SESSION[$this->_ns]['messages'][$msg_id]['count']) : 1)
+            'count'   => (isset($_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) ? (1 + $_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) : 1)
         );
 
@@ -391 +391 @@
         }
 
-        return isset($_SESSION[$this->_ns]['messages']) ? $_SESSION[$this->_ns]['messages'] : array();
+        return isset($_SESSION['_app'][$this->_ns]['messages']) ? $_SESSION['_app'][$this->_ns]['messages'] : array();
     }
     
@@ -408 +408 @@
         }
         
-        $_SESSION[$this->_ns]['messages'] = array();
+        $_SESSION['_app'][$this->_ns]['messages'] = array();
     }
 
@@ -843 +843 @@
         // Get URL from stored boomerang. Allow non specific URL if ID not valid.
         if ($this->validBoomerangURL($id, true)) {
-            if (isset($id) && isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
-                $url = $_SESSION[$this->_ns]['boomerang']['url'][$id];
+            if (isset($id) && isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
+                $url = $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id];
                 $this->logMsg(sprintf('dieBoomerangURL(%s) found: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             } else {
-                $url = end($_SESSION[$this->_ns]['boomerang']['url']);
+                $url = end($_SESSION['_app'][$this->_ns]['boomerang']['url']);
                 $this->logMsg(sprintf('dieBoomerangURL(%s) using: %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
             }
@@ -866 +866 @@
         // A redirection will never happen immediately twice.
         // Set the time so ensure this doesn't happen.
-        $_SESSION[$this->_ns]['boomerang']['time'] = time();
+        $_SESSION['_app'][$this->_ns]['boomerang']['time'] = time();
         $this->dieURL($url, $carry_args);
     }
@@ -890 +890 @@
             $url = preg_replace('/boomerang=[\w]+/', '', $url);
 
-            if (isset($_SESSION[$this->_ns]['boomerang']['url']) && is_array($_SESSION[$this->_ns]['boomerang']['url']) && !empty($_SESSION[$this->_ns]['boomerang']['url'])) {
+            if (isset($_SESSION['_app'][$this->_ns]['boomerang']['url']) && is_array($_SESSION['_app'][$this->_ns]['boomerang']['url']) && !empty($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
                 // If the URL currently exists in the boomerang array, delete.
-                while ($existing_key = array_search($url, $_SESSION[$this->_ns]['boomerang']['url'])) {
-                    unset($_SESSION[$this->_ns]['boomerang']['url'][$existing_key]);
+                while ($existing_key = array_search($url, $_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
+                    unset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$existing_key]);
                 }
             }
 
             if (isset($id)) {
-                $_SESSION[$this->_ns]['boomerang']['url'][$id] = $url;
+                $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id] = $url;
             } else {
-                $_SESSION[$this->_ns]['boomerang']['url'][] = $url;
+                $_SESSION['_app'][$this->_ns]['boomerang']['url'][] = $url;
             }
             $this->logMsg(sprintf('setBoomerangURL(%s): %s', $id, $url), LOG_DEBUG, __FILE__, __LINE__);
@@ -923 +923 @@
 
         if (isset($id)) {
-            if (isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
-                return $_SESSION[$this->_ns]['boomerang']['url'][$id];
+            if (isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
+                return $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id];
             } else {
                 return '';
             }
-        } else if (is_array($_SESSION[$this->_ns]['boomerang']['url'])) {
-            return end($_SESSION[$this->_ns]['boomerang']['url']);
+        } else if (is_array($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
+            return end($_SESSION['_app'][$this->_ns]['boomerang']['url']);
         } else {
             return false;
@@ -949 +949 @@
         $this->logMsg(sprintf('deleteBoomerangURL(%s): %s', $id, $this->getBoomerangURL($id)), LOG_DEBUG, __FILE__, __LINE__);
 
-        if (isset($id) && isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
-            unset($_SESSION[$this->_ns]['boomerang']['url'][$id]);
-        } else if (is_array($_SESSION[$this->_ns]['boomerang']['url'])) {
-            array_pop($_SESSION[$this->_ns]['boomerang']['url']);
+        if (isset($id) && isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
+            unset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id]);
+        } else if (is_array($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
+            array_pop($_SESSION['_app'][$this->_ns]['boomerang']['url']);
         }
     }
@@ -969 +969 @@
         }
 
-        if (!isset($_SESSION[$this->_ns]['boomerang']['url'])) {
+        if (!isset($_SESSION['_app'][$this->_ns]['boomerang']['url'])) {
             $this->logMsg(sprintf('validBoomerangURL(%s) no boomerang URL set.', $id), LOG_DEBUG, __FILE__, __LINE__);
             return false;
@@ -977 +977 @@
         // a boomerang redirection will always occur at least several seconds after the last boomerang redirect
         // or a boomerang being set.
-        $boomerang_time = isset($_SESSION[$this->_ns]['boomerang']['time']) ? $_SESSION[$this->_ns]['boomerang']['time'] : 0;
+        $boomerang_time = isset($_SESSION['_app'][$this->_ns]['boomerang']['time']) ? $_SESSION['_app'][$this->_ns]['boomerang']['time'] : 0;
 
         $url = '';
-        if (isset($id) && isset($_SESSION[$this->_ns]['boomerang']['url'][$id])) {
-            $url = $_SESSION[$this->_ns]['boomerang']['url'][$id];
+        if (isset($id) && isset($_SESSION['_app'][$this->_ns]['boomerang']['url'][$id])) {
+            $url = $_SESSION['_app'][$this->_ns]['boomerang']['url'][$id];
         } else if (!isset($id) || $use_nonspecificboomerang) {
             // Use non specific boomerang if available.
-            $url = end($_SESSION[$this->_ns]['boomerang']['url']);
+            $url = end($_SESSION['_app'][$this->_ns]['boomerang']['url']);
         }