X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=3c4ae6f433bd16a7eb9834cf1edbcc9b3fad7310;hb=32b3d87eb50fd8a021cc5711aae022532a8cad12;hp=6e49080e507db048b28c21d02fc0b1b12d18eac0;hpb=de80e95e61d4a179a0d41ac4512c83818f3243ef;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 6e49080e..3c4ae6f4 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -8,61 +8,71 @@ ** **/ - function printMessageInfo($imapConnection, $t, $i, $from, $subject, $dateString, $answered, $seen, $mailbox, $sort, $startMessage) { - $senderName = getSenderName($from); + $mailbox_info = true; + + function printMessageInfo($imapConnection, $t, $msg, $mailbox, $sort, $startMessage) { + //require ("../config/config.php"); + global $color, $PHPSESSID; + + $senderName = $msg["FROM"]; $urlMailbox = urlencode($mailbox); + $subject = trim(stripslashes($msg["SUBJECT"])); echo "\n"; - if ($seen == false) { - echo " \n"; - echo " $senderName\n"; - echo "
$dateString
\n"; - echo " $subject\n"; - } else { - echo " \n"; - echo " $senderName\n"; - echo "
$dateString
\n"; - echo " $subject\n"; - } - echo "\n"; + + if ($msg["FLAG_FLAGGED"] == true) { $flag = ""; $flag_end = ""; } + if ($msg["FLAG_SEEN"] == false) { $bold = ""; $bold_end = ""; } + if ($msg["FLAG_ANSWERED"] == true) { $ans = " [A]"; } + + echo " \n"; + echo " $bold$flag$senderName$flag_end$bold_end\n"; + echo "
$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end
\n"; + echo " $bold$flag$subject$flag_end$ans$bold_end\n"; + + echo "\n"; } /** ** 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"); + global $PHPSESSID; - if (1 <= $numMessages) { - getMessageHeaders($imapConnection, 1, $numMessages, $from, $subject, $date); + if ($numMessages >= 1) { + for ($q = 0; $q < $numMessages; $q++) { + sqimap_get_small_header ($imapConnection, $q+1, $f, $s, $d); + $from[$q] = $f; + $date[$q] = $d; + $subject[$q] = $s; + $flags[$q] = sqimap_get_flags ($imapConnection, $q+1); + } } $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]; - $messages[$j]["FLAG_DELETED"] = false; - $messages[$j]["FLAG_ANSWERED"] = false; - $messages[$j]["FLAG_SEEN"] = false; + $messages[$j]["FROM"] = decodeHeader($from[$j]); + $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]); $num = 0; - getMessageFlags($imapConnection, $j+1, $flags); - while ($num < count($flags)) { - if ($flags[$num] == "Deleted") { + while ($num < count($flags[$j])) { + if ($flags[$j][$num] == "Deleted") { $messages[$j]["FLAG_DELETED"] = true; } - else if ($flags[$num] == "Answered") { + else if ($flags[$j][$num] == "Answered") { $messages[$j]["FLAG_ANSWERED"] = true; } - else if ($flags[$num] == "Seen") { + else if ($flags[$j][$num] == "Seen") { $messages[$j]["FLAG_SEEN"] = true; } + else if ($flags[$j][$num] == "Flagged") { + $messages[$j]["FLAG_FLAGGED"] = true; + } $num++; } $j++; @@ -76,14 +86,7 @@ $j++; continue; } - $msgs[$i]["TIME_STAMP"] = $messages[$j]["TIME_STAMP"]; - $msgs[$i]["DATE_STRING"] = $messages[$j]["DATE_STRING"]; - $msgs[$i]["ID"] = $messages[$j]["ID"]; - $msgs[$i]["FROM"] = $messages[$j]["FROM"]; - $msgs[$i]["SUBJECT"] = $messages[$j]["SUBJECT"]; - $msgs[$i]["FLAG_DELETED"] = $messages[$j]["FLAG_DELETED"]; - $msgs[$i]["FLAG_ANSWERED"] = $messages[$j]["FLAG_ANSWERED"]; - $msgs[$i]["FLAG_SEEN"] = $messages[$j]["FLAG_SEEN"]; + $msgs[$i] = $messages[$j]; $i++; $j++; @@ -98,11 +101,13 @@ ** 2 = Name (up) ** 3 = Name (dn) **/ + if ($sort == 0) $msgs = ary_sort($msgs, "TIME_STAMP", -1); else if ($sort == 1) $msgs = ary_sort($msgs, "TIME_STAMP", 1); else { + $original = $msgs; $i = 0; while ($i < count($msgs)) { @@ -125,10 +130,14 @@ $i = 0; while ($i < count($msgs)) { $j = 0; + $loop = true; while ($j < count($original)) { if ($msgs[$i]["ID"] == $original[$j]["ID"]) { $msgs[$i]["FROM"] = $original[$j]["FROM"]; $msgs[$i]["SUBJECT"] = $original[$j]["SUBJECT"]; + + // exit out of this loop if we find the thing. + $j = count($original) + 1; } $j++; } @@ -137,15 +146,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 { @@ -156,111 +156,115 @@ $prevGroup = $startMessage - 25; $urlMailbox = urlencode($mailbox); - /** This is the beginning of the message list table. It wraps around all messages */ 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 "\n\n\n
"; - echo "\n"; + echo "\n\n\n"; + echo "
\n"; echo " \n"; - echo " \n"; - echo " "; echo " \n"; - if (($move_to_trash == true) && ($mailbox == $trash_folder)) - echo ""; echo "
\n"; - echo " \n"; - echo " \n"; + echo " ". _("Move selected to:") .""; + echo " \n"; + echo " "; + echo " \n"; echo " \n"; - echo "  checked messages\n"; + echo " \n"; + echo "  ". _("checked messages") ."\n"; echo "
            Empty Trash
\n\n\n"; echo "
"; - echo ""; - echo ""; - echo " "; + echo "\n"; - echo "
Num
"; + echo ""; + echo ""; + echo " "; /** FROM HEADER **/ - echo " \n"; + echo " \n"; else if ($sort == 3) - echo " \n"; + echo " \n"; else - echo " \n"; + echo " \n"; /** DATE HEADER **/ - echo " \n"; + echo " \n"; else if ($sort == 1) - echo " \n"; + echo " \n"; else - echo " \n"; + echo " \n"; /** SUBJECT HEADER **/ - echo " \n"; + echo " \n"; else if ($sort == 5) - echo " \n"; + echo " \n"; else - echo " \n"; + echo " \n"; echo ""; + // 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); + printMessageInfo($imapConnection, $t, $msgs[$i], $mailbox, $sort, $startMessage); } else { for ($i = $startMessage - 1;$i <= $endMessage - 1; $i++) { - 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); + printMessageInfo($imapConnection, $t, $msgs[$i], $mailbox, $sort, $startMessage); $t++; } } @@ -269,18 +273,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 */ }