X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fbanana%2Fmoderate.inc.php;h=d59b2e9f450069dd9996021d260ab37454389db6;hb=602119a260d65a6a9d146e01d43bc21358d706d9;hp=a6439b089b522b5ffbaf3a6161868d854e8d34bc;hpb=ea74d2785d9c1ff5571ebf2f73c89cbf19c8dd07;p=platal.git

diff --git a/include/banana/moderate.inc.php b/include/banana/moderate.inc.php
index a6439b0..d59b2e9 100644
--- a/include/banana/moderate.inc.php
+++ b/include/banana/moderate.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,13 +19,11 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'banana/banana.inc.php';
-require_once 'banana/message.func.inc.php';
 require_once 'banana/hooks.inc.php';
 
 function hook_checkcancel($_headers)
 {
-    return ($_headers['x-org-id'] == S::v('hruid') or S::has_perms());
+    return ($_headers['x-org-id'] == S::v('hruid') or S::admin());
 }
 
 function hook_makeLink($params)
@@ -57,16 +55,16 @@ class ModerationBanana extends Banana
     static public $domain;
     static public $client;
 
-    function __construct(User &$user, $params = null)
+    function __construct(User $user, $params = null)
     {
-        ini_set('memory_limit', '128M'); 
+        ini_set('memory_limit', '128M');
 
         global $globals;
         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_root = $globals->spoolroot . '/spool/banana/';
         Banana::$spool_boxlist = false;
         Banana::$msgshow_withthread = false;
         Banana::$withtabs      = false;
@@ -214,12 +212,12 @@ class BananaMLInterface implements BananaProtocoleInterface
         return array();
     }
 
-    public function send(BananaMessage &$message)
+    public function send(BananaMessage $message)
     {
         return true;
     }
 
-    public function cancel(BananaMessage &$message)
+    public function cancel(BananaMessage $message)
     {
         return true;
     }