X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=05462549a88987a26c702247754b207f4e615640;hb=ca29b81004eea3cff3f249e95235ba544730a4e7;hp=022ddd014ba3748316cc00112fb990f6b8ed31d7;hpb=1195c34026fc65eb8e0ca7a337fe4b406764dee8;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index 022ddd01..05462549 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -27,6 +27,7 @@ include("../src/load_prefs.php"); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); + do_hook("html_top"); displayPageHeader($color, $mailbox); if ($view_hdr) { @@ -34,24 +35,41 @@ $read = sqimap_read_data ($imapConnection, "a003", true, $a, $b); echo "
"; - echo "\n"; + echo "
\n"; echo " \n"; - echo "
" . _("Viewing full header") . " - "; - echo ""; - echo ""._("View message") . "
";
+      if ($where && $what) {
+         // Got here from a search
+         echo "";
+      } else {
+         echo "";
+      }
+      echo ""._("View message") . "
\n"; + echo "\n"; + echo "
"; + + echo ""; 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", "$pre", $read[$i]); + $line = htmlspecialchars($read[$i]); + if (eregi("^[ |\t]", $line)) { + $second = $line; + $first = ""; + } else if (eregi("^([^:|^\s]+):(.+)", $line, $regs)) { + $first = $regs[1]; + $second = $regs[2]; + } else { + $second = trim($line); + $first = ""; } - echo "$read[$i]"; + echo ""; } - echo "
"; + if ($first) echo "$first:"; + else echo " "; + echo "$second
\n"; + echo "
"; + echo "\n"; echo ""; + sqimap_mailbox_close($imapConnection); + sqimap_logout($imapConnection); exit; } @@ -60,34 +78,48 @@ // 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; } if (isset($msgs)) { - $currentArrayIndex = $passed_id; + $currentArrayIndex = $passed_id; /* for ($i=0; $i < count($msgs); $i++) { if ($msgs[$i]["ID"] == $passed_id) { @@ -110,12 +142,25 @@ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); /** translate the subject and mailbox into url-able text **/ - $url_subj = urlencode(trim(stripslashes($message->header->subject))); + $url_subj = urlencode(trim(sqStripSlashes($message->header->subject))); $urlMailbox = urlencode($mailbox); $url_replyto = urlencode($message->header->replyto); $url_replytoall = urlencode($message->header->replyto); - $url_replytoallcc = urlencode(getLineOfAddrs($message->header->to) . ", " . getLineOfAddrs($message->header->cc)); + $url_replytoallcc = getLineOfAddrs($message->header->to); + $url_replytoallcc_cc = getLineOfAddrs($message->header->cc); + if ($url_replytoallcc) { + if ($url_replytoallcc_cc) { + $url_replytoallcc .= ", " . $url_replytoallcc_cc; + } + } else { + if ($url_replytoallcc_cc) { + $url_replytoallcc = $url_replytoallcc_cc; + } else { + $url_replytoallcc = ""; + } + } + $url_replytoallcc = urlencode($url_replytoallcc); $dateString = getLongDateString($message->header->date); $ent_num = findDisplayEntity($message); @@ -129,7 +174,7 @@ $to_string = ""; $to_ary = $message->header->to; while ($i < count($to_ary)) { - $to_ary[$i] = htmlspecialchars($to_ary[$i]); + $to_ary[$i] = htmlspecialchars(decodeHeader($to_ary[$i])); if ($to_string) $to_string = "$to_string
$to_ary[$i]"; @@ -140,11 +185,21 @@ if (count($to_ary) > 1) { if ($show_more == false) { if ($i == 1) { - $to_string = "$to_string ($echo_more)"; + if ($where && $what) { + // from a search + $to_string = "$to_string ($echo_more)"; + } else { + $to_string = "$to_string ($echo_more)"; + } $i = count($to_ary); } } else if ($i == 1) { - $to_string = "$to_string ($echo_less)"; + if ($where && $what) { + // from a search + $to_string = "$to_string ($echo_less)"; + } else { + $to_string = "$to_string ($echo_less)"; + } } } } @@ -153,7 +208,7 @@ $i = 0; $cc_string = ""; $cc_ary = $message->header->cc; - while ($i < count($cc_ary)) { + while ($i < count(decodeHeader($cc_ary))) { $cc_ary[$i] = htmlspecialchars($cc_ary[$i]); if ($cc_string) $cc_string = "$cc_string
$cc_ary[$i]"; @@ -164,49 +219,72 @@ if (count($cc_ary) > 1) { if ($show_more_cc == false) { if ($i == 1) { - $cc_string = "$cc_string ($echo_more)"; + if ($where && $what) { + // from a search + $cc_string = "$cc_string ($echo_more)"; + } else { + $cc_string = "$cc_string ($echo_more)"; + } $i = count($cc_ary); } } else if ($i == 1) { - $cc_string = "$cc_string ($echo_less)"; + if ($where && $what) { + // from a search + $cc_string = "$cc_string ($echo_less)"; + } else { + $cc_string = "$cc_string ($echo_less)"; + } } } } /** make sure everything will display in HTML format **/ $from_name = decodeHeader(htmlspecialchars($message->header->from)); - $subject = decodeHeader(htmlspecialchars(stripslashes($message->header->subject))); + $subject = decodeHeader(htmlspecialchars($message->header->subject)); + do_hook("read_body_top"); echo "
"; - echo "\n"; + + echo "
\n"; echo " "; + echo "
"; echo " "; echo " "; echo " \n"; - echo " "; + if ($where && $what) { + // Got here from a search + echo " "; + } else { + echo " "; + } echo " \n"; /** from **/ echo " \n"; echo " \n"; echo " \n"; /** date **/ @@ -248,7 +331,7 @@ echo " \n"; echo " \n"; /** to **/ @@ -256,7 +339,7 @@ echo " \n"; echo " \n"; /** cc **/ @@ -265,22 +348,27 @@ echo " \n"; echo " \n"; } echo "
"; echo " "; - echo " "; + if ($where && $what) { + echo " "; + } else { + echo " "; + } echo _("Message List"); echo " | "; - echo " "; + if ($where && $what) { + echo " "; + } else { + echo " "; + } echo _("Delete"); echo "  "; echo " "; echo " "; echo " \n"; - if ($currentArrayIndex == -1) { - echo "Previous | Next"; + if ($where && $what) { } else { - $prev = findPreviousMessage(); - $next = findNextMessage(); - if ($prev != -1) - echo "" . _("Previous") . " | "; - else - echo _("Previous") . " | "; - if ($next != -1) - echo "" . _("Next") . ""; - else - echo _("Next"); - } + if ($currentArrayIndex == -1) { + echo "Previous | Next"; + } else { + $prev = findPreviousMessage(); + $next = findNextMessage(); + if ($prev != -1) + echo "" . _("Previous") . " | "; + else + echo _("Previous") . " | "; + if ($next != -1) + echo "" . _("Next") . ""; + else + echo _("Next"); + } + } echo " \n"; echo " "; echo " "; @@ -231,16 +309,21 @@ echo " \n"; echo _("Subject:"); echo " \n"; - echo " $subject\n"; + echo " $subject \n"; echo " " . _("View full header") . "  " . _("View full header") . "  " . _("View full header") . "  
\n"; echo _("From:"); echo " \n"; - echo " $from_name\n"; + echo " $from_name \n"; echo "
\n"; echo _("Date:"); echo " \n"; - echo " $dateString\n"; + echo " $dateString \n"; echo "
\n"; echo _("To:"); echo " \n"; - echo " $to_string\n"; + echo " $to_string \n"; echo "
\n"; echo " Cc:\n"; echo " \n"; - echo " $cc_string\n"; + echo " $cc_string \n"; echo "
"; echo "
"; + echo "\n"; echo " \n"; + echo $body; + + echo "
\n"; - $body = formatBody($message, $color, $wrap_at); echo "
"; + + $body = formatBody($imapConnection, $message, $color, $wrap_at); - echo "$body"; - - echo "
\n"; echo " "; echo "
 
\n"; + do_hook("read_body_bottom"); + do_hook("html_bottom"); sqimap_logout($imapConnection); ?>