From 90bc0b93cb30d88fa4199370b902ca8671895f7d Mon Sep 17 00:00:00 2001 From: lbergman Date: Wed, 31 Jan 2001 03:05:58 +0000 Subject: [PATCH] Fixed unread messages not bolded bug git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@994 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mailbox_display.php | 204 +++++++++++++++++----------------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php index 6b74424b..2151cf3e 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -20,64 +20,64 @@ $msg = $msgs[$key]; - $senderName = sqimap_find_displayable_name($msg["FROM"]); + $senderName = sqimap_find_displayable_name($msg['FROM']); $urlMailbox = urlencode($mailbox); - $subject = trim($msg["SUBJECT"]); - if ($subject == "") + $subject = trim($msg['SUBJECT']); + if ($subject == '') $subject = _("(no subject)"); echo "\n"; - if (isset($msg['FLAG_FLAGGED']) && $msg["FLAG_FLAGGED"] == true) + if (isset($msg['FLAG_FLAGGED']) && $msg['FLAG_FLAGGED'] == true) { $flag = ""; - $flag_end = ""; + $flag_end = ''; } else { - $flag = ""; - $flag_end = ""; + $flag = ''; + $flag_end = ''; } - if (isset($msg['FLAG_SEEN']) && $msg["FLAG_SEEN"] == false) + if (!isset($msg['FLAG_SEEN']) && $msg['FLAG_SEEN'] == false) { - $bold = ""; - $bold_end = ""; + $bold = ''; + $bold_end = ''; } else { - $bold = ""; - $bold_end = ""; + $bold = ''; + $bold_end = ''; } if ($mailbox == $sent_folder) { - $italic = ""; - $italic_end = ""; + $italic = ''; + $italic_end = ''; } else { - $italic = ""; - $italic_end = ""; + $italic = ''; + $italic_end = ''; } - if (isset($msg['FLAG_DELETED']) && $msg["FLAG_DELETED"]) + if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { $fontstr = ""; - $fontstr_end = ""; + $fontstr_end = ''; } else { - $fontstr = ""; - $fontstr_end = ""; + $fontstr = ''; + $fontstr_end = ''; } for ($i=0; $i < count($message_highlight_list); $i++) { - 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"]; + 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"]; + } 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; } } @@ -87,13 +87,13 @@ $hlt_color = $color[4]; if ($where && $what) { - $search_stuff = "&where=".urlencode($where)."&what=".urlencode($what); + $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what); } if ($checkall == 1) - $checked = " checked"; + $checked = ' checked'; else - $checked = ""; + $checked = ''; for ($i=1; $i <= count($index_order); $i++) { switch ($index_order[$i]) { @@ -109,12 +109,12 @@ case 4: # subject echo " $bold"; if (! isset($search_stuff)) - $search_stuff = ""; + $search_stuff = ''; echo "$flag"; if (strlen($subject) > 55) - echo substr($subject, 0, 50) . "..."; + echo substr($subject, 0, 50) . '...'; else echo $subject; echo "$flag_end$bold_end\n"; @@ -123,19 +123,19 @@ $stuff = false; echo " \n"; if (isset($msg['FLAG_ANSWERED']) && - $msg["FLAG_ANSWERED"] == true) { + $msg['FLAG_ANSWERED'] == true) { echo "A\n"; $stuff = true; } - if ($msg["TYPE0"] == "multipart") { + if ($msg['TYPE0'] == 'multipart') { echo "+\n"; $stuff = true; } - if (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) { + if (ereg('(1|2)',substr($msg['PRIORITY'],0,1))) { echo "!\n"; $stuff = true; } - if (isset($msg['FLAG_DELETED']) && $msg["FLAG_DELETED"]) { + if (isset($msg['FLAG_DELETED']) && $msg['FLAG_DELETED']) { echo "D\n"; $stuff = true; } @@ -236,42 +236,42 @@ } if ($end > $numMessages) $end = $numMessages; while ($j < $end) { - $date[$j] = ereg_replace(" ", " ", $date[$j]); - $tmpdate = explode(" ", trim($date[$j])); - - $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate); - $messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]); - $messages[$j]["ID"] = $id[$j]; - $messages[$j]["FROM"] = decodeHeader($from[$j]); - $messages[$j]["FROM-SORT"] = strtolower(sqimap_find_displayable_name(decodeHeader($from[$j]))); - $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]); - $messages[$j]["SUBJECT-SORT"] = strtolower(decodeHeader($subject[$j])); - $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]; + $date[$j] = ereg_replace(' ', ' ', $date[$j]); + $tmpdate = explode(' ', trim($date[$j])); + + $messages[$j]['TIME_STAMP'] = getTimeStamp($tmpdate); + $messages[$j]['DATE_STRING'] = getDateString($messages[$j]['TIME_STAMP']); + $messages[$j]['ID'] = $id[$j]; + $messages[$j]['FROM'] = decodeHeader($from[$j]); + $messages[$j]['FROM-SORT'] = strtolower(sqimap_find_displayable_name(decodeHeader($from[$j]))); + $messages[$j]['SUBJECT'] = decodeHeader($subject[$j]); + $messages[$j]['SUBJECT-SORT'] = strtolower(decodeHeader($subject[$j])); + $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: $re_abbr = # Add more here! - "vedr|sv|" . # Danish - "re|aw"; # English + '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])) { - if ($flags[$j][$num] == "Deleted") { - $messages[$j]["FLAG_DELETED"] = true; + if ($flags[$j][$num] == 'Deleted') { + $messages[$j]['FLAG_DELETED'] = true; } - elseif ($flags[$j][$num] == "Answered") { - $messages[$j]["FLAG_ANSWERED"] = true; + elseif ($flags[$j][$num] == 'Answered') { + $messages[$j]['FLAG_ANSWERED'] = true; } - elseif ($flags[$j][$num] == "Seen") { - $messages[$j]["FLAG_SEEN"] = true; + elseif ($flags[$j][$num] == 'Seen') { + $messages[$j]['FLAG_SEEN'] = true; } - elseif ($flags[$j][$num] == "Flagged") { - $messages[$j]["FLAG_FLAGGED"] = true; + elseif ($flags[$j][$num] == 'Flagged') { + $messages[$j]['FLAG_FLAGGED'] = true; } $num++; } @@ -287,7 +287,7 @@ $i = 0; $j = 0; while ($j < $numMessages) { - if ($messages[$j]["FLAG_DELETED"] == true) { + if ($messages[$j]['FLAG_DELETED'] == true) { $j++; continue; } @@ -313,11 +313,11 @@ **/ session_unregister("msgs"); if (($sort == 0) || ($sort == 1)) - $msort = array_cleave ($msgs, "TIME_STAMP"); + $msort = array_cleave ($msgs, 'TIME_STAMP'); if (($sort == 2) || ($sort == 3)) - $msort = array_cleave ($msgs, "FROM-SORT"); + $msort = array_cleave ($msgs, 'FROM-SORT'); if (($sort == 4) || ($sort == 5)) - $msort = array_cleave ($msgs, "SUBJECT-SORT"); + $msort = array_cleave ($msgs, 'SUBJECT-SORT'); if ($sort == 6) $msort = $msgs; @@ -328,10 +328,10 @@ arsort($msort); } } - session_register("msort"); + session_register('msort'); } displayMessageArray($imapConnection, $numMessages, $startMessage, $msgs, $msort, $mailbox, $sort, $color,$show_num); - session_register("msgs"); + session_register('msgs'); } // generic function to convert the msgs array into an HTML table @@ -341,10 +341,10 @@ global $index_order, $real_endMessage, $real_startMessage, $checkall; // if cache isn't already set, do it now - if (!session_is_registered("msgs")) - session_register("msgs"); - if (!session_is_registered("msort")) - session_register("msort"); + if (!session_is_registered('msgs')) + session_register('msgs'); + if (!session_is_registered('msort')) + session_register('msort'); if ($startMessage + ($show_num - 1) < $numMessages) { $endMessage = $startMessage + ($show_num-1); @@ -362,7 +362,7 @@ $prevGroup = $startMessage - $show_num; $urlMailbox = urlencode($mailbox); - do_hook("mailbox_index_before"); + do_hook('mailbox_index_before'); $Message = ''; if ($startMessage < $endMessage) { @@ -447,24 +447,24 @@ next($msort); } while ($i && $i < $endVar); } - echo ""; + echo ''; echo "\n"; echo ""; - echo ""; - echo "
"; + echo '
'; echo "$More\n"; if (!$startMessage) $startMessage=1; - if ( $checkall == "1") + if ( $checkall == '1') echo "\n" . _("Unselect All") . "\n"; else echo "\n" . _("Select All") . "\n"; - echo "
"; - echo "
"; /** End of message-list table */ + echo ''; + echo ''; + echo ''; /** End of message-list table */ - do_hook("mailbox_index_after"); + do_hook('mailbox_index_after'); } /* Displays the standard message list header. @@ -483,7 +483,7 @@ $urlMailbox = urlencode($mailbox); /** This is the beginning of the message list table. It wraps around all messages */ - echo ""; + echo '
'; if ($Message) { @@ -491,15 +491,15 @@ } echo "'; /** The delete and move options */ echo "\n"; echo " \n"; echo " \n"; echo "
"; - echo ""; + echo '
"; + echo '
'; echo "$More\n"; - if ( $checkall == "1") + if ( $checkall == '1') echo "\n" . _("Unselect All") . "\n"; else echo "\n" . _("Select All") . "\n"; - echo "
"; - echo "
'; + echo '
"; @@ -510,33 +510,33 @@ echo " \n"; - echo " ". _("Move selected to:") .""; - echo " '; $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]["unformatted-disp"]); + 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]['unformatted-disp']); echo " \n"; } } - echo " "; - echo " \n"; + echo ' '; + echo ' \n"; echo " \n"; if (! $auto_expunge) { - echo "  ". _("mailbox") ."  \n"; + echo '  '. _("mailbox") ."  \n"; } echo "  ". _("checked messages") ."\n"; echo "
\n"; - do_hook("mailbox_form_before"); - echo ""; + do_hook('mailbox_form_before'); + echo ''; echo ""; echo ""; @@ -549,14 +549,14 @@ switch ($index_order[$i]) { case 1: # checkbox case 5: # flags - echo " "; + echo ' '; break; case 2: # from if ($mailbox == $sent_folder) - echo " \n"; @@ -568,7 +568,7 @@ break; case 3: # date - echo " \n"; elseif ($sort == 1) @@ -577,11 +577,11 @@ echo " \n"; elseif ($sort != -1) echo " \n"; - echo ""; + echo ''; break; case 4: # subject - echo " \n"; elseif ($sort == 5) @@ -592,7 +592,7 @@ break; case 6: # size - echo " \n"; + echo ' \n"; break; } } -- 2.25.1
  ". _("To") .""; + echo ' '. _("To") .''; else - echo " ". _("From") .""; + echo ' '. _("From") .''; if ($sort == 2) echo " ". _("Date") .""; + echo ' '. _("Date") .''; if ($sort == 0) echo " ". _("Subject") ."\n"; + echo ' '. _("Subject") ."\n"; if ($sort == 4) echo " " . _("Size")."' . _("Size")."