Cleanup work.

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 4c68191496d26692e4dc651d76dc2745e2557d32..8d1e5be39a32add371145f1ce669b646df1b9bb1 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -594,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);
    }
@@ -752,4 +754,4 @@
       return substr($subject, 0, $trim_val) . '...';
    }
 
-?>
\ No newline at end of file
+?>

diff --git a/src/options_highlight.php b/src/options_highlight.php
index 2bfe3b0cfc0d4c6b2fe16b4ecd90fee331f4752b..8fb86a38e55330640513608d31c72708fe0e8ddb 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -1,28 +1,28 @@
 <?php
 
-   /**
-    **  options_highlight.php
-    **
-    **  Copyright (c) 1999-2001 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Displays message highlighting options
-    **
-    **  $Id$
-    **/
+/**
+ * options_highlight.php
+ *
+ * Copyright (c) 1999-2001 The SquirrelMail Development Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Displays message highlighting options
+ *
+ * $Id$
+ */
 
-   require_once('../src/validate.php');
-   require_once('../functions/display_messages.php');
-   require_once('../functions/imap.php');
-   require_once('../functions/array.php');
-   require_once('../functions/plugin.php');
+require_once('../src/validate.php');
+require_once('../functions/display_messages.php');
+require_once('../functions/imap.php');
+require_once('../functions/array.php');
+require_once('../functions/plugin.php');
 
-    function oh_opt( $val, $sel, $tit ) {
-        echo "            <option value=\"$val\"";
-        if ( $sel )
-            echo 'selected';
-        echo  ">$tit</option>\n";
-    }
+function oh_opt( $val, $sel, $tit ) {
+    echo "            <option value=\"$val\"";
+    if ( $sel )
+        echo 'selected';
+    echo  ">$tit</option>\n";
+}
 
    if (! isset($action))
        $action = '';
@@ -344,4 +344,4 @@
    }
    do_hook('options_highlight_bottom');
 ?>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/src/right_main.php b/src/right_main.php
index bf155105c16d3873fba30c89d7d41c3e823e1043..a583ec062786387a4a47b9e7551b930dbf3f9ede 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,136 +1,137 @@
 <?php
 
-    /**
-     **  right_main.php
-     **
-     **  Copyright (c) 1999-2001 The Squirrelmail Development Team
-     **  Licensed under the GNU GPL. For full terms see the file COPYING.
-     **
-     **  This is where the mailboxes are listed.  This controls most of what
-     **  goes on in SquirrelMail.
-     **
-     **  $Id$
-     **/
-
-    require_once('../src/validate.php');
-    require_once('../functions/imap.php');
-    require_once('../functions/date.php');
-    require_once('../functions/array.php');
-    require_once('../functions/mime.php');
-    require_once('../functions/mailbox_display.php');
-    require_once('../functions/display_messages.php');
-
-    /***********************************************************
-     * incoming variables from URL:                            *
-     *   $sort             Direction to sort by date           *
-     *                        values:  0  -  descending order  *
-     *                        values:  1  -  ascending order   *
-     *   $startMessage     Message to start at                 *
-     *    $mailbox          Full Mailbox name                  *
-     *                                                         *
-     * incoming from cookie:                                   *
-     *    $username         duh                                *
-     *    $key              pass                               *
-     ***********************************************************/
-
-    /* Open a connection on the imap port (143) */
-    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-
-    if (isset($newsort) && $newsort != $sort) {
-        setPref($data_dir, $username, 'sort', $newsort);
+/**
+ * right_main.php
+ *
+ * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * This is where the mailboxes are listed. This controls most of what
+ * goes on in SquirrelMail.
+ *
+ * $Id$
+ */
+
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+require_once('../functions/date.php');
+require_once('../functions/array.php');
+require_once('../functions/mime.php');
+require_once('../functions/mailbox_display.php');
+require_once('../functions/display_messages.php');
+
+/***********************************************************
+ * incoming variables from URL:                            *
+ *   $sort             Direction to sort by date           *
+ *                        values:  0  -  descending order  *
+ *                        values:  1  -  ascending order   *
+ *   $startMessage     Message to start at                 *
+ *    $mailbox          Full Mailbox name                  *
+ *                                                         *
+ * incoming from cookie:                                   *
+ *    $username         duh                                *
+ *    $key              pass                               *
+ ***********************************************************/
+
+/* Open a connection on the imap port (143) */
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+
+if (isset($newsort) && $newsort != $sort) {
+    setPref($data_dir, $username, 'sort', $newsort);
+}
+
+/* If the page has been loaded without a specific mailbox, */
+/* send them to the inbox                                  */
+if (!isset($mailbox)) {
+    $mailbox = 'INBOX';
+    $startMessage = 1;
+}
+   
+if (!isset($startMessage) || ($startMessage == '')) {
+    $startMessage = 1;
+}
+
+/* compensate for the UW vulnerability. */
+if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
+                                  substr($mailbox, 0, 1) == '/')) {
+   $mailbox = 'INBOX';
+}
+
+sqimap_mailbox_select($imapConnection, $mailbox);
+displayPageHeader($color, $mailbox);
+echo "<br>\n";
+
+do_hook('right_main_after_header');
+
+if (isset($note)) {
+    echo "<CENTER><B>$note</B></CENTER><BR>\n";
+}
+
+if ($just_logged_in == true) {
+    $just_logged_in = false;
+
+    if (strlen(trim($motd)) > 0) {
+        echo "<br><table align=center width=70% cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
+         '<tr><td>' .
+             "<table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
+             "<tr><td align=center>$motd";
+        do_hook('motd');
+        echo '</td></tr>' .
+             '</table>' .
+             '</td></tr></table>';
     }
-
-    /* If the page has been loaded without a specific mailbox, */
-    /* send them to the inbox                                  */
-    if (!isset($mailbox)) {
-        $mailbox = 'INBOX';
-        $startMessage = 1;
-    }
-    
-    if (! isset($startMessage) || $startMessage == '')
-       $startMessage = 1;
-
-    /* compensate for the UW vulnerability. */
-    if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
-                                      substr($mailbox, 0, 1) == '/')) {
-       $mailbox = 'INBOX';
-    }
-
-    sqimap_mailbox_select($imapConnection, $mailbox);
-    displayPageHeader($color, $mailbox);
-    echo "<br>\n";
-
-    do_hook('right_main_after_header');
-
-    if (isset($note)) {
-        echo "<CENTER><B>$note</B></CENTER><BR>\n";
+}
+
+if (isset($newsort)) {
+    $sort = $newsort;
+    session_register('sort');
+}
+
+/*********************************************************************
+ * Check to see if we can use cache or not. Currently the only time  *
+ * when you will not use it is when a link on the left hand frame is *
+ * used. Also check to make sure we actually have the array in the   *
+ * registered session data.  :)                                      *
+ *********************************************************************/
+if (! isset($use_mailbox_cache)) {
+    $use_mailbox_cache = 0;
+}
+
+if ($use_mailbox_cache && session_is_registered('msgs')) {
+    showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
+} else {
+    if (session_is_registered('msgs')) {
+        unset($msgs);
     }
 
-    if ($just_logged_in == true) {
-        $just_logged_in = false;
-
-        if (strlen(trim($motd)) > 0) {
-            echo "<br><table align=center width=70% cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
-                 '<tr><td>' .
-                 "<table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
-                 "<tr><td align=center>$motd";
-            do_hook('motd');
-            echo '</td></tr>' .
-                 '</table>' .
-                 '</td></tr></table>';
-        }
+    if (session_is_registered('msort')) {
+        unset($msort);
     }
 
-    if (isset($newsort)) {
-        $sort = $newsort;
-        session_register('sort');
+    if (session_is_registered('numMessages')) {
+        unset($numMessages);
     }
 
-    /*********************************************************************
-     * Check to see if we can use cache or not. Currently the only time  *
-     * when you will not use it is when a link on the left hand frame is *
-     * used. Also check to make sure we actually have the array in the   *
-     * registered session data.  :)                                      *
-     *********************************************************************/
-    if (! isset($use_mailbox_cache)) {
-        $use_mailbox_cache = 0;
-    }
-
-    if ($use_mailbox_cache && session_is_registered('msgs')) {
-        showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
-    } else {
-        if (session_is_registered('msgs')) {
-            unset($msgs);
-        }
-
-        if (session_is_registered('msort')) {
-            unset($msort);
-        }
+    $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
 
-        if (session_is_registered('numMessages')) {
-            unset($numMessages);
-        }
+    showMessagesForMailbox($imapConnection, $mailbox, $numMessages, 
+                           $startMessage, $sort, $color, $show_num,
+                           $use_mailbox_cache);
 
-        $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
+    if (session_is_registered('msgs') && isset($msgs)) {
+        session_register('msgs');
+    }
 
-        showMessagesForMailbox($imapConnection, $mailbox, $numMessages, 
-                               $startMessage, $sort, $color, $show_num,
-                               $use_mailbox_cache);
+    if (session_is_registered('msort') && isset($msort)) {
+        session_register('msort');
+    }
 
-        if (session_is_registered('msgs') && isset($msgs)) {
-            session_register('msgs');
-        }
+    session_register('numMessages');
+}
 
-        if (session_is_registered('msort') && isset($msort)) {
-            session_register('msort');
-        }
+do_hook('right_main_bottom');
+sqimap_logout ($imapConnection);
 
-        session_register('numMessages');
-    }
+echo '/FONT></BODY></HTML>';
 
-    do_hook('right_main_bottom');
-    sqimap_logout ($imapConnection);
 ?>
-</FONT>
-</BODY>
-</HTML>