From 5dd6c4d7b35ccb12d93f3785366eba67f691c9e9 Mon Sep 17 00:00:00 2001
From: fidian <fidian@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 15 Jan 2002 01:49:14 +0000
Subject: [PATCH] Warning removal. Priority now works as expected. -- Note:  If
 you don't have your config file set up properly, and if $default_use_priority
 is unset, you'll get warnings.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2133 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/mailbox_display.php | 3 ++-
 src/read_body.php             | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index b88e1f72..8fb83291 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -41,8 +41,9 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
      * because you can have multi receiver.
      */
     $sendersName = split(',', $msg['FROM']);
+    $senderName = '';
     for ($index = 0 ; $index < count($sendersName) ; $index++) {
-        if (strlen($senderName) > 0) {
+        if ($senderName != '') {
             $senderName .= ', ';
         }
         $senderName .= sqimap_find_displayable_name($sendersName[$index]);
diff --git a/src/read_body.php b/src/read_body.php
index 7c7d3a3e..8d647a54 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -460,7 +460,7 @@ if ($where && $what) {
     }
     echo "search.php?where$pos=".urlencode($where)."&pos=$pos&what$pos=".urlencode($what)."&mailbox=$urlMailbox\">";
 } else {
-    echo "right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
+    echo "right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
 }
 echo _("Message List") .
      '</A>&nbsp;|&nbsp;' .
@@ -509,17 +509,17 @@ echo '               </SMALL>' . "\n" .
     '            </TD><TD WIDTH="33%" ALIGN="RIGHT">' .
     '               <SMALL>' .
     '               <A HREF="' . $base_uri . "src/compose.php?forward_id=$passed_id&forward_subj=$url_subj&".
-                    (isset($default_use_priority)?"mailprio=$priority_level&":"")
+                    ($default_use_priority?"mailprio=$priority_level&":"")
                     ."mailbox=$urlMailbox&ent_num=$ent_num\">" .
     _("Forward") .
     '</A>&nbsp;|&nbsp;' .
     '               <A HREF="' . $base_uri . "src/compose.php?send_to=$url_replyto&reply_subj=$url_subj&".
-                    (isset($default_use_priority)?"mailprio=$priority_level&":"").
+                    ($default_use_priority?"mailprio=$priority_level&":"").
                     "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">" .
     _("Reply") .
     '</A>&nbsp;|&nbsp;' .
     '               <A HREF="' . $base_uri . "src/compose.php?send_to=$url_replytoall&send_to_cc=$url_replytoallcc&reply_subj=$url_subj&".
-                    (isset($default_use_priority)?"mailprio=$priority_level&":"").
+                    ($default_use_priority?"mailprio=$priority_level&":"").
                     "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num\">" .
     _("Reply All") .
     '</A>&nbsp;&nbsp;' .
-- 
2.25.1