Dolibarr / dolibarr

htdocs/core/ajax/constantonoff.php

Braces +23 added lines, -9 removed lines

@@ -20,13 +20,28 @@ 
  *       \brief      File to set or del an on/off constant
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN','1');
+}
+if (! defined('NOREQUIREHOOK')) {
+	define('NOREQUIREHOOK','1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -58,8 +73,7 @@ 
 		if ($action == 'set')
 		{
 			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
-		}
-		else if ($action == 'del')
+		} else if ($action == 'del')
 		{
 			dolibarr_del_const($db, $name, $entity);
 		}

htdocs/core/ajax/row.php

Braces +26 added lines, -8 removed lines

@@ -22,13 +22,29 @@ 
  *                   This ajax page is called when doing an up or down drag and drop.
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disable token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');  // Disable "main.inc.php" hooks
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Disable token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN','1');
+}
+if (! defined('NOREQUIREHOOK')) {
+	define('NOREQUIREHOOK','1');
+}
+// Disable "main.inc.php" hooks
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
@@ -56,7 +72,9 @@ 
 	$rowordertab = explode(',',$roworder);
 	foreach($rowordertab as $value)
 	{
-		if (! empty($value)) $newrowordertab[] = $value;
+		if (! empty($value)) {
+			$newrowordertab[] = $value;
+		}
 	}
 
 	$row=new GenericObject($db);

htdocs/core/ajax/bankconciliate.php

Braces +16 added lines, -5 removed lines

@@ -20,11 +20,22 @@
  *       \brief      File to set data for bank concilation
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');    // Required to know date format for dol_print_date
 
 require '../../main.inc.php';

htdocs/core/ajax/objectonoff.php

Braces +21 added lines, -7 removed lines

@@ -19,12 +19,25 @@ 
  *       \brief      File to set tosell and tobuy for product
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN','1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
@@ -45,5 +58,6 @@ 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering new values
-if (($action == 'set') && ! empty($id))
+if (($action == 'set') && ! empty($id)) {
     $object->setValueFrom($field, $value, $element, $id);
+}

htdocs/core/ajax/price.php

Braces +14 added lines, -6 removed lines

@@ -20,11 +20,20 @@ 
  *       \brief      File to get ht and ttc
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require('../../main.inc.php');
@@ -55,8 +64,7 @@ 
 			$return['price_ht'] = $amount;
 			$return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
 
-		}
-		else if ($output == 'price_ht') {
+		} else if ($output == 'price_ht') {
 
 			$price = price2num($amount / (1 + ($tva_tx/100)), 'MU');
 			$return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');

htdocs/core/ajax/box.php

Braces +27 added lines, -8 removed lines

@@ -21,13 +21,26 @@ 
  *       \brief      File to return Ajax response on Box move or close
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');
+if (! defined('NOREQUIREHOOK')) {
+	define('NOREQUIREHOOK','1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
@@ -59,8 +72,14 @@ 
 	$nbboxonleft=substr_count($tmp[0],',');
 	$nbboxonright=substr_count($tmp[1],',');
 	print $nbboxonleft.'-'.$nbboxonright;
-	if ($nbboxonleft > $nbboxonright) $boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);    // Insert id of new box into list
-    else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
+	if ($nbboxonleft > $nbboxonright) {
+		$boxorder=preg_replace('/B:/','B:'.$boxid.',',$boxorder);
+	}
+	// Insert id of new box into list
+    else {
+    	$boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);
+    }
+    // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move

htdocs/core/ajax/ziptown.php

Braces +36 added lines, -15 removed lines

@@ -22,12 +22,25 @@ 
  *       \brief     File to return Ajax response on zipcode or town request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL',1);
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK','1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -60,9 +73,11 @@ 
 	$zipcode = $_GET['zipcode']?$_GET['zipcode']:'';
 	$town = $_GET['town']?$_GET['town']:'';
 
-	if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY))   // Use zip-town table
+	if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) {
+		// Use zip-town table
 	{
     	$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
+	}
     	$sql.= ", c.rowid as fk_country, c.code as country_code, c.label as country";
     	$sql.= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
     	$sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
@@ -71,12 +86,15 @@ 
     	$sql.= " ".MAIN_DB_PREFIX."c_country as c";
     	$sql.= " WHERE z.fk_pays = c.rowid";
     	$sql.= " AND z.active = 1 AND c.active = 1";
-    	if ($zipcode) $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
-    	if ($town)    $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
+    	if ($zipcode) {
+    		$sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
+    	}
+    	if ($town) {
+    		$sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
+    	}
     	$sql.= " ORDER BY z.zip, z.town";
         $sql.= $db->plimit(100); // Avoid pb with bad criteria
-	}
-	else                                               // Use table of third parties
+	} else                                               // Use table of third parties
 	{
         $sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
         $sql.= ", c.code as country_code, c.label as country";
@@ -85,8 +103,12 @@ 
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON s.fk_departement = d.rowid";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
         $sql.= " WHERE";
-        if ($zipcode) $sql.= " s.zip LIKE '".$db->escape($zipcode)."%'";
-        if ($town)    $sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
+        if ($zipcode) {
+        	$sql.= " s.zip LIKE '".$db->escape($zipcode)."%'";
+        }
+        if ($town) {
+        	$sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
+        }
         $sql.= " ORDER BY s.fk_pays, s.zip, s.town";
         $sql.= $db->plimit(100); // Avoid pb with bad criteria
 	}
@@ -127,8 +149,7 @@ 
 	}
 
 	echo json_encode($return_arr);
-}
-else
+} else
 {
 
 }

htdocs/core/ajax/loadinplace.php

Braces +32 added lines, -19 removed lines

@@ -20,11 +20,20 @@ 
  *       \brief      File to load field value
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 require '../../main.inc.php';
@@ -57,15 +66,18 @@ 
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $element = 'propale';
-	else if ($element == 'fichinter') $element = 'ficheinter';
-	else if ($element == 'product') $element = 'produit';
-	else if ($element == 'member') $element = 'adherent';
-	else if ($element == 'order_supplier') {
+	if ($element == 'propal') {
+		$element = 'propale';
+	} else if ($element == 'fichinter') {
+		$element = 'ficheinter';
+	} else if ($element == 'product') {
+		$element = 'produit';
+	} else if ($element == 'member') {
+		$element = 'adherent';
+	} else if ($element == 'order_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
+	} else if ($element == 'invoice_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'facture';
 	}
@@ -84,9 +96,10 @@ 
 			if (method_exists($form, $methodname))
 			{
 				$ret = $form->$methodname();
-				if ($ret > 0) echo json_encode($form->$cachename);
-			}
-			else if (! empty($ext_element))
+				if ($ret > 0) {
+					echo json_encode($form->$cachename);
+				}
+			} else if (! empty($ext_element))
 			{
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
@@ -99,17 +112,17 @@ 
 				$classname = 'Actions'.ucfirst($subelement);
 				$object = new $classname($db);
 				$ret = $object->$methodname($fk_element);
-				if ($ret > 0) echo json_encode($object->$cachename);
+				if ($ret > 0) {
+					echo json_encode($object->$cachename);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$object = new GenericObject($db);
 			$value=$object->$loadmethod($table_element, $fk_element, $field);
 			echo $value;
 		}
-	}
-	else
+	} else
 	{
 		echo $langs->transnoentities('NotEnoughPermissions');
 	}

htdocs/core/ajax/fileupload.php

Braces +14 added lines, -4 removed lines

@@ -25,10 +25,20 @@
 //if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
 //if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+// If there is no menu to show
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+// If we don't need to load the html.form.class.php
 //if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)