UTF-8...

[banana.git] / banana / banana.inc.php.in

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index 06972b2..8e9d3a7 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -65,7 +65,7 @@ class Banana
      *   $matches[2] = "http://www.polytechnique.org"
      *   $matches[3] = "]"
      */
-    static public $msgshow_url     = '(["\[])?((?:[a-z]+:\/\/|www\.)(?:[\.\,\;\!\:]*[a-z\@0-9~%$£µ&i#\-+=_\/\?]+)+)(["\]])?';
+    static public $msgshow_url     = '(["\[])?((?:[a-z]+:\/\/|www\.)(?:[\.\,\;\!\:]*[a-z\@0-9~%$&i#\-+=_\/\?]+)+)(["\]])?';
 
 ### Message edition ###
     static public $msgedit_canattach  = true;
@@ -529,20 +529,13 @@ class Banana
         Banana::load('spool');
         if (!Banana::$spool || Banana::$spool->group != $group) {
             $clean = false;
-            if ($group == @$_SESSION['banana_group'] && isset($_SESSION['banana_spool'])) {
-                Banana::$spool = unserialize($_SESSION['banana_spool']);
-                $clean = @(Banana::$profile['lastnews'] != $_SESSION['banana_lastnews']);
-            } else {
+            if ($group != @$_SESSION['banana_group']) {
                 unset($_SESSION['banana_message']);
                 unset($_SESSION['banana_artid']);
                 unset($_SESSION['banana_showhdr']);
             }
             BananaSpool::getSpool($group, Banana::$profile['lastnews'], Banana::$profile['autoup'] || $clean);
             $_SESSION['banana_group'] = $group;
-            if (!Banana::$profile['display']) {
-                $_SESSION['banana_spool'] = serialize(Banana::$spool);
-                $_SESSION['banana_lastnews'] = Banana::$profile['lastnews'];
-            }
             Banana::$spool->setMode(Banana::$profile['display'] ? Banana::SPOOL_UNREAD : Banana::SPOOL_ALL);
         }
         return true;
@@ -569,15 +562,10 @@ class Banana
     protected function removeMessage($group, $artid)
     {
         Banana::$spool->delId($artid);
-        if ($group == $_SESSION['banana_group']) {
-            if (!Banana::$profile['display']) {
-                $_SESSION['banana_spool'] = serialize(Banana::$spool);
-            }
-            if ($artid == $_SESSION['banana_artid']) {
-                unset($_SESSION['banana_message']);
-                unset($_SESSION['banana_showhdr']);
-                unset($_SESSION['banana_artid']);
-            }
+        if ($group == $_SESSION['banana_group'] && $artid == $_SESSION['banana_artid']) {
+            unset($_SESSION['banana_message']);
+            unset($_SESSION['banana_showhdr']);
+            unset($_SESSION['banana_artid']);
         }
         return true;
     }