X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=981f1b67e1d9ab2e60f6aaf6af98889836ae31a3;hb=f8ba91808cc97117107a82d18d35dd4e4994ca6d;hp=98a4ce0b1d5ede09ba7b07f5b8e398f5cc134496;hpb=b8ea4ed629e58fb57a4b110867b4e1b84c82610f;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 98a4ce0b..981f1b67 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -9,19 +9,22 @@ **/ function printMessageInfo($imapConnection, $t, $i, $from, $subject, $dateString, $answered, $seen, $mailbox, $sort, $startMessage) { + require ("../config/config.php"); + $senderName = getSenderName($from); $urlMailbox = urlencode($mailbox); + $subject = trim(stripslashes($subject)); echo "\n"; if ($seen == false) { echo " \n"; echo " $senderName\n"; echo "
$dateString
\n"; - echo " $subject\n"; + echo " $subject\n"; } else { echo " \n"; echo " $senderName\n"; echo "
$dateString
\n"; - echo " $subject\n"; + echo " $subject\n"; } echo "\n"; } @@ -29,8 +32,8 @@ /** ** This function loops through a group of messages in the mailbox and shows them **/ - function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort) { - include("../config/config.php"); + function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color) { + include ("../config/config.php"); if (1 <= $numMessages) { getMessageHeaders($imapConnection, 1, $numMessages, $from, $subject, $date); @@ -38,12 +41,11 @@ $j = 0; while ($j < $numMessages) { -// echo "$numMessages -- $j -- $subject[$j]
"; $date[$j] = ereg_replace(" ", " ", $date[$j]); $tmpdate = explode(" ", trim($date[$j])); $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate); - $messages[$j]["DATE_STRING"] = getDateString($tmpdate); + $messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]); $messages[$j]["ID"] = $j+1; $messages[$j]["FROM"] = getSenderName($from[$j]); $messages[$j]["SUBJECT"] = $subject[$j]; @@ -137,15 +139,6 @@ } } -// $j = 0; -// while ($j < $numMessages) { -// $sub = $msgs[$j]["SUBJECT"]; -// $id = $msgs[$j]["ID"]; -// echo "$id -- $sub
"; -// $j++; -// } -//exit; - if ($startMessage + 24 < $numMessages) { $endMessage = $startMessage + 24; } else { @@ -161,45 +154,76 @@ echo ""; if ($startMessage < $endMessage) { - echo "\n"; } else if ($startMessage == $endMessage) { - echo "\"TD>"; + echo "
". _("Viewing message ") ."$startMessage ($numMessages ". _("total") .")
\n"; echo "\n"; } - echo "\n"; /** The delete and move options */ - echo ""; - echo "
"; - echo "
Viewing messages $startMessage to $endMessage ($numMessages total)
\n"; + echo "
"; + echo "
". _("Viewing messages ") ."$startMessage". _(" to ") ."$endMessage ($numMessages total)
\n"; echo "
"; - echo "
Viewing message $startMessage ($numMessages total)
\n"; + echo "
"; + echo "
"; if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { - echo "Previous\n"; - echo "Next\n"; + echo "". _("Previous") ."\n"; + echo "". _("Next") ."\n"; } else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - echo "Previous\n"; - echo "Next\n"; + echo "". _("Previous") ."\n"; + echo "Next\n"; } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { - echo "Previous\n"; - echo "Next\n"; + echo "Previous\n"; + echo "". _("Next") ."\n"; } echo "
"; - echo "
"; - echo ""; - echo ""; - if (($move_to_trash == true) && ($mailbox == $trash_folder)) - echo "            Empty Trash"; + echo "
"; + + echo "\n\n\n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo " "; + echo " \n"; + + echo "
\n"; + echo " ". _("Move selected to:") .""; + echo " "; + echo " \n"; + + echo " \n"; + echo "  ". _("checked messages") ."\n"; + echo "
\n\n\n"; echo "
"; - echo ""; - echo ""; - echo " "; + echo "\n"; - echo "
Num
"; + echo ""; + echo ""; + echo " "; /** FROM HEADER **/ - echo " \n"; else if ($sort == 3) @@ -207,7 +231,7 @@ else echo " \n"; /** DATE HEADER **/ - echo " \n"; else if ($sort == 1) @@ -215,9 +239,9 @@ else echo " \n"; /** SUBJECT HEADER **/ - echo " \n"; + echo " \n"; else if ($sort == 5) echo " \n"; else @@ -227,7 +251,7 @@ // loop through and display the info for each message. $t = 0; // $t is used for the checkbox number if ($numMessages == 0) { // if there's no messages in this folder - echo ""; + echo ""; } else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different. $i = $startMessage - 1; printMessageInfo($imapConnection, $t, $msgs[$i]["ID"], $msgs[$i]["FROM"], $msgs[$i]["SUBJECT"], $msgs[$i]["DATE_STRING"], $msgs[$i]["FLAG_ANSWERED"], $msgs[$i]["FLAG_SEEN"], $mailbox, $sort, $startMessage); @@ -242,18 +266,18 @@ echo "
 From"; + echo " ". _("From") .""; if ($sort == 2) echo " Date"; + echo " ". _("Date") .""; if ($sort == 0) echo " Subject\n"; + echo " ". _("Subject") ."\n"; if ($sort == 4) - echo "

THIS FOLDER IS EMPTY
 

THIS FOLDER IS EMPTY
 
\n"; echo "
"; + echo "
"; if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { - echo "Previous\n"; - echo "Next\n"; + echo "" . _("Previous") . "\n"; + echo "" . _("Next") . "\n"; } else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - echo "Previous\n"; - echo "Next\n"; + echo "" . _("Previous") . "\n"; + echo "" . _("Next") . "\n"; } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { - echo "Previous\n"; - echo "Next\n"; + echo "Previous\n"; + echo "" . _("Next") . "\n"; } echo "
"; /** End of message-list table */ }