Changeset 300

Timestamp:

08/05/08 20:32:15 (4 years ago)

Author:

john

Message:

fixed a few bugs with new session AR store

Location:

trunk/trax/vendor/trax

Files:

• action_controller.php (modified) (1 diff)
• session.php (modified) (5 diffs)
• session/active_record_store.php (modified) (1 diff)

trunk/trax/vendor/trax/action_controller.php

@@ -1284 +1284 @@
         if($content) {
             echo $content;
+            $this->end_content_for();
         }
     }

trunk/trax/vendor/trax/session.php

@@ -265 +265 @@
             self::$id = session_id();
             self::$started = true;
+            $hash = self::get_hash();
+            if(!isset($_SESSION[$hash])) {
+                $_SESSION[self::get_hash()] = array();
+            }
         }               
     }
@@ -296 +300 @@
      */
     function unset_session() {
-        unset($_SESSION[self::get_hash()]);
+        $_SESSION[self::get_hash()] = array();
     }
 
@@ -337 +341 @@
     function isset_var($key) {
         if(self::is_valid_host()) {
-            if($_SESSION[self::get_hash()][$key]) {
+            if(isset($_SESSION[self::get_hash()][$key])) {
                 return true;    
             }
@@ -363 +367 @@
     function isset_flash($key) {
         if(self::is_valid_host()) {
-            if(array_key_exists(self::get_hash(), $_SESSION)
-               && array_key_exists('flash',$_SESSION[self::get_hash()])
-               && array_key_exists($key,
-                                   $_SESSION[self::get_hash()]['flash'])) {
-                return true;    
-            }
+            $hash = self::get_hash();
+            if(isset($_SESSION[$hash]['flash'][$key])) {
+                return true;
+            }
+            #if(array_key_exists($hash, $_SESSION)
+            #   && array_key_exists('flash', $_SESSION[$hash])
+            #   && array_key_exists($key, $_SESSION[$hash]['flash'])) {
+            #    return true;    
+            #}
         }
         return false;
@@ -393 +400 @@
     function flash($key, $value = null) {
         if(self::is_valid_host()) {
+            $hash = self::get_hash();
             if($value) {
-                $_SESSION[self::get_hash()]['flash'][$key] = $value;
+                $_SESSION[$hash]['flash'][$key] = $value;
             } else {
-                $value = $_SESSION[self::get_hash()]['flash'][$key];
-                unset($_SESSION[self::get_hash()]['flash'][$key]);
+                $value = $_SESSION[$hash]['flash'][$key];
+                unset($_SESSION[$hash]['flash'][$key]);
                 return $value;
             }
         }
     }
+
+    /**
+     *  Debugging function to see what's in the session
+     *
+     *  Does a dump of the session to log file and optionally to screen
+     *
+     *  @param boolean $screen Display dump to screen
+     */
+    function debug($screen = false) {
+        $msg = "Session::debug() => ".print_r($_SESSION, true);
+        error_log($msg);
+        if($screen) {
+            echo "<p><pre>".$msg."</pre></p>";
+        }
+    }
 }
 

trunk/trax/vendor/trax/session/active_record_store.php

@@ -74 +74 @@
         $session = ($session instanceof ActiveRecordStore) ? $session : $this;
         $session->id = $sess_id;
-        $session->data = $this->escape($data);
+        $session->data = $data;
         $session->client_ip = $this->escape($_SERVER['REMOTE_ADDR']);
         $session->http_user_agent = $this->escape($_SERVER['HTTP_USER_AGENT']);