From d6def997ed1c35054ff1bb48c4a605c28dc0d549 Mon Sep 17 00:00:00 2001 From: philippe_mingo Date: Thu, 25 Oct 2001 08:57:54 +0000 Subject: [PATCH 1/1] Cleaning git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1610 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mailbox_display.php | 100 ++++----- po/squirrelmail.po | 372 ++++++++++++++++++---------------- src/left_main.php | 24 +-- 3 files changed, 255 insertions(+), 241 deletions(-) diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 1272d5a3..e6e5f114 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -41,36 +41,36 @@ // sqimap_logout($imapConnection); $mailbox = $boxes[0]['unformatted']; unset( $boxes ); - } + } $urlMailbox = urlencode($mailbox); $subject = processSubject($msg['SUBJECT']); echo "\n"; - if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) - { - $flag = ""; - $flag_end = ''; + if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) + { + $flag = ""; + $flag_end = ''; } else { $flag = ''; $flag_end = ''; } - if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == false) - { - $bold = ''; - $bold_end = ''; + if (!isset($msg['FLAG_SEEN']) || $msg['FLAG_SEEN'] == false) + { + $bold = ''; + $bold_end = ''; } else { $bold = ''; $bold_end = ''; } - if ($mailbox == $sent_folder) - { - $italic = ''; - $italic_end = ''; + if ($mailbox == $sent_folder) + { + $italic = ''; + $italic_end = ''; } else { @@ -79,8 +79,8 @@ } if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { - $fontstr = ""; - $fontstr_end = ''; + $fontstr = ""; + $fontstr_end = ''; } else { @@ -109,11 +109,11 @@ $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what); } - if ($checkall == 1) + if ($checkall == 1) $checked = ' checked'; else $checked = ''; - + for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { case 1: # checkbox @@ -143,7 +143,7 @@ case 5: # flags $stuff = false; echo " \n"; - if (isset($msg['FLAG_ANSWERED']) && + if (isset($msg['FLAG_ANSWERED']) && $msg['FLAG_ANSWERED'] == true) { echo "A\n"; $stuff = true; @@ -237,8 +237,8 @@ if ($numMessages < $show_num) $end_loop = $numMessages; elseif ($end > $numMessages) - $end_loop = $numMessages - $startMessage + 1; - else + $end_loop = $numMessages - $startMessage + 1; + else $end_loop = $show_num; } else { $end = $numMessages; @@ -293,7 +293,7 @@ /* Only ignore messages flagged as deleted if we are using a * trash folder or auto_expunge */ - if (((isset($move_to_trash) && $move_to_trash) + if (((isset($move_to_trash) && $move_to_trash) || (isset($auto_expunge) && $auto_expunge)) && $sort != 6) { /** Find and remove the ones that are deleted */ @@ -315,7 +315,7 @@ $messages = array(); $msgs = $messages; } - } + } // There's gotta be messages in the array for it to sort them. if ($numMessages > 0 && ! $use_cache) { @@ -404,7 +404,7 @@ $rMore = "". _("Next") ."\n"; } if( $lMore <> '' ) - $lMore .= ' | '; + $lMore .= ' | '; // Page selector block. Following code computes page links. $mMore = ''; @@ -541,8 +541,8 @@ echo '  ' . _("Move selected to:") . "\n"; echo " \n"; echo "  \n"; - echo " \n"; - echo '  ' . _("Transform Selected Messages") . ":
\n"; + echo " \n"; + echo '  ' . _("Transform Selected Messages") . ":
\n"; echo " \n"; echo " \n"; echo " \n"; @@ -591,59 +591,59 @@ case 5: # flags echo '  '; break; - + case 2: # from if ($mailbox == $sent_folder) echo ' '. _("To") .''; else echo ' '. _("From") .''; - ShowSortButton($sort, $mailbox, 2, 3); + ShowSortButton($sort, $mailbox, 2, 3); echo "\n"; break; - + case 3: # date echo ' '. _("Date") .''; - ShowSortButton($sort, $mailbox, 0, 1); + ShowSortButton($sort, $mailbox, 0, 1); echo "\n"; break; - + case 4: # subject echo ' '. _("Subject") .' '; - ShowSortButton($sort, $mailbox, 4, 5); + ShowSortButton($sort, $mailbox, 4, 5); echo "\n"; break; - - case 6: # size + + case 6: # size echo ' ' . _("Size")."\n"; break; } } echo "\n"; } - + function ShowSortButton($sort, $mailbox, $Up, $Down) { if ($sort != $Up && $sort != $Down) { $img = 'sort_none.gif'; $which = $Up; } elseif ($sort == $Up) { $img = 'up_pointer.gif'; - $which = $Down; + $which = $Down; } else { $img = 'down_pointer.gif'; - $which = 6; + $which = 6; } - echo ' '; + echo ' '; } - + function ShowSelectAllLink($startMessage, $sort) { global $checkall, $PHP_SELF, $what, $where, $mailbox; // This code is from Philippe Mingo - + ?>