Dolibarr / dolibarr

htdocs/core/class/extrafields.class.php

Braces +224 added lines, -75 removed lines

@@ -230,12 +230,20 @@ 
 	 */
 	public function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
 	{
-		if (empty($attrname)) return -1;
-		if (empty($label)) return -1;
+		if (empty($attrname)) {
+			return -1;
+		}
+		if (empty($label)) {
+			return -1;
+		}
 
 		if ($type == 'separate') { $unique = 0; $required = 0; }	// Force unique and not required if this is a separator field to avoid troubles.
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
@@ -253,7 +261,9 @@ 
 				$this->error = '';
 				$this->errno = 0;
 				return 1;
-			} else return -2;
+			} else {
+				return -2;
+			}
 		} else {
 			return -1;
 		}
@@ -279,11 +289,17 @@ 
 	 */
 	private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '', $help = '')
 	{
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		$table = $elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+		if ($elementtype == 'categorie') {
+			$table = 'categories_extrafields';
+		}
 
 		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname))
 		{
@@ -317,7 +333,9 @@ 
 			} else {
 				$typedb = $type;
 				$lengthdb = $length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb = '255';
+				if ($type == 'varchar' && empty($lengthdb)) {
+					$lengthdb = '255';
+				}
 			}
 			$field_desc = array(
 				'type'=>$typedb,
@@ -377,17 +395,35 @@ 
 		// phpcs:enable
 		global $conf, $user;
 
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		// Clean parameters
-		if (empty($pos)) $pos = 0;
-		if (empty($list)) $list = '0';
-		if (empty($required)) $required = 0;
-		if (empty($unique)) $unique = 0;
-		if (empty($printable)) $printable = 0;
-		if (empty($alwayseditable)) $alwayseditable = 0;
-		if (empty($totalizable)) $totalizable = 0;
+		if (empty($pos)) {
+			$pos = 0;
+		}
+		if (empty($list)) {
+			$list = '0';
+		}
+		if (empty($required)) {
+			$required = 0;
+		}
+		if (empty($unique)) {
+			$unique = 0;
+		}
+		if (empty($printable)) {
+			$printable = 0;
+		}
+		if (empty($alwayseditable)) {
+			$alwayseditable = 0;
+		}
+		if (empty($totalizable)) {
+			$totalizable = 0;
+		}
 
 		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname))
 		{
@@ -472,11 +508,17 @@ 
 	 */
 	public function delete($attrname, $elementtype = 'member')
 	{
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		$table = $elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+		if ($elementtype == 'categorie') {
+			$table = 'categories_extrafields';
+		}
 
 		$error = 0;
 
@@ -533,8 +575,12 @@ 
 		// phpcs:enable
 		global $conf;
 
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
@@ -585,11 +631,17 @@ 
 	 */
 	public function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
 	{
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		$table = $elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+		if ($elementtype == 'categorie') {
+			$table = 'categories_extrafields';
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
@@ -625,10 +677,12 @@ 
 			}
 			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required ? 'NOT NULL' : 'NULL'), 'default'=>$default);
 
-			if ($type != 'separate') // No table update when separate type
+			if ($type != 'separate') {
+				// No table update when separate type
 			{
 				$result = $this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			}
+			}
 			if ($result > 0 || $type == 'separate')
 			{
 				if ($label)
@@ -694,17 +748,31 @@ 
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable.", ".$printable);
 
 		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
-		if (empty($pos)) $pos = 0;
-		if (empty($list)) $list = '0';
+		if (empty($pos)) {
+			$pos = 0;
+		}
+		if (empty($list)) {
+			$list = '0';
+		}
 		if (empty($totalizable)) {
 			$totalizable = 0;
 		}
-		if (empty($required)) $required = 0;
-		if (empty($unique)) $unique = 0;
-		if (empty($alwayseditable)) $alwayseditable = 0;
+		if (empty($required)) {
+			$required = 0;
+		}
+		if (empty($unique)) {
+			$unique = 0;
+		}
+		if (empty($alwayseditable)) {
+			$alwayseditable = 0;
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
@@ -816,12 +884,22 @@ 
 		// phpcs:enable
 		global $conf;
 
-		if (empty($elementtype)) return array();
+		if (empty($elementtype)) {
+			return array();
+		}
 
-		if ($elementtype == 'thirdparty')     $elementtype = 'societe';
-		if ($elementtype == 'contact')        $elementtype = 'socpeople';
-		if ($elementtype == 'order_supplier') $elementtype = 'commande_fournisseur';
-		if ($elementtype == 'stock_mouvement') $elementtype = 'movement';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
+		if ($elementtype == 'order_supplier') {
+			$elementtype = 'commande_fournisseur';
+		}
+		if ($elementtype == 'stock_mouvement') {
+			$elementtype = 'movement';
+		}
 
 		$array_name_label = array();
 
@@ -829,7 +907,10 @@ 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,printable,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
 		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
 		//$sql.= " WHERE entity IN (0,".$conf->entity.")";    // Filter is done later
-		if ($elementtype) $sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'"; // Filed with object->table_element
+		if ($elementtype) {
+			$sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'";
+		}
+		// Filed with object->table_element
 		$sql .= " ORDER BY pos";
 
 		$resql = $this->db->query($sql);
@@ -897,7 +978,10 @@ 
 					$this->attributes[$tab->elementtype]['loaded'] = 1;
 				}
 			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
+			if ($elementtype) {
+				$this->attributes[$elementtype]['loaded'] = 1;
+			}
+			// If nothing found, we also save tag 'loaded'
 		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
@@ -934,10 +1018,12 @@ 
 
 		$out = '';
 
-		if (!preg_match('/options_$/', $keyprefix))	// Because we work on extrafields, we add 'options_' to prefix if not already added
+		if (!preg_match('/options_$/', $keyprefix)) {
+			// Because we work on extrafields, we add 'options_' to prefix if not already added
 		{
 			$keyprefix = $keyprefix.'options_';
 		}
+		}
 
 		if (!empty($extrafieldsobjectkey))
 		{
@@ -974,8 +1060,11 @@ 
 
 		if ($computed)
 		{
-			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+			if (!preg_match('/^search_/', $keyprefix)) {
+				return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+				return '';
+			}
 		}
 
 		if (empty($morecss))
@@ -1019,7 +1108,9 @@ 
 			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+				$value = '-1';
+			}
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
@@ -1036,9 +1127,11 @@ 
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 		} elseif ($type == 'text')
 		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix)) {
+				// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
@@ -1046,9 +1139,11 @@ 
 			}
 		} elseif ($type == 'html')
 		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix)) {
+				// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
@@ -1093,14 +1188,19 @@ 
 			$out .= '<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
-				if ((string) $key == '') continue;
+				if ((string) $key == '') {
+					continue;
+				}
 				list($val, $parent) = explode('|', $val);
 				$out .= '<option value="'.$key.'"';
 				$out .= (((string) $value == (string) $key) ? ' selected' : '');
 				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
 				$out .= '>';
-				if ($langfile && $val) $out .= $langs->trans($val);
-				else $out .= $val;
+				if ($langfile && $val) {
+					$out .= $langs->trans($val);
+				} else {
+					$out .= $val;
+				}
 				$out .= '</option>';
 			}
 			$out .= '</select>';
@@ -1233,7 +1333,9 @@ 
 									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 									$labeltoshow = $translabel;
 								}
-								if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+								if (empty($labeltoshow)) {
+									$labeltoshow = '(not defined)';
+								}
 
 								if (!empty($InfoFieldList[3]) && $parentField) {
 									$parent = $parentName.':'.$obj->{$parentField};
@@ -1452,8 +1554,9 @@ 
 										$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 									}
 								}
-								if (empty($labeltoshow))
-									$labeltoshow = '(not defined)';
+								if (empty($labeltoshow)) {
+																	$labeltoshow = '(not defined)';
+								}
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 									$data[$obj->rowid] = $labeltoshow;
@@ -1551,7 +1654,10 @@ 
 			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
-		if ($hidden) return ''; // This is a protection. If field is hidden, we should just not call this method.
+		if ($hidden) {
+			return '';
+		}
+		// This is a protection. If field is hidden, we should just not call this method.
 
 		//if ($computed) $value =		// $value is already calculated into $value before calling this method
 
@@ -1594,15 +1700,20 @@ 
 		} elseif ($type == 'price')
 		{
 			//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
-			if ($value || $value == '0') $value = price($value, 0, $langs, 0, 0, -1);
+			if ($value || $value == '0') {
+				$value = price($value, 0, $langs, 0, 0, -1);
+			}
 		} elseif ($type == 'select') {
 			$valstr = $param['options'][$value];
 			if (($pos = strpos($valstr, "|")) !== false)
 			{
 				$valstr = substr($valstr, 0, $pos);
 			}
-			if ($langfile && $valstr) $value = $langs->trans($valstr);
-			else $value = $valstr;
+			if ($langfile && $valstr) {
+				$value = $langs->trans($valstr);
+			} else {
+				$value = $valstr;
+			}
 		} elseif ($type == 'sellist') {
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -1693,7 +1804,9 @@ 
 					}
 					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 				}
-			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			} else {
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			}
 		} elseif ($type == 'radio')
 		{
 			$value = $param['options'][$value];
@@ -1804,9 +1917,12 @@ 
 			$out = '';
 
 			// Only if something to display (perf)
-			if ($value)		// If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)
+			if ($value) {
+				// If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)
 			{
-				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
+				$param_list = array_keys($param['options']);
+			}
+			// $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
 				$classname = $InfoFieldList[0];
@@ -1836,7 +1952,9 @@ 
 			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
 		} else {
 			$showsize = round($size);
-			if ($showsize > 48) $showsize = 48;
+			if ($showsize > 48) {
+				$showsize = 48;
+			}
 		}
 
 		//print $type.'-'.$size;
@@ -1856,8 +1974,11 @@ 
 	{
 		global $conf, $langs;
 
-		if (!empty($extrafieldsobjectkey)) $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type = $this->attribute_type[$key];
+		if (!empty($extrafieldsobjectkey)) {
+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+		} else {
+			$type = $this->attribute_type[$key];
+		}
 
 		$align = '';
 
@@ -1967,18 +2088,26 @@ 
 		$nofillrequired = 0; // For error when required field left blank
 		$error_field_required = array();
 
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels = $this->attributes[$object->table_element]['label'];
+		if (is_array($this->attributes[$object->table_element]['label'])) {
+			$extralabels = $this->attributes[$object->table_element]['label'];
+		}
 
 		if (is_array($extralabels))
 		{
 			// Get extra fields
 			foreach ($extralabels as $key => $value)
 			{
-				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) continue;
-				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key)) continue;
+				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) {
+					continue;
+				}
+				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key)) {
+					continue;
+				}
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
-				if ($key_type == 'separate') continue;
+				if ($key_type == 'separate') {
+					continue;
+				}
 
 				$enabled = 1;
 				if (isset($this->attributes[$object->table_element]['list'][$key]))
@@ -1990,10 +2119,15 @@ 
 				{
 					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
 				}
-				if (empty($enabled)) continue;
-				if (empty($perms)) continue;
+				if (empty($enabled)) {
+					continue;
+				}
+				if (empty($perms)) {
+					continue;
+				}
 
-				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
+				if ($this->attributes[$object->table_element]['required'][$key]) {
+					// Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
 					if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
@@ -2002,6 +2136,7 @@ 
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
 						$nofillrequired++;
+				}
 						$error_field_required[] = $langs->transnoentitiesnoconv($value);
 					}
 				}
@@ -2030,7 +2165,9 @@ 
 					$value_key = GETPOST("options_".$key, 'alphanohtml');
 				} else {
 					$value_key = GETPOST("options_".$key);
-					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
+					if (in_array($key_type, array('link')) && $value_key == '-1') {
+						$value_key = '';
+					}
 				}
 
 				$object->array_options["options_".$key] = $value_key;
@@ -2082,23 +2219,35 @@ 
 
 				if (in_array($key_type, array('date', 'datetime')))
 				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it.
+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) {
+						continue;
+					}
+					// Value was not provided, we should not set it.
 					// Clean parameters
 					$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
 				} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {
+						continue;
+					}
+					// Value was not provided, we should not set it.
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
 					$value_arr = (array) $value_arr;
 					$value_key = implode(',', $value_arr);
 				} elseif (in_array($key_type, array('price', 'double', 'int')))
 				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {
+						continue;
+					}
+					// Value was not provided, we should not set it.
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key = price2num($value_arr);
 				} else {
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {
+						continue;
+					}
+					// Value was not provided, we should not set it.
 					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
 

htdocs/compta/bank/graph.php

Braces +90 added lines, -30 removed lines

@@ -40,12 +40,16 @@ 
 	$id = isset($_GET["account"]) ? $_GET["account"] : (isset($_GET["ref"]) ? $_GET["ref"] : '');
 }
 $fieldid = isset($_GET["ref"]) ? 'ref' : 'rowid';
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', '', $fieldid);
 
 $account = GETPOST("account");
 $mode = 'standard';
-if (GETPOST("mode") == 'showalltime') $mode = 'showalltime';
+if (GETPOST("mode") == 'showalltime') {
+	$mode = 'showalltime';
+}
 $error = 0;
 
 
@@ -63,15 +67,21 @@ 
 $year = dol_print_date($datetime, "%Y");
 $month = dol_print_date($datetime, "%m");
 $day = dol_print_date($datetime, "%d");
-if (GETPOST("year"))  $year = sprintf("%04d", GETPOST("year"));
-if (GETPOST("month")) $month = sprintf("%02d", GETPOST("month"));
+if (GETPOST("year")) {
+	$year = sprintf("%04d", GETPOST("year"));
+}
+if (GETPOST("month")) {
+	$month = sprintf("%02d", GETPOST("month"));
+}
 
 
 $object = new Account($db);
-if ($_GET["account"] && !preg_match('/,/', $_GET["account"]))	// if for a particular account and not a list
+if ($_GET["account"] && !preg_match('/,/', $_GET["account"])) {
+	// if for a particular account and not a list
 {
 	$result = $object->fetch(GETPOST("account", "int"));
 }
+}
 if ($_GET["ref"])
 {
 	$result = $object->fetch(0, GETPOST("ref"));
@@ -91,7 +101,9 @@ 
 	$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql .= " WHERE b.fk_account = ba.rowid";
 	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-	if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+	if ($account && $_GET["option"] != 'all') {
+		$sql .= " AND b.fk_account IN (".$account.")";
+	}
 
 	$resql = $db->query($sql);
 	if ($resql)
@@ -103,7 +115,9 @@ 
 	} else {
 		dol_print_error($db);
 	}
-	if (empty($min)) $min = dol_now() - 3600 * 24;
+	if (empty($min)) {
+		$min = dol_now() - 3600 * 24;
+	}
 
 	$log = "graph.php: min=".$min." max=".$max;
 	dol_syslog($log);
@@ -132,7 +146,9 @@ 
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
 		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
 		$resql = $db->query($sql);
@@ -160,7 +176,9 @@ 
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev < '".$db->escape($year)."-".sprintf("%02s", $month)."-01'";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 
 		$resql = $db->query($sql);
 		if ($resql)
@@ -222,15 +240,23 @@ 
 		foreach ($datas as $i => $val)
 		{
 			$graph_datas[$i] = array(isset($labels[$i]) ? $labels[$i] : '', $datas[$i]);
-			if ($object->min_desired) array_push($graph_datas[$i], $datamin[$i]);
-			if ($object->min_allowed) array_push($graph_datas[$i], $dataall[$i]);
+			if ($object->min_desired) {
+				array_push($graph_datas[$i], $datamin[$i]);
+			}
+			if ($object->min_allowed) {
+				array_push($graph_datas[$i], $dataall[$i]);
+			}
 		}
 
 		$px1 = new DolGraph();
 		$px1->SetData($graph_datas);
 		$arraylegends = array($langs->transnoentities("Balance"));
-		if ($object->min_desired) array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
-		if ($object->min_allowed) array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		if ($object->min_desired) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
+		}
+		if ($object->min_allowed) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		}
 		$px1->SetLegend($arraylegends);
 		$px1->SetLegendWidthMin(180);
 		$px1->SetMaxValue($px1->GetCeilMaxValue() < 0 ? 0 : $px1->GetCeilMaxValue());
@@ -269,7 +295,9 @@ 
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
 		$resql = $db->query($sql);
@@ -297,7 +325,9 @@ 
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev < '".$db->escape($year)."-01-01'";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 
 		$resql = $db->query($sql);
 		if ($resql)
@@ -354,14 +384,22 @@ 
 		foreach ($datas as $i => $val)
 		{
 			$graph_datas[$i] = array(isset($labels[$i]) ? $labels[$i] : '', $datas[$i]);
-			if ($object->min_desired) array_push($graph_datas[$i], $datamin[$i]);
-			if ($object->min_allowed) array_push($graph_datas[$i], $dataall[$i]);
+			if ($object->min_desired) {
+				array_push($graph_datas[$i], $datamin[$i]);
+			}
+			if ($object->min_allowed) {
+				array_push($graph_datas[$i], $dataall[$i]);
+			}
 		}
 		$px2 = new DolGraph();
 		$px2->SetData($graph_datas);
 		$arraylegends = array($langs->transnoentities("Balance"));
-		if ($object->min_desired) array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
-		if ($object->min_allowed) array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		if ($object->min_desired) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
+		}
+		if ($object->min_allowed) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		}
 		$px2->SetLegend($arraylegends);
 		$px2->SetLegendWidthMin(180);
 		$px2->SetMaxValue($px2->GetCeilMaxValue() < 0 ? 0 : $px2->GetCeilMaxValue());
@@ -400,7 +438,9 @@ 
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
 		$resql = $db->query($sql);
@@ -434,9 +474,11 @@ 
 		$textdate = strftime("%Y%m%d", $day);
 		//print "x".$textdate;
 		$i = 0;
-		while ($day <= ($max + 86400))	// On va au dela du dernier jour
+		while ($day <= ($max + 86400)) {
+			// On va au dela du dernier jour
 		{
 			$subtotal = $subtotal + (isset($amounts[$textdate]) ? $amounts[$textdate] : 0);
+		}
 			//print strftime ("%e %d %m %y",$day)." ".$subtotal."\n<br>";
 			if ($day > ($max + 86400))
 			{
@@ -465,15 +507,23 @@ 
 		foreach ($datas as $i => $val)
 		{
 			$graph_datas[$i] = array(isset($labels[$i]) ? $labels[$i] : '', $datas[$i]);
-			if ($object->min_desired) array_push($graph_datas[$i], $datamin[$i]);
-			if ($object->min_allowed) array_push($graph_datas[$i], $dataall[$i]);
+			if ($object->min_desired) {
+				array_push($graph_datas[$i], $datamin[$i]);
+			}
+			if ($object->min_allowed) {
+				array_push($graph_datas[$i], $dataall[$i]);
+			}
 		}
 
 		$px3 = new DolGraph();
 		$px3->SetData($graph_datas);
 		$arraylegends = array($langs->transnoentities("Balance"));
-		if ($object->min_desired) array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
-		if ($object->min_allowed) array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		if ($object->min_desired) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
+		}
+		if ($object->min_allowed) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		}
 		$px3->SetLegend($arraylegends);
 		$px3->SetLegendWidthMin(180);
 		$px3->SetMaxValue($px3->GetCeilMaxValue() < 0 ? 0 : $px3->GetCeilMaxValue());
@@ -522,7 +572,9 @@ 
 		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
 		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
 		$sql .= " AND b.amount > 0";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%d')";
 
 		$resql = $db->query($sql);
@@ -558,7 +610,9 @@ 
 		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
 		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
 		$sql .= " AND b.amount < 0";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%d')";
 
 		$resql = $db->query($sql);
@@ -635,7 +689,9 @@ 
 		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
 		$sql .= " AND b.amount > 0";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%m');";
 
 		$resql = $db->query($sql);
@@ -662,7 +718,9 @@ 
 		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
 		$sql .= " AND b.amount < 0";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%m')";
 
 		$resql = $db->query($sql);
@@ -755,7 +813,9 @@ 
 			$bankaccount->fetch($id);
 			$bankaccount->label = $bankaccount->ref;
 			print $bankaccount->getNomUrl(1);
-			if ($key < (count($listid) - 1)) print ', ';
+			if ($key < (count($listid) - 1)) {
+				print ', ';
+			}
 		}
 	}
 } else {

htdocs/accountancy/expensereport/index.php

Braces +44 added lines, -16 removed lines

@@ -36,16 +36,22 @@ 
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
+if (GETPOST("year", 'int')) {
+	$year_start = GETPOST("year", 'int');
+} else {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) {
+		$year_start--;
+	}
+	// If current month is lower that starting fiscal month, we start last year
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
@@ -156,7 +162,9 @@ 
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -165,7 +173,9 @@ 
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(er.date_debut)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= " SUM(erd.total_ht) as total";
@@ -193,13 +203,17 @@ 
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -229,7 +243,9 @@ 
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -238,7 +254,9 @@ 
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(er.date_debut)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= " ROUND(SUM(erd.total_ht),2) as total";
@@ -266,14 +284,18 @@ 
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -291,9 +313,11 @@ 
 
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report where results depends on next step (so not yet available) ?
+if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+	// This part of code looks strange. Why showing a report where results depends on next step (so not yet available) ?
 {
 	print '<br>';
+}
 	print '<br>';
 
 	print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
@@ -304,7 +328,9 @@ 
 	print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("Total").'</td>';
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -312,7 +338,9 @@ 
 	$sql = "SELECT '".$db->escape($langs->trans("TotalExpenseReport"))."' AS label,";
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		$sql .= " SUM(".$db->ifsql('MONTH(er.date_create)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 	}
 	$sql .= " SUM(erd.total_ht) as total";

htdocs/accountancy/supplier/index.php

Braces +44 added lines, -16 removed lines

@@ -37,17 +37,23 @@ 
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
+if (GETPOST("year", 'int')) {
+	$year_start = GETPOST("year", 'int');
+} else {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) {
+		$year_start--;
+	}
+	// If current month is lower that starting fiscal month, we start last year
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
@@ -227,7 +233,9 @@ 
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -236,7 +244,9 @@ 
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
@@ -265,13 +275,17 @@ 
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -300,7 +314,9 @@ 
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -309,7 +325,9 @@ 
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
@@ -338,13 +356,17 @@ 
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -362,9 +384,11 @@ 
 
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report that should rely on result of this step ?
+if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+	// This part of code looks strange. Why showing a report that should rely on result of this step ?
 {
 	print '<br>';
+}
 	print '<br>';
 
 	print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
@@ -375,7 +399,9 @@ 
 	print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("Total").'</td>';
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -383,7 +409,9 @@ 
 	$sql = "SELECT '".$db->escape($langs->trans("CAHTF"))."' AS label,";
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(ffd.total_ht) as total";

htdocs/accountancy/class/lettering.class.php

Braces +12 added lines, -8 removed lines

@@ -67,12 +67,15 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
 		$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."bank_url as bu ON(bk.fk_doc = bu.fk_bank AND bu.type IN ('payment', 'payment_supplier') ) ";
 		$sql .= " WHERE ( ";
-		if ($object->code_compta != "")
-			$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta)."'  ";
-		if ($object->code_compta != "" && $object->code_compta_fournisseur != "")
-			$sql .= " OR ";
-		if ($object->code_compta_fournisseur != "")
-			$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta_fournisseur)."' ";
+		if ($object->code_compta != "") {
+					$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta)."'  ";
+		}
+		if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
+					$sql .= " OR ";
+		}
+		if ($object->code_compta_fournisseur != "") {
+					$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta_fournisseur)."' ";
+		}
 
 		$sql .= " ) AND (bk.date_lettering ='' OR bk.date_lettering IS NULL) ";
 		$sql .= "  AND (bk.lettering_code != '' OR bk.lettering_code IS NULL) ";
@@ -244,8 +247,9 @@ 
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
 			$lettre = (empty($obj->lettering_code) ? 'AAA' : $obj->lettering_code);
-			if (!empty($obj->lettering_code))
-				$lettre++;
+			if (!empty($obj->lettering_code)) {
+							$lettre++;
+			}
 		} else {
 			$this->errors[] = 'Error'.$this->db->lasterror();
 			$error++;

htdocs/accountancy/customer/index.php

Braces +50 added lines, -18 removed lines

@@ -39,17 +39,23 @@ 
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
+if (GETPOST("year", 'int')) {
+	$year_start = GETPOST("year", 'int');
+} else {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) {
+		$year_start--;
+	}
+	// If current month is lower that starting fiscal month, we start last year
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
@@ -238,7 +244,9 @@ 
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -247,7 +255,9 @@ 
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, 'fd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
@@ -281,13 +291,17 @@ 
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -316,7 +330,9 @@ 
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -325,7 +341,9 @@ 
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, 'fd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
@@ -359,14 +377,18 @@ 
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 
 		for ($i = 2; $i <= 12; $i++) {
@@ -384,9 +406,11 @@ 
 print '</div>';
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report that should rely on result of this step ?
+if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+	// This part of code looks strange. Why showing a report that should rely on result of this step ?
 {
 	print '<br>';
+}
 	print '<br>';
 
 	print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
@@ -397,7 +421,9 @@ 
 	print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("TotalVente").'</td>';
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -405,7 +431,9 @@ 
 	$sql = "SELECT '".$db->escape($langs->trans("TotalVente"))."' AS total,";
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, 'fd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(fd.total_ht) as total";
@@ -454,7 +482,9 @@ 
 		print '<tr class="liste_titre"><td width="400">'.$langs->trans("TotalMarge").'</td>';
 		for ($i = 1; $i <= 12; $i++) {
 			$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-			if ($j > 12) $j -= 12;
+			if ($j > 12) {
+				$j -= 12;
+			}
 			print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 		}
 		print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -462,7 +492,9 @@ 
 		$sql = "SELECT '".$db->escape($langs->trans("Vide"))."' AS marge,";
 		for ($i = 1; $i <= 12; $i++) {
 			$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-			if ($j > 12) $j -= 12;
+			if ($j > 12) {
+				$j -= 12;
+			}
 			$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 		}
 		$sql .= "  SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) as total";

htdocs/install/lib/repair.lib.php

Braces +40 added lines, -15 removed lines

@@ -38,9 +38,15 @@ 
 	if ($resql)
 	{
 		$num = $db->num_rows($resql);
-		if ($num > 0) return true;
-		else return false;
-	} else return true; // for security
+		if ($num > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	} else {
+		return true;
+	}
+	// for security
 }
 
 /**
@@ -60,14 +66,26 @@ 
 	$sourcetable = $sourcetype;
 	$targettable = $targettype;
 
-	if ($sourcetype == 'shipping') $sourcetable = 'expedition';
-	elseif ($targettype == 'shipping') $targettable = 'expedition';
-	if ($sourcetype == 'delivery') $sourcetable = 'livraison';
-	elseif ($targettype == 'delivery') $targettable = 'livraison';
-	if ($sourcetype == 'order_supplier') $sourcetable = 'commande_fournisseur';
-	elseif ($targettype == 'order_supplier') $targettable = 'commande_fournisseur';
-	if ($sourcetype == 'invoice_supplier') $sourcetable = 'facture_fourn';
-	elseif ($targettype == 'invoice_supplier') $targettable = 'facture_fourn';
+	if ($sourcetype == 'shipping') {
+		$sourcetable = 'expedition';
+	} elseif ($targettype == 'shipping') {
+		$targettable = 'expedition';
+	}
+	if ($sourcetype == 'delivery') {
+		$sourcetable = 'livraison';
+	} elseif ($targettype == 'delivery') {
+		$targettable = 'livraison';
+	}
+	if ($sourcetype == 'order_supplier') {
+		$sourcetable = 'commande_fournisseur';
+	} elseif ($targettype == 'order_supplier') {
+		$targettable = 'commande_fournisseur';
+	}
+	if ($sourcetype == 'invoice_supplier') {
+		$sourcetable = 'facture_fourn';
+	} elseif ($targettype == 'invoice_supplier') {
+		$targettable = 'facture_fourn';
+	}
 
 	$out = $langs->trans('SourceType').': '.$sourcetype.' => '.$langs->trans('TargetType').': '.$targettype.' ';
 
@@ -103,8 +121,11 @@ 
 		}
 	}
 
-	if ($deleted) $out .= '('.$langs->trans('LinkedElementsInvalidDeleted', $deleted).')<br>';
-	else $out .= '('.$langs->trans('NothingToDelete').')<br>';
+	if ($deleted) {
+		$out .= '('.$langs->trans('LinkedElementsInvalidDeleted', $deleted).')<br>';
+	} else {
+		$out .= '('.$langs->trans('NothingToDelete').')<br>';
+	}
 
 	return $out;
 }
@@ -133,10 +154,14 @@ 
 				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set label='".$db->escape($newlabel)."' WHERE rowid=".$id;
 				print '<tr><td>'.$sqlupdate."</td></tr>\n";
 				$resqlupdate = $db->query($sqlupdate);
-				if (!$resqlupdate) dol_print_error($db, 'Failed to update');
+				if (!$resqlupdate) {
+					dol_print_error($db, 'Failed to update');
+				}
 			}
 		}
-	} else dol_print_error($db, 'Failed to run request');
+	} else {
+		dol_print_error($db, 'Failed to run request');
+	}
 
 	return;
 }

htdocs/core/tpl/commonfields_view.tpl.php

Braces +69 added lines, -22 removed lines

@@ -29,7 +29,9 @@ 
 	print "Error, template page can't be called as URL";
 	exit;
 }
-if (!is_object($form)) $form = new Form($db);
+if (!is_object($form)) {
+	$form = new Form($db);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE commonfields_view.tpl.php -->
@@ -39,32 +41,56 @@ 
 
 foreach ($object->fields as $key => $val)
 {
-	if (!empty($keyforbreak) && $key == $keyforbreak) break; // key used for break on second column
+	if (!empty($keyforbreak) && $key == $keyforbreak) {
+		break;
+	}
+	// key used for break on second column
 
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) continue;
+	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) {
+		continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) continue; // We don't want this field
-	if (in_array($key, array('ref', 'status'))) continue; // Ref and status are already in dol_banner
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) {
+		continue;
+	}
+	// We don't want this field
+	if (in_array($key, array('ref', 'status'))) {
+		continue;
+	}
+	// Ref and status are already in dol_banner
 
 	$value = $object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield fieldname_'.$key;
 	//if ($val['notnull'] > 0) print ' fieldrequired';     // No fieldrequired on the view output
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+		print ' tdtop';
+	}
 	print '">';
-	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
-	else print $langs->trans($val['label']);
+	if (!empty($val['help'])) {
+		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+	} else {
+		print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td class="valuefield fieldname_'.$key;
-	if ($val['type'] == 'text') print ' wordbreak';
-	if ($val['cssview']) print ' '.$val['cssview'];
+	if ($val['type'] == 'text') {
+		print ' wordbreak';
+	}
+	if ($val['cssview']) {
+		print ' '.$val['cssview'];
+	}
 	print '">';
-	if (in_array($val['type'], array('text', 'html'))) print '<div class="longmessagecut">';
+	if (in_array($val['type'], array('text', 'html'))) {
+		print '<div class="longmessagecut">';
+	}
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	//print dol_escape_htmltag($object->$key, 1, 1);
-	if (in_array($val['type'], array('text', 'html'))) print '</div>';
+	if (in_array($val['type'], array('text', 'html'))) {
+		print '</div>';
+	}
 	print '</td>';
 	print '</tr>';
 }
@@ -91,29 +117,50 @@ 
 	}
 
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) continue;
+	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) {
+		continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) continue; // We don't want this field
-	if (in_array($key, array('ref', 'status'))) continue; // Ref and status are already in dol_banner
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) {
+		continue;
+	}
+	// We don't want this field
+	if (in_array($key, array('ref', 'status'))) {
+		continue;
+	}
+	// Ref and status are already in dol_banner
 
 	$value = $object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield fieldname_'.$key;
 	//if ($val['notnull'] > 0) print ' fieldrequired';		// No fieldrequired inthe view output
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+		print ' tdtop';
+	}
 	print '">';
-	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
-	else print $langs->trans($val['label']);
+	if (!empty($val['help'])) {
+		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+	} else {
+		print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td class="valuefield fieldname_'.$key;
-	if ($val['type'] == 'text') print ' wordbreak';
-	if ($val['cssview']) print ' '.$val['cssview'];
+	if ($val['type'] == 'text') {
+		print ' wordbreak';
+	}
+	if ($val['cssview']) {
+		print ' '.$val['cssview'];
+	}
 	print '">';
-	if (in_array($val['type'], array('text', 'html'))) print '<div class="longmessagecut">';
+	if (in_array($val['type'], array('text', 'html'))) {
+		print '<div class="longmessagecut">';
+	}
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	//print dol_escape_htmltag($object->$key, 1, 1);
-	if (in_array($val['type'], array('text', 'html'))) print '</div>';
+	if (in_array($val['type'], array('text', 'html'))) {
+		print '</div>';
+	}
 	print '</td>';
 	print '</tr>';
 }

htdocs/core/login/functions_ldap.php

Braces +45 added lines, -15 removed lines

@@ -45,7 +45,9 @@ 
 
 	// Force master entity in transversal mode
 	$entity = $entitytotest;
-	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;
+	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		$entity = 1;
+	}
 
 	$login = '';
 	$resultFetchUser = '';
@@ -78,7 +80,9 @@ 
 		$ldapadminpass = $dolibarr_main_auth_ldap_admin_pass;
 		$ldapdebug = (empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug == "false" ? false : true);
 
-		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
+		if ($ldapdebug) {
+			print "DEBUG: Logging LDAP steps<br>\n";
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 		$ldap = new Ldap();
@@ -116,10 +120,14 @@ 
 			{
 				$resultFetchLdapUser = $ldap->fetch($usertotest, $userSearchFilter);
 				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
-				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
+				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) {
+					// If ok but password need to be reset
 				{
 					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');
-					if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";
+				}
+					if ($ldapdebug) {
+						print "DEBUG: User ".$usertotest." must change password<br>\n";
+					}
 					$ldap->close();
 					sleep(1);
 					$langs->load('ldap');
@@ -127,7 +135,9 @@ 
 					return '';
 				}
 			} else {
-				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
+				 if ($ldapdebug) {
+				 	print "DEBUG: ".$ldap->error."<br>\n";
+				 }
 			}
 			$ldap->close();
 		}
@@ -138,7 +148,9 @@ 
 		$ldap->searchUser = $ldapuserattr."=".$usertotest.",".$ldapdn; // Default dn (will work if LDAP accept a dn with login value inside)
 		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
 		// dn detected into ldapUserDN.
-		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
+		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) {
+			$ldap->searchUser = $ldap->ldapUserDN;
+		}
 		$ldap->searchPassword = $passwordtotest;
 
 		// Test with this->seachUser and this->searchPassword
@@ -146,9 +158,11 @@ 
 		$result = $ldap->connect_bind();
 		if ($result > 0)
 		{
-			if ($result == 2)	// Connection is ok for user/pass into LDAP
+			if ($result == 2) {
+				// Connection is ok for user/pass into LDAP
 			{
 				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
+			}
 				$login = $usertotest;
 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -173,24 +187,36 @@ 
 				}
 
 				// ldap2dolibarr synchronisation
-				if ($login && !empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
+				if ($login && !empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {
+					// ldap2dolibarr synchronisation
 				{
 					dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
+				}
 
 					// On charge les attributs du user ldap
-					if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
+					if ($ldapdebug) {
+						print "DEBUG: login ldap = ".$login."<br>\n";
+					}
 					$resultFetchLdapUser = $ldap->fetch($login, $userSearchFilter);
 
-					if ($ldapdebug) print "DEBUG: UACF = ".join(',', $ldap->uacf)."<br>\n";
-					if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset, 'day')."<br>\n";
-					if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime, 'day')."<br>\n";
+					if ($ldapdebug) {
+						print "DEBUG: UACF = ".join(',', $ldap->uacf)."<br>\n";
+					}
+					if ($ldapdebug) {
+						print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset, 'day')."<br>\n";
+					}
+					if ($ldapdebug) {
+						print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime, 'day')."<br>\n";
+					}
 
 					// On recherche le user dolibarr en fonction de son SID ldap (only for Active Directory)
 					$sid = null;
 					if ($conf->global->LDAP_SERVER_TYPE == "activedirectory")
 					{
 						$sid = $ldap->getObjectSid($login);
-						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
+						if ($ldapdebug) {
+							print "DEBUG: sid = ".$sid."<br>\n";
+						}
 					}
 
 					$usertmp = new User($db);
@@ -213,9 +239,11 @@ 
 					unset($usertmp);
 				}
 
-				if (!empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
+				if (!empty($conf->multicompany->enabled)) {
+					// We must check entity (even if sync is not active)
 				{
 					global $mc;
+				}
 
 					$usertmp = new User($db);
 					$usertmp->fetch('', $login);
@@ -248,9 +276,11 @@ 
              ** 53 - Account inactive (manually locked out by administrator)
              */
 			dol_syslog("functions_ldap::check_user_password_ldap Authentication KO failed to connect to LDAP for '".$usertotest."'", LOG_NOTICE);
-			if (is_resource($ldap->connection))    // If connection ok but bind ko
+			if (is_resource($ldap->connection)) {
+				// If connection ok but bind ko
 			{
 				$ldap->ldapErrorCode = ldap_errno($ldap->connection);
+			}
 				$ldap->ldapErrorText = ldap_error($ldap->connection);
 				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
 			}