Dolibarr / dolibarr

htdocs/core/tpl/document_actions_post_headers.tpl.php

Braces +12 added lines, -4 removed lines

@@ -38,17 +38,25 @@
 
 
 $langs->load("link");
-if (empty($relativepathwithnofile)) $relativepathwithnofile = '';
+if (empty($relativepathwithnofile)) {
+	$relativepathwithnofile = '';
+}
 
-if (!isset($permission)) $permission = $permissiontoadd;
-if (!isset($permtoedit)) $permtoedit = $permissiontoadd;
+if (!isset($permission)) {
+	$permission = $permissiontoadd;
+}
+if (!isset($permtoedit)) {
+	$permtoedit = $permissiontoadd;
+}
 
 // Drag and drop for up and down allowed on product, thirdparty, ...
 // The drag and drop call the page core/ajax/row.php
 // If you enable the move up/down of files here, check that page that include template set its sortorder on 'position_name' instead of 'name'
 // Also the object->fk_element must be defined.
 $disablemove = 1;
-if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket', 'holiday', 'expensereport'))) $disablemove = 0;
+if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket', 'holiday', 'expensereport'))) {
+	$disablemove = 0;
+}
 
 
 

htdocs/core/tpl/bloc_showhide.tpl.php

Braces +6 added lines, -2 removed lines

@@ -25,8 +25,12 @@
 }
 
 $hide = true; // Hide by default
-if (isset($parameters['showblocbydefault'])) $hide = (empty($parameters['showblocbydefault']) ? true : false);
-if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
+if (isset($parameters['showblocbydefault'])) {
+	$hide = (empty($parameters['showblocbydefault']) ? true : false);
+}
+if (isset($object->extraparams[$blocname]['showhide'])) {
+	$hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE bloc_showhide.tpl.php -->

htdocs/core/tpl/objectline_title.tpl.php

Braces +15 added lines, -5 removed lines

@@ -48,7 +48,9 @@ 
 print '<tr class="liste_titre nodrag nodrop">';
 
 // Adds a line numbering column
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum center">&nbsp;</td>';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	print '<td class="linecolnum center">&nbsp;</td>';
+}
 
 // Description
 print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
@@ -65,9 +67,13 @@ 
 print '<td class="linecoluht right" style="width: 80px">'.$langs->trans('PriceUHT').'</td>';
 
 // Multicurrency
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency right" style="width: 80px">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	print '<td class="linecoluht_currency right" style="width: 80px">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+}
 
-if ($inputalsopricewithtax) print '<td class="right" style="width: 80px">'.$langs->trans('PriceUTTC').'</td>';
+if ($inputalsopricewithtax) {
+	print '<td class="right" style="width: 80px">'.$langs->trans('PriceUTTC').'</td>';
+}
 
 // Qty
 print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
@@ -109,9 +115,13 @@ 
 print '<td class="linecolht right">'.$langs->trans('TotalHTShort').'</td>';
 
 // Multicurrency
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	print '<td class="linecoltotalht_currency right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+}
 
-if ($outputalsopricetotalwithtax) print '<td class="right" style="width: 80px">'.$langs->trans('TotalTTCShort').'</td>';
+if ($outputalsopricetotalwithtax) {
+	print '<td class="right" style="width: 80px">'.$langs->trans('TotalTTCShort').'</td>';
+}
 
 print '<td class="linecoledit"></td>'; // No width to allow autodim
 

htdocs/core/boxes/box_comptes.php

Braces +4 added lines, -1 removed lines

@@ -64,7 +64,10 @@
 
 		// disable module for such cases
 		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (!in_array('banque', $listofmodulesforexternal) && !empty($user->socid)) $this->enabled = 0; // disabled for external users
+		if (!in_array('banque', $listofmodulesforexternal) && !empty($user->socid)) {
+			$this->enabled = 0;
+		}
+		// disabled for external users
 
 		$this->hidden = !($user->rights->banque->lire);
 	}

htdocs/core/actions_lineupdown.inc.php

Braces +12 added lines, -4 removed lines

@@ -35,8 +35,12 @@ 
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+		$newlang = GETPOST('lang_id', 'aZ09');
+	}
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+		$newlang = $object->thirdparty->default_lang;
+	}
 	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
@@ -57,8 +61,12 @@ 
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+		$newlang = GETPOST('lang_id', 'aZ09');
+	}
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+		$newlang = $object->thirdparty->default_lang;
+	}
 	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);

htdocs/core/filemanagerdol/connectors/php/upload.php

Braces +6 added lines, -3 removed lines

@@ -41,8 +41,9 @@ 
 
 
 // Check if this uploader has been enabled.
-if (!$Config['Enabled'])
+if (!$Config['Enabled']) {
 	SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
+}
 
 $sCommand = 'QuickUpload';
 
@@ -52,12 +53,14 @@ 
 $sCurrentFolder = "/";
 
 // Is enabled the upload?
-if (!IsAllowedCommand($sCommand))
+if (!IsAllowedCommand($sCommand)) {
 	SendUploadResults('1', '', '', 'The ""'.$sCommand.'"" command isn\'t allowed');
+}
 
 // Check if it is an allowed type.
-if (!IsAllowedType($sType))
+if (!IsAllowedType($sType)) {
 	SendUploadResults(1, '', '', 'Invalid type specified');
+}
 
 
 // @CHANGE

htdocs/core/filemanagerdol/connectors/php/config.php

Braces +10 added lines, -3 removed lines

@@ -34,7 +34,10 @@ 
 require_once '../../../../main.inc.php';
 $uri = preg_replace('/^http(s?):\/\//i', '', $dolibarr_main_url_root);
 $pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine
-if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a ''
+if ($pos == '/') {
+	$pos = '';
+}
+// si $pos vaut /, on le met a ''
 define('DOL_URL_ROOT', $pos);
 $entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null);
 
@@ -81,14 +84,18 @@ 
 // Set to 0 to disable this feature.
 // Note: not needed on Windows-based servers.
 $newmask = '0644';
-if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+if (!empty($conf->global->MAIN_UMASK)) {
+	$newmask = $conf->global->MAIN_UMASK;
+}
 $Config['ChmodOnUpload'] = $newmask;
 
 // See comments above.
 // Used when creating folders that does not exist.
 $newmask = '0755';
 $dirmaskdec = octdec($newmask);
-if (!empty($conf->global->MAIN_UMASK)) $dirmaskdec = octdec($conf->global->MAIN_UMASK);
+if (!empty($conf->global->MAIN_UMASK)) {
+	$dirmaskdec = octdec($conf->global->MAIN_UMASK);
+}
 $dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
 $newmask = decoct($dirmaskdec);
 

htdocs/core/js/lib_gravatar.js.php

Braces +26 added lines, -9 removed lines

@@ -24,14 +24,28 @@ 
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB', '1');
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1');	// Not disabled cause need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 session_cache_limiter('public');
 
@@ -40,8 +54,11 @@ 
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // 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');
+}
 
 ?>
 

htdocs/core/js/lib_head.js.php

Braces +29 added lines, -10 removed lines

@@ -24,13 +24,27 @@ 
  * 				JQuery (providing object $) and JQuery-UI (providing $datepicker) libraries must be loaded before this file.
  */
 
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1);
-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);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 session_cache_limiter('public');
 
@@ -39,8 +53,11 @@ 
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // 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');
+}
 
 
 
@@ -1060,7 +1077,9 @@ 
 	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
 		$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
 	}
-	if ($thousand == 'Space') $thousand = ' ';
+	if ($thousand == 'Space') {
+		$thousand = ' ';
+	}
 	print "var dec='".dol_escape_js($dec)."'; var thousand='".dol_escape_js($thousand)."';\n"; // Set var in javascript
 	?>