Fix banana stand-alone

[banana.git] / banana / banana.inc.php.in

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index 2f7daa4..dc29078 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -7,6 +7,8 @@
 * Copyright: See COPYING files that comes with this distribution
 ********************************************************************************/
 
+require_once dirname(__FILE__) . '/text.func.inc.php';
+
 class Banana
 {
 
@@ -24,8 +26,10 @@ class Banana
                                     'autoup' => 1);
     static public $boxpattern;
     static public $withtabs = true;
+    static public $mimeparts = array();
 
 ### Spool ###
+    static public $spool_root    = '/var/spool/banana';
     static public $spool_max     = 3000;
     static public $spool_tbefore = 5;
     static public $spool_tafter  = 5;
@@ -42,10 +46,12 @@ class Banana
 ### Message display ###
     static public $msgshow_headers   = array('from', 'newsgroups', 'followup-to', 'to', 'cc', 'reply-to',
                                        'organization', 'date', 'references', 'in-reply-to');
-    static public $msgshow_mimeparts = array('multipart/report', 'multipart/mixed', 'text/html', 'text/plain', 'text/enriched', 'text', 'message');
+    static public $msgshow_mimeparts = array('multipart/report', 'multipart/mixed', 
+                                             'text/html', 'text/plain', 'text/enriched', 'text', 'message');
     static public $msgshow_xface     = true;
     static public $msgshow_wrap      = 78;
     static public $msgshow_externalimages = false;
+    static public $msgshow_hasextimages   = false;
     static public $msgshow_withthread = true;
 
     /** Match an url
@@ -59,7 +65,7 @@ class Banana
      *   $matches[2] = "http://www.polytechnique.org"
      *   $matches[3] = "]"
      */
-    static public $msgshow_url     = '(["\[])?((?:[a-z]+:\/\/|www\.)(?:[\.\,\;\!]*[a-z\@0-9~%$£µ&i#\-+=_\/\?]+)+)(["\]])?';
+    static public $msgshow_url     = '(["\[])?((?:[a-z]+:\/\/|www\.)(?:[\.\,\;\!\:]*[a-z\@0-9~%$£µ&i#\-+=_\/\?]+)+)(["\]])?';
 
 ### Message edition ###
     static public $msgedit_canattach  = true;
@@ -95,6 +101,7 @@ class Banana
     const ACTION_MSG_READ   = 5;
     const ACTION_MSG_NEW    = 9;
     const ACTION_MSG_CANCEL = 17;
+    const ACTION_MSG_IMAGES = 33;
 
     // Box list view
     const BOXES_ALL = 0;
@@ -136,7 +143,6 @@ class Banana
      */
     public function __construct($params = null, $protocole = 'NNTP', $pageclass = 'BananaPage')
     {
-        Banana::load('text.func');
         if (is_null($params)) {
             $this->params = $_GET;
         } else {
@@ -156,6 +162,16 @@ class Banana
             Banana::load('page');
         }
         Banana::$page = new $pageclass;
+        $types = array('multipart/report' => _b_('Rapport d\'erreur'),
+                       'multipart/mixed'  => _b_('Composition'),
+                       'text/html'        => _b_('Texte formaté'),
+                       'text/plain'       => _b_('Texte brut'),
+                       'text/enriched'    => _b_('Texte enrichi'),
+                       'text'             => _b_('Texte'),
+                       'message/rfc822'   => _b_('Mail'),
+                       'message'          => _b_('Message'),
+                       'source'           => _b_('Source'));
+        Banana::$mimeparts = array_merge($types, Banana::$mimeparts);
     }
 
     /** Fill state vars (Banana::$group, Banana::$artid, Banana::$action, Banana;:$part, Banana::$first)
@@ -192,6 +208,9 @@ class Banana
           case 'cancel':
             Banana::$action = Banana::ACTION_MSG_CANCEL;
             return;
+          case 'showext':
+            Banana::$action = Banana::ACTION_MSG_IMAGES;
+            return;
           default:
             Banana::$action = Banana::ACTION_MSG_READ;
         }
@@ -231,6 +250,8 @@ class Banana
           case Banana::ACTION_MSG_LIST:
             $error = $this->action_showThread(Banana::$group, Banana::$first);
             break;
+          case Banana::ACTION_MSG_IMAGES:
+            Banana::$msgshow_externalimages = true;
           case Banana::ACTION_MSG_READ:
             $error = $this->action_showMessage(Banana::$group, Banana::$artid, Banana::$part);
             break;
@@ -331,7 +352,8 @@ class Banana
             }
             exit;
         } elseif ($partid == 'text') {
-            Banana::$page->assign('body', $msg->getFormattedBody());
+            $partid = null;
+            Banana::$page->assign('body', $msg->getFormattedBody($partid));
         } elseif ($partid == 'source') {
             $text = Banana::$protocole->getMessageSource($artid);
             if (!is_utf8($text)) {
@@ -350,7 +372,9 @@ class Banana
             Banana::$page->assign('groups', $groups);
         }    
         Banana::$page->assign_by_ref('message', $msg);
+        Banana::$page->assign('extimages', Banana::$msgshow_hasextimages);
         Banana::$page->assign('headers', Banana::$msgshow_headers);
+        Banana::$page->assign('type', $partid);
         return true;
     }
 
@@ -546,7 +570,7 @@ class Banana
         if ($group == $_SESSION['banana_group']) {
             if (!Banana::$profile['display']) {
                 $_SESSION['banana_spool'] = serialize(Banana::$spool);
-            }    
+            }
             if ($artid == $_SESSION['banana_artid']) {
                 unset($_SESSION['banana_message']);
                 unset($_SESSION['banana_showhdr']);