Dolibarr / dolibarr

htdocs/margin/lib/margins.lib.php

Braces +11 added lines, -7 removed lines

@@ -141,16 +141,20 @@
 	$pu_ht_remise = price2num($pu_ht_remise, 'MU');
 
 	// calcul marge
-	if ($pu_ht_remise < 0)
-		$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
-	else $marge = $pu_ht_remise - $paht_ret;
+	if ($pu_ht_remise < 0) {
+			$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
+	} else {
+		$marge = $pu_ht_remise - $paht_ret;
+	}
 
 	// calcul taux marge
-	if ($paht_ret != 0)
-		$marge_tx_ret = (100 * $marge) / $paht_ret;
+	if ($paht_ret != 0) {
+			$marge_tx_ret = (100 * $marge) / $paht_ret;
+	}
 	// calcul taux marque
-	if ($pu_ht_remise != 0)
-		$marque_tx_ret = (100 * $marge) / $pu_ht_remise;
+	if ($pu_ht_remise != 0) {
+			$marque_tx_ret = (100 * $marge) / $pu_ht_remise;
+	}
 
 	return array($paht_ret, $marge_tx_ret, $marque_tx_ret);
 }

htdocs/theme/eldy/theme_vars.inc.php

Braces +3 added lines, -1 removed lines

@@ -33,13 +33,15 @@
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235, 235, 224);
 $theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(80, 166, 90), array(190, 190, 100), array(91, 115, 247), array(140, 140, 220), array(190, 120, 120), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
-if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
+if (!defined('ISLOADEDBYSTEELSHEET')) {
+	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
 {
 	if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
 	{
 		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
+}
 		} else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));

htdocs/theme/md/theme_vars.inc.php

Braces +3 added lines, -1 removed lines

@@ -29,13 +29,15 @@
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235, 235, 224);
 $theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
-if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
+if (!defined('ISLOADEDBYSTEELSHEET')) {
+	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
 {
 	if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
 	{
 		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
+}
 		} else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));

htdocs/theme/md/style.css.php

Braces +107 added lines, -35 removed lines

@@ -28,21 +28,36 @@ 
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1); // File must be accessed by logon page so without login
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+// File must be accessed by logon page so without login
 //if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 
 define('ISLOADEDBYSTEELSHEET', '1');
 
 
 require __DIR__.'/theme_vars.inc.php';
-if (defined('THEME_ONLY_CONSTANT')) return;
+if (defined('THEME_ONLY_CONSTANT')) {
+	return;
+}
 
 session_cache_limiter('public');
 
@@ -62,11 +77,20 @@ 
 // Define css type
 top_httphead('text/css');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
-if (GETPOST('theme', 'alpha')) $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
+if (GETPOST('theme', 'alpha')) {
+	$conf->theme = GETPOST('theme', 'alpha');
+}
+// If theme was forced on URL
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+}
+// If language was forced on URL
 
 $langs->load("main", 0, 1);
 $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
@@ -94,15 +118,33 @@ 
 $borderwidth = 2;
 
 // Case of option always editable
-if (!isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY = $colorbackbody;
-if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
-if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1;
-if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1;
-if (!isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover;
-if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) $conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked;
-if (!isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak;
-if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab;
-if (!isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
+if (!isset($conf->global->THEME_ELDY_BACKBODY)) {
+	$conf->global->THEME_ELDY_BACKBODY = $colorbackbody;
+}
+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
+	$conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+}
+if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) {
+	$conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1;
+}
+if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) {
+	$conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1;
+}
+if (!isset($conf->global->THEME_ELDY_USE_HOVER)) {
+	$conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover;
+}
+if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) {
+	$conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked;
+}
+if (!isset($conf->global->THEME_ELDY_LINEBREAK)) {
+	$conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak;
+}
+if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
+	$conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab;
+}
+if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
+	$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
+}
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
@@ -145,14 +187,19 @@ 
 	$colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'edf4fb' : $user->conf->THEME_ELDY_USE_CHECKED));
 }
 
-if (empty($colortopbordertitle1)) $colortopbordertitle1 = $colorbackhmenu1;
+if (empty($colortopbordertitle1)) {
+	$colortopbordertitle1 = $colorbackhmenu1;
+}
 
 // Set text color to black or white
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackhmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) $colortextbackhmenu = 'FFFFFF';
-else $colortextbackhmenu = '000000';
+if ($tmpval <= 460) {
+	$colortextbackhmenu = 'FFFFFF';
+} else {
+	$colortextbackhmenu = '000000';
+}
 
 $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackvmenu1);
@@ -165,7 +212,9 @@ 
 {
 	$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
 	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF'; }
-} else $colorshadowtitle = '888888';
+} else {
+	$colorshadowtitle = '888888';
+}
 
 $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktabcard1);
@@ -182,8 +231,12 @@ 
 $colorbacklineimpair2 = join(',', colorStringToArray($colorbacklineimpair2));
 $colorbacklinepair1 = join(',', colorStringToArray($colorbacklinepair1));
 $colorbacklinepair2 = join(',', colorStringToArray($colorbacklinepair2));
-if ($colorbacklinepairhover != '') $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover));
-if ($colorbacklinepairchecked != '') $colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked));
+if ($colorbacklinepairhover != '') {
+	$colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover));
+}
+if ($colorbacklinepairchecked != '') {
+	$colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked));
+}
 $colorbackbody = join(',', colorStringToArray($colorbackbody));
 $colortexttitlenotab = join(',', colorStringToArray($colortexttitlenotab));
 $colortexttitle = join(',', colorStringToArray($colortexttitle));
@@ -191,7 +244,9 @@ 
 $colortextlink = join(',', colorStringToArray($colortextlink));
 
 $nbtopmenuentries = $menumanager->showmenu('topnb');
-if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10);
+if ($conf->browser->layout == 'phone') {
+	$nbtopmenuentries = max($nbtopmenuentries, 10);
+}
 
 print '/*'."\n";
 print 'colorbackbody='.$colorbackbody."\n";
@@ -1068,7 +1123,8 @@ 
 }
 
 .flexcontainer {
-    <?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) echo 'display: inline-flex;' ?>
+    <?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) {
+	echo 'display: inline-flex;' ?>
     flex-flow: row wrap;
     justify-content: flex-start;
 }
@@ -1118,7 +1174,9 @@ 
 .minwidth50  { min-width: 50px; }
 .minwidth75  { min-width: 75px; }
 /* rule for not too small screen only */
-@media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7; ?>px)
+@media only screen and (min-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 7;
+}
+?>px)
 {
 	.width20  { width: 20px; }
 	.width25  { width: 25px; }
@@ -1573,7 +1631,10 @@ 
 div.fiche {
 	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '24' : '6')); ?>px;
 	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '22' : '6')); ?>px;
-	<?php if (!empty($dol_hide_leftmenu) && !empty($dol_hide_topmenu)) print 'margin-top: 12px;'; ?>
+	<?php if (!empty($dol_hide_leftmenu) && !empty($dol_hide_topmenu)) {
+	print 'margin-top: 12px;';
+}
+?>
 	margin-bottom: 15px;
 }
 body.onlinepaymentbody div.fiche {	/* For online payment page */
@@ -1625,7 +1686,10 @@ 
     div.fiche {
     	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '4' : '20')); ?>px;
     	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 8 : 16); ?>px;
-    	<?php if (!empty($conf->dol_hide_leftmenu) && !empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
+    	<?php if (!empty($conf->dol_hide_leftmenu) && !empty($conf->dol_hide_topmenu)) {
+	print 'margin-top: 4px;';
+}
+?>
     	margin-bottom: 15px;
     }
     div.fichecenter {
@@ -2120,8 +2184,12 @@ 
 	$divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
 	foreach ($mainmenuusedarray as $val)
 	{
-		if (empty($val) || in_array($val, $divalreadydefined)) continue;
-		if (in_array($val, $divnotrequired)) continue;
+		if (empty($val) || in_array($val, $divalreadydefined)) {
+			continue;
+		}
+		if (in_array($val, $divnotrequired)) {
+			continue;
+		}
 		//print "XXX".$val;
 
 		// Search img file in module dir
@@ -6303,9 +6371,13 @@ 
 include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
 include dol_buildpath($path.'/theme/eldy/timeline.inc.php', 0); // actually md use same style as eldy theme
 
-if (!empty($conf->global->THEME_CUSTOM_CSS)) print $conf->global->THEME_CUSTOM_CSS;
+if (!empty($conf->global->THEME_CUSTOM_CSS)) {
+	print $conf->global->THEME_CUSTOM_CSS;
+}
 
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}
 ?>
 
 /* This must be at end */

htdocs/paypal/lib/paypalfunctions.lib.php

Braces +18 added lines, -6 removed lines

@@ -25,11 +25,13 @@ 
 if (session_id() == "")
 {
 	session_start();
-	if (ini_get('register_globals'))    // To solve bug in using $_SESSION
+	if (ini_get('register_globals')) {
+		// To solve bug in using $_SESSION
 	{
 		foreach ($_SESSION as $key=>$value)
 		{
 			if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
+	}
 		}
 	}
 }
@@ -48,9 +50,11 @@ 
  ' For the sandbox, the URL is       https://www.sandbox.paypal.com/webscr&cmd=_express-checkout&token=
  ' For the live site, the URL is        https://www.paypal.com/webscr&cmd=_express-checkout&token=
  */
-if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'))		// We can force sand box with param 'forcesandbox'
+if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha')) {
+	// We can force sand box with param 'forcesandbox'
 {
 	$API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
+}
 	$API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
 } else {
 	$API_Endpoint = "https://api-3t.paypal.com/nvp";
@@ -59,13 +63,21 @@ 
 
 // Clean parameters
 $PAYPAL_API_USER = "";
-if (!empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER = $conf->global->PAYPAL_API_USER;
+if (!empty($conf->global->PAYPAL_API_USER)) {
+	$PAYPAL_API_USER = $conf->global->PAYPAL_API_USER;
+}
 $PAYPAL_API_PASSWORD = "";
-if (!empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD = $conf->global->PAYPAL_API_PASSWORD;
+if (!empty($conf->global->PAYPAL_API_PASSWORD)) {
+	$PAYPAL_API_PASSWORD = $conf->global->PAYPAL_API_PASSWORD;
+}
 $PAYPAL_API_SIGNATURE = "";
-if (!empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE = $conf->global->PAYPAL_API_SIGNATURE;
+if (!empty($conf->global->PAYPAL_API_SIGNATURE)) {
+	$PAYPAL_API_SIGNATURE = $conf->global->PAYPAL_API_SIGNATURE;
+}
 $PAYPAL_API_SANDBOX = "";
-if (!empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX = $conf->global->PAYPAL_API_SANDBOX;
+if (!empty($conf->global->PAYPAL_API_SANDBOX)) {
+	$PAYPAL_API_SANDBOX = $conf->global->PAYPAL_API_SANDBOX;
+}
 
 // Proxy
 $PROXY_HOST = $conf->global->MAIN_PROXY_HOST;

htdocs/resource/card.php

Braces +12 added lines, -4 removed lines

@@ -70,7 +70,9 @@ 
 $hookmanager->initHooks(array('resource', 'resource_card', 'globalcard'));
 $parameters = array('resource_id'=>$id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -107,7 +109,9 @@ 
 
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost(null, $object);
-				if ($ret < 0) $error++;
+				if ($ret < 0) {
+					$error++;
+				}
 
 				$result = $object->create($user);
 				if ($result > 0)
@@ -220,7 +224,9 @@ 
 
 	if ($action == 'create' || $action == 'edit')
 	{
-		if (!$user->rights->resource->write) accessforbidden('', 0, 1);
+		if (!$user->rights->resource->write) {
+			accessforbidden('', 0, 1);
+		}
 
 		// Create/Edit object
 
@@ -251,7 +257,9 @@ 
 		// Origin country
 		print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td>';
 		print $form->select_country($object->country_id, 'country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 		print '</td></tr>';
 
 		// Other attributes

htdocs/resource/document.php

Braces +9 added lines, -3 removed lines

@@ -44,7 +44,9 @@ 
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'resource', $id, 'resource');
 
 
@@ -57,8 +59,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 $object = new DolResource($db);

htdocs/compta/deplacement/document.php

Braces +9 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'deplacement', $id, '');
 
 
@@ -56,8 +58,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 $object = new Deplacement($db);

htdocs/compta/paiement/cheque/index.php

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 $langs->loadLangs(array('banks', 'categories', 'compta', 'bills'));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', '', '');