From 4d59ecb04954de745143d9c27450387b817b569e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Aug 2012 21:06:48 +0200
Subject: [PATCH] Fix: Missing condition

---
 htdocs/core/class/html.formother.class.php | 47 ++++++++++++----------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 2625b4aef5c..15ce6928bbf 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -261,7 +261,7 @@ class FormOther
         // Print a select with each of them
         $moreforfilter ='<select class="flat" name="'.$htmlname.'">';
         $moreforfilter.='<option value="">&nbsp;</option>';	// Should use -1 to say nothing
-        
+
         if (is_array($tab_categs))
         {
             foreach ($tab_categs as $categ)
@@ -271,7 +271,7 @@ class FormOther
                 $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';
             }
         }
-        if ($nocateg) 
+        if ($nocateg)
         {
         	$langs->load("categories");
         	$moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected="selected"':'').'>- '.$langs->trans("NotCategorized").' -</option>';
@@ -829,26 +829,29 @@ class FormOther
             $selectboxlist=$form->selectarray('boxcombo', $arrayboxtoactivatelabel,'',1);
         }
 
-        print '<script type="text/javascript" language="javascript">
-        jQuery(document).ready(function() {
-        	jQuery("#boxcombo").change(function() {
-        	var boxid=jQuery("#boxcombo").val();
-        		if (boxid > 0) {
-            		var left_list = cleanSerialize(jQuery("#left").sortable("serialize"));
-            		var right_list = cleanSerialize(jQuery("#right").sortable("serialize"));
-            		var boxorder = \'A:\' + left_list + \'-B:\' + right_list;
-    				jQuery.ajax({ url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\',
-    			        async:   false
-    		        });
-        			//jQuery.get(\''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\');
-        			window.location.search=\'mainmenu='.GETPOST("mainmenu").'&leftmenu='.GETPOST('leftmenu').'&action=addbox&boxid=\'+boxid;
-    				//window.location.href=\''.$_SERVER["PHP_SELF"].'\';
-                }
-        	});';
-        if (! count($arrayboxtoactivatelabel)) print 'jQuery("#boxcombo").hide();';
-        print  '
-    	});
-        </script>';
+        if (! empty($conf->use_javascript_ajax))
+        {
+	        print '<script type="text/javascript" language="javascript">
+	        jQuery(document).ready(function() {
+	        	jQuery("#boxcombo").change(function() {
+	        	var boxid=jQuery("#boxcombo").val();
+	        		if (boxid > 0) {
+	            		var left_list = cleanSerialize(jQuery("#left").sortable("serialize"));
+	            		var right_list = cleanSerialize(jQuery("#right").sortable("serialize"));
+	            		var boxorder = \'A:\' + left_list + \'-B:\' + right_list;
+	    				jQuery.ajax({ url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\',
+	    			        async:   false
+	    		        });
+	        			//jQuery.get(\''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\');
+	        			window.location.search=\'mainmenu='.GETPOST("mainmenu").'&leftmenu='.GETPOST('leftmenu').'&action=addbox&boxid=\'+boxid;
+	    				//window.location.href=\''.$_SERVER["PHP_SELF"].'\';
+	                }
+	        	});';
+	        if (! count($arrayboxtoactivatelabel)) print 'jQuery("#boxcombo").hide();';
+	        print  '
+	    	});
+	        </script>';
+        }
 
         print load_fiche_titre((count($boxactivated)?$langs->trans("OtherInformationsBoxes"):''),$selectboxlist,'','','otherboxes');