X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fbanana%2Fml.inc.php;h=6c703cfb100ebefdec64a3d4e3162e7727c593b5;hb=e23d21c1588a9ffa0697aef08e9ebdada4fe167e;hp=c2eea5c74f82c52a967b19db713aed9750c219ee;hpb=7f12e3b4113791f3372f11572a205925d7bb6b97;p=platal.git

diff --git a/include/banana/ml.inc.php b/include/banana/ml.inc.php
index c2eea5c..6c703cf 100644
--- a/include/banana/ml.inc.php
+++ b/include/banana/ml.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,7 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'banana/banana.inc.php';
 require_once 'banana/hooks.inc.php';
 
 class PlatalBananaMLPage extends PlatalBananaPage
@@ -45,24 +44,25 @@ class MLBanana extends Banana
 {
     static public $listname;
     static public $domain;
+    private $user;
 
-    function __construct($forlife, $params = null)
+    function __construct(User $user, $params = null)
     {
         global $globals;
-        Banana::$spool_root = $globals->banana->spool_root;
+        $this->user = &$user;
+
+        Banana::$spool_root = $globals->spoolroot . '/spool/banana/';
         Banana::$spool_boxlist = false;
         Banana::$msgedit_canattach = true;
         Banana::$debug_mbox = ($globals->debug & DEBUG_BT);
         Banana::$debug_smarty = ($globals->debug & DEBUG_SMARTY);
-        Banana::$mbox_helper = $globals->banana->mbox_helper;
+        Banana::$mbox_helper = $globals->spoolroot . '/banana/mbox-helper/mbox-helper';
         Banana::$feed_updateOnDemand = true;
-        if (S::has_perms()) {
+        if (S::admin()) {
             Banana::$msgshow_mimeparts[] = 'source';
         }
         array_push(Banana::$msgparse_headers, 'x-org-id', 'x-org-mail');
-        if (!S::v('core_rss_hash')) {
-            Banana::$feed_active = false;
-        }
+        Banana::$feed_active = S::hasAuthToken();
 
         MLBanana::$listname = $params['listname'];
         MLBanana::$domain   = $params['domain'];
@@ -75,14 +75,14 @@ class MLBanana extends Banana
         global $platal, $globals;
 
         $nom  = S::v('prenom') . ' ' . S::v('nom');
-        $mail = S::v('bestalias') . '@' . $globals->mail->domain;
+        $mail = $this->user->bestEmail();
         $sig  = $nom . ' (' . S::v('promo') . ')';
-        Banana::$msgedit_headers['X-Org-Mail'] = S::v('forlife') . '@' . $globals->mail->domain;
+        Banana::$msgedit_headers['X-Org-Mail'] = $this->user->forlifeEmail();
 
         // Tree color
-        $req = XDB::query("SELECT  tree_unread, tree_read
-                             FROM  {$globals->banana->table_prefix}profils
-                            WHERE  uid={?}", S::i('uid'));
+        $req = XDB::query('SELECT  tree_unread, tree_read
+                             FROM  forum_profiles
+                            WHERE  uid= {?}', $this->user->id());
         if (!(list($unread, $read) = $req->fetchOneRow())) {
             $unread = 'o';
             $read = 'dg';
@@ -104,7 +104,7 @@ class MLBanana extends Banana
     }
 }
 
-require_once('banana/mbox.inc.php');
+require_once dirname(__FILE__) . '/../../banana/banana/mbox.inc.php';
 
 class BananaMLArchive extends BananaMBox
 {