X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=4c68191496d26692e4dc651d76dc2745e2557d32;hb=71257f8b1bbf95b87735f654487efbad21b138a0;hp=89ae5ebaab381a666e623b06cf65f33e07a60f37;hpb=8c16ad63e49c95f2b9aa7f6ce9fe1081d93add44;p=squirrelmail.git diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 89ae5eba..4c681914 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -1,22 +1,24 @@ \n"; - if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) - { - $flag = ""; - $flag_end = ''; - } - else - { + 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 = ''; - } - else - { + if (!isset($msg['FLAG_SEEN']) || ($msg['FLAG_SEEN'] == false)) { + $bold = ''; + $bold_end = ''; + } else { $bold = ''; $bold_end = ''; } - if ($mailbox == $sent_folder) - { - $italic = ''; - $italic_end = ''; - } - else - { + + if (($mailbox == $sent_folder) || ($mailbox == $draft_folder)) { + $italic = ''; + $italic_end = ''; + } else { $italic = ''; $italic_end = ''; } - if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) - { - $fontstr = ""; - $fontstr_end = ''; - } - else - { + + if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { + $fontstr = ""; + $fontstr_end = ''; + } else { $fontstr = ''; $fontstr_end = ''; } @@ -95,48 +92,46 @@ } } - if (!isset($hlt_color)) - $hlt_color = $color_string; + if (!isset($hlt_color)) { + $hlt_color = $color_string; + } if ($where && $what) { $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what); } - if ($checkall == 1) - $checked = ' checked'; - else - $checked = ''; - + $checked = ($checkall == 1 ?' checked' : ''); + for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { - case 1: # checkbox + case 1: /* checkbox */ echo "
'; - echo "$More | \n"; - if (!$startMessage) $startMessage=1; - ShowSelectAllLink($startMessage, $sort); - echo ' |
$paginator_str | ". + "$msg_cnt_str |
$Message | ||
";
- echo '
| ||
"; - - echo "\n\n\n |