Dolibarr / dolibarr

htdocs/webservices/server_other.php

Braces +16 added lines, -7 removed lines

@@ -20,7 +20,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (!defined("NOCSRFCHECK"))    define("NOCSRFCHECK", '1');
+if (!defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK", '1');
+}
 
 require '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
@@ -149,7 +151,9 @@ 
 
 	dol_syslog("Function: getVersions login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp = array();
@@ -192,7 +196,9 @@ 
 
 	dol_syslog("Function: getDocument login=".$authentication['login'].' - modulepart='.$modulepart.' - file='.$file);
 
-	if ($authentication['entity']) $conf->entity = $authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity = $authentication['entity'];
+	}
 
 	$objectresp = array();
 	$errorcode = ''; $errorlabel = '';
@@ -208,7 +214,9 @@ 
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
-	if ($fuser->societe_id) $socid = $fuser->societe_id;
+	if ($fuser->societe_id) {
+		$socid = $fuser->societe_id;
+	}
 
 	// Check parameters
 	if (!$error && (!$file || !$modulepart))
@@ -225,7 +233,9 @@ 
 		$original_file = str_replace("../", "/", $original_file);
 
 		// find the subdirectory name as the reference
-		if (empty($refname)) $refname = basename(dirname($original_file)."/");
+		if (empty($refname)) {
+			$refname = basename(dirname($original_file)."/");
+		}
 
 		// Security check
 		$check_access = dol_check_secure_access_document($modulepart, $original_file, $conf->entity, $fuser, $refname);
@@ -303,8 +313,7 @@ 
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'document'=>$objectret
 				);
-			}
-			else {
+			} else {
 				dol_syslog("File doesn't exist ".$original_file);
 				$errorcode = 'NOT_FOUND';
 				$errorlabel = '';

htdocs/core/ajax/ajaxdirtree.php

Braces +108 added lines, -37 removed lines

@@ -26,14 +26,25 @@ 
 // This script is called with a POST method.
 // Directory to scan (full path) is inside POST['dir'] and encode by js escape() if ajax is used or encoded by urlencode if mode=noajax
 
-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('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 (!isset($mode) || $mode != 'noajax')    // For ajax call
+if (!isset($mode) || $mode != 'noajax') {
+	// For ajax call
 {
 	$res = @include '../../main.inc.php';
+}
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
@@ -48,7 +59,10 @@ 
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
+	if ($selecteddir != '/') {
+		$selecteddir = preg_replace('/\/$/', '', $selecteddir);
+	}
+	// We removed last '/' except if it is '/'
 } else // For no ajax call
 {
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
@@ -59,9 +73,14 @@ 
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
-	if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
-}
+	if ($selecteddir != '/') {
+		$selecteddir = preg_replace('/\/$/', '', $selecteddir);
+	}
+	// We removed last '/' except if it is '/'
+	if (empty($url)) {
+		$url = DOL_URL_ROOT.'/ecm/index.php';
+	}
+	}
 
 // Load translation files required by the page
 $langs->load("ecm");
@@ -92,8 +111,10 @@ 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (!$user->rights->ecm->read) accessforbidden();
-} elseif ($modulepart == 'medias')
+	if (!$user->rights->ecm->read) {
+		accessforbidden();
+	}
+	} elseif ($modulepart == 'medias')
 {
 	// Always allowed
 }
@@ -103,10 +124,12 @@ 
  * View
  */
 
-if (!isset($mode) || $mode != 'noajax')	// if ajax mode
+if (!isset($mode) || $mode != 'noajax') {
+	// if ajax mode
 {
 	top_httphead();
 }
+}
 
 //print '<!-- selecteddir (relative dir we click on) = '.$selecteddir.', openeddir = '.$openeddir.', modulepart='.$modulepart.', preopened='.$preopened.' -->'."\n";
 $userstatic = new User($db);
@@ -114,7 +137,9 @@ 
 $ecmdirstatic = new EcmDirectory($db);
 
 // Load full tree of ECM module from database. We will use it to define nbofsubdir and nboffilesinsubdir
-if (empty($sqltree)) $sqltree = $ecmdirstatic->get_full_arbo(0);
+if (empty($sqltree)) {
+	$sqltree = $ecmdirstatic->get_full_arbo(0);
+}
 
 // Try to find selected dir id into $sqltree and save it into $current_ecmdir_id
 $current_ecmdir_id = -1;
@@ -160,7 +185,10 @@ 
 	print '<ul class="ecmjqft">';
 
 	// Load full tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
-	if (empty($sqltree)) $sqltree = $ecmdirstatic->get_full_arbo(0); // Slow
+	if (empty($sqltree)) {
+		$sqltree = $ecmdirstatic->get_full_arbo(0);
+	}
+	// Slow
 
 	// ----- This section will show a tree from a fulltree array -----
 	// $section must also be defined
@@ -181,7 +209,9 @@ 
 
 	// Update expandedsectionarray in session
 	$expandedsectionarray = array();
-	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray = explode(',', $_SESSION['dol_ecmexpandedsectionarray']);
+	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) {
+		$expandedsectionarray = explode(',', $_SESSION['dol_ecmexpandedsectionarray']);
+	}
 
 	if ($section && GETPOST('sectionexpand') == 'true')
 	{
@@ -189,10 +219,12 @@ 
 		$pathtosection = explode('_', $fullpathselected);
 		foreach ($pathtosection as $idcursor)
 		{
-			if ($idcursor && !in_array($idcursor, $expandedsectionarray))	// Not already in array
+			if ($idcursor && !in_array($idcursor, $expandedsectionarray)) {
+				// Not already in array
 			{
 				$expandedsectionarray[] = $idcursor;
 			}
+			}
 		}
 		$_SESSION['dol_ecmexpandedsectionarray'] = join(',', $expandedsectionarray);
 	}
@@ -233,18 +265,29 @@ 
 		$showline = 0;
 
 		// If directory is son of expanded directory, we show line
-		if (in_array($val['id_mere'], $expandedsectionarray)) $showline = 4;
+		if (in_array($val['id_mere'], $expandedsectionarray)) {
+			$showline = 4;
+		}
 		// If directory is brother of selected directory, we show line
-		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline = 3;
+		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) {
+			$showline = 3;
+		}
 		// If directory is parent of selected directory or is selected directory, we show line
-		elseif (preg_match('/'.$val['fullpath'].'_/i', $fullpathselected.'_')) $showline = 2;
+		elseif (preg_match('/'.$val['fullpath'].'_/i', $fullpathselected.'_')) {
+			$showline = 2;
+		}
 		// If we are level one we show line
-		elseif ($val['level'] < 2) $showline = 1;
+		elseif ($val['level'] < 2) {
+			$showline = 1;
+		}
 
 		if ($showline)
 		{
-			if (in_array($val['id'], $expandedsectionarray)) $option = 'indexexpanded';
-			else $option = 'indexnotexpanded';
+			if (in_array($val['id'], $expandedsectionarray)) {
+				$option = 'indexexpanded';
+			} else {
+				$option = 'indexnotexpanded';
+			}
 			//print $option;
 
 			print '<li class="directory collapsed">';
@@ -271,7 +314,9 @@ 
 			print $val['cachenbofdoc'];
 			print '</td>';
 			print '<td class="left">';
-			if ($nbofsubdir && $nboffilesinsubdir) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+			if ($nbofsubdir && $nboffilesinsubdir) {
+				print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+			}
 			print '</td>';
 
 			// Info
@@ -284,8 +329,11 @@ 
 			$htmltooltip .= '<b>'.$langs->trans("ECMCreationDate").'</b>: '.dol_print_date($val['date_c'], "dayhour").'<br>';
 			$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
 			$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>';
-			if ($nbofsubdir) $htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-			else $htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+			if ($nbofsubdir) {
+				$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+			} else {
+				$htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+			}
 			print $form->textwithpicto('', $htmltooltip, 1, 'info');
 			print "</td>";
 
@@ -315,7 +363,9 @@ 
 
 
 // Close db if mode is not noajax
-if ((!isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((!isset($mode) || $mode != 'noajax') && is_object($db)) {
+	$db->close();
+}
 
 
 
@@ -348,14 +398,18 @@ 
 		if (!empty($files))
 		{
 			natcasesort($files);
-			if (count($files) > 2)    /* The 2 accounts for . and .. */
+			if (count($files) > 2) {
+				/* The 2 accounts for . and .. */
 			{
 				echo '<ul class="ecmjqft" style="display: none;">'."\n";
+			}
 
 				// All dirs
-				foreach ($files as $file)    // $file can be '.', '..', or 'My dir' or 'My file'
+				foreach ($files as $file) {
+					// $file can be '.', '..', or 'My dir' or 'My file'
 				{
 					if ($file == 'temp') continue;
+				}
 
 					$nbofsubdir = 0;
 					$nboffilesinsubdir = 0;
@@ -366,15 +420,19 @@ 
 					foreach ($sqltree as $key => $tmpval)
 					{
 						//print "-- key=".$key." - ".$tmpval['fullrelativename']." vs ".(($selecteddir != '/'?$selecteddir.'/':'').$file)."<br>\n";
-						if ($tmpval['fullrelativename'] == (($selecteddir != '/' ? $selecteddir.'/' : '').$file))		// We found equivalent record into database
+						if ($tmpval['fullrelativename'] == (($selecteddir != '/' ? $selecteddir.'/' : '').$file)) {
+							// We found equivalent record into database
 						{
 							$val = $tmpval;
+						}
 							$resarray = tree_showpad($sqltree, $key, 1);
 
 							// Refresh cache for this subdir
-							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0)	// Cache is not up to date, so we update it for this directory t
+							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0) {
+								// Cache is not up to date, so we update it for this directory t
 							{
 								$result = $ecmdirstatic->fetch($val['id']);
+							}
 								$ecmdirstatic->ref = $ecmdirstatic->label;
 
 								$result = $ecmdirstatic->refreshcachenboffile(0);
@@ -391,9 +449,11 @@ 
 					//print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
 					if ($file != '.' && $file != '..' && ((!empty($val['fullrelativename']) && $val['id'] >= 0) || dol_is_dir($fullpathselecteddir.(preg_match('/\/$/', $fullpathselecteddir) ? '' : '/').$file)))
 					{
-						if (empty($val['fullrelativename']))	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
+						if (empty($val['fullrelativename'])) {
+							// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
 						{
 							$val['fullrelativename'] = (($selecteddir && $selecteddir != '/') ? $selecteddir.'/' : '').$file;
+						}
 							$val['id'] = 0;
 							$val['label'] = $file;
 							$val['description'] = '';
@@ -401,7 +461,9 @@ 
 						}
 
 						$collapsedorexpanded = 'collapsed';
-						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) $collapsedorexpanded = 'expanded';
+						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) {
+							$collapsedorexpanded = 'expanded';
+						}
 						print '<li class="directory '.$collapsedorexpanded.'">'; // collapsed is opposite if expanded
 
 						print "<a class=\"fmdirlia jqft ecmjqft\" href=\"";
@@ -425,7 +487,9 @@ 
 						print (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0) ? $val['cachenbofdoc'] : '&nbsp;';
 						print '</td>';
 						print '<td class="left">';
-						if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) print '<font class="opacitymedium">+'.$nboffilesinsubdir.'</font> ';
+						if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) {
+							print '<font class="opacitymedium">+'.$nboffilesinsubdir.'</font> ';
+						}
 						print '</td>';
 
 						// Edit link
@@ -450,8 +514,11 @@ 
 							$htmltooltip .= '<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c']) ?dol_print_date($val['date_c'], "dayhour") : $langs->trans("NeedRefresh")).'<br>';
 							$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
 							$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.((isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0) ? $val['cachenbofdoc'] : $langs->trans("NeedRefresh")).'<br>';
-							if ($nboffilesinsubdir > 0) $htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-							else $htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+							if ($nboffilesinsubdir > 0) {
+								$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+							} else {
+								$htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+							}
 							print $form->textwithpicto('', $htmltooltip, 1, "info");
 							print "</td>";
 						}
@@ -473,7 +540,9 @@ 
 								$newfullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
 							}
 
-							if ($newfullpathselecteddir) treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth + 1);
+							if ($newfullpathselecteddir) {
+								treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth + 1);
+							}
 						}
 
 						print "</li>\n";
@@ -482,6 +551,8 @@ 
 
 				echo "</ul>\n";
 			}
-		} else print "PermissionDenied";
+		} else {
+			print "PermissionDenied";
+		}
 	}
 }

htdocs/core/ajax/saveinplace.php

Braces +21 added lines, -7 removed lines

@@ -20,10 +20,19 @@ 
  *       \brief      File to save field value
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '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('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
@@ -197,7 +206,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
@@ -209,8 +220,11 @@ 
 			$ret = $object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
 			if ($ret > 0)
 			{
-				if ($type == 'numeric') $value = price($newvalue);
-				elseif ($type == 'textarea') $value = dol_nl2br($newvalue);
+				if ($type == 'numeric') {
+					$value = price($newvalue);
+				} elseif ($type == 'textarea') {
+					$value = dol_nl2br($newvalue);
+				}
 
 				$return['value'] = $value;
 				$return['view'] = (!empty($view) ? $view : $value);

htdocs/core/ajax/objectonoff.php

Braces +22 added lines, -7 removed lines

@@ -20,12 +20,25 @@ 
  *       			 This Ajax service is called when option MAIN_DIRECT_STATUS_UPDATE is set.
  */
 
-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';
@@ -74,7 +87,9 @@ 
 	}
 
 	$tablename = $element;
-	if ($tablename == 'websitepage') $tablename = 'website_page';
+	if ($tablename == 'websitepage') {
+		$tablename = 'website_page';
+	}
 
 	$format = 'int';
 

htdocs/core/ajax/vatrates.php

Braces +10 added lines, -3 removed lines

@@ -20,9 +20,16 @@
  *       \brief      File to load vat rates combobox
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+// Disables token renewal
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../../main.inc.php';
 

htdocs/core/ajax/loadinplace.php

Braces +28 added lines, -11 removed lines

@@ -20,10 +20,19 @@ 
  *       \brief      File to load field value
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '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('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
@@ -55,11 +64,15 @@ 
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $element = 'propale';
-	elseif ($element == 'fichinter') $element = 'ficheinter';
-	elseif ($element == 'product') $element = 'produit';
-	elseif ($element == 'member') $element = 'adherent';
-	elseif ($element == 'order_supplier') {
+	if ($element == 'propal') {
+		$element = 'propale';
+	} elseif ($element == 'fichinter') {
+		$element = 'ficheinter';
+	} elseif ($element == 'product') {
+		$element = 'produit';
+	} elseif ($element == 'member') {
+		$element = 'adherent';
+	} elseif ($element == 'order_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'commande';
 	} elseif ($element == 'invoice_supplier') {
@@ -81,7 +94,9 @@ 
 			if (method_exists($form, $methodname))
 			{
 				$ret = $form->$methodname();
-				if ($ret > 0) echo json_encode($form->$cachename);
+				if ($ret > 0) {
+					echo json_encode($form->$cachename);
+				}
 			} elseif (!empty($ext_element))
 			{
 				$module = $subelement = $ext_element;
@@ -95,7 +110,9 @@ 
 				$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 {
 			$object = new GenericObject($db);

htdocs/core/ajax/extraparams.php

Braces +16 added lines, -5 removed lines

@@ -20,11 +20,22 @@
  *	\brief      File to make Ajax action on setting extra parameters of elements
  */
 
-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');
+}
 
 include '../../main.inc.php';
 

htdocs/core/ajax/price.php

Braces +13 added lines, -4 removed lines

@@ -20,10 +20,19 @@
  *       \brief      File to get ht and ttc
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '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('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 

htdocs/core/ajax/ziptown.php

Braces +34 added lines, -11 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,8 +86,12 @@ 
 		$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
@@ -84,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
 	}