X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=95ea1b95cfbc985a72f511e366abb47c55bd6e18;hb=ae6b5b411b82d87730b18d081ff57dde99523f4e;hp=638529a20701de8394c47b07d92f0d325c69fac6;hpb=98fe1e9ffb8c254a739f853d3b83c667b9f9f65e;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 638529a2..95ea1b95 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -14,12 +14,16 @@ global $color, $msgs, $msort; global $sent_folder; global $message_highlight_list; + global $index_order; $msg = $msgs[$key]; $senderName = sqimap_find_displayable_name($msg["FROM"]); $urlMailbox = urlencode($mailbox); - $subject = trim(stripslashes($msg["SUBJECT"])); + $subject = trim($msg["SUBJECT"]); + if ($subject == "") + $subject = _("(no subject)"); + echo "\n"; if ($msg["FLAG_FLAGGED"] == true) { $flag = ""; $flag_end = ""; } @@ -27,15 +31,17 @@ if ($mailbox == $sent_folder) { $italic = ""; $italic_end = ""; } for ($i=0; $i < count($message_highlight_list); $i++) { - if ($message_highlight_list[$i]["match_type"] == "to_cc") { - if (eregi($message_highlight_list[$i]["value"],$msg["TO"]) || eregi($message_highlight_list[$i]["value"],$msg["CC"])) { + if (trim($message_highlight_list[$i]["value"]) != "") { + if ($message_highlight_list[$i]["match_type"] == "to_cc") { + if (strpos("^^".strtolower($msg["TO"]), strtolower($message_highlight_list[$i]["value"])) || strpos("^^".strtolower($msg["CC"]), strtolower($message_highlight_list[$i]["value"]))) { + $hlt_color = $message_highlight_list[$i]["color"]; + continue; + } + } else if (strpos("^^".strtolower($msg[strtoupper($message_highlight_list[$i]["match_type"])]),strtolower($message_highlight_list[$i]["value"]))) { $hlt_color = $message_highlight_list[$i]["color"]; continue; - } - } else if (eregi($message_highlight_list[$i]["value"],$msg[strtoupper($message_highlight_list[$i]["match_type"])])) { - $hlt_color = $message_highlight_list[$i]["color"]; - continue; - } + } + } } if (!$hlt_color) @@ -44,14 +50,45 @@ if ($where && $what) { $search_stuff = "&where=".urlencode($where)."&what=".urlencode($what); } - - echo " \n"; - echo " $italic$bold$flag$senderName$flag_end$bold_end$italic_end\n"; - echo "
$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end
\n"; - if ($msg["FLAG_ANSWERED"] == true) echo " A"; - elseif (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) echo " !"; - else echo "  "; - echo " $bold$flag$subject$flag_end$bold_end\n"; + + for ($i=1; $i <= count($index_order); $i++) { + switch ($index_order[$i]) { + case 1: # checkbox + echo " \n"; + break; + case 2: # from + echo " $italic$bold$flag$senderName$flag_end$bold_end$italic_end\n"; + break; + case 3: # date + echo "
$bold$flag".$msg["DATE_STRING"]."$flag_end$bold_end
\n"; + break; + case 4: # subject + echo " $bold$flag$subject$flag_end$bold_end\n"; + break; + case 5: # flags + $stuff = false; + echo " \n"; + if ($msg["FLAG_ANSWERED"] == true) { + echo "A\n"; + $stuff = true; + } + if ($msg["TYPE0"] == "multipart") { + echo "+\n"; + $stuff = true; + } + if (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) { + echo "!\n"; + $stuff = true; + } + if (!$stuff) echo " \n"; + echo "\n"; + break; + case 6: # size + echo " $bold".show_readable_size($msg['SIZE'])."$bold_end\n"; + break; + } + } + echo "\n"; } @@ -63,6 +100,12 @@ global $msgs, $msort; global $sent_folder; global $message_highlight_list; + global $auto_expunge; + + if ($auto_expunge) { + sqimap_mailbox_expunge($imapConnection, $mailbox); + sqimap_mailbox_select($imapConnection, $mailbox); + } if (!$use_cache) { if ($numMessages >= 1) { @@ -78,6 +121,8 @@ $to[$q] = $hdr->to; $priority[$q] = $hdr->priority; $cc[$q] = $hdr->cc; + $size[$q] = $hdr->size; + $type[$q] = $hdr->type0; $flags[$q] = sqimap_get_flags ($imapConnection, $q+1); } @@ -98,11 +143,16 @@ $messages[$j]["TO"] = decodeHeader($to[$j]); $messages[$j]["PRIORITY"] = $priority[$j]; $messages[$j]["CC"] = $cc[$j]; + $messages[$j]["SIZE"] = $size[$j]; + $messages[$j]["TYPE0"] = $type[$j]; # fix SUBJECT-SORT to remove Re: - if (substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "re:" || - substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "aw:") - $messages[$j]["SUBJECT-SORT"] = trim(substr($messages[$j]["SUBJECT-SORT"], 3)); + $re_abbr = # Add more here! + "vedr|sv|" . # Danish + "re|aw"; # English + if (eregi("^($re_abbr):[ ]*(.*)$", + $messages[$j]['SUBJECT-SORT'], $regs)) + $messages[$j]['SUBJECT-SORT'] = $regs[2]; $num = 0; while ($num < count($flags[$j])) { @@ -169,10 +219,7 @@ function displayMessageArray($imapConnection, $numMessages, $startMessage, &$msgs, $msort, $mailbox, $sort, $color,$show_num) { global $folder_prefix, $sent_folder; global $imapServerAddress; - - // do a check to see if the config stuff has already been included or not -// if (!isset($imapServerAddress)) -// include("../config/config.php"); + global $index_order; // if cache isn't already set, do it now if (!session_is_registered("msgs")) @@ -180,117 +227,58 @@ if (!session_is_registered("msort")) session_register("msort"); + if ($startMessage + ($show_num - 1) < $numMessages) { $endMessage = $startMessage + ($show_num-1); } else { $endMessage = $numMessages; } - + + if ($endMessage < $startMessage) { + $startMessage = $startMessage - $show_num; + if ($startMessage < 1) + $startMessage = 1; + } + $nextGroup = $startMessage + $show_num; $prevGroup = $startMessage - $show_num; $urlMailbox = urlencode($mailbox); - /** This is the beginning of the message list table. It wraps around all messages */ - echo ""; + do_hook("mailbox_index_before"); + $Message = ''; if ($startMessage < $endMessage) { - echo "\n"; + $Message = _("Viewing messages") ." $startMessage ". _("to") ." $endMessage ($numMessages " . _("total") . ")\n"; } else if ($startMessage == $endMessage) { - echo "\n"; + $Message = _("Viewing message") ." $startMessage ($numMessages " . _("total") . ")\n"; } - echo "\n"; - - /** The delete and move options */ - echo ""; - - echo "
"; - echo "
". _("Viewing messages") ." $startMessage ". _("to") ." $endMessage ($numMessages " . _("total") . ")
\n"; - echo "
"; - echo "
". _("Viewing message") ." $startMessage ($numMessages " . _("total") . ")
\n"; - echo "
"; + $More = ''; if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { - echo "". _("Previous") ." | \n"; - echo "". _("Next") ."\n"; + $More = "". _("Previous") ." | \n"; + $More .= "". _("Next") ."\n"; } else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - echo "". _("Previous") ." | \n"; - echo ""._("Next")."\n"; + $More = "". _("Previous") ." | \n"; + $More .= ""._("Next")."\n"; } else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { - echo ""._("Previous")." | \n"; - echo "". _("Next") ."\n"; + $More = ""._("Previous")." | \n"; + $More .= "". _("Next") ."\n"; } - 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 " "; - /** FROM HEADER **/ - if ($mailbox == $sent_folder) - echo " \n"; - else if ($sort == 3) - echo " \n"; - else - echo " \n"; - /** DATE HEADER **/ - echo " \n"; - else if ($sort == 1) - echo " \n"; - else - echo " \n"; - echo " \n"; - /** SUBJECT HEADER **/ - echo " \n"; - else if ($sort == 5) - echo " \n"; - else - echo " \n"; - - echo ""; + mail_message_listing_beginning($imapConnection, + "move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$startMessage", + $mailbox, $sort, $Message, $More); // 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; + $i = $startMessage; reset($msort); do { $key = key($msort); @@ -315,24 +303,128 @@ next($msort); } while ($i < ($endMessage+1)); } - echo "
 ". _("To") .""; - else - echo " ". _("From") .""; - - if ($sort == 2) - echo " ". _("Date") .""; - if ($sort == 0) - echo "  ". _("Subject") ."\n"; - if ($sort == 4) - echo "

". _("THIS FOLDER IS EMPTY") ."
 

". _("THIS FOLDER IS EMPTY") ."
 
"; + echo "
"; - echo "\n"; - echo "\n"; + echo "\n"; - echo ""; - if (($nextGroup <= $numMessages) && ($prevGroup >= 0)) { - echo "" . _("Previous") . " | \n"; - echo "" . _("Next") . "\n"; + if ($More) + { + echo "$More\n"; } - else if (($nextGroup > $numMessages) && ($prevGroup >= 0)) { - echo "" . _("Previous") . " | \n"; - echo "" . _("Next") . "\n"; + echo ""; /** End of message-list table */ + + do_hook("mailbox_index_after"); + } + + /* Displays the standard message list header. + * To finish the table, you need to do a ""; + * $moveURL is the URL to submit the delete/move form to + * $mailbox is the current mailbox + * $sort is the current sorting method (-1 for no sorting available [searches]) + * $Message is a message that is centered on top of the list + * $More is a second line that is left aligned + */ + function mail_message_listing_beginning($imapConnection, $moveURL, + $mailbox = '', $sort = -1, $Message = '', $More = '') + { + global $color, $index_order; + + /** This is the beginning of the message list table. It wraps around all messages */ + echo ""; + + if ($Message) + { + echo "\n"; } - else if (($nextGroup <= $numMessages) && ($prevGroup < 0)) { - echo "" . _("Previous"). " | \n"; - echo "" . _("Next") . "\n"; + + if ($More) + { + echo "\n"; + } + + /** The delete and move options */ + echo ""; + + echo "\n"; } ?>
$Message
$More
"; + + echo "\n\n\n
\n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + + echo "
\n"; + echo " ". _("Move selected to:") .""; + echo " "; + echo " \n"; + echo " \n"; + echo "  ". _("checked messages") ."\n"; + echo "
\n"; + do_hook("mailbox_form_before"); + echo "
"; + echo ""; + echo ""; + + // Print the headers + for ($i=1; $i <= count($index_order); $i++) { + switch ($index_order[$i]) { + case 1: # checkbox + case 5: # flags + echo " "; + break; + + case 2: # from + if ($mailbox == $sent_folder) + echo " \n"; + else if ($sort == 3) + echo " \n"; + else if ($sort != -1) + echo " \n"; + break; + + case 3: # date + echo " \n"; + else if ($sort == 1) + echo " \n"; + else if ($sort != -1) + echo " \n"; + break; + + case 4: # subject + echo " \n"; + else if ($sort == 5) + echo " \n"; + else if ($sort != -1) + echo " \n"; + break; + + case 6: # size + echo " \n"; + break; + } } - echo "
 ". _("To") .""; + else + echo " ". _("From") .""; + + if ($sort == 2) + echo " ". _("Date") .""; + if ($sort == 0) + echo " ". _("Subject") ."\n"; + if ($sort == 4) + echo " " . _("Size")."
"; /** End of message-list table */ + echo "