Turned off validation scripts for widgets when javascript is disabled

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

diff --git a/functions/options.php b/functions/options.php
index b3ade283e57e6ce67dd2424745efb50f02d12d0b..4d1a89048b303166dbc13b8c0ab04b7f4b9dca1b 100644 (file)
--- a/functions/options.php
+++ b/functions/options.php
@@ -274,34 +274,34 @@ class SquirrelOption {
     }
 
     function createWidget_Integer() {
-        return ($this->createWidget_String());
 
-        /*  FIXME: Paul, weren't you going to make this browser safe
-                   ie, if JS was off, or browser didn't support it?
+        global $javascript_on;
 
         // add onChange javascript handler to a regular string widget
         // which will strip out all non-numeric chars
-        return preg_replace('/>/', ' onChange="a=this.value; b=\'\'; '
+        if ($javascript_on)
+           return preg_replace('/>/', ' onChange="a=this.value; b=\'\'; '
                     . 'for (i=0;i<a.length;i++) { if (a.charAt(i)>=\'0\' '
                     . '&& a.charAt(i)<=\'9\') b += a.charAt(i); } '
                     . 'this.value=b;">', $this->createWidget_String());
-        */
+        else
+           return $this->createWidget_String();
     }
 
     function createWidget_Float() {
-        return ($this->createWidget_String());
         
-        /*  FIXME: Paul, weren't you going to make this browser safe
-                   ie, if JS was off, or browser didn't support it?
+        global $javascript_on;
 
         // add onChange javascript handler to a regular string widget
         // which will strip out all non-numeric (period also OK) chars 
-        return preg_replace('/>/', ' onChange="a=this.value; b=\'\'; '
+        if ($javascript_on)
+           return preg_replace('/>/', ' onChange="a=this.value; b=\'\'; '
                     . 'for (i=0;i<a.length;i++) { if ((a.charAt(i)>=\'0\' '
                     . '&& a.charAt(i)<=\'9\') || a.charAt(i)==\'.\') '
                     . 'b += a.charAt(i); } this.value=b;">'
                 , $this->createWidget_String());
-        */
+        else
+           return $this->createWidget_String();
     }
 
     function createWidget_Boolean() {