fixed some problems and improved "view header" functionality

[squirrelmail.git] / src / read_body.php

diff --git a/src/read_body.php b/src/read_body.php
index d49ec3d1780c7dc6c1d038bd4e37c8a02d5a83b6..5825218a6f925c2d2fa505e5e5d91025330cde2d 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -23,6 +23,8 @@
       include("../functions/mime.php");
    if (!isset($date_php))
       include("../functions/date.php");
+       if (!isset($url_parser_php)) 
+               include("../functions/url_parser.php");
 
    include("../src/load_prefs.php");
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -45,19 +47,38 @@
       }
       echo ""._("View message") . "</a></b></center></td></tr></table>\n";
       echo "<table width=99% cellpadding=2 cellspacing=0 border=0 align=center>\n";
-      echo "<tr><td><pre>";
+      echo "<tr><td>";
+
       for ($i=1; $i < count($read)-1; $i++) {
-         $read[$i] = htmlspecialchars($read[$i]);
-         if (substr($read[$i], 0, 1) != "\t" && 
-             substr($read[$i], 0, 1) != " " && 
-             substr($read[$i], 0, 1) != "&" && 
-             trim($read[$i])) {
-            $pre = substr($read[$i], 0, strpos($read[$i], ":"));
-            $read[$i] = str_replace("$pre", "<b>$pre</b>", decodeHeader($read[$i]));
+         $line = htmlspecialchars($read[$i]);
+                       if (eregi("^&gt;", $line)) {
+                               $second[$i] = $line;
+                               $first[$i] = "&nbsp;";
+                               $cnum++;
+         } else if (eregi("^[ |\t]", $line)) {
+            $second[$i] = $line;
+            $first[$i] = "";
+         } else if (eregi("^([^:]+):(.+)", $line, $regs)) {
+            $first[$i] = $regs[1] . ":";
+            $second[$i] = $regs[2];
+                               $cnum++;
+         } else {
+            $second[$i] = trim($line);
+            $first[$i] = "";
          }
-         echo "$read[$i]";
+               }
+               for ($i=0; $i < count($second); $i = $j) {
+                       $f = $first[$i];
+                       $s = nl2br($second[$i]);
+                       $j = $i + 1;
+                       while ($first[$j] == "" && $j < count($first)) {
+                               $s .= "&nbsp;&nbsp;&nbsp;&nbsp;" . nl2br($second[$j]);
+                               $j++;
+                       }
+                       parseEmail($s);
+                       echo "<nobr><tt><b>$f</b>$s</tt></nobr>";
       }
-      echo "</pre></td></tr></table>\n";
+      echo "</td></tr></table>\n";
       echo "</body></html>";
       sqimap_mailbox_close($imapConnection);
       sqimap_logout($imapConnection);
@@ -69,29 +90,43 @@
 
    // returns the index of the next valid message from the array
    function findNextMessage() {
-      global $msort, $currentArrayIndex, $msgs;
-               for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { 
-          if ($currentArrayIndex == $msgs[$key]["ID"]) {
-                               next($msort); 
-                               $key = key($msort);
-                               if (isset($key)) 
-                                       return $msgs[$key]["ID"];
-                       }
-               }
+      global $msort, $currentArrayIndex, $msgs, $sort;
+
+      if ($sort == 6) {
+         if ($currentArrayIndex != 1) {
+            return $currentArrayIndex - 1;
+         }
+      } else {
+         for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { 
+            if ($currentArrayIndex == $msgs[$key]["ID"]) {
+               next($msort); 
+               $key = key($msort);
+               if (isset($key)) 
+                  return $msgs[$key]["ID"];
+            }
+         }
+      }
       return -1;
    }
 
    // returns the index of the previous message from the array
    function findPreviousMessage() {
-      global $msort, $currentArrayIndex, $msgs;
-               for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { 
-          if ($currentArrayIndex == $msgs[$key]["ID"]) {
-                               prev($msort);
-                               $key = key($msort);
-                               if (isset($key))
-                                       return $msgs[$key]["ID"];
-                       }
-               }
+      global $msort, $currentArrayIndex, $sort, $msgs, $imapConnection, $mailbox;
+      if ($sort == 6) {
+         $numMessages = sqimap_get_num_messages($imapConnection, $mailbox);
+         if ($currentArrayIndex != $numMessages) {
+            return $currentArrayIndex + 1; 
+         }
+      } else {
+               for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { 
+          if ($currentArrayIndex == $msgs[$key]["ID"]) {
+                               prev($msort);
+                               $key = key($msort);
+                               if (isset($key))
+                                       return $msgs[$key]["ID"];
+                       }
+               }
+      }   
       return -1;
    }