Dolibarr / dolibarr

htdocs/core/ajax/row.php

Spacing +19 added lines, -19 removed lines

@@ -22,13 +22,13 @@ 
  *                   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';
@@ -43,23 +43,23 @@ 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
-if ((isset($_POST['roworder']) && ! empty($_POST['roworder'])) && (isset($_POST['table_element_line']) && ! empty($_POST['table_element_line']))
-	&& (isset($_POST['fk_element']) && ! empty($_POST['fk_element'])) && (isset($_POST['element_id']) && ! empty($_POST['element_id'])) )
+if ((isset($_POST['roworder']) && !empty($_POST['roworder'])) && (isset($_POST['table_element_line']) && !empty($_POST['table_element_line']))
+	&& (isset($_POST['fk_element']) && !empty($_POST['fk_element'])) && (isset($_POST['element_id']) && !empty($_POST['element_id'])))
 {
-	$roworder=GETPOST('roworder','alpha',2);
-	$table_element_line=GETPOST('table_element_line','alpha',2);
-	$fk_element=GETPOST('fk_element','alpha',2);
-	$element_id=GETPOST('element_id','int',2);
+	$roworder = GETPOST('roworder', 'alpha', 2);
+	$table_element_line = GETPOST('table_element_line', 'alpha', 2);
+	$fk_element = GETPOST('fk_element', 'alpha', 2);
+	$element_id = GETPOST('element_id', 'int', 2);
 
 	dol_syslog("AjaxRow roworder=".$roworder." table_element_line=".$table_element_line." fk_element=".$fk_element." element_id=".$element_id, LOG_DEBUG);
 
-	$rowordertab = explode(',',$roworder);
-	foreach($rowordertab as $value)
+	$rowordertab = explode(',', $roworder);
+	foreach ($rowordertab as $value)
 	{
-		if (! empty($value)) $newrowordertab[] = $value;
+		if (!empty($value)) $newrowordertab[] = $value;
 	}
 
-	$row=new GenericObject($db);
+	$row = new GenericObject($db);
 	$row->table_element_line = $table_element_line;
 	$row->fk_element = $fk_element;
 	$row->id = $element_id;
@@ -67,9 +67,9 @@ 
 
 	// Reorder line to have position of chilren lines sharing same counter than parent lines
 	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
-	if (in_array($fk_element,array('fk_facture','fk_propal','fk_commande')))
+	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande')))
 	{
-		$result=$row->line_order(true);
+		$result = $row->line_order(true);
 	}
 }
 

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';

Indentation +16 added lines, -16 removed lines

@@ -51,47 +51,47 @@
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->datev_next(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al->datev_next(GETPOST('rowid','int'));
+	$al->fetch(GETPOST('rowid','int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
+	print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
 
-    exit;
+	exit;
 }
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev')
 {
 	// Decrease date
 	$al =new AccountLine($db);
-    $al->datev_previous(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al->datev_previous(GETPOST('rowid','int'));
+	$al->fetch(GETPOST('rowid','int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
+	print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
 
-    exit;
+	exit;
 }
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'donext')
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->dateo_next(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al->dateo_next(GETPOST('rowid','int'));
+	$al->fetch(GETPOST('rowid','int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
+	print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
 
-    exit;
+	exit;
 }
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev')
 {
 	// Decrease date
 	$al =new AccountLine($db);
-    $al->dateo_previous(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al->dateo_previous(GETPOST('rowid','int'));
+	$al->fetch(GETPOST('rowid','int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
+	print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
 
-    exit;
+	exit;
 }
 

Spacing +20 added lines, -20 removed lines

@@ -20,18 +20,18 @@ 
  *       \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';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$action=GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -51,10 +51,10 @@ 
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->datev_next(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+    $al->datev_next(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
 
     exit;
 }
@@ -62,11 +62,11 @@ 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev')
 {
 	// Decrease date
-	$al =new AccountLine($db);
-    $al->datev_previous(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al = new AccountLine($db);
+    $al->datev_previous(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
 
     exit;
 }
@@ -75,10 +75,10 @@ 
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->dateo_next(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+    $al->dateo_next(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
 
     exit;
 }
@@ -86,11 +86,11 @@ 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev')
 {
 	// Decrease date
-	$al =new AccountLine($db);
-    $al->dateo_previous(GETPOST('rowid','int'));
-    $al->fetch(GETPOST('rowid','int'));
+	$al = new AccountLine($db);
+    $al->dateo_previous(GETPOST('rowid', 'int'));
+    $al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo),"day").'</span>';
+    print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
 
     exit;
 }

htdocs/core/ajax/objectonoff.php

Indentation +1 added lines, -1 removed lines

@@ -46,4 +46,4 @@
 
 // Registering new values
 if (($action == 'set') && ! empty($id))
-    $object->setValueFrom($field, $value, $element, $id);
+	$object->setValueFrom($field, $value, $element, $id);

Spacing +12 added lines, -12 removed lines

@@ -19,21 +19,21 @@ 
  *       \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';
 
-$action=GETPOST('action','alpha');
-$id=GETPOST('id', 'int');
-$value=GETPOST('value', 'int');
-$field=GETPOST('field', 'alpha');
-$element=GETPOST('element', 'alpha');
+$action = GETPOST('action', 'alpha');
+$id = GETPOST('id', 'int');
+$value = GETPOST('value', 'int');
+$field = GETPOST('field', 'alpha');
+$element = GETPOST('element', 'alpha');
 
 $object = new GenericObject($db);
 /*
@@ -45,5 +45,5 @@ 
 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);

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

Spacing +12 added lines, -12 removed lines

@@ -20,18 +20,18 @@ 
  *       \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');
 
-$output		= GETPOST('output','alpha');
-$amount		= price2num(GETPOST('amount','alpha'));
-$tva_tx		= str_replace('*','',GETPOST('tva_tx','alpha'));
+$output		= GETPOST('output', 'alpha');
+$amount		= price2num(GETPOST('amount', 'alpha'));
+$tva_tx		= str_replace('*', '', GETPOST('tva_tx', 'alpha'));
 
 /*
  * View
@@ -42,23 +42,23 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (! empty($output) && isset($amount) && isset($tva_tx))
+if (!empty($output) && isset($amount) && isset($tva_tx))
 {
-	$return=array();
-	$price='';
+	$return = array();
+	$price = '';
 
 	if (is_numeric($amount) && $amount != '')
 	{
 		if ($output == 'price_ttc') {
 
-			$price = price2num($amount * (1 + ($tva_tx/100)), 'MU');
+			$price = price2num($amount * (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = $amount;
 			$return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
 
 		}
 		else if ($output == 'price_ht') {
 
-			$price = price2num($amount / (1 + ($tva_tx/100)), 'MU');
+			$price = price2num($amount / (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');
 			$return['price_ttc'] = ($tva_tx == 0 ? $price : $amount);
 		}

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

Indentation +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 	$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
+	else $boxorder=preg_replace('/^A:/','A:'.$boxid.',',$boxorder);    // Insert id of new box into list
 }
 
 // Registering the location of boxes after a move
@@ -72,11 +72,11 @@ 
 	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
 	if ($result > 0) 
 	{
-	    $langs->load("boxes");
-	    if (! GETPOST('closing'))
-	    {
-	       setEventMessages($langs->trans("BoxAdded"), null);
-	    }
+		$langs->load("boxes");
+		if (! GETPOST('closing'))
+		{
+		   setEventMessages($langs->trans("BoxAdded"), null);
+		}
 	}
 }
 

Spacing +20 added lines, -20 removed lines

@@ -21,22 +21,22 @@ 
  *       \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';
 
-$boxid=GETPOST('boxid','int');
-$boxorder=GETPOST('boxorder');
-$userid=GETPOST('userid');
-$zone=GETPOST('zone','int');
-$userid=GETPOST('userid','int');
+$boxid = GETPOST('boxid', 'int');
+$boxorder = GETPOST('boxorder');
+$userid = GETPOST('userid');
+$zone = GETPOST('zone', 'int');
+$userid = GETPOST('userid', 'int');
 
 
 /*
@@ -53,27 +53,27 @@ 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Add a box
-if ($boxid > 0 && $zone !='' && $userid > 0)
+if ($boxid > 0 && $zone != '' && $userid > 0)
 {
-	$tmp=explode('-',$boxorder);
-	$nbboxonleft=substr_count($tmp[0],',');
-	$nbboxonright=substr_count($tmp[1],',');
+	$tmp = explode('-', $boxorder);
+	$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
-if ($boxorder && $zone != '' &&  $userid > 0)
+if ($boxorder && $zone != '' && $userid > 0)
 {
 	// boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
 	dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
 
-	$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
+	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
 	if ($result > 0) 
 	{
 	    $langs->load("boxes");
-	    if (! GETPOST('closing'))
+	    if (!GETPOST('closing'))
 	    {
 	       setEventMessages($langs->trans("BoxAdded"), null);
 	    }

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

Indentation +29 added lines, -29 removed lines

@@ -62,36 +62,36 @@ 
 
 	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";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
-    	$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) . "%'";
-    	$sql.= " ORDER BY z.zip, z.town";
-        $sql.= $db->plimit(100); // Avoid pb with bad criteria
+		$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";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
+		$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) . "%'";
+		$sql.= " ORDER BY z.zip, z.town";
+		$sql.= $db->plimit(100); // Avoid pb with bad criteria
 	}
 	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";
-        $sql.= ", d.code_departement as county_code , d.nom as county";
-        $sql.= " FROM ".MAIN_DB_PREFIX.'societe as s';
-        $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) . "%'";
-        $sql.= " ORDER BY s.fk_pays, s.zip, s.town";
-        $sql.= $db->plimit(100); // Avoid pb with bad criteria
+		$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";
+		$sql.= ", d.code_departement as county_code , d.nom as county";
+		$sql.= " FROM ".MAIN_DB_PREFIX.'societe as s';
+		$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) . "%'";
+		$sql.= " ORDER BY s.fk_pays, s.zip, s.town";
+		$sql.= $db->plimit(100); // Avoid pb with bad criteria
 	}
 
-    //print $sql;
+	//print $sql;
 	$resql=$db->query($sql);
 	//var_dump($db);
 	if ($resql)
@@ -103,11 +103,11 @@ 
 
 			$row_array['label'] = $row['zip'].' '.$row['town'];
 			$row_array['label'] .= ($county || $country)?' (':'';
-            $row_array['label'] .= $county;
+			$row_array['label'] .= $county;
 			$row_array['label'] .= ($county && $country?' - ':'');
-            $row_array['label'] .= $country;
-            $row_array['label'] .= ($county || $country)?')':'';
-            if ($zipcode)
+			$row_array['label'] .= $country;
+			$row_array['label'] .= ($county || $country)?')':'';
+			if ($zipcode)
 			{
 				$row_array['value'] = $row['zip'];
 				$row_array['town'] = $row['town'];

Spacing +41 added lines, -41 removed lines

@@ -22,12 +22,12 @@ 
  *       \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';
@@ -47,66 +47,66 @@ 
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-dol_syslog("GET is ".join(',',$_GET).', MAIN_USE_ZIPTOWN_DICTIONNARY='.(empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY)?'':$conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY));
+dol_syslog("GET is ".join(',', $_GET).', MAIN_USE_ZIPTOWN_DICTIONNARY='.(empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY) ? '' : $conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY));
 //var_dump($_GET);
 
 // Generation of list of zip-town
-if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
+if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 {
 	$return_arr = array();
 	$formcompany = new FormCompany($db);
 
 	// Define filter on text typed
-	$zipcode = $_GET['zipcode']?$_GET['zipcode']:'';
-	$town = $_GET['town']?$_GET['town']:'';
+	$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";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
-    	$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) . "%'";
-    	$sql.= " ORDER BY z.zip, z.town";
-        $sql.= $db->plimit(100); // Avoid pb with bad criteria
+    	$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";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON z.fk_county = d.rowid";
+    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
+    	$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)."%'";
+    	$sql .= " ORDER BY z.zip, z.town";
+        $sql .= $db->plimit(100); // Avoid pb with bad criteria
 	}
 	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";
-        $sql.= ", d.code_departement as county_code , d.nom as county";
-        $sql.= " FROM ".MAIN_DB_PREFIX.'societe as s';
-        $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) . "%'";
-        $sql.= " ORDER BY s.fk_pays, s.zip, s.town";
-        $sql.= $db->plimit(100); // Avoid pb with bad criteria
+        $sql .= ", c.code as country_code, c.label as country";
+        $sql .= ", d.code_departement as county_code , d.nom as county";
+        $sql .= " FROM ".MAIN_DB_PREFIX.'societe as s';
+        $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)."%'";
+        $sql .= " ORDER BY s.fk_pays, s.zip, s.town";
+        $sql .= $db->plimit(100); // Avoid pb with bad criteria
 	}
 
     //print $sql;
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	//var_dump($db);
 	if ($resql)
 	{
 		while ($row = $db->fetch_array($resql))
 		{
-			$country = $row['fk_country']?($langs->transnoentitiesnoconv('Country'.$row['country_code'])!='Country'.$row['country_code']?$langs->transnoentitiesnoconv('Country'.$row['country_code']):$row['country']):'';
-			$county = $row['fk_county']?($langs->transnoentitiesnoconv($row['county_code'])!=$row['county_code']?$langs->transnoentitiesnoconv($row['county_code']):($row['county']!='-'?$row['county']:'')):'';
+			$country = $row['fk_country'] ? ($langs->transnoentitiesnoconv('Country'.$row['country_code']) != 'Country'.$row['country_code'] ? $langs->transnoentitiesnoconv('Country'.$row['country_code']) : $row['country']) : '';
+			$county = $row['fk_county'] ? ($langs->transnoentitiesnoconv($row['county_code']) != $row['county_code'] ? $langs->transnoentitiesnoconv($row['county_code']) : ($row['county'] != '-' ? $row['county'] : '')) : '';
 
 			$row_array['label'] = $row['zip'].' '.$row['town'];
-			$row_array['label'] .= ($county || $country)?' (':'';
+			$row_array['label'] .= ($county || $country) ? ' (' : '';
             $row_array['label'] .= $county;
-			$row_array['label'] .= ($county && $country?' - ':'');
+			$row_array['label'] .= ($county && $country ? ' - ' : '');
             $row_array['label'] .= $country;
-            $row_array['label'] .= ($county || $country)?')':'';
+            $row_array['label'] .= ($county || $country) ? ')' : '';
             if ($zipcode)
 			{
 				$row_array['value'] = $row['zip'];
@@ -120,9 +120,9 @@ 
 			$row_array['selectcountry_id'] = $row['fk_country'];
 			$row_array['state_id'] = $row['fk_county'];
 
-			$row_array['states'] = $formcompany->select_state('',$row['fk_country'],'');
+			$row_array['states'] = $formcompany->select_state('', $row['fk_country'], '');
 
-			array_push($return_arr,$row_array);
+			array_push($return_arr, $row_array);
 		}
 	}
 

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

Spacing +19 added lines, -19 removed lines

@@ -20,20 +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';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
-$field			= GETPOST('field','alpha');
-$element		= GETPOST('element','alpha');
-$table_element	= GETPOST('table_element','alpha');
-$fk_element		= GETPOST('fk_element','alpha');
+$field = GETPOST('field', 'alpha');
+$element = GETPOST('element', 'alpha');
+$table_element = GETPOST('table_element', 'alpha');
+$fk_element = GETPOST('fk_element', 'alpha');
 
 /*
  * View
@@ -44,14 +44,14 @@ 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
+if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
 {
-	$ext_element	= GETPOST('ext_element','alpha');
-	$field			= substr($field, 8); // remove prefix val_
-	$type			= GETPOST('type','alpha');
-	$loadmethod		= (GETPOST('loadmethod','alpha') ? GETPOST('loadmethod','alpha') : 'getValueFrom');
+	$ext_element	= GETPOST('ext_element', 'alpha');
+	$field = substr($field, 8); // remove prefix val_
+	$type = GETPOST('type', 'alpha');
+	$loadmethod		= (GETPOST('loadmethod', 'alpha') ? GETPOST('loadmethod', 'alpha') : 'getValueFrom');
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
 	{
 		$element = $regs[1];
 		$subelement = $regs[2];
@@ -77,8 +77,8 @@ 
 	{
 		if ($type == 'select')
 		{
-			$methodname	= 'load_cache_'.$loadmethod;
-			$cachename = 'cache_'.GETPOST('loadmethod','alpha');
+			$methodname = 'load_cache_'.$loadmethod;
+			$cachename = 'cache_'.GETPOST('loadmethod', 'alpha');
 
 			$form = new Form($db);
 			if (method_exists($form, $methodname))
@@ -86,10 +86,10 @@ 
 				$ret = $form->$methodname();
 				if ($ret > 0) echo json_encode($form->$cachename);
 			}
-			else if (! empty($ext_element))
+			else if (!empty($ext_element))
 			{
 				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
 				{
 					$module = $regs[1];
 					$subelement = $regs[2];
@@ -105,7 +105,7 @@ 
 		else
 		{
 			$object = new GenericObject($db);
-			$value=$object->$loadmethod($table_element, $fk_element, $field);
+			$value = $object->$loadmethod($table_element, $fk_element, $field);
 			echo $value;
 		}
 	}

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

Indentation +17 added lines, -17 removed lines

@@ -59,23 +59,23 @@
 switch ($_SERVER['REQUEST_METHOD']) {
 	case 'OPTIONS':
 		break;
-    case 'HEAD':
-    case 'GET':
-        $upload_handler->get();
-        break;
-    case 'POST':
-    	if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
-            $upload_handler->delete();
-        } else {
-            $upload_handler->post();
-        }
-        break;
-    case 'DELETE':
-        $upload_handler->delete();
-        break;
-    default:
-        header('HTTP/1.0 405 Method Not Allowed');
-        exit;
+	case 'HEAD':
+	case 'GET':
+		$upload_handler->get();
+		break;
+	case 'POST':
+		if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
+			$upload_handler->delete();
+		} else {
+			$upload_handler->post();
+		}
+		break;
+	case 'DELETE':
+		$upload_handler->delete();
+		break;
+	default:
+		header('HTTP/1.0 405 Method Not Allowed');
+		exit;
 }
 
 $db->close();

Spacing +7 added lines, -7 removed lines

@@ -25,10 +25,10 @@ 
 //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)
 
@@ -42,11 +42,11 @@ 
 //print_r($_GET);
 //print 'upload_dir='.GETPOST('upload_dir');
 
-$fk_element = GETPOST('fk_element','int');
-$element = GETPOST('element','alpha');
+$fk_element = GETPOST('fk_element', 'int');
+$element = GETPOST('element', 'alpha');
 
 
-$upload_handler = new FileUpload(null,$fk_element,$element);
+$upload_handler = new FileUpload(null, $fk_element, $element);
 
 header('Pragma: no-cache');
 header('Cache-Control: no-store, no-cache, must-revalidate');

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)
 

htdocs/core/ajax/saveinplace.php

Spacing +36 added lines, -36 removed lines

@@ -20,20 +20,20 @@ 
  *       \brief      File to save 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';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
-$field			= GETPOST('field','alpha',2);
-$element		= GETPOST('element','alpha',2);
-$table_element	= GETPOST('table_element','alpha',2);
-$fk_element		= GETPOST('fk_element','alpha',2);
+$field = GETPOST('field', 'alpha', 2);
+$element = GETPOST('element', 'alpha', 2);
+$table_element = GETPOST('table_element', 'alpha', 2);
+$fk_element = GETPOST('fk_element', 'alpha', 2);
 
 /* Example:
 field:editval_ref_customer (8 first chars will removed to know name of property)
@@ -58,23 +58,23 @@ 
 //print_r($_POST);
 
 // Load original field value
-if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($fk_element))
+if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
 {
-	$ext_element		= GETPOST('ext_element','alpha',2);
+	$ext_element = GETPOST('ext_element', 'alpha', 2);
 	$field				= substr($field, 8); // remove prefix val_
-	$type				= GETPOST('type','alpha',2);
-	$value				= ($type == 'ckeditor' ? GETPOST('value','',2) : GETPOST('value','alpha',2));
-	$loadmethod			= GETPOST('loadmethod','alpha',2);
-	$savemethod			= GETPOST('savemethod','alpha',2);
-	$savemethodname		= (! empty($savemethod) ? $savemethod : 'setValueFrom');
+	$type = GETPOST('type', 'alpha', 2);
+	$value				= ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
+	$loadmethod			= GETPOST('loadmethod', 'alpha', 2);
+	$savemethod			= GETPOST('savemethod', 'alpha', 2);
+	$savemethodname = (!empty($savemethod) ? $savemethod : 'setValueFrom');
 	$newelement			= $element;
 
-	$view='';
-	$format='text';
-	$return=array();
-	$error=0;
+	$view = '';
+	$format = 'text';
+	$return = array();
+	$error = 0;
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
 	{
 		$element = $regs[1];
 		$subelement = $regs[2];
@@ -94,8 +94,8 @@ 
 	}
 	else $newelement = $element;
 
-	if (! empty($user->rights->$newelement->creer) || ! empty($user->rights->$newelement->create) || ! empty($user->rights->$newelement->write)
-	|| (isset($subelement) && (! empty($user->rights->$newelement->$subelement->creer) || ! empty($user->rights->$newelement->$subelement->write)))
+	if (!empty($user->rights->$newelement->creer) || !empty($user->rights->$newelement->create) || !empty($user->rights->$newelement->write)
+	|| (isset($subelement) && (!empty($user->rights->$newelement->$subelement->creer) || !empty($user->rights->$newelement->$subelement->write)))
 	|| ($element == 'payment' && $user->rights->facture->paiement)
 	|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->creer))
 	{
@@ -107,7 +107,7 @@ 
 			$newvalue = price2num($newvalue);
 
 			// Check parameters
-			if (! is_numeric($newvalue))
+			if (!is_numeric($newvalue))
 			{
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
@@ -115,15 +115,15 @@ 
 		}
 		else if ($type == 'datepicker')
 		{
-			$timestamp	= GETPOST('timestamp','int',2);
-			$format		= 'date';
-			$newvalue	= ($timestamp / 1000);
+			$timestamp = GETPOST('timestamp', 'int', 2);
+			$format = 'date';
+			$newvalue = ($timestamp / 1000);
 		}
 		else if ($type == 'select')
 		{
-			$loadmethodname	= 'load_cache_'.$loadmethod;
-			$loadcachename	= 'cache_'.$loadmethod;
-			$loadviewname	= 'view_'.$loadmethod;
+			$loadmethodname = 'load_cache_'.$loadmethod;
+			$loadcachename = 'cache_'.$loadmethod;
+			$loadviewname = 'view_'.$loadmethod;
 
 			$form = new Form($db);
 			if (method_exists($form, $loadmethodname))
@@ -134,7 +134,7 @@ 
 					$loadcache = $form->$loadcachename;
 					$value = $loadcache[$newvalue];
 
-					if (! empty($form->$loadviewname))
+					if (!empty($form->$loadviewname))
 					{
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
@@ -149,7 +149,7 @@ 
 			else
 			{
 				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
+				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
 				{
 					$module = $regs[1];
 					$subelement = $regs[2];
@@ -164,7 +164,7 @@ 
 					$loadcache = $object->$loadcachename;
 					$value = $loadcache[$newvalue];
 
-					if (! empty($object->$loadviewname))
+					if (!empty($object->$loadviewname))
 					{
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
@@ -178,9 +178,9 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+			if ((isset($object) && !is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
 
 			// Specific for add_object_linked()
 			// TODO add a function for variable treatment
@@ -189,14 +189,14 @@ 
 			$object->fk_element = $fk_element;
 			$object->element = $element;
 
-			$ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
+			$ret = $object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
 			if ($ret > 0)
 			{
 				if ($type == 'numeric') $value = price($newvalue);
 				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
 
 				$return['value'] = $value;
-				$return['view'] = (! empty($view) ? $view : $value);
+				$return['view'] = (!empty($view) ? $view : $value);
 			}
 			else
 			{

Braces +40 added lines, -29 removed lines

@@ -20,11 +20,20 @@ 
  *       \brief      File to save 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';
@@ -80,19 +89,23 @@ 
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $newelement = 'propale';
-	else if ($element == 'fichinter') $newelement = 'ficheinter';
-	else if ($element == 'product') $newelement = 'produit';
-	else if ($element == 'member') $newelement = 'adherent';
-	else if ($element == 'order_supplier') {
+	if ($element == 'propal') {
+		$newelement = 'propale';
+	} else if ($element == 'fichinter') {
+		$newelement = 'ficheinter';
+	} else if ($element == 'product') {
+		$newelement = 'produit';
+	} else if ($element == 'member') {
+		$newelement = 'adherent';
+	} else if ($element == 'order_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'commande';
-	}
-	else if ($element == 'invoice_supplier') {
+	} else if ($element == 'invoice_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'facture';
+	} else {
+		$newelement = $element;
 	}
-	else $newelement = $element;
 
 	if (! empty($user->rights->$newelement->creer) || ! empty($user->rights->$newelement->create) || ! empty($user->rights->$newelement->write)
 	|| (isset($subelement) && (! empty($user->rights->$newelement->$subelement->creer) || ! empty($user->rights->$newelement->$subelement->write)))
@@ -112,14 +125,12 @@ 
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
-		}
-		else if ($type == 'datepicker')
+		} else if ($type == 'datepicker')
 		{
 			$timestamp	= GETPOST('timestamp','int',2);
 			$format		= 'date';
 			$newvalue	= ($timestamp / 1000);
-		}
-		else if ($type == 'select')
+		} else if ($type == 'select')
 		{
 			$loadmethodname	= 'load_cache_'.$loadmethod;
 			$loadcachename	= 'cache_'.$loadmethod;
@@ -139,14 +150,12 @@ 
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$return['error'] = $form->error;
 				}
-			}
-			else
+			} else
 			{
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i',$ext_element,$regs))
@@ -169,8 +178,7 @@ 
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$return['error'] = $object->error;
@@ -180,7 +188,9 @@ 
 
 		if (! $error)
 		{
-			if ((isset($object) && ! is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+			if ((isset($object) && ! is_object($object)) || empty($savemethod)) {
+				$object = new GenericObject($db);
+			}
 
 			// Specific for add_object_linked()
 			// TODO add a function for variable treatment
@@ -192,21 +202,22 @@ 
 			$ret=$object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
 			if ($ret > 0)
 			{
-				if ($type == 'numeric') $value = price($newvalue);
-				else if ($type == 'textarea') $value = dol_nl2br($newvalue);
+				if ($type == 'numeric') {
+					$value = price($newvalue);
+				} else if ($type == 'textarea') {
+					$value = dol_nl2br($newvalue);
+				}
 
 				$return['value'] = $value;
 				$return['view'] = (! empty($view) ? $view : $value);
-			}
-			else
+			} else
 			{
 				$return['error'] = $object->error;
 			}
 		}
 
 		echo json_encode($return);
-	}
-	else
+	} else
 	{
 		echo $langs->trans('NotEnoughPermissions');
 	}