From: x2003bruneau <x2003bruneau@9869982d-c50d-0410-be91-f2a2ec7c7c7b>
Date: Thu, 7 Jun 2007 20:42:03 +0000 (+0000)
Subject: Clean params to remove empty strings and fix the default checkCancel implementation
X-Git-Tag: 1.8~47
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=1ffc081d2cffd228b99a39ef6dc0393c8473d533;hp=1c3d7f101c76ba015a3937a87ec0e532f7734bd8;p=banana.git

Clean params to remove empty strings and fix the default checkCancel implementation

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@263 9869982d-c50d-0410-be91-f2a2ec7c7c7b
---

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index e3c16ef..34ae838 100644
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -193,6 +193,11 @@ class Banana
      */
     protected function loadParams()
     {
+        foreach ($this->params as &$value) {
+            if ($value === "") {
+                $value = null;
+            }
+        }
         Banana::$group = isset($this->params['group']) ? $this->params['group'] : null;
         Banana::$artid = isset($this->params['artid']) ? $this->params['artid'] : null;
         Banana::$first = isset($this->params['first']) ? $this->params['first'] : null;
diff --git a/banana/message.inc.php b/banana/message.inc.php
index 56885f7..5caa802 100644
--- a/banana/message.inc.php
+++ b/banana/message.inc.php
@@ -303,7 +303,7 @@ final class BananaMessage extends BananaMimePart
         if (function_exists('hook_checkcancel')) {
             return hook_checkcancel($this->headers);
         }
-        return Banana::$profile['name'] == $this->headers['from'];
+        return Banana::$profile['headers']['From'] == $this->headers['from'];
     }
 
     public function canSend()