Use checkForJavascript() instead of $javascript_on

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

diff --git a/plugins/message_details/setup.php b/plugins/message_details/setup.php
index 648fcb0b3f85ceb9ffa7e2caeee4cf58654a7b1e..43c7e7b940bb8b93aa16ba55b617a8c8f21f01c5 100644 (file)
--- a/plugins/message_details/setup.php
+++ b/plugins/message_details/setup.php
@@ -30,8 +30,7 @@ function squirrelmail_plugin_init_message_details()
  * @access private
  */
 function show_message_details(&$links) {
-    global $passed_id, $mailbox, $ent_num,
-           $javascript_on;
+    global $passed_id, $mailbox, $ent_num;
     
     if (strlen(trim($mailbox)) < 1) {
         $mailbox = 'INBOX';
@@ -41,7 +40,7 @@ function show_message_details(&$links) {
               '&mailbox=' . urlencode($mailbox) .
               '&passed_id=' . $passed_id;
 
-    $url = $javascript_on ? 'javascript:MessageSource();' : 
+    $url = checkForJavascript() ? 'javascript:MessageSource();' : 
         '../plugins/message_details/message_details_main.php' .
         $params;
 
@@ -49,7 +48,7 @@ function show_message_details(&$links) {
     $links[] = array('URL' => $url,
         'Text' => _("View Message details") );
 
-    if ($javascript_on) {
+    if (checkForJavascript()) {
         echo '<script type="text/javascript">' . "\n" .
                 '<!--' . "\n" .
                 "  function MessageSource() {\n" .

diff --git a/plugins/spamcop/functions.php b/plugins/spamcop/functions.php
index d53f299b6148ff2a88e41a52e407517838f2195d..e21fbfecf8f2b27bdc90261d0f9a8f13f8fae76a 100644 (file)
--- a/plugins/spamcop/functions.php
+++ b/plugins/spamcop/functions.php
@@ -60,7 +60,7 @@ function spamcop_load_function() {
  * @access private
  */
 function spamcop_show_link_function(&$links) {
-    global $spamcop_enabled, $spamcop_method, $spamcop_quick_report,$javascript_on;
+    global $spamcop_enabled, $spamcop_method, $spamcop_quick_report;
 
     if (! $spamcop_enabled)
         return;
@@ -99,7 +99,7 @@ function spamcop_show_link_function(&$links) {
     $url =  '../plugins/spamcop/spamcop.php?passed_id=' . urlencode($passed_id) .
                 '&mailbox=' . urlencode($mailbox) . '&startMessage=' . urlencode($startMessage) .
                 '&passed_ent_id=' . urlencode($passed_ent_id);
-    if ( $spamcop_method == 'web_form' && $javascript_on ) {
+    if ( $spamcop_method == 'web_form' && checkForJavascript() ) {
         $url .= '&js_web=1';
     }