Use checkForJavascript() instead of $javascript_on. Except I did not change mailbox_...

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 0f50c06eddd0d933b75718a806c9b324d075e4a2..280c187392cd80ca18ff93dea296482e70bd3a14 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1154,6 +1154,7 @@ function showMessagesForMailbox($imapConnection, &$aMailbox,$aProps, &$iError) {
     $aTemplate['thread_link_str'] = $thread_link_str;
     $aTemplate['php_self'] = str_replace('&','&',$php_self);
     $aTemplate['mailbox'] = $sMailbox;
+//FIXME: javascript_on is always assigned to the template object in places like init.php; is there some reason to reassign it here?  is there some chance that it was changed?  if not, please remove this line!
     $aTemplate['javascript_on'] = (isset($aProps['config']['javascript_on'])) ? $aProps['config']['javascript_on'] : false;
     $aTemplate['enablesort'] = (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false;
     $aTemplate['icon_theme'] = (isset($aProps['config']['icon_theme'])) ? $aProps['config']['icon_theme'] : false;

diff --git a/functions/options.php b/functions/options.php
index ccd40206c444d340f50c6bba31ea208fe5b0e6f0..b3ef78641ef0903e38a0cb7d6077fcb4ee5bc1af 100644 (file)
--- a/functions/options.php
+++ b/functions/options.php
@@ -463,11 +463,10 @@ class SquirrelOption {
      * @return string html formated option field
      */
     function createWidget_Integer() {
-        global $javascript_on;
 
         // add onChange javascript handler to a regular string widget
         // which will strip out all non-numeric chars
-        if ($javascript_on)
+        if (checkForJavascript())
            return preg_replace('/\/>/', ' onChange="origVal=this.value; newVal=\'\'; '
                     . 'for (i=0;i<origVal.length;i++) { if (origVal.charAt(i)>=\'0\' '
                     . '&& origVal.charAt(i)<=\'9\') newVal += origVal.charAt(i); } '
@@ -482,11 +481,10 @@ class SquirrelOption {
      * @return string html formated option field
      */
     function createWidget_Float() {
-        global $javascript_on;
 
         // add onChange javascript handler to a regular string widget
         // which will strip out all non-numeric (period also OK) chars
-        if ($javascript_on)
+        if (checkForJavascript())
            return preg_replace('/\/>/', ' onChange="origVal=this.value; newVal=\'\'; '
                     . 'for (i=0;i<origVal.length;i++) { if ((origVal.charAt(i)>=\'0\' '
                     . '&& origVal.charAt(i)<=\'9\') || origVal.charAt(i)==\'.\') '

diff --git a/functions/page_header.php b/functions/page_header.php
index 27fa23a0ec91f7fc5ca3ec8a3d841f1bf70b684e..f324b74d09537f5766ee7c1029f7f64172c3820e 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -186,7 +186,7 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
 
     global $reply_focus, $hide_sm_attributions, $frame_top,
         $provider_name, $provider_uri, $startMessage,
-        $javascript_on, $action, $oTemplate;
+        $action, $oTemplate;
 
     if (empty($sBodyTagJs)) {
         if (strpos($action, 'reply') !== FALSE && $reply_focus) {
@@ -210,7 +210,8 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
         $frame_top = '_top';
     }
 
-    if( $javascript_on || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
+//FIXME: does checkForJavascript() make the 2nd part of the if() below unneccessary??
+    if( checkForJavascript() || strpos($sHeaderJs, 'new_js_autodetect_results.value') ) {
         $js_includes = $oTemplate->get_javascript_includes(TRUE);
         $sJsBlock = '';
         foreach ($js_includes as $js_file) {
@@ -271,7 +272,7 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
  */
 function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
 
-    global $reply_focus, $javascript_on, $action, $oTemplate;
+    global $reply_focus, $action, $oTemplate;
 
     if (empty($sBodyTagJs)) {
         if (strpos($action, 'reply') !== FALSE && $reply_focus) {
@@ -290,7 +291,7 @@ function compose_Header($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
     /*
      * Locate the first displayable form element (only when JavaScript on)
      */
-    if($javascript_on) {
+    if(checkForJavascript()) {
         if ($sHeaderJs) {
             $sJsBlock = "\n<script type=\"text/javascript\">" .
                         "\n<!--\n" .

diff --git a/functions/strings.php b/functions/strings.php
index 2e610b3862e2e6a8037d0eec4535681bce14851c..68c607819bd9d230c41590d0e189109b252c9b49 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -792,7 +792,7 @@ function quoteimap($str) {
  * @since 1.4.2
  */
 function makeComposeLink($url, $text = null, $target='') {
-    global $compose_new_win, $javascript_on, $compose_width, 
+    global $compose_new_win, $compose_width, 
            $compose_height, $oTemplate;
 
     if(!$text) {
@@ -809,7 +809,7 @@ function makeComposeLink($url, $text = null, $target='') {
 
 
     // if javascript is on, use onclick event to handle it
-    if($javascript_on) {
+    if(checkForJavascript()) {
         sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
         $compuri = SM_BASE_URI.$url;