Small fixes

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@168 9869982d-c50d-0410-be91-f2a2ec7c7c7b

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index 0b3c77c..f4b19b0 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -45,6 +45,7 @@ class Banana
     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_withthread = true;
 
     /** Match an url

diff --git a/banana/message.func.inc.php b/banana/message.func.inc.php
index 07d52f7..c0cd097 100644 (file)
--- a/banana/message.func.inc.php
+++ b/banana/message.func.inc.php
@@ -357,7 +357,9 @@ function banana_formatHtml(BananaMimePart &$part)
 {
     $text = $part->getText();
     $text = banana_catchHtmlSignature($text);
-    $text = banana_hideExternalImages($text);
+    if (!Banana::$msgshow_externalimages) {
+        $text = banana_hideExternalImages($text);
+    }    
     $text = banana_catchPartLinks($text);
     return banana_cleanHtml($text);
 }

diff --git a/banana/templates/banana-base.tpl b/banana/templates/banana-base.tpl
index 8f3f82c..26e6d7a 100644 (file)
--- a/banana/templates/banana-base.tpl
+++ b/banana/templates/banana-base.tpl
@@ -47,7 +47,7 @@
         {include file="banana-thread.inc.tpl" withtitle=true}
       {elseif $page eq 'message'}
         {include file="banana-message.inc.tpl"}
-        {if $withthread}
+        {if $showthread}
         {include file="banana-thread.inc.tpl" withtitle=false}
         {/if}
       {elseif $page eq 'new'}