X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fbanana%2Fml.inc.php;h=1d72b5dbf0e607b21269b67ab75b99df8af8ab72;hb=145006c0ff77fa8a329616c2c8859191b2b236f7;hp=6eb7b0c3abf7d0e9fa998059922bdb333686652f;hpb=b2bffbe6b6812e63fa718fdcc2b860055d5642db;p=platal.git

diff --git a/include/banana/ml.inc.php b/include/banana/ml.inc.php
index 6eb7b0c..1d72b5d 100644
--- a/include/banana/ml.inc.php
+++ b/include/banana/ml.inc.php
@@ -29,15 +29,16 @@ class MLBanana extends Banana
 
     function __construct($forlife, $params = null)
     {
-		global $globals;
+        global $globals;
         Banana::$spool_root = $globals->banana->spool_root;
         Banana::$spool_boxlist = false;
         Banana::$msgedit_canattach = true;
-        Banana::$debug_mbox = ($globals->debug & 1);
+        Banana::$debug_mbox = ($globals->debug & DEBUG_BT);
+        Banana::$debug_smarty = ($globals->debug & DEBUG_SMARTY);
         Banana::$mbox_helper = $globals->banana->mbox_helper;
         if (S::has_perms()) {
             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;
@@ -60,12 +61,12 @@ class MLBanana extends Banana
 
         // Build user profile
         Banana::$profile['headers']['From']         = "$nom <$mail>";
-        Banana::$profile['headers']['Organization'] = 'Utilisateur de Polytechnique.org';
+        Banana::$profile['headers']['Organization'] = make_Organization();
         Banana::$profile['signature']               = $sig;
-        
+
         // Page design
         Banana::$page->killPage('forums');
-        Banana::$page->killPage('subscribe'); 
+        Banana::$page->killPage('subscribe');
 
         // Run Banana
         return parent::run();
@@ -85,13 +86,13 @@ class BananaMLArchive extends BananaMBox
     {
         global $globals;
         $spool = $globals->lists->spool . '/';
-        $list = glob($spool . '*.mbox', GLOB_ONLYDIR);
+        $list = glob($spool . '*.mbox/*.mbox');
         if ($list === false) {
             return array();
         }
         $groups = array();
         foreach ($list as $path) {
-            $path = substr($path, strlen($spool));
+            $path = substr($path, strpos($path, 'mbox/') + 5);
             $path = substr($path, 0, -5);
             list($domain, $listname) = explode($globals->lists->vhost_sep, $path, 2);
             $group = $listname . '@' . $domain;