Do not explicitly serialize object in session.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@291 9869982d-c50d-0410-be91-f2a2ec7c7c7b

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index 3784daa..2c223bf 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -680,7 +680,7 @@ class Banana
             $clean = false;
             if (php_sapi_name() != 'cli') {
                 if ($group == @$_SESSION['banana_group'] && isset($_SESSION['banana_spool'])) {
-                    Banana::$spool = unserialize($_SESSION['banana_spool']);
+                    Banana::$spool =& $_SESSION['banana_spool'];
                     $clean = @(Banana::$profile['lastnews'] != $_SESSION['banana_lastnews']);
                 } else {
                     unset($_SESSION['banana_message']);
@@ -692,7 +692,7 @@ class Banana
             if (php_sapi_name() != 'cli') {
                 $_SESSION['banana_group'] = $group;
                 if (!Banana::$profile['display']) {
-                    $_SESSION['banana_spool'] = serialize(Banana::$spool);
+                    $_SESSION['banana_spool'] =& Banana::$spool;
                     $_SESSION['banana_lastnews'] = Banana::$profile['lastnews'];
                 }
             }
@@ -706,13 +706,13 @@ class Banana
         Banana::load('message');
         if ($group == @$_SESSION['banana_group'] && $artid == @$_SESSION['banana_artid']
             && isset($_SESSION['banana_message'])) {
-            $message = unserialize($_SESSION['banana_message']);
+            $message =& $_SESSION['banana_message'];
             Banana::$msgshow_headers = $_SESSION['banana_showhdr'];
         }  else {
             $message = Banana::$protocole->getMessage($artid);
             $_SESSION['banana_group'] = $group;
             $_SESSION['banana_artid'] = $artid;
-            $_SESSION['banana_message'] = serialize($message);
+            $_SESSION['banana_message'] =& $message;
             $_SESSION['banana_showhdr'] = Banana::$msgshow_headers;
         }
         Banana::$message =& $message;
@@ -724,7 +724,7 @@ class Banana
         Banana::$spool->delId($artid);
         if ($group == $_SESSION['banana_group']) {
             if (!Banana::$profile['display']) {
-                $_SESSION['banana_spool'] = serialize(Banana::$spool);
+                $_SESSION['banana_spool'] =& Banana::$spool;
             }
             if ($artid == $_SESSION['banana_artid']) {
                 unset($_SESSION['banana_message']);
@@ -736,7 +736,7 @@ class Banana
         return true;
     }
 
-    static private function load($file)
+    static public function load($file)
     {
         $file = strtolower($file) . '.inc.php';
         if (!@include_once dirname(__FILE__) . "/$file") {

diff --git a/banana/spool.inc.php b/banana/spool.inc.php
index cdd1928..a96f788 100644 (file)
--- a/banana/spool.inc.php
+++ b/banana/spool.inc.php
@@ -127,7 +127,6 @@ class BananaSpool
             $spool->markAllAsRead();
         }
         $spool->updateUnread($since);
-        //var_dump($spool->trees);
         return $spool;
     }