alxarafe / alixar

dolibarr/htdocs/core/class/doleditor.class.php

Braces +26 added lines, -9 removed lines

@@ -70,8 +70,12 @@ 
 
     	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
-    	if (! $rows) $rows=round($height/20);
-    	if (! $cols) $cols=($width?round($width/6):80);
+    	if (! $rows) {
+    	    $rows=round($height/20);
+    	}
+    	if (! $cols) {
+    	    $cols=($width?round($width/6):80);
+    	}
 		$shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
 
         // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
@@ -81,8 +85,12 @@ 
         $this->readonly=$readonly;
 
         // Check if extended editor is ok. If not we force textarea
-        if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
-		if ($okforextendededitor === 'ace') $this->tool='ace';
+        if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) {
+            $this->tool = 'textarea';
+        }
+		if ($okforextendededitor === 'ace') {
+		    $this->tool='ace';
+		}
         //if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
 
         // Define content and some properties
@@ -100,7 +108,9 @@ 
         	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
         	$this->editor->Value	= $content;
         	$this->editor->Height   = $height;
-        	if (! empty($width)) $this->editor->Width = $width;
+        	if (! empty($width)) {
+        	    $this->editor->Width = $width;
+        	}
         	$this->editor->ToolbarSet = $shorttoolbarname;         // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
         	$this->editor->Config['AutoDetectLanguage'] = 'true';  // Language of user (browser)
         	$this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In';
@@ -163,9 +173,11 @@ 
     	$found=0;
 		$out='';
 
-        if ($this->tool == 'fckeditor') // not used anymore
+        if ($this->tool == 'fckeditor') {
+            // not used anymore
         {
 			$found=1;
+        }
             $this->editor->Create();
         }
         if (in_array($this->tool,array('textarea','ckeditor')))
@@ -179,7 +191,9 @@ 
 
             if ($this->tool == 'ckeditor' && ! empty($conf->use_javascript_ajax))
             {
-            	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
+            	if (! defined('REQUIRE_CKEDITOR')) {
+            	    define('REQUIRE_CKEDITOR','1');
+            	}
 
             	if (! empty($conf->global->FCKEDITOR_SKIN)) {
 					$skin = $conf->global->FCKEDITOR_SKIN;
@@ -343,7 +357,10 @@ 
             $out.= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
         }
 
-        if ($noprint) return $out;
-        else print $out;
+        if ($noprint) {
+            return $out;
+        } else {
+            print $out;
+        }
     }
 }

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/dolreceiptprinter.class.php

Braces +1 added lines, -2 removed lines

@@ -545,8 +545,7 @@
         $ret = $this->InitPrinter($printerid);
         if ($ret>0) {
             setEventMessages($this->error, $this->errors, 'errors');
-        }
-        else
+        } else
         {
             $nboflines = count($vals);
             for ($line=0; $line < $nboflines; $line++)

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/fiscalyear.class.php

Braces +35 added lines, -32 removed lines

@@ -137,15 +137,13 @@ 
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
@@ -187,8 +185,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
@@ -223,8 +220,7 @@ 
 			$this->statut	    = $obj->statut;
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -249,8 +245,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -285,30 +280,37 @@ 
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$statut]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
-		}
-		elseif ($mode == 3)
+			if ($statut==0) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			} elseif ($statut==1) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+			}
+		} elseif ($mode == 3)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
-		}
-		elseif ($mode == 4)
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			} elseif ($statut==1 && ! empty($this->statuts_short[$statut])) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 5)
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			} elseif ($statut==1 && ! empty($this->statuts_short[$statut])) {
+			    return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+			}
+		} elseif ($mode == 5)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) {
+			    return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			} elseif ($statut==1 && ! empty($this->statuts_short[$statut])) {
+			    return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			}
 		}
 	}
 
@@ -350,8 +352,7 @@ 
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -377,8 +378,9 @@ 
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 
 		return $nb;
 	}
@@ -403,8 +405,9 @@ 
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
+		} else {
+		    dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 
 		return $nb;
 	}

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/ldap.class.php

Braces +109 added lines, -90 removed lines

@@ -118,8 +118,12 @@ 
 		global $conf;
 
 		// Server
-		if (! empty($conf->global->LDAP_SERVER_HOST))       $this->server[] = $conf->global->LDAP_SERVER_HOST;
-		if (! empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+		if (! empty($conf->global->LDAP_SERVER_HOST)) {
+		    $this->server[] = $conf->global->LDAP_SERVER_HOST;
+		}
+		if (! empty($conf->global->LDAP_SERVER_HOST_SLAVE)) {
+		    $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+		}
 		$this->serverPort          = $conf->global->LDAP_SERVER_PORT;
 		$this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;
 		$this->dn                  = $conf->global->LDAP_SERVER_DN;
@@ -185,13 +189,18 @@ 
 			// Loop on each ldap server
 			foreach ($this->server as $key => $host)
 			{
-				if ($connected) break;
-				if (empty($host)) continue;
+				if ($connected) {
+				    break;
+				}
+				if (empty($host)) {
+				    continue;
+				}
 
 				if ($this->serverPing($host, $this->serverPort) === true) {
 					$this->connection = ldap_connect($host, $this->serverPort);
+				} else {
+				    continue;
 				}
-				else continue;
 
 				if (is_resource($this->connection))
 				{
@@ -221,13 +230,11 @@ 
 							$this->bind=$this->result;
 							$connected=2;
 							break;
-						}
-						else
+						} else
 						{
 							$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
 						}
-					}
-					else
+					} else
 					{
 						// Try in auth mode
 						if ($this->searchUser && $this->searchPassword)
@@ -239,8 +246,7 @@ 
 								$this->bind=$this->result;
 								$connected=2;
 								break;
-							}
-							else
+							} else
 							{
 								$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
@@ -255,8 +261,7 @@ 
 								$this->bind=$this->result;
 								$connected=1;
 								break;
-							}
-							else
+							} else
 							{
 								$this->error=ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
@@ -264,7 +269,9 @@ 
 					}
 				}
 
-				if (! $connected) $this->close();
+				if (! $connected) {
+				    $this->close();
+				}
 			}
 		}
 
@@ -272,8 +279,7 @@ 
 		{
 			$return=$connected;
 			dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
-		}
-		else
+		} else
 		{
 			$this->error='Failed to connect to LDAP'.($this->error?': '.$this->error:'');
 			$return=-1;
@@ -295,8 +301,7 @@ 
 		if ($this->connection && ! @ldap_close($this->connection))
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -316,8 +321,7 @@ 
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -341,8 +345,7 @@ 
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error=$this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -432,7 +435,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -444,8 +449,7 @@ 
 		{
 			dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->ldapErrorCode = @ldap_errno($this->connection);
 			$this->ldapErrorText = @ldap_error($this->connection);
@@ -486,7 +490,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -498,8 +504,7 @@ 
 		{
 			dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
@@ -548,8 +553,7 @@ 
 		{
 			dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
@@ -593,15 +597,16 @@ 
 			{
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
-			}
-			else
+			} else
 			{
 				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
 				$result = $this->add($dn, $info, $user);
-				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn);	// If add fails, we do not try to delete old one
+				if ($result > 0 && $olddn && $olddn != $dn) {
+				    $result = $this->delete($olddn);
+				}
+				// If add fails, we do not try to delete old one
 			}
-		}
-		else
+		} else
 		{
 			//$result = $this->delete($olddn);
 			$result = $this->add($dn, $info, $user);	// If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
@@ -613,8 +618,7 @@ 
 			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
 			//print_r($info);
 			return -1;
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::update done successfully");
 			return 1;
@@ -652,7 +656,9 @@ 
 
 		$result=@ldap_delete($this->connection, $dn);
 
-		if ($result) return 1;
+		if ($result) {
+		    return 1;
+		}
 		return -1;
 	}
 
@@ -673,23 +679,23 @@ 
 		if (preg_match('/^ldap/',$this->server[0]))
 		{
 			$target="-H ".join(',',$this->server);
-		}
-		else
+		} else
 		{
 			$target="-h ".join(',',$this->server)." -p ".$this->serverPort;
 		}
 		$content.="# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
 		$content.="# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
 		$content.="# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
-		if (in_array('localhost',$this->server)) $content.="# If commands fails to connect, try without -h and -p\n";
+		if (in_array('localhost',$this->server)) {
+		    $content.="# If commands fails to connect, try without -h and -p\n";
+		}
 		$content.="dn: ".$dn."\n";
 		foreach($info as $key => $value)
 		{
 			if (! is_array($value))
 			{
 				$content.="$key: $value\n";
-			}
-			else
+			} else
 			{
 				foreach($value as $valuekey => $valuevalue)
 				{
@@ -723,11 +729,11 @@ 
 		{
 			fputs($fp, $content);
 			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));
+			}
 			return 1;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -752,7 +758,10 @@ 
 			$host = $regs[1];
 		}
 		$op = @fsockopen($host, $port, $errno, $errstr, $timeout);
-		if (!$op) return false; //DC is N/A
+		if (!$op) {
+		    return false;
+		}
+		//DC is N/A
 		else {
 			fclose($op); //explicitly close open socket connection
 			return true; //DC is up & running, we can safely connect with ldap_connect
@@ -793,7 +802,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -805,8 +816,7 @@ 
 		{
 			dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
@@ -845,7 +855,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -857,8 +869,7 @@ 
 		{
 			dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
@@ -897,7 +908,9 @@ 
 		$dn=$this->convFromOutputCharset($dn,$this->ldapcharset);
 		foreach($info as $key => $val)
 		{
-			if (! is_array($val)) $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			if (! is_array($val)) {
+			    $info[$key]=$this->convFromOutputCharset($val,$this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn,$info);
@@ -909,8 +922,7 @@ 
 		{
 			dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=@ldap_error($this->connection);
 			dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
@@ -1034,17 +1046,14 @@ 
 			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
 			{
 				$filter = '('.$this->filter.')';
-			}
-			elseif (((string) $activefilter == 'member') && $this->filter)
+			} elseif (((string) $activefilter == 'member') && $this->filter)
 			{
 				$filter = '('.$this->filtermember.')';
-			}
-			else	// If this->filter is empty, make fiter on * (all)
+			} else	// If this->filter is empty, make fiter on * (all)
 			{
 				$filter = '('.$useridentifier.'=*)';
 			}
-		}
-		else
+		} else
 		{
 			$filter = '('.$useridentifier.'='.$search.')';
 		}
@@ -1056,8 +1065,7 @@ 
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter. " attributeArray=(".join(',',$attributeArray).")");
 			//var_dump($attributeArray);
 			$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
-		}
-		else
+		} else
 		{
 			// Return list with fields selected by default
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
@@ -1095,8 +1103,7 @@ 
 					{
 						$objectsid = $this->getObjectSid($recordid);
 						$fulllist[$recordid][$attributeArray[$j]]    = $objectsid;
-					}
-					else
+					} else
 					{
 						if(in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
 							$valueTab = array();
@@ -1170,8 +1177,7 @@ 
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else
+			} else
 			{
 				$i++;
 				$i++;
@@ -1183,8 +1189,7 @@ 
 			$ldapBinary = ldap_get_values_len($this->connection, $entry, "objectsid");
 			$SIDText = $this->binSIDtoText($ldapBinary[0]);
 			return $SIDText;
-		}
-		else
+		} else
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return '?';
@@ -1243,8 +1248,7 @@ 
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else
+		} else
 		{
 			ldap_free_result($this->result);
 			return $result;
@@ -1280,11 +1284,13 @@ 
 			if ($this->result)
 			{
 				$result = @ldap_get_entries($this->connection, $this->result);
-				if ($result['count'] > 0) dol_syslog('Ldap::fetch search found '.$result['count'].' records');
-				else dol_syslog('Ldap::fetch search returns but found no records');
+				if ($result['count'] > 0) {
+				    dol_syslog('Ldap::fetch search found '.$result['count'].' records');
+				} else {
+				    dol_syslog('Ldap::fetch search returns but found no records');
+				}
 				//var_dump($result);exit;
-			}
-			else
+			} else
 			{
 				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 				dol_syslog(get_class($this)."::fetch search fails");
@@ -1296,8 +1302,7 @@ 
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else
+			} else
 			{
 				break;
 			}
@@ -1307,8 +1312,7 @@ 
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else
+		} else
 		{
 			$this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0],$this->ldapcharset);
 			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0],$this->ldapcharset);
@@ -1320,15 +1324,18 @@ 
 			$this->mobile     = $this->convToOutputCharset($result[0][$this->attr_mobile][0],$this->ldapcharset);
 
 			$this->uacf       = $this->parseUACF($this->convToOutputCharset($result[0]["useraccountcontrol"][0],$this->ldapcharset));
-			if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists
+			if (isset($result[0]["pwdlastset"][0])) {
+			    // If expiration on password exists
 			{
 				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0)?$this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0],$this->ldapcharset)):0;
 			}
-			else
+			} else
 			{
 				$this->pwdlastset = -1;
 			}
-			if (!$this->name && !$this->login) $this->pwdlastset = -1;
+			if (!$this->name && !$this->login) {
+			    $this->pwdlastset = -1;
+			}
 			$this->badpwdtime = $this->convert_time($this->convToOutputCharset($result[0]["badpasswordtime"][0],$this->ldapcharset));
 
 			// FQDN domain
@@ -1433,7 +1440,9 @@ 
 				break;
 			}
 		}
-		if (empty($retval)) $retval = "UNKNOWN_TYPE_" . $samtype;
+		if (empty($retval)) {
+		    $retval = "UNKNOWN_TYPE_" . $samtype;
+		}
 
 		return($retval);
 	}
@@ -1466,8 +1475,12 @@ 
 	private function convToOutputCharset($str,$pagecodefrom='UTF-8')
 	{
 		global $conf;
-		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8')  $str=utf8_encode($str);
-		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1')  $str=utf8_decode($str);
+		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {
+		    $str=utf8_encode($str);
+		}
+		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {
+		    $str=utf8_decode($str);
+		}
 		return $str;
 	}
 
@@ -1481,8 +1494,12 @@ 
 	function convFromOutputCharset($str,$pagecodeto='UTF-8')
 	{
 		global $conf;
-		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str=utf8_decode($str);
-		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_encode($str);
+		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {
+		    $str=utf8_decode($str);
+		}
+		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {
+		    $str=utf8_encode($str);
+		}
 		return $str;
 	}
 
@@ -1497,7 +1514,9 @@ 
 	{
 		global $conf;
 
-		if (empty($keygroup)) $keygroup='LDAP_KEY_GROUPS';
+		if (empty($keygroup)) {
+		    $keygroup='LDAP_KEY_GROUPS';
+		}
 
 		$search='('.$conf->global->$keygroup.'=*)';
 		$result = $this->search($this->groups,$search);

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';