X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmailbox_display.php;h=8d1e5be39a32add371145f1ce669b646df1b9bb1;hp=7aa739e61f21818420b16f78ceddb0285d94065a;hb=c57b0888fe1f3bf8dbd55b8a4657a4de23a29f6a;hpb=dfec863ee306edcf23b897453bc19262002343d0

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 7aa739e6..8d1e5be3 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1,20 +1,17 @@
 <?php
+
    /**
-    * mailbox_display.php
+    *   mailbox_display.php
     *
-    * Copyright (c) 1999-2001 The Squirrelmail Development Team
-    * Licensed under the GNU GPL. For full terms see the file COPYING.
+    *   Copyright (c) 1999-2001 The Squirrelmail Development Team
+    *   Licensed under the GNU GPL. For full terms see the file COPYING.
     *
-    * This contains functions that display mailbox information, such as the
-    * table row that has sender, date, subject, etc...
+    *   This contains functions that display mailbox information, such as the
+    *   table row that has sender, date, subject, etc...
     *
-    * $Id$
+    *   $Id$
     */
 
-   if (defined('mailbox_display_php'))
-       return;
-   define('mailbox_display_php', true);
-
    define('PG_SEL_MAX', 10);  /* Default value for page_selector_max. */
 
    function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start_msg, $where, $what) {
@@ -39,7 +36,7 @@
       $msg = $msgs[$key];
 
       $senderName = htmlspecialchars(sqimap_find_displayable_name($msg['FROM']));
-      if( $mailbox == _("None") ) {
+      if( $mailbox == 'None' ) {
          // $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
          $boxes = sqimap_mailbox_list($imapConnection);
          // sqimap_logout($imapConnection);
@@ -403,9 +400,9 @@
       /* Loop through and display the info for each message. */
       $t = 0; // $t is used for the checkbox number
       if ($num_msgs == 0) { // if there's no messages in this folder
-          echo "<TR><TD BGCOLOR=\"$color[4]\" COLSPAN=" . count($index_order) . ">\n";
-          echo "  <CENTER><BR><B>". _("THIS FOLDER IS EMPTY") ."</B><BR>&nbsp;</CENTER>\n";
-          echo "</TD></TR>";
+          echo "<TR><TD BGCOLOR=\"$color[4]\" COLSPAN=" . count($index_order) . ">\n".
+               "  <CENTER><BR><B>". _("THIS FOLDER IS EMPTY") ."</B><BR>&nbsp;</CENTER>\n".
+               "</TD></TR>";
       } else if ($start_msg == $end_msg) {
           /* If there's only one message in the box, handle it differently. */
           if ($sort != 6) {
@@ -442,8 +439,8 @@
           } while ($i && $i < $endVar);
       }
 
-      echo '</table>';
-      echo "<table bgcolor=\"$color[9]\" width=100% border=0 cellpadding=1 cellspacing=1>" .
+      echo '</table>'.
+           "<table bgcolor=\"$color[9]\" width=100% border=0 cellpadding=1 cellspacing=1>" .
               "<tr BGCOLOR=\"$color[4]\">" .
                  "<table width=100% BGCOLOR=\"$color[4]\" border=0 cellpadding=1 cellspacing=0><tr><td>$paginator_str</td>".
                  "<td align=right>$msg_cnt_str</td></tr></table>".
@@ -476,23 +473,18 @@
        * This is the beginning of the message list table. *
        * It wraps around all messages                     *
        ****************************************************/
-      echo "<TABLE WIDTH=\"100%\" BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"0\">\n";
-
-      echo "<TR BGCOLOR=\"$color[0]\"><TD>";
-      echo "  <TABLE BGCOLOR=\"$color[4]\" width=\"100%\" CELLPADDING=\"2\" CELLSPACING=\"0\" BORDER=\"0\"><TR>\n";
-      echo "    <TD ALIGN=LEFT>$paginator</TD>\n";
-      echo '    <TD ALIGN=CENTER>' . get_selectall_link($start_msg, $sort) . "</TD>\n";
-      echo "    <TD ALIGN=RIGHT>$msg_cnt_str</TD>\n";
-      echo "  </TR></TABLE>\n";
-      echo "</TD></TR>";
-
-      /** The delete and move options */
-      echo "<TR><TD BGCOLOR=\"$color[0]\">";
-
-      echo "\n<FORM name=messageList method=post action=\"$moveURL\">\n";
-      echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=100%>\n";
-
-      echo "   <TR>\n" .
+      echo "<TABLE WIDTH=\"100%\" BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"0\">\n".
+           "<TR BGCOLOR=\"$color[0]\"><TD>".
+             "<TABLE BGCOLOR=\"$color[4]\" width=\"100%\" CELLPADDING=\"2\" CELLSPACING=\"0\" BORDER=\"0\"><TR>\n".
+           "    <TD ALIGN=LEFT>$paginator</TD>\n".
+           '    <TD ALIGN=CENTER>' . get_selectall_link($start_msg, $sort) . "</TD>\n".
+           "    <TD ALIGN=RIGHT>$msg_cnt_str</TD>\n".
+           "  </TR></TABLE>\n".
+           '</TD></TR>'.
+           "<TR><TD BGCOLOR=\"$color[0]\">\n".
+           "<FORM name=messageList method=post action=\"$moveURL\">\n".
+           "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=\"100%\">\n".
+           "   <TR>\n" .
            "      <TD ALIGN=LEFT VALIGN=CENTER NOWRAP>\n" .
            '         <SMALL>&nbsp;' . _("Move selected to:") . "</SMALL>\n" .
            "      </TD>\n" .
@@ -512,31 +504,31 @@
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
          }
       }
-      echo '         </SELECT></TT></SMALL>';
-      echo "         <SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"" . _("Move") . "\"></SMALL>\n";
-      echo "      </TD>\n";
-      echo "      <TD ALIGN=RIGHT NOWRAP>&nbsp;&nbsp;&nbsp;\n";
+      echo '         </SELECT></TT></SMALL>'.
+                    "<SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"" . _("Move") . "\"></SMALL>\n".
+           "      </TD>\n".
+           "      <TD ALIGN=RIGHT NOWRAP>&nbsp;&nbsp;&nbsp;\n";
       if (!$auto_expunge) {
          echo '         <INPUT TYPE=SUBMIT NAME="expungeButton" VALUE="'. _("Expunge") .'">&nbsp;'. _("mailbox") ."&nbsp;\n";
       }
-      echo "         <INPUT TYPE=SUBMIT NAME=\"markRead\" VALUE=\"". _("Read")."\">\n";
-      echo "         <INPUT TYPE=SUBMIT NAME=\"markUnread\" VALUE=\"". _("Unread")."\">\n";
-      echo "         <INPUT TYPE=SUBMIT VALUE=\"". _("Delete") . "\">&nbsp;\n";
-      echo "      </TD>\n";
-      echo "   </TR>\n";
-      echo "</TABLE>\n";
+      echo "         <INPUT TYPE=SUBMIT NAME=\"markRead\" VALUE=\"". _("Read")."\">\n".
+           "         <INPUT TYPE=SUBMIT NAME=\"markUnread\" VALUE=\"". _("Unread")."\">\n".
+           "         <INPUT TYPE=SUBMIT VALUE=\"". _("Delete") . "\">&nbsp;\n".
+           "      </TD>\n".
+           "   </TR>\n".
+           "</TABLE>\n";
       do_hook('mailbox_form_before');
-      echo '</TD></TR>';
+      echo '</TD></TR>'.
 
-      echo "<TR><TD BGCOLOR=\"$color[0]\">";
-      echo "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=";
+           "<TR><TD BGCOLOR=\"$color[0]\">".
+           "<TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=";
       if ($GLOBALS['alt_index_colors']) {
         echo "0";
       } else {
         echo "1";
       }
-      echo " BGCOLOR=\"$color[0]\">";
-      echo "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
+      echo " BGCOLOR=\"$color[0]\">".
+           "<TR BGCOLOR=\"$color[5]\" ALIGN=\"center\">";
 
       /* Print the headers. */
       for ($i=1; $i <= count($index_order); $i++) {
@@ -554,7 +546,7 @@
                    echo '   <TD WIDTH="25%"><B>'. _("From") .'</B>';
                }
 
-           ShowSortButton($sort, $mailbox, 2, 3);
+               ShowSortButton($sort, $mailbox, 2, 3);
                echo "</TD>\n";
                break;
 
@@ -602,44 +594,46 @@
    }
 
    function get_selectall_link($start_msg, $sort) {
-       global $checkall, $PHP_SELF, $what, $where, $mailbox;
-
-       $result =
-            '&nbsp;<script language="JavaScript">' .
-            "\n<!-- \n" .
-            "function CheckAll() {\n" .
-            "   for (var i = 0; i < document.messageList.elements.length; i++) {\n" .
-            "       if( document.messageList.elements[i].type == 'checkbox' ) {\n" .
-            "           document.messageList.elements[i].checked = !(document.messageList.elements[i].checked);\n".
-            "       }\n" .
-            "   }\n" .
-            "}\n" .
-            'window.document.write(\'<a href=# onClick="CheckAll();">' . _("Toggle All") . "</a>');\n" .
-            "//-->\n" .
-            "</script>\n<noscript>\n";
-
-       $result .= "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox)
-          .  "&startMessage=$start_msg&sort=$sort&checkall=";
-       if (isset($checkall) && $checkall == '1') {
-           $result .= '0';
+       global $checkall, $PHP_SELF, $what, $where, $mailbox, $javascript_on;
+
+       if ($javascript_on) {
+           $result =
+               '&nbsp;<script language="JavaScript">' .
+                "\n<!-- \n" .
+                "function CheckAll() {\n" .
+                "   for (var i = 0; i < document.messageList.elements.length; i++) {\n" .
+                "       if( document.messageList.elements[i].type == 'checkbox' ) {\n" .
+                "           document.messageList.elements[i].checked = !(document.messageList.elements[i].checked);\n".
+                "       }\n" .
+                "   }\n" .
+                "}\n" .
+                "//-->\n" .
+                '</script><a href=# onClick="CheckAll();">' . _("Toggle All") . "</a>\n";
        } else {
-           $result .= '1';
+           $result .= "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox)
+                    . "&startMessage=$start_msg&sort=$sort&checkall=";
+           if (isset($checkall) && $checkall == '1') {
+               $result .= '0';
+           } else {
+               $result .= '1';
+           }
+
+           if (isset($where) && isset($what)) {
+               $result .= '&where=' . urlencode($where)
+                       . '&what=' . urlencode($what);
+           }
+
+           $result .= "\">";
+
+           if (isset($checkall) && ($checkall == '1')) {
+               $result .= _("Unselect All");
+           } else {
+               $result .= _("Select All");
+           }
+
+           $result .= "</A>\n";
        }
 
-       if (isset($where) && isset($what)) {
-           $result .= '&where=' . urlencode($where) . '&what=' . urlencode($what);
-       }
-
-       $result .= "\">";
-
-       if (isset($checkall) && ($checkall == '1')) {
-           $result .= _("Unselect All");
-       } else {
-           $result .= _("Select All");
-       }
-
-       $result .= "</A>\n</noscript>\n";
-
        /* Return our final result. */
        return ($result);
    }
@@ -695,7 +689,7 @@
 
         /* Page selector block. Following code computes page links. */
         $mMore = '';
-        if (!getPref($data_dir, $username, 'page_selector')
+        if (getPref($data_dir, $username, 'page_selector')
                && ($num_msgs > $show_num)) {
             $j = intval( $num_msgs / $show_num );  // Max pages
             $k = max( 1, $j / getPref($data_dir, $username, 'page_selector_max', PG_SEL_MAX ) );