Non significant spaces suck.

[platal.git] / include / banana / moderate.inc.php

diff --git a/include/banana/moderate.inc.php b/include/banana/moderate.inc.php
index d2d077c..4931902 100644 (file)
--- a/include/banana/moderate.inc.php
+++ b/include/banana/moderate.inc.php
@@ -39,7 +39,7 @@ function hook_makeLink($params)
         if ($key == 'group') {
             continue;
         }
-        if ($key == 'action') {
+        if ($key == 'action' && $value != 'showext') {
             continue;
         }
         if (!empty($get)) {
@@ -56,16 +56,21 @@ class ModerationBanana extends Banana
     static public $domain;
     static public $client;
 
-    function __construct($params = null, &$client)
+    function __construct($forlife, $params = null)
     {
         global $globals;
-        ModerationBanana::$client = $client;
+        ModerationBanana::$client = $params['client'];
         ModerationBanana::$listname = $params['listname'];
         ModerationBanana::$domain = isset($params['domain']) ? $params['domain'] : $globals->mail->domain;
         $params['group'] = ModerationBanana::$listname . '@' . ModerationBanana::$domain;
+        Banana::$spool_root = $globals->banana->spool_root;
         Banana::$spool_boxlist = false;
         Banana::$msgshow_withthread = false;
         Banana::$withtabs      = false;
+        Banana::$msgshow_externalimages = false;
+        Banana::$msgshow_mimeparts[] = 'source';
+        Banana::$feed_active = false;
+        Banana::$debug_smarty = ($globals->debug & DEBUG_SMARTY);
         array_push(Banana::$msgparse_headers, 'x-org-id', 'x-org-mail');
         parent::__construct($params, 'MLInterface', 'ModerationPage');
     }
@@ -87,7 +92,7 @@ class ModerationPage extends BananaPage
     {
         global $page;
         if ($page) {
-            $page->trig(utf8_decode($msg));
+            $page->trig($msg);
         }
         return true;
     }
@@ -103,23 +108,23 @@ class BananaMLInterface implements BananaProtocoleInterface
 
     public function __construct()
     {
-        $this->infos = ModerationBanana::$client->get_members(ModerationBanana::$listname); 
+        $this->infos = ModerationBanana::$client->get_members(ModerationBanana::$listname);
         $this->infos = $this->infos[0];
-        
+
         $mods = ModerationBanana::$client->get_pending_ops(ModerationBanana::$listname);
         $this->helds = $mods[1];
     }
-    
+
     public function isValid()
     {
         return !is_null(ModerationBanana::$client);
     }
-    
+
     public function lastErrNo()
     {
         return 0;
     }
-    
+
     public function lastError()
     {
         return null;
@@ -143,7 +148,7 @@ class BananaMLInterface implements BananaProtocoleInterface
         $message = null;
         $msg = ModerationBanana::$client->get_pending_mail(ModerationBanana::$listname, $id, 1);
         if ($msg) {
-            $message = new BananaMessage($msg);
+            $message = new BananaMessage(html_entity_decode($msg));
         }
         return $message;
     }
@@ -233,7 +238,12 @@ class BananaMLInterface implements BananaProtocoleInterface
     {
         return ModerationBanana::$domain . '_' . ModerationBanana::$listname;
     }
+
+    public function backtrace()
+    {
+        return null;
+    }
 }
 
-// vim:set et sw=4 sts=4 ts=4:
+// vim:set et sw=4 sts=4 ts=4 enc=utf-8:
 ?>