Fixed bug #496681, wrong behavior of non-javascript "Select All".

http://sf.net/tracker/?group_id=311&atid=100311&func=detail&aid=496681

Added opposite link of "Show All" - "Show Pages" link for message listings showing all messages already (when "Show All" has been clicked).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1999 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index e4da669ad09c0f2a49f40cddb10873c18e3747e3..069dc3cabd7be3be34f1fccb4c8c9e6650d66e73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@ Version 1.2.2 -- ??
     '#!/usr/bin/env perl' to help people who have perl somewhere
     else. (Bug #496753)
   - Fixed sorting of folder list, bug #497181
     '#!/usr/bin/env perl' to help people who have perl somewhere
     else. (Bug #496753)
   - Fixed sorting of folder list, bug #497181

+  - Fixed wrong behavior of non-javascript select all, bug #496681
+  - Added "Show Pages" link to message list showing all messages
+    (the resultant page of clicking "Show All")

        
 Version 1.2.1 -- 25 December 2001
 ---------------------------------
        
 Version 1.2.1 -- 25 December 2001
 ---------------------------------

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 132a9a904ce1d91d7ca4db3fcc5206c5586682c6..b0f2cc9a13e34abc66cc792bf4162c6732a1c43a 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -175,8 +175,8 @@ function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start
  * and shows them to the user.
  */
 function showMessagesForMailbox
  * 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;
     global $msgs, $msort;
     global $sent_folder, $draft_folder;
     global $message_highlight_list;


@@ -597,7 +597,8 @@ function ShowSortButton($sort, $mailbox, $Up, $Down) {
 }
 
 function get_selectall_link($start_msg, $sort) {
 }
 
 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 =
 
     if ($javascript_on) {
         $result =


@@ -626,6 +627,10 @@ function get_selectall_link($start_msg, $sort) {
                     . '&what=' . urlencode($what);
         }
 
                     . '&what=' . urlencode($what);
         }
 

+        if ($PG_SHOWNUM == 999999) {
+            $result .= '&PG_SHOWNUM=999999';
+        }
+

         $result .= "\">";
 
         if (isset($checkall) && ($checkall == '1')) {
         $result .= "\">";
 
         if (isset($checkall) && ($checkall == '1')) {


@@ -675,7 +680,7 @@ function get_paginator_link
  */
 function get_paginator_str
 ($box, $start_msg, $end_msg, $num_msgs, $show_num, $sort) {
  */
 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 = '';
 
     /* Initialize paginator string chunks. */
     $prv_str = '';


@@ -832,11 +837,15 @@ function get_paginator_str
                 $pg_str .= get_paginator_link($box, $start, $use, $pg) . $spc;
             }
         }
                 $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\">"
+                . _("Show Pages") . '</A>' . $spc;

     }
 
     /* If necessary, compute the 'show all' string. */
     if (($prv_str != '') || ($nxt_str != '')) {
     }
 
     /* 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>';
     }
                  . "&use_mailbox_cache=$use&startMessage=1&mailbox=$box\" "
                  . "TARGET=\"right\">" . _("Show All") . '</A>';
     }


@@ -846,10 +855,10 @@ function get_paginator_str
 
     /* Put all the pieces of the paginator string together. */
     $result = '';
 
     /* 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 .= ($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. */
     $result .= ($result != '' ? $sep . $spc . $tgl_str: $tgl_str);
 
     /* If the resulting string is blank, return a non-breaking space. */