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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 4c681914..8d1e5be3 100644
--- 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
+?>