some more fixes to solve the vhost problem (icy cold here in the freeze)

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e9e53fb648fab7ba9c51d7b97d09cb27100667c5..fadc568487e4fc8cb1825da675ee38534f7affae 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -12,6 +12,8 @@
  * $Id$
  */
 
+include_once('../functions/strings.php');
+
 define('PG_SEL_MAX', 10);  /* Default value for page_selector_max. */
 
 function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start_msg, $where, $what) {
@@ -21,6 +23,7 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
     global $default_use_priority;
     global $message_highlight_list;
     global $index_order;
+    global $pos;            /* Search postion (if any)  */
 
     $color_string = $color[4];
     if ($GLOBALS['alt_index_colors']) {
@@ -35,7 +38,19 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
     }
     $msg = $msgs[$key];
 
-    $senderName = htmlspecialchars(sqimap_find_displayable_name($msg['FROM']));
+    /**
+     * This is done in case you're looking into Sent folders,
+     * because you can have multi receiver.
+     */
+    $sendersName = split(',', $msg['FROM']);
+    $senderName = '';
+    for ($index = 0 ; $index < count($sendersName) ; $index++) {
+        if ($senderName != '') {
+            $senderName .= ', ';
+        }
+        $senderName .= sqimap_find_displayable_name($sendersName[$index]);
+    }
+
     if( $mailbox == 'None' ) {
         // $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
         $boxes = sqimap_mailbox_list($imapConnection);
@@ -97,7 +112,10 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
     }
 
     if ($where && $what) {
-        $search_stuff = '&where='.urlencode($where).'&what='.urlencode($what);
+        if( !isset( $pos ) || $pos == '' ) {
+            $pos = '0';
+        }
+        $search_stuff = "&pos=" . urlencode( $pos ) . "&where=".urlencode($where).'&what='.urlencode($what);
     }
 
     $checked = ($checkall == 1 ?' checked' : '');
@@ -175,8 +193,8 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
  * and shows them to the user.
  */
 function showMessagesForMailbox
-        ($imapConnection, $mailbox, $num_msgs, $start_msg,
-        $sort, $color,$show_num, $use_cache) {
+($imapConnection, $mailbox, $num_msgs, $start_msg, $sort,
+ $color, $show_num, $use_cache) {
     global $msgs, $msort;
     global $sent_folder, $draft_folder;
     global $message_highlight_list;
@@ -597,7 +615,8 @@ function ShowSortButton($sort, $mailbox, $Up, $Down) {
 }
 
 function get_selectall_link($start_msg, $sort) {
-    global $checkall, $PHP_SELF, $what, $where, $mailbox, $javascript_on;
+    global $checkall, $what, $where, $mailbox, $javascript_on;
+    global $PHP_SELF, $PG_SHOWNUM;
 
     if ($javascript_on) {
         $result =
@@ -611,7 +630,7 @@ function get_selectall_link($start_msg, $sort) {
             "   }\n" .
             "}\n" .
             "//-->\n" .
-            '</script><a href=\"#\" onClick="CheckAll();">' . _("Toggle All") . "</a>\n";
+            '</script><a href="#" onClick="CheckAll();">' . _("Toggle All") . "</a>\n";
     } else {
         $result .= "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox)
                     . "&startMessage=$start_msg&sort=$sort&checkall=";
@@ -626,6 +645,10 @@ function get_selectall_link($start_msg, $sort) {
                     . '&what=' . urlencode($what);
         }
 
+        if ($PG_SHOWNUM == 999999) {
+            $result .= '&PG_SHOWNUM=999999';
+        }
+
         $result .= "\">";
 
         if (isset($checkall) && ($checkall == '1')) {
@@ -675,7 +698,7 @@ function get_paginator_link
  */
 function get_paginator_str
 ($box, $start_msg, $end_msg, $num_msgs, $show_num, $sort) {
-    global $username, $data_dir, $use_mailbox_cache, $color;
+    global $username, $data_dir, $use_mailbox_cache, $color, $PG_SHOWNUM;
 
     /* Initialize paginator string chunks. */
     $prv_str = '';
@@ -832,11 +855,15 @@ function get_paginator_str
                 $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc;
             }
         }
+    } else if ($PG_SHOWNUM == 999999) {
+        $pg_str = "<A HREF=\"right_main.php?use_mailbox_cache=$use"
+                . "&startMessage=1&mailbox=$box\" TARGET=\"right\">"
+                . _("Paginate") . '</A>' . $spc;
     }
 
     /* If necessary, compute the 'show all' string. */
     if (($prv_str != '') || ($nxt_str != '')) {
-        $all_str = "<A HREF=\"right_main.php?PG_SHOWNUM=9999"
+        $all_str = "<A HREF=\"right_main.php?PG_SHOWNUM=999999"
                  . "&use_mailbox_cache=$use&startMessage=1&mailbox=$box\" "
                  . "TARGET=\"right\">" . _("Show All") . '</A>';
     }
@@ -846,10 +873,10 @@ function get_paginator_str
 
     /* Put all the pieces of the paginator string together. */
     $result = '';
-    $result .= ($all_str != '' ? $all_str . $spc . $sep . $spc: '');
     $result .= ($prv_str != '' ? $prv_str . $spc . $sep . $spc : '');
     $result .= ($nxt_str != '' ? $nxt_str . $spc . $sep . $spc : '');
     $result .= ($pg_str != '' ? $pg_str : '');
+    $result .= ($all_str != '' ? $sep . $spc . $all_str . $spc : '');
     $result .= ($result != '' ? $sep . $spc . $tgl_str: $tgl_str);
 
     /* If the resulting string is blank, return a non-breaking space. */