Force auth on newsletter unsubscription link

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

diff --git a/include/banana/ml.inc.php b/include/banana/ml.inc.php
index b78139c..5d185a0 100644 (file)
--- a/include/banana/ml.inc.php
+++ b/include/banana/ml.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 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
@@ -47,25 +46,23 @@ class MLBanana extends Banana
     static public $domain;
     private $user;
 
-    function __construct(User &$user, $params = null)
+    function __construct(User $user, $params = null)
     {
         global $globals;
         $this->user = &$user;
 
-        Banana::$spool_root = $globals->banana->spool_root;
+        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'];
@@ -83,9 +80,9 @@ class MLBanana extends Banana
         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';
@@ -107,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
 {
@@ -161,5 +158,5 @@ class BananaMLArchive extends BananaMBox
     }
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>