Browse Source

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.

Tyler Akins 23 years ago
parent
commit
548c4e2768
2 changed files with 6 additions and 5 deletions
  1. 2 1
      functions/mailbox_display.php
  2. 4 4
      src/read_body.php

+ 2 - 1
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]);

+ 4 - 4
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;' .