* Added code to show text/html messages (immediately after text/plain and

  entity_id of 2) as default instead of the text/plain version.
* Made option default to off

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1172 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/data/default_pref b/data/default_pref
index cc40cad89e3aae440573e0dc7ff8d2bb125b1eff..1337b528b772f998affe6d62d1e27838402d8ade 100644 (file)
--- a/data/default_pref
+++ b/data/default_pref
@@ -1,3 +1,4 @@
 full_name=
 reply_to=
 chosen_theme=../config/default_theme.php
+show_html_default=0

diff --git a/functions/mime.php b/functions/mime.php
index 53ae552cd6123f0487f1d5abdac889d0f5042700..f5d4b2583397764c275c4cc98f0e476f93f797cb 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -479,21 +479,46 @@
 
    // figures out what entity to display and returns the $message object
    // for that entity.
-   function findDisplayEntity ($message) {
-      if ($message) {
-         if ($message->header->type0 == "text") {
-            if ($message->header->type1 == "plain" ||
-                $message->header->type1 == "html") {
-              if (isset($message->header->entity_id))
-                   return $message->header->entity_id;
-              return 0;
-            }
-         } else {
-            for ($i=0; $message->entities[$i]; $i++) {
-               return findDisplayEntity($message->entities[$i]);
-            }   
-         }   
-      }
+   function findDisplayEntity ($message, $next = 'none')
+   {
+      global $show_html_default;
+      
+      if (! $message)
+       return;
+
+      // Show text/plain or text/html -- the first one we find.
+      if ($message->header->type0 == 'text' && 
+         ($message->header->type1 == 'plain' ||
+          $message->header->type2 == 'html'))
+       {
+          // If the next part is an HTML version, this will
+          // all be true.  Show it, if the user so desires.
+          // HTML mails this way all have entity_id of 2.  1 = text/plain
+          if ($next != 'none' &&
+              $next->header->type0 == "text" &&
+              $next->header->type1 == "html" &&
+              $next->header->entity_id == 2 &&
+              $message->header->type1 == "plain" &&
+              isset($show_html_default) &&
+              $show_html_default)
+            $message = $next;
+          
+          if (isset($message->header->entity_id))
+            return $message->header->entity_id;
+       } 
+      else 
+       {
+          for ($i=0; $message->entities[$i]; $i++) 
+            {
+               $next = 'none';
+               if (isset($message->entities[$i + 1]))
+                 $next = $message->entities[$i + 1];
+               $entity = findDisplayEntity($message->entities[$i], $next);
+               if ($entity != 0)
+                 return $entity;
+            }   
+       }   
+      return 0;
    }
 
    /** This returns a parsed string called $body. That string can then

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 6778427a433f3442690135a16381c56e6fae4149..844ce3a61ad41fd31333ba732d2e40cd7259addc 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -188,6 +188,8 @@
        $location_of_buttons = 'between';
        
    $collapse_folders = getPref($data_dir, $username, 'collapse_folders');
+   
+   $show_html_default = getPref($data_dir, $username, 'show_html_default');
 
    do_hook("loading_prefs");
 

diff --git a/src/options.php b/src/options.php
index 92ad97011ef7862319b307b5220190c9cb6cad48..43a5ce6fa044f4292502e997dcfe95ac1fa42bfc 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -71,6 +71,10 @@
       setPref($data_dir, $username, 'location_of_buttons', $button_new_location);
       setPref($data_dir, $username, 'left_size', $leftsize);
       setPref($data_dir, $username, 'use_javascript_addr_book', $javascript_abook);
+      if (isset($showhtmldefault))
+         setPref($data_dir, $username, 'show_html_default', 1);
+      else
+         removePref($data_dir, $username, 'show_html_default');
     
       do_hook('options_display_save');
 

diff --git a/src/options_display.php b/src/options_display.php
index 259655b56d9428fa8c72514032b9b086a62d15e9..dae1856847e745bc8ebd6b917220e5a18fc8e7a1 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -293,6 +293,19 @@
 ?>
             </td>
          </tr>
+         <tr>
+            <td valign=top align=right>
+               <?php echo _("Show HTML version by default"); ?>:
+            </td>
+            <td>
+               <input type=checkbox name=showhtmldefault <?php 
+              if (isset($show_html_default) && $show_html_default) 
+              echo " checked"; ?>>
+                <?php 
+echo _("Yes, show me the HTML version of a mail message, if it is available."); 
+                 ?>
+            </td>
+         </tr>
          <?php do_hook('options_display_inside'); ?>
          <tr>
             <td>&nbsp;