X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=3c4ae6f433bd16a7eb9834cf1edbcc9b3fad7310;hb=32b3d87eb50fd8a021cc5711aae022532a8cad12;hp=ed7e12369fb5e0f433d064362e6e1dd26511a5e3;hpb=8b673ac145ad6dc77796fc0c1ef48094c76b46e1;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index ed7e1236..3c4ae6f4 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -8,25 +8,27 @@ ** **/ - function printMessageInfo($imapConnection, $t, $i, $from, $subject, $dateString, $answered, $seen, $mailbox, $sort, $startMessage) { - require ("../config/config.php"); + $mailbox_info = true; - $senderName = $from; + function printMessageInfo($imapConnection, $t, $msg, $mailbox, $sort, $startMessage) { + //require ("../config/config.php"); + global $color, $PHPSESSID; + + $senderName = $msg["FROM"]; $urlMailbox = urlencode($mailbox); - $subject = trim(stripslashes($subject)); + $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"; } /** @@ -34,6 +36,7 @@ **/ function showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color) { include ("../config/config.php"); + global $PHPSESSID; if ($numMessages >= 1) { for ($q = 0; $q < $numMessages; $q++) { @@ -41,8 +44,8 @@ $from[$q] = $f; $date[$q] = $d; $subject[$q] = $s; + $flags[$q] = sqimap_get_flags ($imapConnection, $q+1); } - $flags = sqimap_get_flags ($imapConnection, 1, $numMessages); } $j = 0; @@ -55,9 +58,6 @@ $messages[$j]["ID"] = $j+1; $messages[$j]["FROM"] = decodeHeader($from[$j]); $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]); - $messages[$j]["FLAG_DELETED"] = false; - $messages[$j]["FLAG_ANSWERED"] = false; - $messages[$j]["FLAG_SEEN"] = false; $num = 0; while ($num < count($flags[$j])) { @@ -70,6 +70,9 @@ else if ($flags[$j][$num] == "Seen") { $messages[$j]["FLAG_SEEN"] = true; } + else if ($flags[$j][$num] == "Flagged") { + $messages[$j]["FLAG_FLAGGED"] = true; + } $num++; } $j++; @@ -83,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++; @@ -165,37 +161,37 @@ if ($startMessage < $endMessage) { echo ""; - echo "
". _("Viewing messages ") ."$startMessage". _(" to ") ."$endMessage ($numMessages total)
\n"; + echo "
". _("Viewing messages ") ."$startMessage". _(" to ") ."$endMessage ($numMessages total)
\n"; echo "\n"; } else if ($startMessage == $endMessage) { echo "\"TD>"; - echo "
". _("Viewing message ") ."$startMessage ($numMessages ". _("total") .")
\n"; + echo "
". _("Viewing message ") ."$startMessage ($numMessages ". _("total") .")
\n"; echo "\n"; } 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 "\n"; /** The delete and move options */ echo ""; - echo "\n\n\n
"; + echo "\n\n\n"; echo "\n"; echo " \n"; echo " \n"; echo " "; echo " \n"; @@ -231,31 +227,31 @@ echo "
\n"; - echo " ". _("Move selected to:") .""; + echo " ". _("Move selected to:") .""; echo " "; - echo " \n"; + echo " \n"; echo " \n"; - echo "  ". _("checked messages") ."\n"; + echo "  ". _("checked messages") ."\n"; echo "
"; echo ""; 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 ""; @@ -265,10 +261,10 @@ 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++; } } @@ -279,16 +275,16 @@ 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") ."
 
"; 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 */ }