From 14eb705c9398b4dc511405ec96d296350f96f55b Mon Sep 17 00:00:00 2001 From: fidian Date: Wed, 18 Oct 2000 17:25:15 +0000 Subject: [PATCH] Moved a lot of duplicated code into a separate function to display the header of the list of messages for searches and for standard folder listings. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@809 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_search.php | 83 +------------- functions/mailbox_display.php | 199 ++++++++++++++++++---------------- 2 files changed, 112 insertions(+), 170 deletions(-) diff --git a/functions/imap_search.php b/functions/imap_search.php index 086fa085..c9d0ddb0 100644 --- a/functions/imap_search.php +++ b/functions/imap_search.php @@ -127,86 +127,11 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo if (count($messagelist) > 0) { $j=0; - echo "
" . _("Found") . " " . count($messagelist) . " " . _("messages") . "
\n"; - echo "
\n"; - echo ""; - echo ""; - echo "\n"; + + if ($More) + { + echo "\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"; - do_hook("mailbox_form_before"); - echo "
"; - echo ""; - echo ""; - - for ($i=1; $i <= count($index_order); $i++) { - switch ($index_order[$i]) { - case 1: # checkbox - echo " "; - break; - case 2: # from - if ($mailbox == $sent_folder) - echo " \n"; - else if ($sort == 3) - echo " \n"; - else - echo " \n"; - break; - case 3: # date - echo " \n"; - else if ($sort == 1) - echo " \n"; - else - echo " \n"; - break; - case 4: # subject - echo " \n"; - else if ($sort == 5) - echo " \n"; - else - echo " \n"; - break; - case 5: # flags - echo " \n"; - break; - case 6: # size - echo " \n"; - break; - } - } - echo ""; while ($j < count($msgs)) { printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what); diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 3268d5c7..5a12ca46 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -242,38 +242,107 @@ $urlMailbox = urlencode($mailbox); do_hook("mailbox_index_before"); - /** This is the beginning of the message list table. It wraps around all messages */ - echo "
 ". _("To") .""; - else - echo " ". _("From") .""; + mail_message_listing_beginning($imapConnection, + "move_messages.php?msg=$msg&mailbox=$urlMailbox&where=".urlencode($search_where)."&what=".urlencode($search_what), + '', -1, '' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '', + ' '); - if ($sort == 2) - echo " ". _("Date") .""; - if ($sort == 0) - echo " ". _("Subject") ."\n"; - if ($sort == 4) - echo "  " . _("Size")."
"; + $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 ""; + } else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different. + $i = $startMessage; + reset($msort); + do { + $key = key($msort); + next($msort); + $k++; + } while (isset ($key) && ($k < $i)); + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0); + } else { + $i = $startMessage; + reset($msort); + do { + $key = key($msort); + next($msort); + $k++; + } while (isset ($key) && ($k < $i)); + + do { + printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0); + $key = key($msort); + $t++; + $i++; + next($msort); + } while ($i < ($endMessage+1)); + } + 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"; + } + + 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 "

". _("THIS FOLDER IS EMPTY") ."
 
"; + + echo "
$More
"; /** 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"; + } + + if ($More) + { + echo "\n"; } - echo "\n"; /** The delete and move options */ echo "
$Message
$More
"; - echo "\n\n\n"; + echo "\n\n\n\n"; echo "\n"; echo " \n"; echo " \n"; echo " "; + echo " \n"; echo " \n"; echo "
\n"; @@ -282,19 +351,20 @@ $boxes = sqimap_mailbox_list($imapConnection); for ($i = 0; $i < count($boxes); $i++) { - if ($boxes[$i]["flags"][0] != "noselect" && $boxes[$i]["flags"][1] != "noselect" && $boxes[$i]["flags"][2] != "noselect") { - $box = $boxes[$i]["unformatted"]; - $box2 = replace_spaces($boxes[$i]["formatted"]); - echo " \n"; + } } echo " "; echo " \n"; - echo " \n"; echo "  ". _("checked messages") ."\n"; - echo "
\n"; @@ -305,106 +375,53 @@ 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 + else if ($sort != -1) echo " \n"; break; + case 3: # date echo " \n"; else if ($sort == 1) echo " \n"; - else + else if ($sort != -1) echo " \n"; break; + case 4: # subject echo " \n"; else if ($sort == 5) echo " \n"; - else + else if ($sort != -1) echo " \n"; break; - case 5: # flags - echo " \n"; - break; + case 6: # size echo " \n"; break; } } - 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 ""; - } else if ($startMessage == $endMessage) { // if there's only one message in the box, handle it different. - $i = $startMessage; - reset($msort); - do { - $key = key($msort); - next($msort); - $k++; - } while (isset ($key) && ($k < $i)); - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0); - } else { - $i = $startMessage; - reset($msort); - do { - $key = key($msort); - next($msort); - $k++; - } while (isset ($key) && ($k < $i)); - - do { - printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0); - $key = key($msort); - $t++; - $i++; - next($msort); - } while ($i < ($endMessage+1)); - } - echo "
 ". _("To") .""; - else - echo " ". _("From") .""; + if ($mailbox == $sent_folder) + echo " ". _("To") .""; + else + echo " ". _("From") .""; if ($sort == 2) echo " ". _("Date") .""; if ($sort == 0) echo " ". _("Subject") ."\n"; if ($sort == 4) echo "  " . _("Size")."

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