alxarafe / alixar

dolibarr/htdocs/core/class/html.formcompany.class.php

Braces +153 added lines, -81 removed lines

@@ -70,7 +70,9 @@ 
 		$sql = "SELECT id, code, libelle";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
 		$sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
-		if ($filter) $sql.=" ".$filter;
+		if ($filter) {
+		    $sql.=" ".$filter;
+		}
 		$sql.= " ORDER by position, id";
 		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -82,11 +84,19 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
-				if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);
-				else $effs[$key] = $objp->libelle;
-				if ($effs[$key]=='-') $effs[$key]='';
+				if (! $mode) {
+				    $key=$objp->id;
+				} else {
+				    $key=$objp->code;
+				}
+				if ($langs->trans($objp->code) != $objp->code) {
+				    $effs[$key] = $langs->trans($objp->code);
+				} else {
+				    $effs[$key] = $objp->libelle;
+				}
+				if ($effs[$key]=='-') {
+				    $effs[$key]='';
+				}
 				$i++;
 			}
 			$this->db->free($resql);
@@ -111,7 +121,9 @@ 
 		$sql = "SELECT id, code, libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
 		$sql.= " WHERE active = 1";
-		if ($filter) $sql.=" ".$filter;
+		if ($filter) {
+		    $sql.=" ".$filter;
+		}
 		$sql .= " ORDER BY id ASC";
 		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -123,8 +135,11 @@ 
 			while ($i < $num)
 			{
 				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
+				if (! $mode) {
+				    $key=$objp->id;
+				} else {
+				    $key=$objp->code;
+				}
 
 				$effs[$key] = $objp->libelle!='-'?$objp->libelle:'';
 				$i++;
@@ -179,9 +194,12 @@ 
 			}
 
 			print Form::selectarray($htmlname, $options, $selected);
+		} else {
+		    dol_print_error($this->db);
+		}
+		if (! empty($htmlname) && $user->admin) {
+		    print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		}
-		else dol_print_error($this->db);
-		if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
@@ -235,15 +253,23 @@ 
 		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
-		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
-		if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
+		if ($country_codeid && is_numeric($country_codeid)) {
+		    $sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
+		}
+		if ($country_codeid && ! is_numeric($country_codeid)) {
+		    $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
+		}
 		$sql .= " ORDER BY c.code, d.code_departement";
 
 		$result=$this->db->query($sql);
 		if ($result)
 		{
-			if (!empty($htmlname)) $out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';
+			if (!empty($htmlname)) {
+			    $out.= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
+			}
+			if ($country_codeid) {
+			    $out.= '<option value="0">&nbsp;</option>';
+			}
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			dol_syslog(get_class($this)."::select_departement num=".$num,LOG_DEBUG);
@@ -253,11 +279,12 @@ 
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($result);
-					if ($obj->code == '0')		// Le code peut etre une chaine
+					if ($obj->code == '0') {
+					    // Le code peut etre une chaine
 					{
 						$out.= '<option value="0">&nbsp;</option>';
 					}
-					else {
+					} else {
 						if (! $country || $country != $obj->country)
 						{
 							// Affiche la rupture si on est en mode liste multipays
@@ -272,8 +299,7 @@ 
 						 || (empty($selected) && ! empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
 						{
 							$out.= '<option value="'.$obj->rowid.'" selected>';
-						}
-						else
+						} else
 						{
 							$out.= '<option value="'.$obj->rowid.'">';
 						}
@@ -283,16 +309,13 @@ 
 						($conf->global->MAIN_SHOW_STATE_CODE == 1 || $conf->global->MAIN_SHOW_STATE_CODE == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')) {
 							if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out.= $obj->region_name . ' - ' . $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-							else {
+							} else {
 								$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
 							}
-						}
-						else {
+						} else {
 							if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out.= $obj->region_name . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-							else {
+							} else {
 								$out.= ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
 							}
 						}
@@ -302,10 +325,13 @@ 
 					$i++;
 				}
 			}
-			if (! empty($htmlname)) $out.= '</select>';
-			if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
+			if (! empty($htmlname)) {
+			    $out.= '</select>';
+			}
+			if (! empty($htmlname) && $user->admin) {
+			    $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -358,8 +384,7 @@ 
 					$obj = $this->db->fetch_object($resql);
 					if ($obj->code == 0) {
 						print '<option value="0">&nbsp;</option>';
-					}
-					else {
+					} else {
 						if ($country == '' || $country != $obj->country)
 						{
 							// Show break
@@ -372,8 +397,7 @@ 
 						if ($selected > 0 && $selected == $obj->code)
 						{
 							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
-						}
-						else
+						} else
 						{
 							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
@@ -382,8 +406,7 @@ 
 				}
 			}
 			print '</select>';
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -425,8 +448,7 @@ 
 					if ($selected == $obj->code)
 					{
 						$out.= '<option value="'.$obj->code.'" selected>';
-					}
-					else
+					} else
 					{
 						$out.= '<option value="'.$obj->code.'">';
 					}
@@ -437,9 +459,10 @@ 
 				}
 			}
 			$out.= '</select>';
-			if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
+			if ($user->admin) {
+			    $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -489,8 +512,12 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE f.fk_pays=c.rowid";
 		$sql .= " AND f.active = 1 AND c.active = 1";
-		if ($country_codeid) $sql .= " AND c.code = '".$country_codeid."'";
-		if ($filter) $sql .= " ".$filter;
+		if ($country_codeid) {
+		    $sql .= " AND c.code = '".$country_codeid."'";
+		}
+		if ($filter) {
+		    $sql .= " ".$filter;
+		}
 		$sql .= " ORDER BY c.code";
 
 		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
@@ -499,7 +526,10 @@ 
 		{
 			$out.= '<div id="particulier2" class="visible">';
 			$out.= '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';	// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
+			if ($country_codeid) {
+			    $out.= '<option value="0">&nbsp;</option>';
+			}
+			// When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
 
 			$num = $this->db->num_rows($resql);
 			if ($num)
@@ -510,9 +540,11 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 
-					if ($obj->code)		// We exclude empty line, we will add it later
+					if ($obj->code) {
+					    // We exclude empty line, we will add it later
 					{
 						$labelcountry=(($langs->trans("Country".$obj->country_code)!="Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
+					}
 						$labeljs=(($langs->trans("JuridicalStatus".$obj->code)!="JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label!='-'?$obj->label:''));	// $obj->label is already in output charset (converted by database driver)
 						$arraydata[$obj->code]=array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
 					}
@@ -520,10 +552,12 @@ 
 				}
 
 				$arraydata=dol_sort_array($arraydata, 'label_sort', 'ASC');
-				if (empty($country_codeid))	// Introduce empty value (if $country_codeid not empty, empty value was already added)
+				if (empty($country_codeid)) {
+				    // Introduce empty value (if $country_codeid not empty, empty value was already added)
 				{
 					$arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
 				}
+				}
 
 				foreach($arraydata as $key => $val)
 				{
@@ -540,8 +574,7 @@ 
 					if ($selected > 0 && $selected == $val['code'])
 					{
 						$out.= '<option value="'.$val['code'].'" selected>';
-					}
-					else
+					} else
 					{
 						$out.= '<option value="'.$val['code'].'">';
 					}
@@ -551,15 +584,16 @@ 
 				}
 			}
 			$out.= '</select>';
-			if ($user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) {
+			    $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
 
 		    // Make select dynamic
         	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 	        $out .= ajax_combobox($htmlname);
 
 			$out.= '</div>';
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -611,7 +645,8 @@ 
 			// To refresh contacts list on thirdparty list change
 			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 
-			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
+			if (count($events)) {
+			    // If there is some ajax events to run once selection is done, we add code here to run events
 			{
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
@@ -662,13 +697,13 @@ 
 				});
 				</script>';
 			}
+			}
 
 			print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
 			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
 			print ajax_autocompleter(($socid?$socid:-1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
-		}
-		else
+		} else
 		{
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
@@ -698,20 +733,27 @@ 
 					while ($i < $num)
 					{
 						$obj = $this->db->fetch_object($resql);
-						if ($i == 0) $firstCompany = $obj->rowid;
+						if ($i == 0) {
+						    $firstCompany = $obj->rowid;
+						}
 						$disabled=0;
-						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
+						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) {
+						    $disabled=1;
+						}
 						if ($selected > 0 && $selected == $obj->rowid)
 						{
 							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
+							if ($disabled) {
+							    print ' disabled';
+							}
 							print ' selected>'.dol_trunc($obj->name,24).'</option>';
 							$firstCompany = $obj->rowid;
-						}
-						else
+						} else
 						{
 							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
+							if ($disabled) {
+							    print ' disabled';
+							}
 							print '>'.dol_trunc($obj->name,24).'</option>';
 						}
 						$i ++;
@@ -719,8 +761,7 @@ 
 				}
 				print "</select>\n";
 				return $firstCompany;
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 				print 'Error sql';
@@ -748,15 +789,21 @@ 
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
 			print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($showempty) print '<option value="0"></option>';
+			if ($showempty) {
+			    print '<option value="0"></option>';
+			}
 			foreach($lesTypes as $key=>$value)
 			{
 				print '<option value="'.$key.'"';
-				if ($key == $selected) print ' selected';
+				if ($key == $selected) {
+				    print ' selected';
+				}
 				print '>'.$value.'</option>';
 			}
 			print "</select>";
-			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if ($user->admin) {
+			    print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			}
 			print "\n";
 		}
 	}
@@ -782,7 +829,9 @@ 
 		$out='';
 
 		$size='';
-		if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
+		if (!empty($fieldsize)) {
+		    $size='size="'.$fieldsize.'"';
+		}
 
 		if ($conf->use_javascript_ajax && empty($disableautocomplete))
 		{
@@ -815,27 +864,51 @@ 
         	if ($country_code == 'FR')
         	{
         		if (isset($idprof)) {
-        			if ($idprof==1) $formlength=9;
-        			else if ($idprof==2) $formlength=14;
-        			else if ($idprof==3) $formlength=5;      // 4 chiffres et 1 lettre depuis janvier
-        			else if ($idprof==4) $formlength=32;     // No maximum as we need to include a town name in this id
+        			if ($idprof==1) {
+        			    $formlength=9;
+        			} else if ($idprof==2) {
+        			    $formlength=14;
+        			} else if ($idprof==3) {
+        			    $formlength=5;
+        			}
+        			// 4 chiffres et 1 lettre depuis janvier
+        			else if ($idprof==4) {
+        			    $formlength=32;
+        			}
+        			// No maximum as we need to include a town name in this id
         		}
-        	}
-        	else if ($country_code == 'ES')
+        	} else if ($country_code == 'ES')
         	{
-        		if ($idprof==1) $formlength=9;  //CIF/NIF/NIE 9 digits
-        		if ($idprof==2) $formlength=12; //NASS 12 digits without /
-        		if ($idprof==3) $formlength=5;  //CNAE 5 digits
-        		if ($idprof==4) $formlength=32; //depend of college
+        		if ($idprof==1) {
+        		    $formlength=9;
+        		}
+        		//CIF/NIF/NIE 9 digits
+        		if ($idprof==2) {
+        		    $formlength=12;
+        		}
+        		//NASS 12 digits without /
+        		if ($idprof==3) {
+        		    $formlength=5;
+        		}
+        		//CNAE 5 digits
+        		if ($idprof==4) {
+        		    $formlength=32;
+        		}
+        		//depend of college
         	}
         }
 
         $selected=$preselected;
         if (! $selected && isset($idprof)) {
-        	if ($idprof==1 && ! empty($this->idprof1)) $selected=$this->idprof1;
-        	else if ($idprof==2 && ! empty($this->idprof2)) $selected=$this->idprof2;
-        	else if ($idprof==3 && ! empty($this->idprof3)) $selected=$this->idprof3;
-        	else if ($idprof==4 && ! empty($this->idprof4)) $selected=$this->idprof4;
+        	if ($idprof==1 && ! empty($this->idprof1)) {
+        	    $selected=$this->idprof1;
+        	} else if ($idprof==2 && ! empty($this->idprof2)) {
+        	    $selected=$this->idprof2;
+        	} else if ($idprof==3 && ! empty($this->idprof3)) {
+        	    $selected=$this->idprof3;
+        	} else if ($idprof==4 && ! empty($this->idprof4)) {
+        	    $selected=$this->idprof4;
+        	}
         }
 
         $maxlength=$formlength;
@@ -875,8 +948,7 @@ 
     				if ($selected == $valors[$i])
     				{
     					print '<option value="'.$valors[$i].'" selected>';
-    				}
-    				else
+    				} else
     				{
     					print '<option value="'.$valors[$i].'">';
     				}

dolibarr/htdocs/core/class/smtps.class.php

Braces +188 added lines, -125 removed lines

@@ -300,8 +300,9 @@ 
      */
 	function setErrorsTo($_strErrorsTo)
 	{
-		if ( $_strErrorsTo )
-		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+		if ( $_strErrorsTo ) {
+				$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+		}
 	}
 
     /**
@@ -314,10 +315,11 @@ 
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
-		$_retValue = $this->_errorsTo;
-		else
-		$_retValue = $this->_errorsTo[$_part];
+		if ( $_part === true ) {
+				$_retValue = $this->_errorsTo;
+		} else {
+				$_retValue = $this->_errorsTo[$_part];
+		}
 
 		return $_retValue;
 	}
@@ -373,8 +375,7 @@ 
 		{
 			$this->_setErr(99, $host . ' is either offline or is an invalid host name.');
 			$_retVal = false;
-		}
-		else
+		} else
 		{
 			//See if we can connect to the SMTP server
 			if ($this->socket = @fsockopen(
@@ -383,23 +384,28 @@ 
     			$this->errno,           // actual system level error
     			$this->errstr,          // and any text that goes with the error
     			$this->_smtpTimeout
-			))  // timeout for reading/writing data over the socket
+			)) {
+			    // timeout for reading/writing data over the socket
 			{
 				// Fix from PHP SMTP class by 'Chris Ryan'
 				// Sometimes the SMTP server takes a little longer to respond
 				// so we will give it a longer timeout for the first read
 				// Windows still does not have support for this timeout function
 				if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
+			}
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($this->socket, "220") )
-				$_retVal = $this->socket;
+				if ( $_retVal = $this->server_parse($this->socket, "220") ) {
+								$_retVal = $this->socket;
+				}
 			}
 			// This connection attempt failed.
 			else
 			{
 				// @CHANGE LDR
-				if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				if (empty($this->errstr)) {
+				    $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				}
 				$this->_setErr($this->errno, $this->errstr);
 				$_retVal = false;
 			}
@@ -429,7 +435,9 @@ 
 		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
 		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
 
-		if ($usetls) $host='tls://'.$host;
+		if ($usetls) {
+		    $host='tls://'.$host;
+		}
 
 		$hosth = $host;
 
@@ -506,10 +514,10 @@ 
 
 			// The error here just means the ID/password combo doesn't work.
 			// There is not a method to determine which is the problem, ID or password
-			if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') )
-			$this->_setErr(130, 'Invalid Authentication Credentials.');
-		}
-		else
+			if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') ) {
+						$this->_setErr(130, 'Invalid Authentication Credentials.');
+			}
+		} else
 		{
 			$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
 		}
@@ -672,14 +680,17 @@ 
 		{
 			// Set these properties ONLY if they are set in the php.ini file.
 			// Otherwise the default values will be used.
-			if ( $_host = ini_get('SMTPs') )
-			$this->setHost($_host);
+			if ( $_host = ini_get('SMTPs') ) {
+						$this->setHost($_host);
+			}
 
-			if ( $_port = ini_get('smtp_port') )
-			$this->setPort($_port);
+			if ( $_port = ini_get('smtp_port') ) {
+						$this->setPort($_port);
+			}
 
-			if ( $_from = ini_get('sendmail_from') )
-			$this->setFrom($_from);
+			if ( $_from = ini_get('sendmail_from') ) {
+						$this->setFrom($_from);
+			}
 		}
 
 		// Send back what we have
@@ -698,8 +709,9 @@ 
 	function setTransportType($_type = 0)
 	{
 		if ( ( is_numeric($_type) ) &&
-		( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
-		$this->_transportType = $_type;
+		( ( $_type >= 0 ) && ( $_type <= 3 ) ) ) {
+				$this->_transportType = $_type;
+		}
 	}
 
 	/**
@@ -740,8 +752,9 @@ 
 	 */
 	function setHost($_strHost)
 	{
-		if ( $_strHost )
-		$this->_smtpsHost = $_strHost;
+		if ( $_strHost ) {
+				$this->_smtpsHost = $_strHost;
+		}
 	}
 
 	/**
@@ -766,8 +779,9 @@ 
 	function setPort($_intPort)
 	{
 		if ( ( is_numeric($_intPort) ) &&
-		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
-		$this->_smtpsPort = $_intPort;
+		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) ) {
+				$this->_smtpsPort = $_intPort;
+		}
 	}
 
 	/**
@@ -832,8 +846,9 @@ 
 	 */
 	function setCharSet($_strCharSet)
 	{
-		if ( $_strCharSet )
-		$this->_smtpsCharSet = $_strCharSet;
+		if ( $_strCharSet ) {
+				$this->_smtpsCharSet = $_strCharSet;
+		}
 	}
 
 	/**
@@ -863,8 +878,9 @@ 
 	 */
 	function setTransEncode($_strTransEncode)
 	{
-		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncode = $_strTransEncode;
+		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes)) {
+				$this->_smtpsTransEncode = $_strTransEncode;
+		}
 	}
 
 	/**
@@ -895,8 +911,9 @@ 
 	 */
 	function setTransEncodeType($_strTransEncodeType)
 	{
-		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncodeType = $_strTransEncodeType;
+		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes)) {
+				$this->_smtpsTransEncodeType = $_strTransEncodeType;
+		}
 	}
 
 	/**
@@ -920,8 +937,9 @@ 
 	 */
 	function setFrom($_strFrom)
 	{
-		if ( $_strFrom )
-		$this->_msgFrom = $this->_strip_email($_strFrom);
+		if ( $_strFrom ) {
+				$this->_msgFrom = $this->_strip_email($_strFrom);
+		}
 	}
 
 	/**
@@ -934,10 +952,11 @@ 
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
-		$_retValue = $this->_msgFrom;
-		else
-		$_retValue = $this->_msgFrom[$_part];
+		if ( $_part === true ) {
+				$_retValue = $this->_msgFrom;
+		} else {
+				$_retValue = $this->_msgFrom[$_part];
+		}
 
 		return $_retValue;
 	}
@@ -950,8 +969,9 @@ 
 	 */
 	function setReplyTo($_strReplyTo)
 	{
-	    if ( $_strReplyTo )
-	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+	    if ( $_strReplyTo ) {
+	    	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+	    }
 	}
 
 	/**
@@ -964,10 +984,11 @@ 
 	{
 	    $_retValue = '';
 
-	    if ( $_part === true )
-	        $_retValue = $this->_msgReplyTo;
-	    else
-	        $_retValue = $this->_msgReplyTo[$_part];
+	    if ( $_part === true ) {
+	    	        $_retValue = $this->_msgReplyTo;
+	    } else {
+	    	        $_retValue = $this->_msgReplyTo[$_part];
+	    }
 
 	    return $_retValue;
 	}
@@ -996,13 +1017,15 @@ 
 			if ( is_string($_addrList) )
 			{
 				// This could be a COMMA delimited string
-				if ( strstr($_addrList, ',') )
-				// "explode "list" into an array
+				if ( strstr($_addrList, ',') ) {
+								// "explode "list" into an array
 				$_addrList = explode(',', $_addrList);
+				}
 
 				// Stick it in an array
-				else
-				$_addrList = array($_addrList);
+				else {
+								$_addrList = array($_addrList);
+				}
 			}
 
 			// take the array of addresses and split them further
@@ -1076,13 +1099,14 @@ 
 		if ( count($_tmpAry) == 2 )
 		{
 			// We may not really have a "Real Name"
-			if ( $_tmpAry[0])
-			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+			if ( $_tmpAry[0]) {
+						$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+			}
 
 			$_aryEmail['addr'] = $_tmpAry[1];
+		} else {
+				$_aryEmail['addr'] = $_tmpAry[0];
 		}
-		else
-		$_aryEmail['addr'] = $_tmpAry[0];
 
 		// Pull User Name and Host.tld apart
 		list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
@@ -1149,12 +1173,13 @@ 
 					{
 						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
 						{
-							if ( $_realName )	// @CHANGE LDR
+							if ( $_realName ) {
+							    // @CHANGE LDR
 							{
 								$_realName = '"' . $_realName . '"';
-								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
 							}
-							else
+								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
+							} else
 							{
 								$_RCPT_list[] = $_addr . '@' . $_host;
 							}
@@ -1163,14 +1188,12 @@ 
 				}
 
 				return implode(', ', $_RCPT_list);
-			}
-			else
+			} else
 			{
 				$this->_setErr(101, 'No eMail Address for message to be sent to.');
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			$this->_setErr(102, 'eMail type not defined.');
 			return false;
@@ -1185,8 +1208,9 @@ 
 	 */
 	function setTO($_addrTo)
 	{
-		if ( $_addrTo )
-		$this->_buildAddrList('to', $_addrTo);
+		if ( $_addrTo ) {
+				$this->_buildAddrList('to', $_addrTo);
+		}
 	}
 
 	/**
@@ -1207,8 +1231,9 @@ 
 	 */
 	function setCC($_strCC)
 	{
-		if ( $_strCC )
-		$this->_buildAddrList('cc', $_strCC);
+		if ( $_strCC ) {
+				$this->_buildAddrList('cc', $_strCC);
+		}
 	}
 
 	/**
@@ -1229,8 +1254,9 @@ 
 	 */
 	function setBCC($_strBCC)
 	{
-		if ( $_strBCC )
-		$this->_buildAddrList('bcc', $_strBCC);
+		if ( $_strBCC ) {
+				$this->_buildAddrList('bcc', $_strBCC);
+		}
 	}
 
 	/**
@@ -1251,8 +1277,9 @@ 
 	 */
 	function setSubject($_strSubject = '')
 	{
-		if ( $_strSubject )
-		$this->_msgSubject = $_strSubject;
+		if ( $_strSubject ) {
+				$this->_msgSubject = $_strSubject;
+		}
 	}
 
 	/**
@@ -1277,8 +1304,9 @@ 
 		$_header = 'From: '       . $this->getFrom('org') . "\r\n"
 		. 'To: '         . $this->getTO()          . "\r\n";
 
-		if ( $this->getCC() )
-		$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+		if ( $this->getCC() ) {
+				$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+		}
 
 		/* Note:
 		 * BCC email addresses must be listed in the RCPT TO command list,
@@ -1311,33 +1339,41 @@ 
 			$_header .= 'Message-ID: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
 			$_header .= 'References: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
 			$_header .= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host . "\r\n";
-		}
-		else
+		} else
 		{
 			$_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
 		}
-		if (! empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. "\r\n";
-		if ( $this->getMoreInHeader() )
-		    $_header .= $this->getMoreInHeader();     // Value must include the "\r\n";
+		if (! empty($_SERVER['REMOTE_ADDR'])) {
+		    $_header .= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. "\r\n";
+		}
+		if ( $this->getMoreInHeader() ) {
+				    $_header .= $this->getMoreInHeader();
+		}
+		// Value must include the "\r\n";
 
 		//$_header .=
 		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
 		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
 
-		if ( $this->getSensitivity() )
-		$_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
+		if ( $this->getSensitivity() ) {
+				$_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
+		}
 
-		if ( $this->_msgPriority != 3 )
-		$_header .= $this->getPriority();
+		if ( $this->_msgPriority != 3 ) {
+				$_header .= $this->getPriority();
+		}
 
 
 		// @CHANGE LDR
-		if ( $this->getDeliveryReceipt() )
-		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
-		if ( $this->getErrorsTo() )
-		    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
-		if ( $this->getReplyTo() )
-		    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+		if ( $this->getDeliveryReceipt() ) {
+				    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
+		}
+		if ( $this->getErrorsTo() ) {
+				    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
+		}
+		if ( $this->getReplyTo() ) {
+				    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+		}
 
 		$_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)' . "\r\n";
 		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART?'MAIN_MAIL_USE_MULTI_PART':'No MAIN_MAIL_USE_MULTI_PART') . "\r\n";
@@ -1358,10 +1394,11 @@ 
 	{
 		//if ( $strContent )
 		//{
-		if ( $strType == 'html' )
-		$strMimeType = 'text/html';
-		else
-		$strMimeType = 'text/plain';
+		if ( $strType == 'html' ) {
+				$strMimeType = 'text/html';
+		} else {
+				$strMimeType = 'text/plain';
+		}
 
 		// Make RFC821 Compliant, replace bare linefeeds
 		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
@@ -1385,8 +1422,9 @@ 
 		$this->_msgContent[$strType]['data']     = $strContent;
 		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
 
-		if ( $this->getMD5flag() )
-		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		if ( $this->getMD5flag() ) {
+				$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		}
 		//}
 	}
 
@@ -1409,8 +1447,9 @@ 
 		$keyCount = count($_types);
 
 		// If we have ZERO, we have a problem
-		if( $keyCount === 0 )
-		die ("Sorry, no content");
+		if( $keyCount === 0 ) {
+				die ("Sorry, no content");
+		}
 
 		// If we have ONE, we can use the simple format
 		else if( $keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
@@ -1423,8 +1462,9 @@ 
 			. 'Content-Disposition: inline'  . "\r\n"
 			. 'Content-Description: Message' . "\r\n";
 
-			if ( $this->getMD5flag() )
-			$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+			if ( $this->getMD5flag() ) {
+						$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+			}
 
 			$content .= "\r\n"
 			.  $_msgData['data'] . "\r\n";
@@ -1447,9 +1487,11 @@ 
 
 			$content .= "--" . $this->_getBoundary('mixed') . "\r\n";
 
-			if (key_exists('image', $this->_msgContent))     // If inline image found
+			if (key_exists('image', $this->_msgContent)) {
+			    // If inline image found
 			{
 				$content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+			}
 				$content .= "\r\n";
 				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
 			}
@@ -1472,8 +1514,9 @@ 
 						.  'Content-Transfer-Encoding: base64' . "\r\n"
 						.  'Content-Description: ' . $_data['fileName'] ."\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ( $this->getMD5flag() ) {
+												$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						}
 
 						$content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
 					}
@@ -1491,8 +1534,9 @@ 
 						.  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
 						.  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ( $this->getMD5flag() ) {
+												$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						}
 
 						$content .= "\r\n"
 						. $_data['data'] . "\r\n";
@@ -1502,8 +1546,7 @@ 
 					$content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
 					$content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
 					$content.= "\r\n";
-				}
-				else
+				} else
 				{
 					if (key_exists('image', $this->_msgContent))
 					{
@@ -1515,9 +1558,11 @@ 
 						$content.= "--" . $this->_getBoundary('related') . "\r\n";
 					}
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
+					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+					    // Add plain text message part before html part
 					{
 					    $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+					}
     					$content .= "\r\n";
 	       				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
 
@@ -1538,15 +1583,18 @@ 
 					//                             . 'Content-Disposition: inline'  . "\r\n"
 					//                             . 'Content-Description: ' . $type . ' message' . "\r\n";
 
-					if ( $this->getMD5flag() )
-					$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
+					if ( $this->getMD5flag() ) {
+										$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
+					}
 
 					$content .= "\r\n"	. $_content['data'] . "\r\n";
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
+					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+					    // Add plain text message part after html part
 					{
 					    $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
 					}
+					}
 
 					$content .= "\r\n";
 				}
@@ -1579,8 +1627,9 @@ 
 			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
 			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
-			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+			if ( $this->getMD5flag() ) {
+						$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+			}
 		}
 	}
 
@@ -1606,8 +1655,9 @@ 
 			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
 			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
-			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+			if ( $this->getMD5flag() ) {
+						$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+			}
 		}
 	}
 	// END @CHANGE LDR
@@ -1627,8 +1677,9 @@ 
 	function setSensitivity($_value = 0)
 	{
 		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
-		$this->_msgSensitivity = $_value;
+		( ( $_value >= 0 ) && ( $_value <= 3 ) ) ) {
+				$this->_msgSensitivity = $_value;
+		}
 	}
 
 	/**
@@ -1662,8 +1713,9 @@ 
 	function setPriority( $_value = 3 )
 	{
 		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
-		$this->_msgPriority = $_value;
+		( ( $_value >= 0 ) && ( $_value <= 5 ) ) ) {
+				$this->_msgPriority = $_value;
+		}
 	}
 
 	/**
@@ -1716,8 +1768,9 @@ 
 	 */
 	function setXheader($strXdata)
 	{
-		if ( $strXdata )
-		$this->_msgXheader[] = $strXdata;
+		if ( $strXdata ) {
+				$this->_msgXheader[] = $strXdata;
+		}
 	}
 
 	/**
@@ -1750,9 +1803,13 @@ 
 	 */
 	function _getBoundary($type='mixed')
 	{
-		if ($type == 'mixed') return $this->_smtpsBoundary;
-		else if ($type == 'related') return $this->_smtpsRelatedBoundary;
-		else if ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
+		if ($type == 'mixed') {
+		    return $this->_smtpsBoundary;
+		} else if ($type == 'related') {
+		    return $this->_smtpsRelatedBoundary;
+		} else if ($type == 'alternative') {
+		    return $this->_smtpsAlternativeBoundary;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1810,12 +1867,18 @@ 
 	function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
 	{
         // phpcs:enable
-		if ($this->_debug) $this->log.=$_strSend;	// @CHANGE LDR for log
+		if ($this->_debug) {
+		    $this->log.=$_strSend;
+		}
+		// @CHANGE LDR for log
 		fputs($this->socket, $_strSend . $CRLF);
-		if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF;
+		if ($this->_debug) {
+		    $this->log.=' ('.$_returnCode.')' . $CRLF;
+		}
 
-		if ( $_returnCode )
-		return $this->server_parse($this->socket, $_returnCode);
+		if ( $_returnCode ) {
+				return $this->server_parse($this->socket, $_returnCode);
+		}
 	}
 
 	// =============================================================

dolibarr/htdocs/core/class/commonobjectline.class.php

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
 			$label = $res[$label_type];
 			$this->db->free($resql);
 			return $label;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error().' sql='.$sql;
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);

dolibarr/htdocs/core/class/ctypent.class.php

Braces +38 added lines, -20 removed lines

@@ -83,11 +83,21 @@ 
 
 		// Clean parameters
 
-		if (isset($this->id)) $this->id=trim($this->id);
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->id)) {
+		    $this->id=trim($this->id);
+		}
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->libelle)) {
+		    $this->libelle=trim($this->libelle);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
+		if (isset($this->module)) {
+		    $this->module=trim($this->module);
+		}
 
 
 
@@ -149,8 +159,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -177,9 +186,13 @@ 
 		$sql.= " t.active,";
 		$sql.= " t.module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-        if ($id)   $sql.= " WHERE t.id = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($label) $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
+        if ($id) {
+            $sql.= " WHERE t.id = ".$id;
+        } elseif ($code) {
+            $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        } elseif ($label) {
+            $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -198,8 +211,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -220,10 +232,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->libelle)) {
+		    $this->libelle=trim($this->libelle);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
+		if (isset($this->module)) {
+		    $this->module=trim($this->module);
+		}
 
 
 		// Check parameters
@@ -269,8 +289,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -325,8 +344,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

dolibarr/htdocs/core/class/antivir.class.php

Braces +13 added lines, -5 removed lines

@@ -129,15 +129,19 @@ 
 		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',',$output));
 
 		$returncodevirus=1;
-		if ($return_var == $returncodevirus)	// Virus found
+		if ($return_var == $returncodevirus) {
+		    // Virus found
 		{
 			$this->errors=$output;
+		}
 			return -99;
 		}
 
-		if ($return_var > 0)					// If other error
+		if ($return_var > 0) {
+		    // If other error
 		{
 			$this->errors=$output;
+		}
 			return -98;
 		}
 
@@ -173,10 +177,14 @@ 
 		$param=preg_replace('/%maxfilesize/',$maxfilesize,$param);
 		$param=preg_replace('/%file/',trim($file),$param);
 
-		if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM))
-			$param=$param." ".escapeshellarg(trim($file));
+		if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM)) {
+					$param=$param." ".escapeshellarg(trim($file));
+		}
 
-		if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command. Using escapeshellcmd fails.
+		if (preg_match("/\s/",$command)) {
+		    $command=escapeshellarg($command);
+		}
+		// Use quotes on command. Using escapeshellcmd fails.
 
 		$ret=$command.' '.$param;
 		//$ret=$command.' '.$param.' 2>&1';

dolibarr/htdocs/core/class/commonobject.class.php

Braces +1328 added lines, -795 removed lines

@@ -426,23 +426,31 @@ 
 		$sql.= " FROM ".MAIN_DB_PREFIX.$element;
 		$sql.= " WHERE entity IN (".getEntity($element).")" ;
 
-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
-		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
-		else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
-		else {
+		if ($id > 0) {
+		    $sql.= " AND rowid = ".$db->escape($id);
+		} else if ($ref) {
+		    $sql.= " AND ref = '".$db->escape($ref)."'";
+		} else if ($ref_ext) {
+		    $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		} else {
 			$error='ErrorWrongParameters';
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) $sql.= " AND entity = ".$conf->entity;
+		if ($ref || $ref_ext) {
+		    $sql.= " AND entity = ".$conf->entity;
+		}
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$num=$db->num_rows($resql);
-			if ($num > 0) return 1;
-			else return 0;
+			if ($num > 0) {
+			    return 1;
+			} else {
+			    return 0;
+			}
 		}
 		return -1;
 	}
@@ -471,13 +479,18 @@ 
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
 		$lastname=$this->lastname;
 		$firstname=$this->firstname;
-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		if (empty($lastname)) {
+		    $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		}
 
 		$ret='';
 		if ($option && $this->civility_id)
 		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
-			else $ret.=$this->civility_id.' ';
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) {
+			    $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+			} else {
+			    $ret.=$this->civility_id.' ';
+			}
 		}
 
 		$ret.=dolGetFirstLastname($firstname, $lastname, $nameorder);
@@ -570,14 +583,15 @@ 
 		{
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
                 $out.=($outdone?' - ':'').$this->region.' - '.$this->state;
-            }
-            else {
+            } else {
                 $out.=($outdone?' - ':'').$this->state;
             }
 			$outdone++;
 		}
 
-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
+		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) {
+		    $out.=($outdone?'<br>':'');
+		}
 		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
 			$out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL','&nbsp;','phone',$langs->trans("PhonePro")); $outdone++;
 		}
@@ -618,13 +632,21 @@ 
 		$out.='<div style="clear: both;">';
 		if (! empty($conf->socialnetworks->enabled))
 		{
-			if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
+			if ($this->skype) {
+			    $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
+			}
 			$outdone++;
-			if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
+			if ($this->jabberid) {
+			    $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
+			}
 			$outdone++;
-			if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
+			if ($this->twitter) {
+			    $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
+			}
 			$outdone++;
-			if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
+			if ($this->facebook) {
+			    $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
+			}
 			$outdone++;
 		}
 		$out.='</div>';
@@ -684,10 +706,10 @@ 
 					$this->errors = $ecmfile->errors;
 				}
 				*/
+			} else {
+			    return '';
 			}
-			else return '';
-		}
-		elseif (empty($ecmfile->share))
+		} elseif (empty($ecmfile->share))
 		{
 			// Add entry into index
 			if ($initsharekey)
@@ -695,8 +717,9 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$ecmfile->share = getRandomPassword(true);
 				$ecmfile->update($user);
+			} else {
+			    return '';
 			}
-			else return '';
 		}
 
 		// Define $urlwithroot
@@ -710,14 +733,18 @@ 
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share
-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+		if (! empty($ecmfile->share)) {
+		    $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;
+		}
+		// Hash for public share
+		if ($forcedownload) {
+		    $paramlink.=($paramlink?'&':'').'attachment=1';
+		}
 
 		if ($relativelink)
 		{
 			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');
-		}
-		else
+		} else
 		{
 			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
 		}
@@ -765,8 +792,7 @@ 
 		if (is_numeric($type_contact))
 		{
 			$id_type_contact=$type_contact;
-		}
-		else
+		} else
 		{
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
@@ -779,7 +805,9 @@ 
 			if ($resql)
 			{
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact=$obj->rowid;
+				if ($obj) {
+				    $id_type_contact=$obj->rowid;
+				}
 			}
 		}
 
@@ -831,8 +859,7 @@ 
 
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
@@ -840,15 +867,16 @@ 
 					$this->db->rollback();
 					echo 'err rollback';
 					return -2;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
 			}
-		} else return 0;
+		} else {
+		    return 0;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -890,15 +918,18 @@ 
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
 		$sql.= " statut = ".$statut;
-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
+		if ($type_contact_id) {
+		    $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
+		}
+		if ($fk_socpeople) {
+		    $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
+		}
 		$sql.= " where rowid = ".$rowid;
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			return 0;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -935,8 +966,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -966,15 +996,15 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
 		$sql.= " WHERE element_id = ".$this->id;
-		if ($listId)
-			$sql.= " AND fk_c_type_contact IN (".$listId.")";
+		if ($listId) {
+					$sql.= " AND fk_c_type_contact IN (".$listId.")";
+		}
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -999,22 +1029,38 @@ 
 		$tab=array();
 
 		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";
+		if ($source == 'internal') {
+		    $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+		    $sql.=", t.fk_soc as socid, t.statut as statuscontact";
+		}
 		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
 		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
 		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		if ($source == 'internal') {
+		    $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		}
+		if ($source == 'external'|| $source == 'thirdparty') {
+		    $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		}
 		$sql.= " WHERE ec.element_id =".$this->id;
 		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
 		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
+		if ($code) {
+		    $sql.= " AND tc.code = '".$this->db->escape($code)."'";
+		}
+		if ($source == 'internal') {
+		    $sql.= " AND tc.source = 'internal'";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+		    $sql.= " AND tc.source = 'external'";
+		}
 		$sql.= " AND tc.active=1";
-		if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
+		if ($statut >= 0) {
+		    $sql.= " AND ec.statut = '".$statut."'";
+		}
 		$sql.=" ORDER BY t.lastname ASC";
 
 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
@@ -1035,8 +1081,7 @@ 
 								   'nom'=>$obj->lastname,      // For backward compatibility
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
-				}
-				else
+				} else
 				{
 					$tab[$i]=$obj->id;
 				}
@@ -1045,8 +1090,7 @@ 
 			}
 
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_print_error($this->db);
@@ -1081,8 +1125,7 @@ 
 			$result = $this->update_contact($rowid, $newstatut);
 			$this->db->free($resql);
 			return $result;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			dol_print_error($this->db);
@@ -1106,16 +1149,27 @@ 
         // phpcs:enable
 		global $langs;
 
-		if (empty($order)) $order='position';
-		if ($order == 'position') $order.=',code';
+		if (empty($order)) {
+		    $order='position';
+		}
+		if ($order == 'position') {
+		    $order.=',code';
+		}
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
+		if ($activeonly == 1) {
+		    $sql.= " AND tc.active=1";
+		}
+		// only the active types
+		if (! empty($source) && $source != 'all') {
+		    $sql.= " AND tc.source='".$this->db->escape($source)."'";
+		}
+		if (! empty($code)) {
+		    $sql.= " AND tc.code='".$this->db->escape($code)."'";
+		}
 		$sql.= $this->db->order($order,'ASC');
 
 		//print "sql=".$sql;
@@ -1130,13 +1184,15 @@ 
 
 				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
-				else $tab[$obj->code]=$libelle_type;
+				if (empty($option)) {
+				    $tab[$obj->rowid]=$libelle_type;
+				} else {
+				    $tab[$obj->code]=$libelle_type;
+				}
 				$i++;
 			}
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			//dol_print_error($this->db);
@@ -1175,19 +1231,29 @@ 
 
 		$sql = "SELECT ec.fk_socpeople";
 		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+		if ($source == 'internal') {
+		    $sql.= " ".MAIN_DB_PREFIX."user as c,";
+		}
+		if ($source == 'external') {
+		    $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+		}
 		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql.= " WHERE ec.element_id = ".$id;
 		$sql.= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
+		if ($source == 'internal') {
+		    $sql.= " AND c.entity IN (".getEntity('user').")";
+		}
+		if ($source == 'external') {
+		    $sql.= " AND c.entity IN (".getEntity('societe').")";
+		}
 		$sql.= " AND ec.fk_c_type_contact = tc.rowid";
 		$sql.= " AND tc.element = '".$element."'";
 		$sql.= " AND tc.source = '".$source."'";
 		$sql.= " AND tc.code = '".$code."'";
 		$sql.= " AND tc.active = 1";
-		if ($status) $sql.= " AND ec.statut = ".$status;
+		if ($status) {
+		    $sql.= " AND ec.statut = ".$status;
+		}
 
 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -1198,8 +1264,7 @@ 
 				$result[$i]=$obj->fk_socpeople;
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return null;
@@ -1218,9 +1283,13 @@ 
 	function fetch_contact($contactid=null)
 	{
         // phpcs:enable
-		if (empty($contactid)) $contactid=$this->contactid;
+		if (empty($contactid)) {
+		    $contactid=$this->contactid;
+		}
 
-		if (empty($contactid)) return 0;
+		if (empty($contactid)) {
+		    return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
@@ -1241,14 +1310,16 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
-			return 0;
+		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
+					return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 
 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
-		if ($force_thirdparty_id)
-			$idtofetch = $force_thirdparty_id;
+		if ($force_thirdparty_id) {
+					$idtofetch = $force_thirdparty_id;
+		}
 
 		if ($idtofetch) {
 			$thirdparty = new Societe($this->db);
@@ -1261,8 +1332,9 @@ 
 			}
 
 			return $result;
-		} else
-			return -1;
+		} else {
+					return -1;
+		}
 	}
 
 
@@ -1308,18 +1380,24 @@ 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
 		$idtype=$this->barcode_type;
-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
+		if (empty($idtype) && $idtype != '0') {
+		    // If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
 		{
 			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-			else if ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
-			else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+		} else if ($this->element == 'societe') {
+			    $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+			} else {
+			    dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+			}
 		}
 
 		if ($idtype > 0)
 		{
-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
+			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {
+			    // If data not already loaded
 			{
 				$sql = "SELECT rowid, code, libelle as label, coder";
+			}
 				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
 				$sql.= " WHERE rowid = ".$idtype;
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
@@ -1332,8 +1410,7 @@ 
 					$this->barcode_type_label = $obj->label;
 					$this->barcode_type_coder = $obj->coder;
 					return 1;
-				}
-				else
+				} else
 				{
 					dol_print_error($this->db);
 					return -1;
@@ -1354,8 +1431,13 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility
-		if (empty($this->fk_project)) return 0;
+		if (empty($this->fk_project) && ! empty($this->fk_projet)) {
+		    $this->fk_project = $this->fk_projet;
+		}
+		// For backward compatibility
+		if (empty($this->fk_project)) {
+		    return 0;
+		}
 
 		$project = new Project($this->db);
 		$result = $project->fetch($this->fk_project);
@@ -1376,7 +1458,9 @@ 
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-		if (empty($this->fk_product)) return 0;
+		if (empty($this->fk_product)) {
+		    return 0;
+		}
 
 		$product = new Product($this->db);
 		$result = $product->fetch($this->fk_product);
@@ -1410,9 +1494,15 @@ 
 	function fetch_origin()
 	{
         // phpcs:enable
-		if ($this->origin == 'shipping') $this->origin = 'expedition';
-		if ($this->origin == 'delivery') $this->origin = 'livraison';
-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
+		if ($this->origin == 'shipping') {
+		    $this->origin = 'expedition';
+		}
+		if ($this->origin == 'delivery') {
+		    $this->origin = 'livraison';
+		}
+        if ($this->origin == 'order_supplier') {
+            $this->origin = 'commandeFournisseur';
+        }
 
 		$origin = $this->origin;
 
@@ -1504,29 +1594,48 @@ 
 	{
 		global $user,$langs,$conf;
 
-		if (empty($table)) 	  $table=$this->table_element;
-		if (empty($id))    	  $id=$this->id;
-		if (empty($format))   $format='text';
-		if (empty($id_field)) $id_field='rowid';
+		if (empty($table)) {
+		    $table=$this->table_element;
+		}
+		if (empty($id)) {
+		    $id=$this->id;
+		}
+		if (empty($format)) {
+		    $format='text';
+		}
+		if (empty($id_field)) {
+		    $id_field='rowid';
+		}
 
 		$error=0;
 
 		$this->db->begin();
 
 		// Special case
-		if ($table == 'product' && $field == 'note_private') $field='note';
-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
+		if ($table == 'product' && $field == 'note_private') {
+		    $field='note';
+		}
+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+		    $fk_user_field = 'fk_user_mod';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
-		else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
-		else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		if ($format == 'text') {
+		    $sql.= $field." = '".$this->db->escape($value)."'";
+		} else if ($format == 'int') {
+		    $sql.= $field." = ".$this->db->escape($value);
+		} else if ($format == 'date') {
+		    $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		}
 
 		if ($fk_user_field)
 		{
-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
+			if (! empty($fuser) && is_object($fuser)) {
+			    $sql.=", ".$fk_user_field." = ".$fuser->id;
+			} elseif (empty($fuser) || $fuser != 'none') {
+			    $sql.=", ".$fk_user_field." = ".$user->id;
+			}
 		}
 
 		$sql.= " WHERE ".$id_field." = ".$id;
@@ -1541,28 +1650,32 @@ 
 				if (empty($this->fields) && method_exists($this, 'fetch'))
 				{
 					$result = $this->fetch($id);
-				}
-				else
+				} else
 				{
 					$result = $this->fetchCommon($id);
 				}
-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors
-				if ($result < 0) $error++;
+				if ($result >= 0) {
+				    $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);
+				}
+				// This may set this->errors
+				if ($result < 0) {
+				    $error++;
+				}
 			}
 
 			if (! $error)
 			{
-				if (property_exists($this, $field)) $this->$field = $value;
+				if (property_exists($this, $field)) {
+				    $this->$field = $value;
+				}
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -1589,36 +1702,66 @@ 
 			dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
 			return -1;
 		}
-		if ($fieldid == 'none') return 1;
+		if ($fieldid == 'none') {
+		    return 1;
+		}
 
 		// Security on socid
 		$socid = 0;
-		if ($user->societe_id > 0) $socid = $user->societe_id;
+		if ($user->societe_id > 0) {
+		    $socid = $user->societe_id;
+		}
 
 		// this->ismultientitymanaged contains
 		// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 		$alias = 's';
-		if ($this->element == 'societe') $alias = 'te';
+		if ($this->element == 'societe') {
+		    $alias = 'te';
+		}
 
 		$sql = "SELECT MAX(te.".$fieldid.")";
 		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
 		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))
 		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+			if (! preg_match('/^\s*AND/i', $filter)) {
+			    $sql.=" AND ";
+			}
+			// For backward compatibility
 			$sql.=$filter;
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1631,9 +1774,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+		    $sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
 		$result = $this->db->query($sql);
@@ -1651,20 +1800,44 @@ 
 		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		// If we need to link to societe to limit select to socid
+		else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";
+		}
+		// If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		}
 		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND sc.fk_user = " .$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
+		}
 		if (! empty($filter))
 		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
+			if (! preg_match('/^\s*AND/i', $filter)) {
+			    $sql.=" AND ";
+			}
+			// For backward compatibility
 			$sql.=$filter;
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to entity
+		else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+		    $sql.= ' AND te.fk_soc = s.rowid';
+		}
+		// If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1677,9 +1850,15 @@ 
 				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND te.fk_soc = ' . $socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+		    $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+		    $sql.= ' AND te.rowid = ' . $socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
@@ -1711,8 +1890,11 @@ 
 		$i = 0;
 		while ($i < $num)
 		{
-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			if ($source == 'thirdparty') {
+			    $contactAlreadySelected[$i] = $tab[$i]['socid'];
+			} else {
+			    $contactAlreadySelected[$i] = $tab[$i]['id'];
+			}
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1736,14 +1918,19 @@ 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		if ($this->table_element == 'actioncomm')
 		{
-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
+			if ($projectid) {
+			    $sql.= ' SET fk_project = '.$projectid;
+			} else {
+			    $sql.= ' SET fk_project = NULL';
+			}
 			$sql.= ' WHERE id = '.$this->id;
-		}
-		else
+		} else
 		{
-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
-			else $sql.= ' SET fk_projet = NULL';
+			if ($projectid) {
+			    $sql.= ' SET fk_projet = '.$projectid;
+			} else {
+			    $sql.= ' SET fk_projet = NULL';
+			}
 			$sql.= ' WHERE rowid = '.$this->id;
 		}
 
@@ -1752,8 +1939,7 @@ 
 		{
 			$this->fk_project = $projectid;
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -1773,8 +1959,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_mode_reglement';
-			if ($this->element == 'societe') $fieldname = 'mode_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
+			if ($this->element == 'societe') {
+			    $fieldname = 'mode_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+			    $fieldname = 'mode_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.$id;
@@ -1784,17 +1974,17 @@ 
 			{
 				$this->mode_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+				    $this->mode_reglement_supplier_id = $id;
+				}
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -1824,18 +2014,18 @@ 
 				$this->multicurrency_code = $code;
 
 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
-				if ($rate) $this->setMulticurrencyRate($rate,2);
+				if ($rate) {
+				    $this->setMulticurrencyRate($rate,2);
+				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -1929,15 +2119,13 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -1958,8 +2146,12 @@ 
 		{
 			// TODO uniformize field name
 			$fieldname = 'fk_cond_reglement';
-			if ($this->element == 'societe') $fieldname = 'cond_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';
+			if ($this->element == 'societe') {
+			    $fieldname = 'cond_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+			    $fieldname = 'cond_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.$id;
@@ -1969,18 +2161,18 @@ 
 			{
 				$this->cond_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+				    $this->cond_reglement_supplier_id = $id;
+				}
 				$this->cond_reglement = $id;	// for compatibility
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
 			$this->error='Status of the object is incompatible '.$this->statut;
@@ -1998,7 +2190,9 @@ 
 	function setDeliveryAddress($id)
 	{
 		$fieldname = 'fk_delivery_address';
-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
+		if ($this->element == 'delivery' || $this->element == 'shipping') {
+		    $fieldname = 'fk_address';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
 		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
@@ -2007,8 +2201,7 @@ 
 		{
 			$this->fk_delivery_address = $id;
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
@@ -2030,7 +2223,9 @@ 
 	{
         global $user;
 
-        if (empty($userused)) $userused=$user;
+        if (empty($userused)) {
+            $userused=$user;
+        }
 
         $error = 0;
 
@@ -2041,7 +2236,9 @@ 
 
         $this->db->begin();
 
-		if ($shipping_method_id<0) $shipping_method_id='NULL';
+		if ($shipping_method_id<0) {
+		    $shipping_method_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2058,7 +2255,9 @@ 
                 // Call trigger
                 $this->context=array('shippingmethodupdate'=>1);
                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger
             }
         }
@@ -2086,7 +2285,9 @@ 
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR);
 			return -1;
 		}
-		if ($warehouse_id<0) $warehouse_id='NULL';
+		if ($warehouse_id<0) {
+		    $warehouse_id='NULL';
+		}
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2133,8 +2334,7 @@ 
 		{
 			$this->modelpdf=$modelpdf;
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return 0;
@@ -2154,7 +2354,9 @@ 
 	{
         global $user;
 
-        if (empty($userused)) $userused=$user;
+        if (empty($userused)) {
+            $userused=$user;
+        }
 
         $error = 0;
 
@@ -2164,7 +2366,9 @@ 
 		}
         $this->db->begin();
 
-		if ($fk_account<0) $fk_account='NULL';
+		if ($fk_account<0) {
+		    $fk_account='NULL';
+		}
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2177,15 +2381,16 @@ 
             dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
             $this->error = $this->db->lasterror();
             $error++;
-        }
-        else
+        } else
         {
             if (!$notrigger)
             {
                 // Call trigger
                 $this->context=array('bankaccountupdate'=>1);
                 $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
-                if ($result < 0) $error++;
+                if ($result < 0) {
+                    $error++;
+                }
                 // End call trigger
             }
         }
@@ -2193,8 +2398,7 @@ 
         {
             $this->db->rollback();
             return -1;
-        }
-        else
+        } else
         {
             $this->fk_account = ($fk_account=='NULL')?null:$fk_account;
             $this->db->commit();
@@ -2233,8 +2437,12 @@ 
 		$nl=0;
 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (! $renum) $sql.= ' AND rang = 0';
-		if ($renum) $sql.= ' AND rang <> 0';
+		if (! $renum) {
+		    $sql.= ' AND rang = 0';
+		}
+		if ($renum) {
+		    $sql.= ' AND rang <> 0';
+		}
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2242,8 +2450,9 @@ 
 		{
 			$row = $this->db->fetch_row($resql);
 			$nl = $row[0];
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 		if ($nl > 0)
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
@@ -2253,7 +2462,9 @@ 
 			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
+			if ($fk_parent_line) {
+			    $sql.= ' AND fk_parent_line IS NULL';
+			}
 			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
@@ -2285,8 +2496,7 @@ 
 						$this->updateRangOfLine($row, ($key+1));
 					}
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 			}
@@ -2379,7 +2589,9 @@ 
 	function updateRangOfLine($rowid,$rang)
 	{
 		$fieldposition = 'rang';
-		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+		    $fieldposition = 'position';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 		$sql.= ' WHERE rowid = '.$rowid;
@@ -2420,7 +2632,9 @@ 
 		if ($rang > 1)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			    $fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2433,8 +2647,7 @@ 
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 			}
@@ -2454,7 +2667,9 @@ 
 		if ($rang < $max)
 		{
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			    $fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -2467,8 +2682,7 @@ 
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db);
 			}
@@ -2539,8 +2753,7 @@ 
 				if (! empty($row[0]))
 				{
 					return $row[0];
-				}
-				else
+				} else
 				{
 					return $this->getRangOfLine($fk_parent_line);
 				}
@@ -2587,8 +2800,7 @@ 
 		{
 			$this->ref_ext = $ref_ext;
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -2622,7 +2834,9 @@ 
 		}
 		// Special cas
 		//var_dump($this->table_element);exit;
-		if ($this->table_element == 'product') $suffix='';
+		if ($this->table_element == 'product') {
+		    $suffix='';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
@@ -2632,16 +2846,17 @@ 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			if ($suffix == '_public') $this->note_public = $note;
-			else if ($suffix == '_private') $this->note_private = $note;
-			else
+			if ($suffix == '_public') {
+			    $this->note_public = $note;
+			} else if ($suffix == '_private') {
+			    $this->note_private = $note;
+			} else
 			{
 				$this->note = $note;      // deprecated
 				$this->note_private = $note;
 			}
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -2681,36 +2896,45 @@ 
 
 		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
 		$MODULE = "";
-		if ($this->element == 'propal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
-		elseif ($this->element == 'order')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
-		elseif ($this->element == 'facture')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
-		elseif ($this->element == 'facture_fourn')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
-		elseif ($this->element == 'order_supplier')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
-		elseif ($this->element == 'supplier_proposal')
-			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		if ($this->element == 'propal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
+		} elseif ($this->element == 'order') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
+		} elseif ($this->element == 'facture') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
+		} elseif ($this->element == 'facture_fourn') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
+		} elseif ($this->element == 'order_supplier') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
+		} elseif ($this->element == 'supplier_proposal') {
+					$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		}
 
 		if (! empty($MODULE)) {
 			if (! empty($conf->global->$MODULE)) {
 				$modsactivated = explode(',', $conf->global->$MODULE);
 				foreach ($modsactivated as $mod) {
-					if ($conf->$mod->enabled)
-						return 1; // update was disabled by specific setup
+					if ($conf->$mod->enabled) {
+											return 1;
+					}
+					// update was disabled by specific setup
 				}
 			}
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility
+		if ($roundingadjust == '-1') {
+		    $roundingadjust='auto';
+		}
+		// For backward compatibility
 
 		$forcedroundingmode=$roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+		    $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		} elseif ($forcedroundingmode == 'auto') {
+		    $forcedroundingmode='0';
+		}
 
 		$error=0;
 
@@ -2733,15 +2957,22 @@ 
 
 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
 		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';
+			if ($this->table_element_line == 'facturedet') {
+			    $sql.= ', situation_percent';
+			}
 			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
 		if ($exclspec)
 		{
 			$product_field='product_type';
-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field
-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';
+			if ($this->table_element_line == 'contratdet') {
+			    $product_field='';
+			}
+			// contratdet table has no product_type field
+			if ($product_field) {
+			    $sql.= ' AND '.$product_field.' <> 9';
+			}
 		}
 		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
@@ -2771,9 +3002,11 @@ 
 				$parameters=array('fk_element' => $obj->rowid);
 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
+				if (empty($reshook) && $forcedroundingmode == '0') {
+				    // Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
 				{
 					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
+				}
 					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
 					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
 					if ($diff)
@@ -2781,7 +3014,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
+								if (! $resqlfix) {
+								    dol_print_error($this->db,'Failed to update line');
+								}
 								$obj->total_tva = $tmpcal[1];
 								$obj->total_ttc = $tmpcal[2];
 						//
@@ -2797,16 +3032,24 @@ 
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
 
-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;
-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;
-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;
+				if (! isset($total_ht_by_vats[$obj->vatrate])) {
+				    $total_ht_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_tva_by_vats[$obj->vatrate])) {
+				    $total_tva_by_vats[$obj->vatrate]=0;
+				}
+				if (! isset($total_ttc_by_vats[$obj->vatrate])) {
+				    $total_ttc_by_vats[$obj->vatrate]=0;
+				}
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
+				if ($forcedroundingmode == '1') {
+				    // Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
 				{
 					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+				}
 					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);
 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
 					if ($diff)
@@ -2815,7 +3058,9 @@ 
 						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db,'Failed to update line');
+								if (! $resqlfix) {
+								    dol_print_error($this->db,'Failed to update line');
+								}
 								$this->total_tva -= $diff;
 								$this->total_ttc -= $diff;
 								$total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -2856,11 +3101,21 @@ 
 			$fieldlocaltax2='localtax2';
 			$fieldttc='total_ttc';
 			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
-			if ($this->element == 'propal')                                                $fieldttc='total';
-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';
+			if ($this->element == 'facture' || $this->element == 'facturerec') {
+			    $fieldht='total';
+			}
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+			    $fieldtva='total_tva';
+			}
+			if ($this->element == 'propal') {
+			    $fieldttc='total';
+			}
+			if ($this->element == 'expensereport') {
+			    $fieldtva='total_tva';
+			}
+			if ($this->element == 'supplier_proposal') {
+			    $fieldttc='total';
+			}
 
 			if (empty($nodatabaseupdate))
 			{
@@ -2889,13 +3144,11 @@ 
 			if (! $error)
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db,'Bad request in update_price');
 			return -1;
@@ -2918,10 +3171,18 @@ 
 		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);
 
 		// Special case
-		if ($origin == 'order') $origin='commande';
-		if ($origin == 'invoice') $origin='facture';
-		if ($origin == 'invoice_template') $origin='facturerec';
-    	if ($origin == 'supplierorder') $origin='order_supplier';
+		if ($origin == 'order') {
+		    $origin='commande';
+		}
+		if ($origin == 'invoice') {
+		    $origin='facture';
+		}
+		if ($origin == 'invoice_template') {
+		    $origin='facturerec';
+		}
+    	if ($origin == 'supplierorder') {
+    	    $origin='order_supplier';
+    	}
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
@@ -2941,8 +3202,7 @@ 
 	  	{
 	  		$this->db->commit();
 	  		return 1;
-	  	}
-	  	else
+	  	} else
 	  	{
 	  		$this->error=$this->db->lasterror();
 	  		$this->db->rollback();
@@ -2987,12 +3247,16 @@ 
 		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))
 		{
 			$justsource=true;  // the source (id and type) is a search criteria
-			if (! empty($targettype)) $withtargettype=true;
+			if (! empty($targettype)) {
+			    $withtargettype=true;
+			}
 		}
 		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))
 		{
 			$justtarget=true;  // the target (id and type) is a search criteria
-			if (! empty($sourcetype)) $withsourcetype=true;
+			if (! empty($sourcetype)) {
+			    $withsourcetype=true;
+			}
 		}
 
 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
@@ -3015,15 +3279,17 @@ 
 			if ($justsource)
 			{
 				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
-			}
-			else if ($justtarget)
+				if ($withtargettype) {
+				    $sql.= " AND targettype = '".$targettype."'";
+				}
+			} else if ($justtarget)
 			{
 				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
+				if ($withsourcetype) {
+				    $sql.= " AND sourcetype = '".$sourcetype."'";
+				}
 			}
-		}
-		else
+		} else
 		{
 			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
 			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
@@ -3044,13 +3310,11 @@ 
 					if ($justsource)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
-					}
-					else if ($justtarget)
+					} else if ($justtarget)
 					{
 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
 					}
-				}
-				else
+				} else
 				{
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
@@ -3067,10 +3331,12 @@ 
 			if (! empty($this->linkedObjectsIds))
 			{
 				$tmparray = $this->linkedObjectsIds;
-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+				foreach($tmparray as $objecttype => $objectids) {
+				    // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
+				}
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
 						&& preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
 					{
@@ -3082,29 +3348,21 @@ 
 					// To work with non standard classpath or module name
 					if ($objecttype == 'facture')			{
 						$classpath = 'compta/facture/class';
-					}
-					else if ($objecttype == 'facturerec')			{
+					} else if ($objecttype == 'facturerec')			{
 						$classpath = 'compta/facture/class'; $module = 'facture';
-					}
-					else if ($objecttype == 'propal')			{
+					} else if ($objecttype == 'propal')			{
 						$classpath = 'comm/propal/class';
-					}
-					else if ($objecttype == 'supplier_proposal')			{
+					} else if ($objecttype == 'supplier_proposal')			{
 						$classpath = 'supplier_proposal/class';
-					}
-					else if ($objecttype == 'shipping')			{
+					} else if ($objecttype == 'shipping')			{
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
-					}
-					else if ($objecttype == 'delivery')			{
+					} else if ($objecttype == 'delivery')			{
 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
-					}
-					else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
+					} else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
 						$classpath = 'fourn/class'; $module = 'fournisseur';
-					}
-					else if ($objecttype == 'fichinter')			{
+					} else if ($objecttype == 'fichinter')			{
 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
-					}
-					else if ($objecttype == 'subscription')			{
+					} else if ($objecttype == 'subscription')			{
 						$classpath = 'adherents/class'; $module = 'adherent';
 					}
 
@@ -3113,20 +3371,15 @@ 
 
 					if ($objecttype == 'order') {
 						$classfile = 'commande'; $classname = 'Commande';
-					}
-					else if ($objecttype == 'invoice_supplier') {
+					} else if ($objecttype == 'invoice_supplier') {
 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
-					}
-					else if ($objecttype == 'order_supplier')   {
+					} else if ($objecttype == 'order_supplier')   {
 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
-					}
-					else if ($objecttype == 'supplier_proposal')   {
+					} else if ($objecttype == 'supplier_proposal')   {
 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
-					}
-					else if ($objecttype == 'facturerec')   {
+					} else if ($objecttype == 'facturerec')   {
 						$classfile = 'facture-rec'; $classname = 'FactureRec';
-					}
-					else if ($objecttype == 'subscription')   {
+					} else if ($objecttype == 'subscription')   {
 						$classfile = 'subscription'; $classname = 'Subscription';
 					}
 
@@ -3139,9 +3392,11 @@ 
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
 							if (class_exists($classname))
 							{
-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element
+								foreach($objectids as $i => $objectid) {
+								    // $i is rowid into llx_element_element
 								{
 									$object = new $classname($this->db);
+								}
 									$ret = $object->fetch($objectid);
 									if ($ret >= 0)
 									{
@@ -3150,16 +3405,14 @@ 
 								}
 							}
 						}
-					}
-					else
+					} else
 					{
 						unset($this->linkedObjectsIds[$objecttype]);
 					}
 				}
 			}
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -3181,8 +3434,11 @@ 
 		$updatesource=false;
 		$updatetarget=false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;
-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;
+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+		    $updatesource=true;
+		} else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+		    $updatetarget=true;
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
 		if ($updatesource)
@@ -3191,8 +3447,7 @@ 
 			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
 			$sql.= " WHERE fk_target = ".$this->id;
 			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";
-		}
-		else if ($updatetarget)
+		} else if ($updatetarget)
 		{
 			$sql.= "fk_target = ".$targetid;
 			$sql.= ", targettype = '".$this->db->escape($targettype)."'";
@@ -3204,8 +3459,7 @@ 
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -3228,8 +3482,11 @@ 
 		$deletesource=false;
 		$deletetarget=false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;
-		else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;
+		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) {
+		    $deletesource=true;
+		} else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) {
+		    $deletetarget=true;
+		}
 
 		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
 		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
@@ -3241,20 +3498,17 @@ 
 		if ($rowid > 0)
 		{
 			$sql.=" rowid = ".$rowid;
-		}
-		else
+		} else
 		{
 			if ($deletesource)
 			{
 				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
 				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
-			}
-			else if ($deletetarget)
+			} else if ($deletetarget)
 			{
 				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
 				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
-			}
-			else
+			} else
 			{
 				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
 				$sql.= " OR";
@@ -3266,8 +3520,7 @@ 
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errors[]=$this->error;
@@ -3296,17 +3549,31 @@ 
 		$this->db->begin();
 
 		$fieldstatus="fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";
-		if ($elementTable == 'mailing') $fieldstatus="statut";
-		if ($elementTable == 'cronjob') $fieldstatus="status";
-		if ($elementTable == 'user') $fieldstatus="statut";
-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
+		if ($elementTable == 'facture_rec') {
+		    $fieldstatus="suspended";
+		}
+		if ($elementTable == 'mailing') {
+		    $fieldstatus="statut";
+		}
+		if ($elementTable == 'cronjob') {
+		    $fieldstatus="status";
+		}
+		if ($elementTable == 'user') {
+		    $fieldstatus="statut";
+		}
+		if ($elementTable == 'expensereport') {
+		    $fieldstatus="fk_statut";
+		}
+		if ($elementTable == 'commande_fournisseur_dispatch') {
+		    $fieldstatus="status";
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
 		$sql.= " SET ".$fieldstatus." = ".$status;
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;
+		if ($status == 1 && $elementTable == 'expensereport') {
+		    $sql.=", fk_user_valid = ".$user->id;
+		}
 		$sql.= " WHERE rowid=".$elementId;
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
@@ -3317,12 +3584,27 @@ 
 			// Try autoset of trigkey
 			if (empty($trigkey))
 			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				if ($this->element == 'supplier_proposal' && $status == 2) {
+				    $trigkey='SUPPLIER_PROPOSAL_SIGN';
+				}
+				// 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 3) {
+				    $trigkey='SUPPLIER_PROPOSAL_REFUSE';
+				}
+				// 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 4) {
+				    $trigkey='SUPPLIER_PROPOSAL_CLOSE';
+				}
+				// 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+				if ($this->element == 'fichinter' && $status == 3) {
+				    $trigkey='FICHINTER_CLASSIFY_DONE';
+				}
+				if ($this->element == 'fichinter' && $status == 2) {
+				    $trigkey='FICHINTER_CLASSIFY_BILLED';
+				}
+				if ($this->element == 'fichinter' && $status == 1) {
+				    $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				}
 			}
 
 			if ($trigkey)
@@ -3341,22 +3623,22 @@ 
 			{
 				$this->db->commit();
 
-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
+				if (empty($savElementId)) {
+				    // If the element we update was $this (so $elementId is null)
 				{
 					$this->statut = $status;
+				}
 					$this->status = $status;
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -3376,8 +3658,13 @@ 
 	{
 		global $conf;
 
-		if (empty($id) && empty($ref)) return 0;
-		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
+		if (empty($id) && empty($ref)) {
+		    return 0;
+		}
+		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) {
+		    return 0;
+		}
+		// To increase speed. Not enabled by default.
 
 		// Clean parameters
 		$ref = trim($ref);
@@ -3385,8 +3672,12 @@ 
 		$sql = "SELECT rowid, canvas";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql.= " WHERE entity IN (".getEntity($this->element).")";
-		if (! empty($id))  $sql.= " AND rowid = ".$id;
-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		if (! empty($id)) {
+		    $sql.= " AND rowid = ".$id;
+		}
+		if (! empty($ref)) {
+		    $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3396,10 +3687,10 @@ 
 			{
 				$this->canvas   = $obj->canvas;
 				return 1;
+			} else {
+			    return 0;
 			}
-			else return 0;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -3436,7 +3727,9 @@ 
 	{
 		global $langs;
 
-		if (empty($id)) $id=$this->id;
+		if (empty($id)) {
+		    $id=$this->id;
+		}
 
 		// Check parameters
 		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
@@ -3470,18 +3763,18 @@ 
 					$langs->load("errors");
 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
 					$haschild += $obj->nb;
-					if (is_numeric($elementname))	// old usage
+					if (is_numeric($elementname)) {
+					    // old usage
 					{
 						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
 					}
-					else	// new usage: $elementname=Translation key
+					} else	// new usage: $elementname=Translation key
 					{
 						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
 					break;    // We found at least one, we stop here
 				}
-			}
-			else
+			} else
 			{
 				$this->errors[]=$this->db->lasterror();
 				return -1;
@@ -3491,8 +3784,9 @@ 
 		{
 			$this->errors[]="ErrorRecordHasChildren";
 			return $haschild;
+		} else {
+		    return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -3508,12 +3802,24 @@ 
 		foreach($this->lines as $key => $val)
 		{
 			$qualified=0;
-			if ($predefined == -1) $qualified=1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;
-			if ($qualified) $nb++;
+			if ($predefined == -1) {
+			    $qualified=1;
+			}
+			if ($predefined == 1 && $val->fk_product > 0) {
+			    $qualified=1;
+			}
+			if ($predefined == 0 && $val->fk_product <= 0) {
+			    $qualified=1;
+			}
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) {
+			    $qualified=1;
+			}
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) {
+			    $qualified=1;
+			}
+			if ($qualified) {
+			    $nb++;
+			}
 		}
 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
 		return $nb;
@@ -3577,16 +3883,24 @@ 
 		{
 			if (isset($line->qty_asked))
 			{
-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
+				if (empty($totalOrdered)) {
+				    $totalOrdered=0;
+				}
+				// Avoid warning because $totalOrdered is ''
 				$totalOrdered+=$line->qty_asked;    // defined for shipment only
 			}
 			if (isset($line->qty_shipped))
 			{
-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
+				if (empty($totalToShip)) {
+				    $totalToShip=0;
+				}
+				// Avoid warning because $totalToShip is ''
 				$totalToShip+=$line->qty_shipped;   // defined for shipment only
-            }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
+            } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
             {
-                if (empty($totalToShip)) $totalToShip=0;
+                if (empty($totalToShip)) {
+                    $totalToShip=0;
+                }
                 $totalToShip+=$line->qty;   // defined for reception only
 			}
 
@@ -3594,8 +3908,7 @@ 
 			if ($this->element == 'shipping') {
 				// for shipments
 				$qty = $line->qty_shipped ? $line->qty_shipped : 0;
-			}
-			else {
+			} else {
 				$qty = $line->qty ? $line->qty : 0;
 			}
 
@@ -3611,19 +3924,30 @@ 
 
 			$weightUnit=0;
 			$volumeUnit=0;
-			if (! empty($weight_units)) $weightUnit = $weight_units;
-			if (! empty($volume_units)) $volumeUnit = $volume_units;
+			if (! empty($weight_units)) {
+			    $weightUnit = $weight_units;
+			}
+			if (! empty($volume_units)) {
+			    $volumeUnit = $volume_units;
+			}
 
-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
+			if (empty($totalWeight)) {
+			    $totalWeight=0;
+			}
+			// Avoid warning because $totalWeight is ''
+			if (empty($totalVolume)) {
+			    $totalVolume=0;
+			}
+			// Avoid warning because $totalVolume is ''
 
 			//var_dump($line->volume_units);
-			if ($weight_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($weight_units < 50) {
+			    // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				$trueWeightUnit=pow(10, $weightUnit);
-				$totalWeight += $weight * $qty * $trueWeightUnit;
 			}
-			else {
+				$totalWeight += $weight * $qty * $trueWeightUnit;
+			} else {
 		if ($weight_units == 99) {
 			// conversion 1 Pound = 0.45359237 KG
 			$trueWeightUnit = 0.45359237;
@@ -3632,18 +3956,20 @@ 
 			// conversion 1 Ounce = 0.0283495 KG
 			$trueWeightUnit = 0.0283495;
 			$totalWeight += $weight * $qty * $trueWeightUnit;
+		} else {
+							$totalWeight += $weight * $qty;
 		}
-		else
-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+		// This may be wrong if we mix different units
 			}
-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
+			if ($volume_units < 50) {
+			    // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
 				$trueVolumeUnit=pow(10, $volumeUnit);
+			}
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
-			}
-			else
+			} else
 			{
 				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units
 			}
@@ -3675,8 +4001,7 @@ 
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -3728,13 +4053,11 @@ 
 			{
 				$res = $this->db->fetch_object($resql);
 				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
-			}
-			else
+			} else
 			{
 				return '';
 			}
-		}
-		else
+		} else
 		{
 			$this->errors[] = $this->db->lasterror();
 			return false;
@@ -3771,14 +4094,14 @@ 
 					$this->libelle_incoterms = $obj->libelle;
 				}
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
+		} else {
+		    return -1;
 		}
-		else return -1;
 	}
 
 
@@ -3817,7 +4140,9 @@ 
 			} else {
 				$res=include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+			    break;
+			}
 		}
 	}
 
@@ -3847,7 +4172,9 @@ 
 
 		// Define usemargins
 		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) $usemargins=1;
+		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element,array('facture','propal','commande'))) {
+		    $usemargins=1;
+		}
 
 		$num = count($this->lines);
 
@@ -3866,7 +4193,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" align="center" width="5">&nbsp;</td>';
+			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+			    print '<td class="linecolnum" align="center" width="5">&nbsp;</td>';
+			}
 
 			// Description
 			print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
@@ -3883,9 +4212,13 @@ 
 			print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+			    print '<td class="linecoluht_currency" align="right" width="80">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+			}
 
-			if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
+			if ($inputalsopricewithtax) {
+			    print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>';
+			}
 
 			// Qty
 			print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
@@ -3906,25 +4239,32 @@ 
 			{
 				if (!empty($user->rights->margins->creer))
 				{
-					if ($conf->global->MARGIN_TYPE == "1")
-						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
-					else
-						print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+					if ($conf->global->MARGIN_TYPE == "1") {
+											print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
+					} else {
+											print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+					}
 				}
 
-				if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
-				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
-					print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
+				if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {
+									print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>';
+				}
+				if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {
+									print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>';
+				}
 			}
 
 			// Total HT
 			print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+			if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+			    print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+			}
 
-			if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
+			if ($outputalsopricetotalwithtax) {
+			    print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
+			}
 
 			print '<td class="linecoledit"></td>';  // No width to allow autodim
 
@@ -3954,14 +4294,15 @@ 
 			$line->fetch_optionals();
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-			if (is_object($hookmanager))   // Old code is commented on preceding line.
+			if (is_object($hookmanager)) {
+			    // Old code is commented on preceding line.
 			{
 				if (empty($line->fk_parent_line))
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+			}
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
-				}
-				else
+				} else
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line);
 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
@@ -4008,8 +4349,14 @@ 
 		// Show product and description
 		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);
 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.
-		if (! empty($line->date_start)) $type=1; // deprecated
-		if (! empty($line->date_end)) $type=1; // deprecated
+		if (! empty($line->date_start)) {
+		    $type=1;
+		}
+		// deprecated
+		if (! empty($line->date_end)) {
+		    $type=1;
+		}
+		// deprecated
 
 		// Ligne en mode visu
 		if ($action != 'editline' || $selected != $line->id)
@@ -4038,8 +4385,13 @@ 
 
 					$outputlangs = $langs;
 					$newlang='';
-					if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) $newlang=$this->thirdparty->default_lang;		// For language to language of customer
+					if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+					    $newlang=GETPOST('lang_id','aZ09');
+					}
+					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) {
+					    $newlang=$this->thirdparty->default_lang;
+					}
+					// For language to language of customer
 					if (! empty($newlang))
 					{
 						$outputlangs = new Translate("",$conf);
@@ -4047,8 +4399,7 @@ 
 					}
 
 					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
-				}
-				else
+				} else
 				{
 					$label = $line->product_label;
 				}
@@ -4070,7 +4421,9 @@ 
 				} else {
 					$res=include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 		}
 
@@ -4093,7 +4446,9 @@ 
 				} else {
 					$res=include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+				    break;
+				}
 			}
 		}
 	}
@@ -4120,7 +4475,9 @@ 
 		print '<td>'.$langs->trans('Description').'</td>';
 		print '<td align="right">'.$langs->trans('VATRate').'</td>';
 		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
-		if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		if (!empty($conf->multicurrency->enabled)) {
+		    print '<td align="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		}
 		print '<td align="right">'.$langs->trans('Qty').'</td>';
 		if($conf->global->PRODUCT_USE_UNITS)
 		{
@@ -4143,8 +4500,7 @@ 
 						$action='';
 						$hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 					}
-				}
-				else
+				} else
 				{
 					$this->printOriginLine($line, $var, $restrictlist);
 				}
@@ -4173,32 +4529,37 @@ 
 		if (!empty($line->date_start))
 		{
 			$date_start=$line->date_start;
-		}
-		else
+		} else
 		{
 			$date_start=$line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;
+			if ($line->date_debut_reel) {
+			    $date_start=$line->date_debut_reel;
+			}
 		}
 		if (!empty($line->date_end))
 		{
 			$date_end=$line->date_end;
-		}
-		else
+		} else
 		{
 			$date_end=$line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
+			if ($line->date_fin_reel) {
+			    $date_end=$line->date_fin_reel;
+			}
 		}
 
 		$this->tpl['label'] = '';
-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
+		if (! empty($line->fk_parent_line)) {
+		    $this->tpl['label'].= img_picto('', 'rightarrow');
+		}
 
-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
+		if (($line->info_bits & 2) == 2) {
+		    // TODO Not sure this is used for source object
 		{
 			$discount=new DiscountAbsolute($this->db);
+		}
 			$discount->fk_soc = $this->socid;
 			$this->tpl['label'].= $discount->getNomUrl(0,'discount');
-		}
-		else if (! empty($line->fk_product))
+		} else if (! empty($line->fk_product))
 		{
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
@@ -4216,13 +4577,12 @@ 
 			{
 				$this->tpl['label'].= get_date_range($date_start,$date_end);
 			}
-		}
-		else
+		} else
 		{
 			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product')));
 			if (!empty($line->desc)) {
 				$this->tpl['label'].=$line->desc;
-			}else {
+			} else {
 				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');
 			}
 			
@@ -4235,36 +4595,35 @@ 
 
 		if (! empty($line->desc))
 		{
-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
+			if ($line->desc == '(CREDIT_NOTE)') {
+			    // TODO Not sure this is used for source object
 			{
 				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+			} elseif ($line->desc == '(DEPOSIT)') {
+			    // TODO Not sure this is used for source object
 			{
 				$discount=new DiscountAbsolute($this->db);
+			}
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS RECEIVED)')
+			} elseif ($line->desc == '(EXCESS RECEIVED)')
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS PAID)')
+			} elseif ($line->desc == '(EXCESS PAID)')
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-			}
-			else
+			} else
 			{
 				$this->tpl['description'] = dol_trunc($line->desc,60);
 			}
-		}
-		else
+		} else
 		{
 			$this->tpl['description'] = '&nbsp;';
 		}
@@ -4272,17 +4631,23 @@ 
         // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) {
+            $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        }
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-		if ($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		if ($conf->global->PRODUCT_USE_UNITS) {
+		    $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		}
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
 		$this->tpl['strike']=0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;
+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {
+		    $this->tpl['strike']=1;
+		}
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
@@ -4295,7 +4660,9 @@ 
 			} else {
 				$res=include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+			    break;
+			}
 		}
 	}
 
@@ -4337,8 +4704,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -4373,8 +4739,7 @@ 
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			if (! $notrigger)
 			{
@@ -4441,13 +4806,20 @@ 
 		// Search template files
 		$file=''; $classname=''; $filefound=0;
 		$dirmodels=array('/');
-		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+		if (is_array($conf->modules_parts['models'])) {
+		    $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+		}
 		foreach($dirmodels as $reldir)
 		{
 			foreach(array('doc','pdf') as $prefix)
 			{
-				if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php
-				else $file = $prefix."_".$modele.".modules.php";
+				if (in_array(get_class($this), array('Adherent'))) {
+				    $file = $prefix."_".$modele.".class.php";
+				}
+				// Member module use prefix_module.class.php
+				else {
+				    $file = $prefix."_".$modele.".modules.php";
+				}
 
 				// On verifie l'emplacement du modele
 				$file=dol_buildpath($reldir.$modelspath.$file,0);
@@ -4458,7 +4830,9 @@ 
 					break;
 				}
 			}
-			if ($filefound) break;
+			if ($filefound) {
+			    break;
+			}
 		}
 
 		// If generator was found
@@ -4490,7 +4864,9 @@ 
 						if (is_dir($tmpdir))
 						{
 							$tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0);
-							if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
+							if (count($tmpfiles)) {
+							    $listoffiles=array_merge($listoffiles,$tmpfiles);
+							}
 						}
 					}
 
@@ -4528,8 +4904,7 @@ 
 			{
 				$arrayofrecords = array();   // The write_file of templates of adherent class need this var
 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
-			}
-			else
+			} else
 			{
 				$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
 			}
@@ -4551,9 +4926,11 @@ 
 					$destfile = basename($destfull);
 					$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
 
-					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+					if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {
+					    // If not a tmp dir
 					{
 						$filename = basename($destfile);
+					}
 						$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 						$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
@@ -4566,18 +4943,30 @@ 
 						if ($this->element == 'propal')
 						{
 							$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok
-							if ($useonlinesignature) $setsharekey=true;
-							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
+							if ($useonlinesignature) {
+							    $setsharekey=true;
+							}
+							if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey=true;
+							}
+						}
+						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
+						}
+						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
+						}
+						if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+						    $setsharekey=true;
 						}
-						if ($this->element == 'commande'     && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))        $setsharekey=true;
-						if ($this->element == 'facture'      && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))      $setsharekey=true;
-						if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
 
 						if ($setsharekey)
 						{
-							if (empty($ecmfile->share))	// Because object not found or share not set yet
+							if (empty($ecmfile->share)) {
+							    // Because object not found or share not set yet
 							{
 								require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+							}
 								$ecmfile->share = getRandomPassword(true);
 							}
 						}
@@ -4594,8 +4983,7 @@ 
 							{
 								setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 							}
-						}
-						else
+						} else
 						{
 							$ecmfile->entity = $conf->entity;
 							$ecmfile->filepath = $rel_dir;
@@ -4622,17 +5010,20 @@ 
 
 						// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
 						$update_main_doc_field=0;
-						if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
+						if (! empty($obj->update_main_doc_field)) {
+						    $update_main_doc_field=1;
+						}
 						if ($update_main_doc_field && ! empty($this->table_element))
 						{
 							$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";
 							$sql.= ' WHERE rowid = '.$this->id;
 							$resql = $this->db->query($sql);
-							if (! $resql) dol_print_error($this->db);
+							if (! $resql) {
+							    dol_print_error($this->db);
+							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
 				}
@@ -4641,15 +5032,13 @@ 
 				dol_meta_create($this);
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$outputlangs->charset_output=$sav_charset_output;
 				dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
 			dol_print_error('',$this->error);
@@ -4705,13 +5094,21 @@ 
 		global $conf, $_POST;
 
 		// If param here has been posted, we use this value first.
-		if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2);
+		if (isset($_POST[$fieldname])) {
+		    return GETPOST($fieldname, 2);
+		}
 
-		if (isset($alternatevalue)) return $alternatevalue;
+		if (isset($alternatevalue)) {
+		    return $alternatevalue;
+		}
 
 		$newelement=$this->element;
-		if ($newelement == 'facture') $newelement='invoice';
-		if ($newelement == 'commande') $newelement='order';
+		if ($newelement == 'facture') {
+		    $newelement='invoice';
+		}
+		if ($newelement == 'commande') {
+		    $newelement='order';
+		}
 		if (empty($newelement))
 		{
 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
@@ -4720,7 +5117,9 @@ 
 
 		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
-		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
+		if (isset($conf->global->$keyforfieldname)) {
+		    return $conf->global->$keyforfieldname;
+		}
 
 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
 	}
@@ -4754,8 +5153,7 @@ 
 			if (!empty($this->errors))
 			{
 				$this->errors=array_unique(array_merge($this->errors,$interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
-			}
-			else
+			} else
 			{
 				$this->errors=$interface->errors;
 			}
@@ -4779,7 +5177,9 @@ 
 	function fetch_optionals($rowid=null, $optionsArray=null)
 	{
         // phpcs:enable
-		if (empty($rowid)) $rowid=$this->id;
+		if (empty($rowid)) {
+		    $rowid=$this->id;
+		}
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
@@ -4805,15 +5205,17 @@ 
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
 			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);
-		}
-		else
+		} else
 		{
 			global $extrafields;
 			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
 		}
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+		    $table_element = 'categories';
+		}
+		// For compatibility
 
 		// Request to get complementary values
 		if (is_array($optionsArray) && count($optionsArray) > 0)
@@ -4849,8 +5251,7 @@ 
 							{
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key]=$this->db->jdate($value);
-							}
-							else
+							} else
 							{
 								$this->array_options["options_".$key]=$value;
 							}
@@ -4862,10 +5263,12 @@ 
 
 				$this->db->free($resql);
 
-				if ($numrows) return $numrows;
-				else return 0;
-			}
-			else
+				if ($numrows) {
+				    return $numrows;
+				} else {
+				    return 0;
+				}
+			} else
 			{
 				dol_print_error($this->db);
 				return -1;
@@ -4884,7 +5287,10 @@ 
 		$this->db->begin();
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+		    $table_element = 'categories';
+		}
+		// For compatibility
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
@@ -4894,8 +5300,7 @@ 
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -4916,11 +5321,16 @@ 
 	{
 		global $conf,$langs,$user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) {
+		    $userused=$user;
+		}
 
 		$error=0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		if (! empty($this->array_options))
 		{
@@ -4933,10 +5343,13 @@ 
 			//Eliminate copied source object extra_fields that do not exist in target object
 			$new_array_options=array();
 			foreach ($this->array_options as $key => $value) {
-				if (in_array(substr($key,8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
+				if (in_array(substr($key,8), array_keys($target_extrafields))) {
+				    // We remove the 'options_' from $key for test
 					$new_array_options[$key] = $value;
-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix
+				} elseif (in_array($key, array_keys($target_extrafields))) {
+				    // We test on $key that does not contains the 'options_' prefix
 					$new_array_options['options_'.$key] = $value;
+				}
 			}
 
 			foreach($new_array_options as $key => $value)
@@ -4950,8 +5363,12 @@ 
 			   	if ($attributeRequired)
 			   	{
 			   		$mandatorypb=false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;
-			   		if ($this->array_options[$key] === '') $mandatorypb=true;
+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') {
+			   		    $mandatorypb=true;
+			   		}
+			   		if ($this->array_options[$key] === '') {
+			   		    $mandatorypb=true;
+			   		}
 			   		if ($mandatorypb)
 			   		{
 			   			dol_syslog($this->error);
@@ -4970,8 +5387,7 @@ 
 			   			{
 			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 			   				return -1;
-			  			}
-			   			elseif ($value=='')
+			  			} elseif ($value=='')
 			   			{
 			   				$new_array_options[$key] = null;
 			   			}
@@ -4983,8 +5399,7 @@ 
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value=='')
+						} elseif ($value=='')
 						{
 							$new_array_options[$key] = null;
 						}
@@ -5009,27 +5424,27 @@ 
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
 			   					//var_dump($action);
 			   					//var_dump($this->oldcopy);exit;
-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+			   					if (is_object($this->oldcopy)) {
+			   					    // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
 			   					{
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
-				   					}
-									else
+				   						$new_array_options[$key] = $this->array_options[$key];
+			   					}
+			   					// Value is kept
+				   					} else
 									{
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
 										$new_array_options[$key] = $newvalue;
 									}
-			   					}
-			   					else
+			   					} else
 			   					{
 			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
 			   					}
 			   				}
-			   			}
-			   			else	// Common usage
+			   			} else	// Common usage
 			   			{
 			   				$new_array_options[$key] = $this->array_options[$key];
 			   			}
@@ -5055,26 +5470,30 @@ 
 						dol_include_once($InfoFieldList[1]);
 						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
 						{
-							if ($value == '-1')	// -1 is key for no defined in combo list of objects
+							if ($value == '-1') {
+							    // -1 is key for no defined in combo list of objects
 							{
 								$new_array_options[$key]='';
 							}
-							elseif ($value)
+							} elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res=$object->fetch($value);
-								else $res=$object->fetch('',$value);
+								if (is_numeric($value)) {
+								    $res=$object->fetch($value);
+								} else {
+								    $res=$object->fetch('',$value);
+								}
 
-								if ($res > 0) $new_array_options[$key]=$object->id;
-								else
+								if ($res > 0) {
+								    $new_array_options[$key]=$object->id;
+								} else
 								{
 									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
 								}
 							}
-						}
-						else
+						} else
 						{
 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 						}
@@ -5085,7 +5504,10 @@ 
 			$this->db->begin();
 
 			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+			if ($table_element == 'categorie') {
+			    $table_element = 'categories';
+			}
+			// For compatibility
 
 			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 			dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
@@ -5096,8 +5518,10 @@ 
 			{
 				$attributeKey = substr($key,8);   // Remove 'options_' prefix
 				// Add field of attribut
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+				    // Only for other type than separator
 					$sql.=",".$attributeKey;
+				}
 			}
 			$sql .= ") VALUES (".$this->id;
 
@@ -5105,13 +5529,14 @@ 
 			{
 				$attributeKey = substr($key,8);   // Remove 'options_' prefix
 				// Add field of attribute
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') {
+				    // Only for other type than separator)
 				{
 					if ($new_array_options[$key] != '')
 					{
 						$sql.=",'".$this->db->escape($new_array_options[$key])."'";
-					}
-					else
+				}
+					} else
 					{
 						$sql.=",null";
 					}
@@ -5132,7 +5557,9 @@ 
 				// Call trigger
 				$this->context=array('extrafieldaddupdate'=>1);
 				$result=$this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+				    $error++;
+				}
 				// End call trigger
 			}
 
@@ -5140,14 +5567,14 @@ 
 			{
 				$this->db->rollback();
 				return -1;
-			}
-			else
+			} else
 			{
 				$this->db->commit();
 				return 1;
 			}
+		} else {
+		    return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -5164,11 +5591,16 @@ 
 	{
 		global $conf,$langs,$user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) {
+		    $userused=$user;
+		}
 
 		$error=0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return 0;
+		}
+		// For avoid conflicts if trigger used
 
 		if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
 		{
@@ -5195,8 +5627,7 @@ 
 					{
 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
 						return -1;
-					}
-					elseif ($value=='')
+					} elseif ($value=='')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5208,8 +5639,7 @@ 
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value=='')
+					} elseif ($value=='')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5261,7 +5691,9 @@ 
 				// Call trigger
 				$this->context=array('extrafieldupdate'=>1);
 				$result=$this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+				    $error++;
+				}
 				// End call trigger
 			}
 
@@ -5270,14 +5702,14 @@ 
 				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
-			}
-			else
+			} else
 			{
 				$this->db->commit();
 				return 1;
 			}
+		} else {
+		    return 0;
 		}
-		else return 0;
 	}
 
 
@@ -5352,8 +5784,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 '';
+			}
 		}
 
 
@@ -5367,33 +5802,27 @@ 
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
+			} elseif ($type == 'datetime')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
+			} elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
 			{
 				$morecss = 'maxwidth75';
-                        }elseif ($type == 'url')
+                        } elseif ($type == 'url')
 			{
 				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss='';
-			}
-			else
+			} else
 			{
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				else if (round($size) <= 48)
+				} else if (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
+				} else
 				{
 					$morecss = 'minwidth400';
 				}
@@ -5408,52 +5837,50 @@ 
 			$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);
-		}
-		elseif (in_array($type,array('int','integer')))
+		} elseif (in_array($type,array('int','integer')))
 		{
 			$tmp=explode(',',$size);
 			$newsize=$tmp[0];
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$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')
+		} 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
+			} else
 			{
 				$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 == 'html')
+		} 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
+			} else
 			{
 				$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 == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
@@ -5462,22 +5889,19 @@ 
 				$checked=' value="1" ';
 			}
 			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
+		} elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type))
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -5487,10 +5911,14 @@ 
 			}
 
 			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';
+                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1)) {
+                    $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':'');
@@ -5498,8 +5926,7 @@ 
 				$out.='>'.$val.'</option>';
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -5566,13 +5993,11 @@ 
 					{
 						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
-					}
-					else
+					} else
 					{
 						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
 					}
-				}
-				else
+				} else
 				{
 					$sqlwhere.= ' WHERE 1=1';
 				}
@@ -5608,8 +6033,7 @@ 
 							{
 								$labeltoshow.= $obj->$field_toshow.' ';
 							}
-						}
-						else
+						} else
 						{
 							$labeltoshow=$obj->{$InfoFieldList[1]};
 						}
@@ -5622,25 +6046,25 @@ 
 								$translabel=$langs->trans($obj->$field_toshow);
 								if ($translabel!=$obj->$field_toshow) {
 									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
+								} else {
 									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
 								}
 							}
 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if (! $notrans)
 							{
 								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel!=$obj->{$InfoFieldList[1]}) {
 									$labeltoshow=dol_trunc($translabel,18);
-								}
-								else {
+								} else {
 									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
+							if (empty($labeltoshow)) {
+							    $labeltoshow='(not defined)';
+							}
 							if ($value==$obj->rowid)
 							{
 								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
@@ -5660,19 +6084,16 @@ 
 						$i++;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out='';
 			foreach ($param['options'] as $keyopt => $val)
@@ -5683,13 +6104,11 @@ 
 				$out.= ($value==$keyopt?'checked':'');
 				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -5804,8 +6223,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;
@@ -5827,8 +6247,7 @@ 
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
 			$showempty=(($required && $default != '')?0:1);
@@ -5836,18 +6255,19 @@ 
 			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 			{
             			list($class,$classfile)=explode(':',$param_list[0]);
-            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);
-            			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);
+            			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) {
+            			    $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1);
+            			} else {
+            			    $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1);
+            			}
             			$out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
             			// TODO Add Javascript code to add input fields contents to new elements urls
 			}
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
@@ -5925,17 +6345,25 @@ 
 		{
 			$type = 'varchar';		// convert varchar(xx) int varchar
 			$size = $reg[1];
+		} elseif (preg_match('/varchar/', $type)) {
+		    $type = 'varchar';
+		}
+		// convert varchar(xx) int varchar
+		if (is_array($val['arrayofkeyval'])) {
+		    $type='select';
+		}
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+		    $type='link';
 		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type='select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
 
 		$default=$val['default'];
 		$computed=$val['computed'];
 		$unique=$val['unique'];
 		$required=$val['required'];
 		$param=$val['param'];
-		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+		if (is_array($val['arrayofkeyval'])) {
+		    $param['options'] = $val['arrayofkeyval'];
+		}
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
 			$type='link';
@@ -5946,7 +6374,9 @@ 
 		$help=$val['help'];
 		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, 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 '';
+		if ($hidden) {
+		    return '';
+		}
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -5962,36 +6392,29 @@ 
 			{
 				//$showsize=10;
 				$showsize = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
+			} elseif ($type == 'datetime')
 			{
 				//$showsize=19;
 				$showsize = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','double','price')))
+			} elseif (in_array($type,array('int','double','price')))
 			{
 				//$showsize=10;
 				$showsize = 'maxwidth75';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$showsize='minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$showsize='';
-			}
-			else
+			} else
 			{
 				if (round($size) < 12)
 				{
 					$showsize = 'minwidth100';
-				}
-				else if (round($size) <= 48)
+				} else if (round($size) <= 48)
 				{
 					$showsize = 'minwidth200';
-				}
-				else
+				} else
 				{
 					//$showsize=48;
 					$showsize = 'minwidth400';
@@ -6000,59 +6423,52 @@ 
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);
-		elseif ($type == 'date')
+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
+		    $value=$this->getNomUrl(1, '', 0, '', 1);
+		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
+		    $value=$this->getLibStatut(3);
+		} elseif ($type == 'date')
 		{
 			if(! empty($value)) {
 				$value=dol_print_date($value,'day');
 			} else {
 				$value='';
 			}
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			if(! empty($value)) {
 				$value=dol_print_date($value,'dayhour');
 			} else {
 				$value='';
 			}
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {
 				$value=price($value);
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
 				$checked=' checked ';
 			}
 			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value=dol_print_email($value,0,0,0,64,1,1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value=dol_print_url($value,'_blank',32,1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$value=price($value,0,$langs,0,0,-1,$conf->currency);
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$value=$param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$param_list=array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -6082,7 +6498,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";
 			} elseif ($selectkey=='rowid') {
 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
+			} else {
 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
@@ -6109,12 +6525,11 @@ 
 						}
 						if ($translabel!=$field_toshow) {
 							$value.=dol_trunc($translabel,18).' ';
-						}else {
+						} else {
 							$value.=$obj->$field_toshow.' ';
 						}
 					}
-				}
-				else
+				} else
 				{
 					$translabel='';
 					if (!empty($obj->{$InfoFieldList[1]})) {
@@ -6122,18 +6537,17 @@ 
 					}
 					if ($translabel!=$obj->{$InfoFieldList[1]}) {
 						$value=dol_trunc($translabel,18);
-					}else {
+					} else {
 						$value=$obj->{$InfoFieldList[1]};
 					}
 				}
+			} 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')
+		} elseif ($type == 'radio')
 		{
 			$value=$param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$value='';
@@ -6144,8 +6558,7 @@ 
 				}
 				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -6213,8 +6626,7 @@ 
 			} else {
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out='';
 
@@ -6236,24 +6648,21 @@ 
 						$object->fetch($value);
 						$value=$object->getNomUrl($getnomurlparam);
 					}
-				}
-				else
+				} else
 				{
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
+			} else {
+			    $value='';
 			}
-			else $value='';
-		}
-		elseif ($type == 'text' || $type == 'html')
+		} elseif ($type == 'text' || $type == 'html')
 		{
 			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value=preg_replace('/./i','*',$value);
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$value = implode('<br>', $value);
 		}
@@ -6280,7 +6689,9 @@ 
 	{
 		global $db, $conf, $langs, $action, $form;
 
-		if (! is_object($form)) $form=new Form($db);
+		if (! is_object($form)) {
+		    $form=new Form($db);
+		}
 
 		$out = '';
 
@@ -6294,7 +6705,9 @@ 
 			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 			{
 				// Show only the key field in params
-				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue;
+				if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) {
+				    continue;
+				}
 
 				$enabled = 1;
 				if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key]))
@@ -6308,11 +6721,18 @@ 
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
 				}
 
-				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-				if (empty($perms)) continue;
+				if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) {
+				    continue;
+				}
+				// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+				if (empty($perms)) {
+				    continue;
+				}
 
 				// Load language if required
-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
+				    $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				}
 
 				$colspan='3';
 				if (is_array($params) && count($params)>0) {
@@ -6346,8 +6766,7 @@ 
 				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
 				{
 					$out .= $extrafields->showSeparator($key, $this);
-				}
-				else
+				} else
 				{
 					$csstyle='';
 					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
@@ -6377,10 +6796,12 @@ 
 					if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime')))
 					{
 						$datenotinstring = $this->array_options['options_' . $key];
-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility
+						if (! is_numeric($this->array_options['options_' . $key])) {
+						    // For backward compatibility
 						{
 							$datenotinstring = $this->db->jdate($datenotinstring);
 						}
+						}
 						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring;
 					}
 					// Convert float submited string into real php numeric (value in memory must be a php numeric)
@@ -6392,11 +6813,18 @@ 
 					$labeltoshow = $langs->trans($label);
 
 					$out .= '<td class="titlefield';
-					if (GETPOST('action','none') == 'create') $out.='create';
-					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+					if (GETPOST('action','none') == 'create') {
+					    $out.='create';
+					}
+					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+					    $out .= ' fieldrequired';
+					}
 					$out .= '">';
-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
-					else $out .= $labeltoshow;
+					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) {
+					    $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
+					} else {
+					    $out .= $labeltoshow;
+					}
 					$out .= '</td>';
 
 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
@@ -6413,8 +6841,11 @@ 
 
 					$out .= '</td>';
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
-					else $out .= '</tr>';
+					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+					    $out .= '</tr>';
+					} else {
+					    $out .= '</tr>';
+					}
 					$e++;
 				}
 			}
@@ -6466,7 +6897,9 @@ 
 		global $user;
 
 		$element = $this->element;
-		if ($element == 'facturerec') $element='facture';
+		if ($element == 'facturerec') {
+		    $element='facture';
+		}
 
 		return $user->rights->{$element};
 	}
@@ -6491,7 +6924,10 @@ 
 
 			if (! $db->query($sql))
 			{
-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				if ($ignoreerrors) {
+				    return true;
+				}
+				// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 				//$this->errors = $db->lasterror();
 				return false;
 			}
@@ -6518,11 +6954,12 @@ 
 
 		$buyPrice = 0;
 
-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+		    // In most cases, test here is false
 		{
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
 		}
-		else
+		} else
 		{
 			// Get cost price for margin calculation
 			if (! empty($fk_product))
@@ -6540,13 +6977,11 @@ 
 					if ($product->cost_price > 0)
 					{
 						$buyPrice = $product->cost_price;
-					}
-					else if ($product->pmp > 0)
+					} else if ($product->pmp > 0)
 					{
 						$buyPrice = $product->pmp;
 					}
-				}
-				else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
+				} else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
@@ -6569,8 +7004,7 @@ 
 					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
 					{
 						$buyPrice = $productFournisseur->fourn_unitprice;
-					}
-					else if ($result < 0)
+					} else if ($result < 0)
 					{
 						$this->errors[] = $productFournisseur->error;
 						return -2;
@@ -6616,8 +7050,7 @@ 
 		{
 			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
 			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/';
-		}
-		else
+		} else
 		{
 			$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
 			$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
@@ -6680,19 +7113,26 @@ 
 
 						// Find name of thumb file
 						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
+						if (! dol_is_file($dirthumb.$photo_vignette)) {
+						    $photo_vignette='';
+						}
 
 						// Get filesize of original file
 						$imgarray=dol_getImageSize($dir.$photo);
 
 						if ($nbbyrow > 0)
 						{
-							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+							if ($nbphoto == 1) {
+							    $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+							}
 
-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';
+							if ($nbphoto % $nbbyrow == 1) {
+							    $return.= '<tr align=center valign=middle border=1>';
+							}
 							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
+						} else if ($nbbyrow < 0) {
+						    $return .= '<div class="inline-block">';
 						}
-						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
 						$return.= "\n";
 
@@ -6700,15 +7140,20 @@ 
 						if (empty($nolink))
 						{
 							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							if ($urladvanced) {
+							    $return.='<a href="'.$urladvanced.'">';
+							} else {
+							    $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							}
 						}
 
 						// Show image (width height=$maxHeight)
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
 						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
 						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt='';
+						if ($notitle) {
+						    $alt='';
+						}
 
 						if ($usesharelink)
 						{
@@ -6718,35 +7163,35 @@ 
 								{
 									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';
 									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
-								}
-								else {
+								} else {
 									$return.= '<!-- Show original file -->';
 									$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
-							}
-							else
+							} else
 							{
 								$return.= '<!-- Show nophoto file (because file is not shared) -->';
 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
-						}
-						else
+						} else
 						{
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
 								$return.= '<!-- Show thumb -->';
 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
-							}
-							else {
+							} else {
 								$return.= '<!-- Show original file -->';
 								$return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 
-						if (empty($nolink)) $return.= '</a>';
+						if (empty($nolink)) {
+						    $return.= '</a>';
+						}
 						$return.="\n";
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) {
+						    $return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							$return.= '<br>';
@@ -6771,15 +7216,20 @@ 
 						if ($nbbyrow > 0)
 						{
 							$return.= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
+							if (($nbphoto % $nbbyrow) == 0) {
+							    $return.= '</tr>';
+							}
+						} else if ($nbbyrow < 0) {
+						    $return.='</div>';
 						}
-						else if ($nbbyrow < 0) $return.='</div>';
 					}
 
 					if (empty($size)) {     // Format origine
 						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) {
+						    $return.= '<br>'.$viewfilename;
+						}
 						if ($showaction)
 						{
 							// Special case for product
@@ -6796,7 +7246,9 @@ 
 					}
 
 					// On continue ou on arrete de boucler ?
-					if ($nbmax && $nbphoto >= $nbmax) break;
+					if ($nbmax && $nbphoto >= $nbmax) {
+					    break;
+					}
 				}
 			}
 
@@ -6811,7 +7263,9 @@ 
 						$nbphoto++;
 					}
 
-					if ($nbphoto) $return.= '</table>';
+					if ($nbphoto) {
+					    $return.= '</table>';
+					}
 				}
 			}
 		}
@@ -6832,10 +7286,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='array') return true;
-			else return false;
+			if(isset($info['type']) && $info['type']=='array') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6848,10 +7306,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='null') return true;
-			else return false;
+			if(isset($info['type']) && $info['type']=='null') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6862,8 +7324,11 @@ 
 	 */
 	public function isDate($info)
 	{
-		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;
-		else return false;
+		if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) {
+		    return true;
+		} else {
+		    return false;
+		}
 	}
 
 	/**
@@ -6876,10 +7341,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true;
-			else return false;
+			if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6892,10 +7361,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true;
-			else return false;
+			if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6908,10 +7381,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='text') return true;
-			else return false;
+			if(isset($info['type']) && $info['type']=='text') {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6924,10 +7401,14 @@ 
 	{
 		if(is_array($info))
 		{
-			if(isset($info['index']) && $info['index']==true) return true;
-			else return false;
+			if(isset($info['index']) && $info['index']==true) {
+			    return true;
+			} else {
+			    return false;
+			}
+		} else {
+		    return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -6941,7 +7422,8 @@ 
 		global $conf;
 
 		$queryarray=array();
-		foreach ($this->fields as $field=>$info)	// Loop on definition of fields
+		foreach ($this->fields as $field=>$info) {
+		    // Loop on definition of fields
 		{
 			// Depending on field type ('datetime', ...)
 			if($this->isDate($info))
@@ -6949,13 +7431,12 @@ 
 				if(empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
-				}
-				else
+		}
+				} else
 				{
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
-			}
-			else if($this->isArray($info))
+			} else if($this->isArray($info))
 			{
 				if(! empty($this->{$field})) {
 					if(! is_array($this->{$field})) {
@@ -6965,28 +7446,35 @@ 
 				} else {
 					$queryarray[$field] = null;
 				}
-			}
-			else if($this->isInt($info))
+			} else if($this->isInt($info))
 			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;
-				else
+				if ($field == 'entity' && is_null($this->{$field})) {
+				    $queryarray[$field]=$conf->entity;
+				} else
 				{
 					$queryarray[$field] = (int) price2num($this->{$field});
-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.
+					if (empty($queryarray[$field])) {
+					    $queryarray[$field]=0;
+					}
+					// May be reset to null later if property 'notnull' is -1 for this field.
 				}
-			}
-			else if($this->isFloat($info))
+			} else if($this->isFloat($info))
 			{
 				$queryarray[$field] = (double) price2num($this->{$field});
-				if (empty($queryarray[$field])) $queryarray[$field]=0;
-			}
-			else
+				if (empty($queryarray[$field])) {
+				    $queryarray[$field]=0;
+				}
+			} else
 			{
 				$queryarray[$field] = $this->{$field};
 			}
 
-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
+			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {
+			    unset($queryarray[$field]);
+			}
+			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {
+			    $queryarray[$field] = null;
+			}
 		}
 
 		return $queryarray;
@@ -7004,42 +7492,47 @@ 
 		{
 			if($this->isDate($info))
 			{
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-				else $this->{$field} = strtotime($obj->{$field});
-			}
-			elseif($this->isArray($info))
+				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') {
+				    $this->{$field} = 0;
+				} else {
+				    $this->{$field} = strtotime($obj->{$field});
+				}
+			} elseif($this->isArray($info))
 			{
 				if(! empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
 					// Hack for data not in UTF8
-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+					if($this->{$field } === false) {
+					    @unserialize(utf8_decode($obj->{$field}));
+					}
 				} else {
 					$this->{$field} = array();
 				}
-			}
-			elseif($this->isInt($info))
+			} elseif($this->isInt($info))
 			{
-				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else $this->{$field} = (int) $obj->{$field};
-			}
-			elseif($this->isFloat($info))
+				if ($field == 'rowid') {
+				    $this->id = (int) $obj->{$field};
+				} else {
+				    $this->{$field} = (int) $obj->{$field};
+				}
+			} elseif($this->isFloat($info))
 			{
 				$this->{$field} = (double) $obj->{$field};
-			}
-			elseif($this->isNull($info))
+			} elseif($this->isNull($info))
 			{
 				$val = $obj->{$field};
 				// zero is not null
 				$this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val);
-			}
-			else
+			} else
 			{
 				$this->{$field} = $obj->{$field};
 			}
 		}
 
 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+		if (! isset($this->fields['ref']) && isset($this->id)) {
+		    $this->ref = $this->id;
+		}
 	}
 
 	/**
@@ -7062,9 +7555,13 @@ 
 	 */
     protected function quote($value, $fieldsentry)
     {
-		if (is_null($value)) return 'NULL';
-		else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-		else return "'".$this->db->escape($value)."'";
+		if (is_null($value)) {
+		    return 'NULL';
+		} else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) {
+		    return $this->db->escape("$value");
+		} else {
+		    return "'".$this->db->escape($value)."'";
+		}
 	}
 
 
@@ -7084,8 +7581,12 @@ 
 		$now=dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;
+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
+		    $fieldvalues['date_creation']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) {
+		    $fieldvalues['fk_user_creat']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
 
 		$keys=array();
@@ -7100,8 +7601,12 @@ 
 		foreach($keys as $key)
 		{
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))
@@ -7111,11 +7616,17 @@ 
 			}
 
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';
-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
+			    $values[$key]='null';
+			}
+			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {
+			    $values[$key]='null';
+			}
 		}
 
-		if ($error) return -1;
+		if ($error) {
+		    return -1;
+		}
 
 		$this->db->begin();
 
@@ -7141,7 +7652,9 @@ 
 		if (! $error)
 		{
 			$result=$this->insertExtraFields();
-			if ($result < 0) $error++;
+			if ($result < 0) {
+			    $error++;
+			}
 		}
 
 		// Triggers
@@ -7174,15 +7687,24 @@ 
 	 */
 	public function fetchCommon($id, $ref = null, $morewhere = '')
 	{
-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
+		if (empty($id) && empty($ref) && empty($morewhere)) {
+		    return -1;
+		}
 
 		$sql = 'SELECT '.$this->getFieldList();
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
-		if ($morewhere)   $sql.= $morewhere;
+		if (!empty($id)) {
+		    $sql.= ' WHERE rowid = '.$id;
+		} elseif (!empty($ref)) {
+		    $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		} else {
+		    $sql.=' WHERE 1 = 1';
+		}
+		// usage with empty id and empty ref is very rare
+		if ($morewhere) {
+		    $sql.= $morewhere;
+		}
 		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
@@ -7193,13 +7715,11 @@ 
 			{
 				$this->setVarsFromFetchObj($obj);
 				return $this->id;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
@@ -7223,8 +7743,12 @@ 
 		$now=dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;
+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
+		    $fieldvalues['date_modification']=$this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) {
+		    $fieldvalues['fk_user_modif']=$user->id;
+		}
 		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 
 		$keys=array();
@@ -7239,8 +7763,14 @@ 
 		// Clean and check mandatory
 		foreach($keys as $key)
 		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			// This is an implicit foreign key field
+			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+			    $values[$key]='';
+			}
+			// This is an explicit foreign key field
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			/*
@@ -7321,10 +7851,11 @@ 
 					return -1;
 				}
 			}
-		}
-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		} elseif (! empty($this->fk_element) && ! empty($this->childtables)) {
+		    // If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
+		}
 			if (! empty($objectisused))
 			{
 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
@@ -7431,7 +7962,9 @@ 
      */
     public function trimParameters($parameters)
     {
-        if (!is_array($parameters)) return;
+        if (!is_array($parameters)) {
+            return;
+        }
         foreach ($parameters as $parameter) {
             if (isset($this->$parameter)) {
                 $this->$parameter = trim($this->$parameter);

dolibarr/htdocs/core/class/ctyperesource.class.php

Braces +7 added lines, -3 removed lines

@@ -172,9 +172,13 @@
 
 
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		if ($id) {
+		    $sql.= " WHERE t.id = ".$id;
+		} elseif ($code) {
+		    $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		} elseif ($label) {
+		    $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		}
 
 
 		$resql = $this->db->query($sql);

dolibarr/htdocs/core/class/html.formsms.class.php

Braces +31 added lines, -28 removed lines

@@ -105,7 +105,9 @@ 
      // phpcs:enable
         global $conf, $langs, $user, $form;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (! is_object($form)) {
+            $form=new Form($this->db);
+        }
 
         // Load translation files required by the page
         $langs->loadLangs(array('other', 'mails', 'sms'));
@@ -131,7 +133,9 @@ 
 }
 </script>';
 
-        if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+        if ($showform) {
+            print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+        }
 
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         foreach ($this->param as $key=>$value)
@@ -141,9 +145,11 @@ 
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+        if (! empty($this->withsubstit)) {
+            // Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
+        }
             $help="";
             foreach($this->substit as $key => $val)
             {
@@ -172,8 +178,7 @@ 
                 if ($this->fromsms)
                 {
                     print $this->fromsms;
-                }
-                else
+                } else
                 {
                     if ($this->fromtype)
                     {
@@ -183,34 +188,34 @@ 
                 }
                 print "</td></tr>\n";
                 print "</td></tr>\n";
-            }
-            else
+            } else
             {
                 print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
                 //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
-                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
+                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh') {
+                    // For backward compatibility        @deprecated
                 {
                     dol_include_once('/ovh/class/ovhsms.class.php');
+                }
                     try
                     {
                         $sms = new OvhSms($this->db);
                         if (empty($conf->global->OVHSMS_ACCOUNT))
                         {
                             $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
-                        }
-                        else
+                        } else
                         {
                             $resultsender = $sms->SmsSenderList();
                         }
-                    }
-                    catch(Exception $e)
+                    } catch(Exception $e)
                     {
                         dol_print_error('','Error to get list of senders: '.$e->getMessage());
                     }
-                }
-                else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+                } else if (!empty($conf->global->MAIN_SMS_SENDMODE)) {
+                    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
                     $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
+                }
                     $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
                     try
@@ -220,20 +225,17 @@ 
                         {
                         	$sms = new $classname($this->db);
                         	$resultsender = $sms->SmsSenderList();
-                        }
-                        else
+                        } else
                         {
                         	$sms = new stdClass();
                         	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
-                    }
-                    catch(Exception $e)
+                    } catch(Exception $e)
                     {
                         dol_print_error('','Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
-                }
-                else
+                } else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
 	                $resultsender=array();
@@ -248,11 +250,12 @@ 
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
                     print '</select>';
-                }
-                else
+                } else
                 {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && ! empty($sms->error)) print ' '.$sms->error;
+                    if (is_object($sms) && ! empty($sms->error)) {
+                        print ' '.$sms->error;
+                    }
                     print '</span>';
                 }
                 print '</td>';
@@ -271,8 +274,7 @@ 
             if ($this->withtoreadonly)
             {
                 print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
-            }
-            else
+            } else
             {
                 print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?GETPOST("sendto"):$this->withto):"+")."\">";
                 if (! empty($this->withtosocid) && $this->withtosocid > 0)
@@ -300,7 +302,9 @@ 
                 $defaultmessage=$this->withbody;
             }
             $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
+            if (isset($_POST["message"])) {
+                $defaultmessage=$_POST["message"];
+            }
             $defaultmessage=str_replace('\n',"\n",$defaultmessage);
 
             print "<tr>";
@@ -310,8 +314,7 @@ 
             {
                 print nl2br($defaultmessage);
                 print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
-            }
-            else
+            } else
             {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
                 print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160-dol_strlen($defaultmessage)).'</span></div></td>';

dolibarr/htdocs/core/class/CMailFile.class.php

Braces +221 added lines, -113 removed lines

@@ -125,7 +125,9 @@ 
 
 		$this->sendcontext = $sendcontext;
 
-		if (empty($replyto)) $replyto=$from;
+		if (empty($replyto)) {
+		    $replyto=$from;
+		}
 
 		// Define this->sendmode
 		$this->sendmode = '';
@@ -133,8 +135,12 @@ 
 		{
 			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
 		}
-		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
-		if (empty($this->sendmode)) $this->sendmode='mail';
+		if (empty($this->sendmode)) {
+		    $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
+		}
+		if (empty($this->sendmode)) {
+		    $this->sendmode='mail';
+		}
 
 		// We define end of line (RFC 821).
 		$this->eol="\r\n";
@@ -175,9 +181,10 @@ 
 		if ($msgishtml == -1)
 		{
 			$this->msgishtml = 0;
-			if (dol_textishtml($msg)) $this->msgishtml = 1;
-		}
-		else
+			if (dol_textishtml($msg)) {
+			    $this->msgishtml = 1;
+			}
+		} else
 		{
 			$this->msgishtml = $msgishtml;
 		}
@@ -192,7 +199,10 @@ 
 		// Replace relative /viewimage to absolute path
 		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
 
-		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
+		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) {
+		    $this->msgishtml=1;
+		}
+		// To force to send everything with content type html.
 
 		// Detect images
 		if ($this->msgishtml)
@@ -232,7 +242,9 @@ 
 		}
 
 		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) {
+		    $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		}
 
 		// Action according to choosed sending method
 		if ($this->sendmode == 'mail')
@@ -257,7 +269,10 @@ 
 			$this->trackid = $trackid;
 
 			$smtp_headers = $this->write_smtpheaders();
-			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+			if (! empty($moreinheader)) {
+			    $smtp_headers.=$moreinheader;
+			}
+			// $moreinheader contains the \r\n
 
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
@@ -293,8 +308,7 @@ 
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message.= $text_body . $files_encoded;
 			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
-		}
-		else if ($this->sendmode == 'smtps')
+		} else if ($this->sendmode == 'smtps')
 		{
 			// Use SMTPS library
 			// ------------------------------------------
@@ -309,7 +323,9 @@ 
 			$smtps->setTrackId($trackid);
 			$smtps->setReplyTo($this->getValidAddress($replyto,0,1));
 
-			if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
+			if (! empty($moreinheader)) {
+			    $smtps->setMoreInHeader($moreinheader);
+			}
 
 			if (! empty($this->html))
 			{
@@ -322,8 +338,11 @@ 
 				$msg = $this->checkIfHTML($msg);
 			}
 
-			if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
-			else $smtps->setBodyContent($msg,'plain');
+			if ($this->msgishtml) {
+			    $smtps->setBodyContent($msg,'html');
+			} else {
+			    $smtps->setBodyContent($msg,'plain');
+			}
 
 			if ($this->atleastoneimage)
 			{
@@ -348,8 +367,7 @@ 
 			$smtps->setDeliveryReceipt($deliveryreceipt);
 
 			$this->smtps=$smtps;
-		}
-		else if ($this->sendmode == 'swiftmailer')
+		} else if ($this->sendmode == 'swiftmailer')
 		{
 			// Use Swift Mailer library
 			// ------------------------------------------
@@ -474,12 +492,17 @@ 
 				}
 			}
 
-			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			if (! empty($addr_cc)) {
+			    $this->message->setCc($this->getArrayAddress($addr_cc));
+			}
+			if (! empty($addr_bcc)) {
+			    $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			}
 			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
-			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
-		}
-		else
+			if (isset($deliveryreceipt) && $deliveryreceipt == 1) {
+			    $this->message->setReadReceiptTo($this->getArrayAddress($from));
+			}
+		} else
 		{
 			// Send mail method not correctly defined
 			// --------------------------------------
@@ -517,13 +540,17 @@ 
 
 				return $reshook;
 			}
-			if ($reshook == 1)	// Hook replace standard code
+			if ($reshook == 1) {
+			    // Hook replace standard code
 			{
 				return true;
 			}
+			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			}
 			$tmparray1 = explode(',', $this->addr_to);
 			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
 			{
@@ -531,7 +558,9 @@ 
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			}
 			$tmparray2 = explode(',', $this->addr_cc);
 			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
 			{
@@ -539,7 +568,9 @@ 
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			}
 			$tmparray3 = explode(',', $this->addr_bcc);
 			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
 			{
@@ -547,7 +578,9 @@ 
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+			}
 			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in to:, cc:, bcc:';
@@ -590,13 +623,19 @@ 
 				// If Windows, sendmail_from must be defined
 				if (isset($_SERVER["WINDIR"]))
 				{
-					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
+					if (empty($this->addr_from)) {
+					    $this->addr_from = 'robot@example.com';
+					}
 					@ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
 				}
 
 				// Force parameters
-				if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
-				if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
+				if (! empty($conf->global->$keyforsmtpserver)) {
+				    ini_set('SMTP',$conf->global->$keyforsmtpserver);
+				}
+				if (! empty($conf->global->$keyforsmtpport)) {
+				    ini_set('smtp_port',$conf->global->$keyforsmtpport);
+				}
 
 				$res=true;
 				if ($res && ! $this->subject)
@@ -624,29 +663,43 @@ 
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
 						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
 					}
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) {
+					    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
 					{
 						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
 					}
+					}
 
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) {
+					    $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam;
+					}
+					// Use -U to add additionnal params
 
 					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
 					$this->message=stripslashes($this->message);
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					    $this->dump_mail();
+					}
 
-					if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
-					else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
+					if (! empty($additionnalparam)) {
+					    $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
+					} else {
+					    $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
+					}
 
 					if (! $res)
 					{
 						$langs->load("errors");
 						$this->error="Failed to send mail with php mail";
 						$linuxlike=1;
-						if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-						if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+						if (preg_match('/^win/i',PHP_OS)) {
+						    $linuxlike=0;
+						}
+						if (preg_match('/^mac/i',PHP_OS)) {
+						    $linuxlike=0;
+						}
 						if (! $linuxlike)
 						{
 							$this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
@@ -654,8 +707,7 @@ 
 						$this->error.=".<br>";
 						$this->error.=$langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					}
-					else
+					} else
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 					}
@@ -667,10 +719,13 @@ 
 				}
 
 				// Restore parameters
-				if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
-				if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
-			}
-			else if ($this->sendmode == 'smtps')
+				if (! empty($conf->global->$keyforsmtpserver)) {
+				    ini_restore('SMTP');
+				}
+				if (! empty($conf->global->$keyforsmtpport)) {
+				    ini_restore('smtp_port');
+				}
+			} else if ($this->sendmode == 'smtps')
 			{
 				if (! is_object($this->smtps))
 				{
@@ -684,14 +739,22 @@ 
 				$this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) {
+				    $conf->global->$keyforsmtpserver=ini_get('SMTP');
+				}
+				if (empty($conf->global->$keyforsmtpport)) {
+				    $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				}
 
 				// If we use SSL/TLS
 				$server=$conf->global->$keyforsmtpserver;
 				$secure='';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+				    $secure='ssl';
+				}
+				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {
+				    $secure='tls';
+				}
 				$server=($secure?$secure.'://':'').$server;
 
 				$port=$conf->global->$keyforsmtpport;
@@ -729,47 +792,63 @@ 
 
 				if ($res)
 				{
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+					if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					    $this->smtps->setDebug(true);
+					}
 
 					$result=$this->smtps->sendMsg();
 					//print $result;
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					    $this->dump_mail();
+					}
 
 					$result=$this->smtps->getErrors();
 					if (empty($this->error) && empty($result))
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 						$res=true;
-					}
-					else
+					} else
 					{
-						if (empty($this->error)) $this->error=$result;
+						if (empty($this->error)) {
+						    $this->error=$result;
+						}
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 						$res=false;
 					}
 				}
-			}
-			else if ($this->sendmode == 'swiftmailer')
+			} else if ($this->sendmode == 'swiftmailer')
 			{
 				// Use Swift Mailer library
 				// ------------------------------------------
 				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) {
+				    $conf->global->$keyforsmtpserver=ini_get('SMTP');
+				}
+				if (empty($conf->global->$keyforsmtpport)) {
+				    $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				}
 
 				// If we use SSL/TLS
 				$server = $conf->global->$keyforsmtpserver;
 				$secure = '';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+				    $secure='ssl';
+				}
+				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {
+				    $secure='tls';
+				}
 
 				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
 
-				if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
-				if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
+				if (! empty($conf->global->$keyforsmtpid)) {
+				    $this->transport->setUsername($conf->global->$keyforsmtpid);
+				}
+				if (! empty($conf->global->$keyforsmtppw)) {
+				    $this->transport->setPassword($conf->global->$keyforsmtppw);
+				}
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Create the Mailer using your created Transport
@@ -797,19 +876,19 @@ 
 				} catch (Exception $e) {
 					$this->error =  $e->getMessage();
 				}
-				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+				if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+				    $this->dump_mail();
+				}
 
 				$res = true;
 				if (! empty($this->error) || ! $result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res=false;
-				}
-				else
+				} else
 				{
 					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 				}
-			}
-			else
+			} else
 			{
 				// Send mail method not correctly defined
 				// --------------------------------------
@@ -826,8 +905,7 @@ 
 
 				return $reshook;
 			}
-		}
-		else
+		} else
 		{
 			$this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
@@ -867,8 +945,7 @@ 
 			$contents = file_get_contents($newsourcefile);	// Need PHP 4.3
 			$encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
-		}
-		else
+		} else
 		{
 			$this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
@@ -890,9 +967,11 @@ 
         // phpcs:enable
 		global $conf,$dolibarr_main_data_root;
 
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
+		if (@is_writeable($dolibarr_main_data_root)) {
+		    // Avoid fatal error on fopen with open_basedir
 		{
 			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
+		}
 			$fp = fopen($outputfile,"w");
 
 			if ($this->sendmode == 'mail')
@@ -900,19 +979,18 @@ 
 				fputs($fp, $this->headers);
 				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
-			}
-			elseif ($this->sendmode == 'smtps')
+			} elseif ($this->sendmode == 'smtps')
 			{
 				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-			elseif ($this->sendmode == 'swiftmailer')
+			} elseif ($this->sendmode == 'swiftmailer')
 			{
 				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+							@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 	}
 
@@ -928,14 +1006,17 @@ 
 		if (!preg_match('/^[\s\t]*<html/i',$msg))
 		{
 			$out = "<html><head><title></title>";
-			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
+			if (!empty($this->styleCSS)) {
+			    $out.= $this->styleCSS;
+			}
 			$out.= "</head><body";
-			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
+			if (!empty($this->bodyCSS)) {
+			    $out.= $this->bodyCSS;
+			}
 			$out.= ">";
 			$out.= $msg;
 			$out.= "</body></html>";
-		}
-		else
+		} else
 		{
 			$out = $msg;
 		}
@@ -995,15 +1076,26 @@ 
 		}
 		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
 		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
-		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
-		if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+		if (isset($this->reply_to)  && $this->reply_to) {
+		    $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
+		}
+		if (isset($this->errors_to) && $this->errors_to) {
+		    $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+		}
 
 		// Receiver
-		if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
-		if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+		if (isset($this->addr_cc)   && $this->addr_cc) {
+		    $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
+		}
+		if (isset($this->addr_bcc)  && $this->addr_bcc) {
+		    $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;
+		}
+		// TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
 
 		// Delivery receipt
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) {
+		    $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+		}
 
 		//$out.= "X-Priority: 3".$this->eol2;
 
@@ -1016,13 +1108,14 @@ 
 			$out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
 			$out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
 			$out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
-		}
-		else
+		} else
 		{
 			$out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
 		}
 
-		if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
+		if (! empty($_SERVER['REMOTE_ADDR'])) {
+		    $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
+		}
 		$out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
 		$out.= "Mime-Version: 1.0".$this->eol2;
 
@@ -1057,7 +1150,9 @@ 
 			{
 				if ($filename_list[$i])
 				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+					if ($mimefilename_list[$i]) {
+					    $filename_list[$i] = $mimefilename_list[$i];
+					}
 					$out.= "X-attachments: $filename_list[$i]".$this->eol2;
 				}
 			}
@@ -1127,9 +1222,11 @@ 
 				$out.= "--" . $this->related_boundary . $this->eol;
 			}
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
+			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+			    // Add plain text message part before html part
 			{
 				$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+			}
 				$out.= $this->eol;
 				$out.= "--" . $this->alternative_boundary . $this->eol;
 				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
@@ -1142,12 +1239,13 @@ 
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
 			$out.= $this->eol.$strContent.$this->eol;
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
+			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+			    // Add plain text message part after html part
 			{
 				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
 			}
-		}
-		else
+			}
+		} else
 		{
 			$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
@@ -1192,7 +1290,9 @@ 
 				$encoded = $this->_encode_file($filename_list[$i]);
 				if ($encoded >= 0)
 				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+					if ($mimefilename_list[$i]) {
+					    $filename_list[$i] = $mimefilename_list[$i];
+					}
 					if (! $mimetype_list[$i]) {
 						$mimetype_list[$i] = "application/octet-stream";
 					}
@@ -1206,8 +1306,7 @@ 
 					$out.= $encoded;
 					$out.= $this->eol;
 					//$out.= $this->eol;
-				}
-				else
+				} else
 				{
 					return $encoded;
 				}
@@ -1286,7 +1385,9 @@ 
 			}
 
 			// If we use SSL/TLS
-			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
+			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+			    $host='ssl://'.$host;
+			}
 			// tls smtp start with no encryption
 			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
@@ -1298,17 +1399,20 @@ 
 					$errno,      // actual system level error
 					$errstr,     // and any text that goes with the error
 					$timeout
-			))  // timeout for reading/writing data over the socket
+			)) {
+			    // timeout for reading/writing data over the socket
 			{
 				// Windows still does not have support for this timeout function
 				if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
+			}
 
 				dol_syslog("Now we wait for answer 220");
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
-			}
-			else
+				if ( $_retVal = $this->server_parse($socket, "220") ) {
+				    $_retVal = $socket;
+				}
+			} else
 			{
 				$this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
 			}
@@ -1369,9 +1473,11 @@ 
 			foreach ($matches[1] as $full)
 			{
 
-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs)) {
+				    // If xxx is 'file=aaa'
 				{
 					$img = $regs[1];
+				}
 
 					if (file_exists($images_dir.'/'.$img))
 					{
@@ -1430,15 +1536,13 @@ 
 					}
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				return -1;
 			}
 
 			return 1;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -1473,8 +1577,7 @@ 
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
+			} else
 			{
 				$name  = '';
 				$email = trim($val);
@@ -1499,9 +1602,13 @@ 
 				}
 				if ($format == 0 || $format == 3)
 				{
-					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
-					elseif (! $name) $newemail='<'.$email.'>';
-					else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) {
+					    $newemail='<'.$email.'>';
+					} elseif (! $name) {
+					    $newemail='<'.$email.'>';
+					} else {
+					    $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+					}
 				}
 
 				$ret=($ret ? $ret.',' : '').$newemail;
@@ -1509,7 +1616,9 @@ 
 				// Stop if we have too much records
 				if ($maxnumberofemail && $i >= $maxnumberofemail)
 				{
-					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+					if (count($arrayaddress) > $maxnumberofemail) {
+					    $ret.='...';
+					}
 					break;
 				}
 			}
@@ -1539,8 +1648,7 @@ 
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
+			} else
 			{
 				$name  = null;
 				$email = trim($val);