alxarafe / alixar

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

Indentation +92 added lines, -92 removed lines

@@ -33,9 +33,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -50,99 +50,99 @@ 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show a combo list with contracts qualified for a third party
-	 *
-	 *	@param	int		$socid      Id third party (-1=all, 0=only interventions not linked to a third party, id=intervention not linked or linked to third party id)
-	 *	@param  int		$selected   Id intervention preselected
-	 *	@param  string	$htmlname   Nom de la zone html
-	 *	@param	int		$maxlength	Maximum length of label
-	 *	@param	int		$showempty	Show empty line
-	 *	@return int         		Nbre of project if OK, <0 if KO
-	 */
-	function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
-	{
+    /**
+     *	Show a combo list with contracts qualified for a third party
+     *
+     *	@param	int		$socid      Id third party (-1=all, 0=only interventions not linked to a third party, id=intervention not linked or linked to third party id)
+     *	@param  int		$selected   Id intervention preselected
+     *	@param  string	$htmlname   Nom de la zone html
+     *	@param	int		$maxlength	Maximum length of label
+     *	@param	int		$showempty	Show empty line
+     *	@return int         		Nbre of project if OK, <0 if KO
+     */
+    function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
+    {
         // phpcs:enable
-		global $db,$user,$conf,$langs;
+        global $db,$user,$conf,$langs;
 
-		$out='';
+        $out='';
 
-		$hideunselectables=false;
+        $hideunselectables=false;
 
-		// Search all contacts
-		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
-		$sql.= " WHERE f.entity = ".$conf->entity;
-		if ($socid != '')
-		{
-			if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
-			else $sql.= " AND f.fk_soc = ".$socid;
-		}
+        // Search all contacts
+        $sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
+        $sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
+        $sql.= " WHERE f.entity = ".$conf->entity;
+        if ($socid != '')
+        {
+            if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+            else $sql.= " AND f.fk_soc = ".$socid;
+        }
 
-		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out.='<option value="0">&nbsp;</option>';
-			$num = $db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $db->fetch_object($resql);
-					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
-					{
-						// Do nothing
-					}
-					else
-					{
-						$labeltoshow=dol_trunc($obj->ref,18);
-						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
-						{
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							$disabled=0;
-							if (! $obj->fk_statut > 0)
-							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
-							}
-							if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
-							}
+        dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
+            if ($showempty) $out.='<option value="0">&nbsp;</option>';
+            $num = $db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $db->fetch_object($resql);
+                    // If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+                    if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+                    {
+                        // Do nothing
+                    }
+                    else
+                    {
+                        $labeltoshow=dol_trunc($obj->ref,18);
+                        if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
+                        {
+                            $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            $disabled=0;
+                            if (! $obj->fk_statut > 0)
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' ('.$langs->trans("Draft").')';
+                            }
+                            if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+                            }
 
-							if ($hideunselectables && $disabled)
-							{
-								$resultat='';
-							}
-							else
-							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
-							}
-							$out.=$resultat;
-						}
-					}
-					$i++;
-				}
-			}
-			$out.='</select>';
-			$db->free($resql);
-			return $out;
-		}
-		else
-		{
-			dol_print_error($db);
-			return '';
-		}
-	}
+                            if ($hideunselectables && $disabled)
+                            {
+                                $resultat='';
+                            }
+                            else
+                            {
+                                $resultat='<option value="'.$obj->rowid.'"';
+                                if ($disabled) $resultat.=' disabled';
+                                $resultat.='>'.$labeltoshow;
+                                $resultat.='</option>';
+                            }
+                            $out.=$resultat;
+                        }
+                    }
+                    $i++;
+                }
+            }
+            $out.='</select>';
+            $db->free($resql);
+            return $out;
+        }
+        else
+        {
+            dol_print_error($db);
+            return '';
+        }
+    }
 }

Spacing +29 added lines, -29 removed lines

@@ -35,7 +35,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -60,31 +60,31 @@ 
 	 *	@param	int		$showempty	Show empty line
 	 *	@return int         		Nbre of project if OK, <0 if KO
 	 */
-	function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
+	function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1)
 	{
         // phpcs:enable
-		global $db,$user,$conf,$langs;
+		global $db, $user, $conf, $langs;
 
-		$out='';
+		$out = '';
 
-		$hideunselectables=false;
+		$hideunselectables = false;
 
 		// Search all contacts
 		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
-		$sql.= " WHERE f.entity = ".$conf->entity;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter as f';
+		$sql .= " WHERE f.entity = ".$conf->entity;
 		if ($socid != '')
 		{
-			if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
-			else $sql.= " AND f.fk_soc = ".$socid;
+			if ($socid == '0') $sql .= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+			else $sql .= " AND f.fk_soc = ".$socid;
 		}
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out.='<option value="0">&nbsp;</option>';
+			$out .= '<select id="interventionid" class="flat" name="'.$htmlname.'">';
+			if ($showempty) $out .= '<option value="0">&nbsp;</option>';
 			$num = $db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -93,49 +93,49 @@ 
 				{
 					$obj = $db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
 					}
 					else
 					{
-						$labeltoshow=dol_trunc($obj->ref,18);
+						$labeltoshow = dol_trunc($obj->ref, 18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
 						else
 						{
-							$disabled=0;
-							if (! $obj->fk_statut > 0)
+							$disabled = 0;
+							if (!$obj->fk_statut > 0)
 							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
+								$disabled = 1;
+								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
-							if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							if ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 
 							if ($hideunselectables && $disabled)
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
+								$resultat .= '>'.$labeltoshow;
+								$resultat .= '</option>';
 							}
-							$out.=$resultat;
+							$out .= $resultat;
 						}
 					}
 					$i++;
 				}
 			}
-			$out.='</select>';
+			$out .= '</select>';
 			$db->free($resql);
 			return $out;
 		}

Braces +15 added lines, -12 removed lines

@@ -75,8 +75,11 @@ 
 		$sql.= " WHERE f.entity = ".$conf->entity;
 		if ($socid != '')
 		{
-			if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
-			else $sql.= " AND f.fk_soc = ".$socid;
+			if ($socid == '0') {
+			    $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+			} else {
+			    $sql.= " AND f.fk_soc = ".$socid;
+			}
 		}
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
@@ -84,7 +87,9 @@ 
 		if ($resql)
 		{
 			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out.='<option value="0">&nbsp;</option>';
+			if ($showempty) {
+			    $out.='<option value="0">&nbsp;</option>';
+			}
 			$num = $db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -96,15 +101,13 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
 						$labeltoshow=dol_trunc($obj->ref,18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							$disabled=0;
 							if (! $obj->fk_statut > 0)
@@ -121,11 +124,12 @@ 
 							if ($hideunselectables && $disabled)
 							{
 								$resultat='';
-							}
-							else
+							} else
 							{
 								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								if ($disabled) {
+								    $resultat.=' disabled';
+								}
 								$resultat.='>'.$labeltoshow;
 								$resultat.='</option>';
 							}
@@ -138,8 +142,7 @@ 
 			$out.='</select>';
 			$db->free($resql);
 			return $out;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 			return '';

dolibarr/htdocs/core/class/interfaces.class.php

Indentation +35 added lines, -35 removed lines

@@ -36,12 +36,12 @@ 
      */
     public $db;
 
-	var $dir;				// Directory with all core and external triggers files
+    var $dir;				// Directory with all core and external triggers files
 
     /**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
     /**
      *	Constructor
@@ -71,9 +71,9 @@ 
         // Check parameters
         if (! is_object($object) || ! is_object($conf))	// Error
         {
-        	$this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+            $this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
             dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
-        	$this->errors[]=$this->error;
+            $this->errors[]=$this->error;
             return -1;
         }
         if (! is_object($langs))	// Warning
@@ -92,9 +92,9 @@ 
         $files = array();
         $modules = array();
         $orders = array();
-		$i=0;
+        $i=0;
 
-		$dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
+        $dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
         foreach($dirtriggers as $reldir)
         {
             $dir=dol_buildpath($reldir,0);
@@ -111,9 +111,9 @@ 
                 {
                     if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i',$file,$reg))
                     {
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+                        $part1=$reg[1];
+                        $part2=$reg[2];
+                        $part3=$reg[3];
 
                         $nbfile++;
 
@@ -175,22 +175,22 @@ 
             $objMod = new $modName($this->db);
             if ($objMod)
             {
-            	$result=0;
-
-				if (method_exists($objMod, 'runTrigger'))	// New method to implement
-				{
-	                //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
-	                $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
-				}
-				elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
-				{
-	                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
-					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
-				}
-				else
-				{
-	                dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
-				}
+                $result=0;
+
+                if (method_exists($objMod, 'runTrigger'))	// New method to implement
+                {
+                    //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
+                    $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
+                }
+                elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+                {
+                    dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
+                    $result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
+                }
+                else
+                {
+                    dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
+                }
 
                 if ($result > 0)
                 {
@@ -215,7 +215,7 @@ 
                 }
             }
             else
-			{
+            {
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
         }
@@ -254,7 +254,7 @@ 
         $dirtriggers=array_merge(array('/core/triggers/'),$conf->modules_parts['triggers']);
         if (is_array($forcedirtriggers))
         {
-        	$dirtriggers=$forcedirtriggers;
+            $dirtriggers=$forcedirtriggers;
         }
 
         foreach($dirtriggers as $reldir)
@@ -274,9 +274,9 @@ 
                     {
                         if (preg_match('/\.back$/',$file)) continue;
 
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+                        $part1=$reg[1];
+                        $part2=$reg[2];
+                        $part3=$reg[3];
 
                         $modName = 'Interface'.ucfirst($reg[3]);
                         //print "file=$file"; print "modName=$modName"; exit;
@@ -317,8 +317,8 @@ 
 
             if (! class_exists($modName))
             {
-				print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
-            	continue;
+                print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
+                continue;
             }
 
             $objMod = new $modName($db);
@@ -340,7 +340,7 @@ 
                 $triggers[$j]['module']=strtolower($module);
             }
 
-			// We set info of modules
+            // We set info of modules
             $triggers[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
             $triggers[$j]['file'] = $files[$key];
             $triggers[$j]['fullpath'] = $fullpath[$key];

Spacing +73 added lines, -73 removed lines

@@ -36,7 +36,7 @@ 
      */
     public $db;
 
-	var $dir;				// Directory with all core and external triggers files
+	var $dir; // Directory with all core and external triggers files
 
     /**
 	 * @var string[] Error codes (or messages)
@@ -65,22 +65,22 @@ 
      *   @param     Conf		$conf       Objet conf
      *   @return    int         			Nb of triggers ran if no error, -Nb of triggers with errors otherwise.
      */
-    function run_triggers($action,$object,$user,$langs,$conf)
+    function run_triggers($action, $object, $user, $langs, $conf)
     {
         // phpcs:enable
         // Check parameters
-        if (! is_object($object) || ! is_object($conf))	// Error
+        if (!is_object($object) || !is_object($conf))	// Error
         {
-        	$this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+        	$this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
             dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
-        	$this->errors[]=$this->error;
+        	$this->errors[] = $this->error;
             return -1;
         }
-        if (! is_object($langs))	// Warning
+        if (!is_object($langs))	// Warning
         {
             dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
         }
-        if (! is_object($user))	    // Warning
+        if (!is_object($user))	    // Warning
         {
             dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
             global $db;
@@ -92,43 +92,43 @@ 
         $files = array();
         $modules = array();
         $orders = array();
-		$i=0;
+		$i = 0;
 
-		$dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
-        foreach($dirtriggers as $reldir)
+		$dirtriggers = array_merge(array('/core/triggers'), $conf->modules_parts['triggers']);
+        foreach ($dirtriggers as $reldir)
         {
-            $dir=dol_buildpath($reldir,0);
-            $newdir=dol_osencode($dir);
+            $dir = dol_buildpath($reldir, 0);
+            $newdir = dol_osencode($dir);
             //print "xx".$dir;exit;
 
             // Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)
-            if (! is_dir($newdir)) continue;
+            if (!is_dir($newdir)) continue;
 
-            $handle=opendir($newdir);
+            $handle = opendir($newdir);
             if (is_resource($handle))
             {
-                while (($file = readdir($handle))!==false)
+                while (($file = readdir($handle)) !== false)
                 {
-                    if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i',$file,$reg))
+                    if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg))
                     {
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+						$part1 = $reg[1];
+						$part2 = $reg[2];
+						$part3 = $reg[3];
 
                         $nbfile++;
 
                         // Check if trigger file is disabled by name
-                        if (preg_match('/NORUN$/i',$file)) continue;
+                        if (preg_match('/NORUN$/i', $file)) continue;
                         // Check if trigger file is for a particular module
-                        $qualified=true;
+                        $qualified = true;
                         if (strtolower($reg[2]) != 'all')
                         {
-                            $module=preg_replace('/^mod/i','',$reg[2]);
-                            $constparam='MAIN_MODULE_'.strtoupper($module);
-                            if (empty($conf->global->$constparam)) $qualified=false;
+                            $module = preg_replace('/^mod/i', '', $reg[2]);
+                            $constparam = 'MAIN_MODULE_'.strtoupper($module);
+                            if (empty($conf->global->$constparam)) $qualified = false;
                         }
 
-                        if (! $qualified)
+                        if (!$qualified)
                         {
                             //dol_syslog(get_class($this)."::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled", LOG_DEBUG);
                             continue;
@@ -136,7 +136,7 @@ 
 
                         $modName = "Interface".ucfirst($reg[3]);
                         //print "file=$file - modName=$modName\n";
-                        if (in_array($modName,$modules))    // $modules = list of modName already loaded
+                        if (in_array($modName, $modules))    // $modules = list of modName already loaded
                         {
                             $langs->load("errors");
                             dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
@@ -148,7 +148,7 @@ 
                             include_once $newdir.'/'.$file;
                             //print 'Done for '.$modName."\n";
                         }
-                        catch(Exception $e)
+                        catch (Exception $e)
                         {
                             dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
                         }
@@ -156,7 +156,7 @@ 
                         $modules[$i] = $modName;
                         $files[$i] = $file;
                         $fullpathfiles[$modName] = $newdir.'/'.$file;
-                        $orders[$i] = $part1.'_'.$part2.'_'.$part3;   // Set sort criteria value
+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
 
                         $i++;
                     }
@@ -175,17 +175,17 @@ 
             $objMod = new $modName($this->db);
             if ($objMod)
             {
-            	$result=0;
+            	$result = 0;
 
 				if (method_exists($objMod, 'runTrigger'))	// New method to implement
 				{
 	                //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
-	                $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
+	                $result = $objMod->runTrigger($action, $object, $user, $langs, $conf);
 				}
 				elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
 				{
 	                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
-					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
+					$result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
 				}
 				else
 				{
@@ -209,8 +209,8 @@ 
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
                     $nbtotal++;
                     $nbko++;
-                    if (! empty($objMod->errors)) $this->errors=array_merge($this->errors,$objMod->errors);
-                    else if (! empty($objMod->error))  $this->errors[]=$objMod->error;
+                    if (!empty($objMod->errors)) $this->errors = array_merge($this->errors, $objMod->errors);
+                    else if (!empty($objMod->error))  $this->errors[] = $objMod->error;
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
                 }
             }
@@ -239,7 +239,7 @@ 
      *	@param	array		$forcedirtriggers		null=All default directories. This parameter is used by modulebuilder module only.
      * 	@return	array								Array list of triggers
      */
-    function getTriggersList($forcedirtriggers=null)
+    function getTriggersList($forcedirtriggers = null)
     {
         global $conf, $langs, $db;
 
@@ -251,39 +251,39 @@ 
         $orders = array();
         $i = 0;
 
-        $dirtriggers=array_merge(array('/core/triggers/'),$conf->modules_parts['triggers']);
+        $dirtriggers = array_merge(array('/core/triggers/'), $conf->modules_parts['triggers']);
         if (is_array($forcedirtriggers))
         {
-        	$dirtriggers=$forcedirtriggers;
+        	$dirtriggers = $forcedirtriggers;
         }
 
-        foreach($dirtriggers as $reldir)
+        foreach ($dirtriggers as $reldir)
         {
-            $dir=dol_buildpath($reldir,0);
-            $newdir=dol_osencode($dir);
+            $dir = dol_buildpath($reldir, 0);
+            $newdir = dol_osencode($dir);
 
             // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-            if (! is_dir($newdir)) continue;
+            if (!is_dir($newdir)) continue;
 
-            $handle=opendir($newdir);
+            $handle = opendir($newdir);
             if (is_resource($handle))
             {
-                while (($file = readdir($handle))!==false)
+                while (($file = readdir($handle)) !== false)
                 {
-                    if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/',$file,$reg))
+                    if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg))
                     {
-                        if (preg_match('/\.back$/',$file)) continue;
+                        if (preg_match('/\.back$/', $file)) continue;
 
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+						$part1 = $reg[1];
+						$part2 = $reg[2];
+						$part3 = $reg[3];
 
                         $modName = 'Interface'.ucfirst($reg[3]);
                         //print "file=$file"; print "modName=$modName"; exit;
-                        if (in_array($modName,$modules))
+                        if (in_array($modName, $modules))
                         {
                             $langs->load("errors");
-                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/core/triggers/").'</div>';
+                            print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
                         }
                         else
                         {
@@ -292,10 +292,10 @@ 
 
                         $files[$i] = $file;
                         $fullpath[$i] = $dir.'/'.$file;
-                        $relpath[$i] = preg_replace('/^\//','',$reldir).'/'.$file;
-                        $iscoreorexternal[$i] = ($reldir == '/core/triggers/'?'internal':'external');
+                        $relpath[$i] = preg_replace('/^\//', '', $reldir).'/'.$file;
+                        $iscoreorexternal[$i] = ($reldir == '/core/triggers/' ? 'internal' : 'external');
                         $modules[$i] = $modName;
-                        $orders[$i] = $part1.'_'.$part2.'_'.$part3;   // Set sort criteria value
+                        $orders[$i] = $part1.'_'.$part2.'_'.$part3; // Set sort criteria value
 
                         $i++;
                     }
@@ -315,7 +315,7 @@ 
             $modName = $modules[$key];
             if (empty($modName)) continue;
 
-            if (! class_exists($modName))
+            if (!class_exists($modName))
             {
 				print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
             	continue;
@@ -324,45 +324,45 @@ 
             $objMod = new $modName($db);
 
             // Define disabledbyname and disabledbymodule
-            $disabledbyname=0;
-            $disabledbymodule=1;
-            $module='';
+            $disabledbyname = 0;
+            $disabledbymodule = 1;
+            $module = '';
 
             // Check if trigger file is disabled by name
-            if (preg_match('/NORUN$/i',$files[$key])) $disabledbyname=1;
+            if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
             // Check if trigger file is for a particular module
-            if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i',$files[$key],$reg))
+            if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))
             {
-                $module=preg_replace('/^mod/i','',$reg[2]);
-                $constparam='MAIN_MODULE_'.strtoupper($module);
-                if (strtolower($module) == 'all') $disabledbymodule=0;
-                else if (empty($conf->global->$constparam)) $disabledbymodule=2;
-                $triggers[$j]['module']=strtolower($module);
+                $module = preg_replace('/^mod/i', '', $reg[2]);
+                $constparam = 'MAIN_MODULE_'.strtoupper($module);
+                if (strtolower($module) == 'all') $disabledbymodule = 0;
+                else if (empty($conf->global->$constparam)) $disabledbymodule = 2;
+                $triggers[$j]['module'] = strtolower($module);
             }
 
 			// We set info of modules
-            $triggers[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
+            $triggers[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto) : img_object('', 'generic');
             $triggers[$j]['file'] = $files[$key];
             $triggers[$j]['fullpath'] = $fullpath[$key];
             $triggers[$j]['relpath'] = $relpath[$key];
             $triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
             $triggers[$j]['version'] = $objMod->getVersion();
-            $triggers[$j]['status'] = img_picto($langs->trans("Active"),'tick');
+            $triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
             if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
 
-            $text ='<b>'.$langs->trans("Description").':</b><br>';
-            $text.=$objMod->getDesc().'<br>';
-            $text.='<br><b>'.$langs->trans("Status").':</b><br>';
+            $text = '<b>'.$langs->trans("Description").':</b><br>';
+            $text .= $objMod->getDesc().'<br>';
+            $text .= '<br><b>'.$langs->trans("Status").':</b><br>';
             if ($disabledbyname == 1)
             {
-                $text.=$langs->trans("TriggerDisabledByName").'<br>';
-                if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                $text .= $langs->trans("TriggerDisabledByName").'<br>';
+                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
             }
             else
             {
-                if ($disabledbymodule == 0) $text.=$langs->trans("TriggerAlwaysActive").'<br>';
-                if ($disabledbymodule == 1) $text.=$langs->trans("TriggerActiveAsModuleActive",$module).'<br>';
-                if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
+                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
+                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
             }
 
             $triggers[$j]['info'] = $text;

Braces +72 added lines, -35 removed lines

@@ -69,20 +69,26 @@ 
     {
         // phpcs:enable
         // Check parameters
-        if (! is_object($object) || ! is_object($conf))	// Error
+        if (! is_object($object) || ! is_object($conf)) {
+            // Error
         {
         	$this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+        }
             dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
         	$this->errors[]=$this->error;
             return -1;
         }
-        if (! is_object($langs))	// Warning
+        if (! is_object($langs)) {
+            // Warning
         {
             dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
         }
-        if (! is_object($user))	    // Warning
+        }
+        if (! is_object($user)) {
+            // Warning
         {
             dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
+        }
             global $db;
             $user = new User($db);
         }
@@ -102,7 +108,9 @@ 
             //print "xx".$dir;exit;
 
             // Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)
-            if (! is_dir($newdir)) continue;
+            if (! is_dir($newdir)) {
+                continue;
+            }
 
             $handle=opendir($newdir);
             if (is_resource($handle))
@@ -118,14 +126,18 @@ 
                         $nbfile++;
 
                         // Check if trigger file is disabled by name
-                        if (preg_match('/NORUN$/i',$file)) continue;
+                        if (preg_match('/NORUN$/i',$file)) {
+                            continue;
+                        }
                         // Check if trigger file is for a particular module
                         $qualified=true;
                         if (strtolower($reg[2]) != 'all')
                         {
                             $module=preg_replace('/^mod/i','',$reg[2]);
                             $constparam='MAIN_MODULE_'.strtoupper($module);
-                            if (empty($conf->global->$constparam)) $qualified=false;
+                            if (empty($conf->global->$constparam)) {
+                                $qualified=false;
+                            }
                         }
 
                         if (! $qualified)
@@ -136,9 +148,11 @@ 
 
                         $modName = "Interface".ucfirst($reg[3]);
                         //print "file=$file - modName=$modName\n";
-                        if (in_array($modName,$modules))    // $modules = list of modName already loaded
+                        if (in_array($modName,$modules)) {
+                            // $modules = list of modName already loaded
                         {
                             $langs->load("errors");
+                        }
                             dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
                             continue;
                         }
@@ -147,8 +161,7 @@ 
                             //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
                             include_once $newdir.'/'.$file;
                             //print 'Done for '.$modName."\n";
-                        }
-                        catch(Exception $e)
+                        } catch(Exception $e)
                         {
                             dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
                         }
@@ -170,24 +183,28 @@ 
         foreach ($orders as $key => $value)
         {
             $modName = $modules[$key];
-            if (empty($modName)) continue;
+            if (empty($modName)) {
+                continue;
+            }
 
             $objMod = new $modName($this->db);
             if ($objMod)
             {
             	$result=0;
 
-				if (method_exists($objMod, 'runTrigger'))	// New method to implement
+				if (method_exists($objMod, 'runTrigger')) {
+				    // New method to implement
 				{
 	                //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
 	                $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
 				}
-				elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+				} elseif (method_exists($objMod, 'run_trigger')) {
+				    // Deprecated method
 				{
 	                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
-					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
 				}
-				else
+					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
+				} else
 				{
 	                dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
 				}
@@ -209,12 +226,14 @@ 
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
                     $nbtotal++;
                     $nbko++;
-                    if (! empty($objMod->errors)) $this->errors=array_merge($this->errors,$objMod->errors);
-                    else if (! empty($objMod->error))  $this->errors[]=$objMod->error;
+                    if (! empty($objMod->errors)) {
+                        $this->errors=array_merge($this->errors,$objMod->errors);
+                    } else if (! empty($objMod->error)) {
+                        $this->errors[]=$objMod->error;
+                    }
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
                 }
-            }
-            else
+            } else
 			{
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
@@ -224,8 +243,7 @@ 
         {
             dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
             return -$nbko;
-        }
-        else
+        } else
         {
             //dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
             return $nbok;
@@ -263,7 +281,9 @@ 
             $newdir=dol_osencode($dir);
 
             // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-            if (! is_dir($newdir)) continue;
+            if (! is_dir($newdir)) {
+                continue;
+            }
 
             $handle=opendir($newdir);
             if (is_resource($handle))
@@ -272,7 +292,9 @@ 
                 {
                     if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/',$file,$reg))
                     {
-                        if (preg_match('/\.back$/',$file)) continue;
+                        if (preg_match('/\.back$/',$file)) {
+                            continue;
+                        }
 
 						$part1=$reg[1];
 						$part2=$reg[2];
@@ -284,8 +306,7 @@ 
                         {
                             $langs->load("errors");
                             print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger",$modName,"/htdocs/core/triggers/").'</div>';
-                        }
-                        else
+                        } else
                         {
                             include_once $newdir.'/'.$file;
                         }
@@ -313,7 +334,9 @@ 
         foreach ($orders as $key => $value)
         {
             $modName = $modules[$key];
-            if (empty($modName)) continue;
+            if (empty($modName)) {
+                continue;
+            }
 
             if (! class_exists($modName))
             {
@@ -329,14 +352,19 @@ 
             $module='';
 
             // Check if trigger file is disabled by name
-            if (preg_match('/NORUN$/i',$files[$key])) $disabledbyname=1;
+            if (preg_match('/NORUN$/i',$files[$key])) {
+                $disabledbyname=1;
+            }
             // Check if trigger file is for a particular module
             if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i',$files[$key],$reg))
             {
                 $module=preg_replace('/^mod/i','',$reg[2]);
                 $constparam='MAIN_MODULE_'.strtoupper($module);
-                if (strtolower($module) == 'all') $disabledbymodule=0;
-                else if (empty($conf->global->$constparam)) $disabledbymodule=2;
+                if (strtolower($module) == 'all') {
+                    $disabledbymodule=0;
+                } else if (empty($conf->global->$constparam)) {
+                    $disabledbymodule=2;
+                }
                 $triggers[$j]['module']=strtolower($module);
             }
 
@@ -348,7 +376,9 @@ 
             $triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
             $triggers[$j]['version'] = $objMod->getVersion();
             $triggers[$j]['status'] = img_picto($langs->trans("Active"),'tick');
-            if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
+            if ($disabledbyname > 0 || $disabledbymodule > 1) {
+                $triggers[$j]['status'] = '';
+            }
 
             $text ='<b>'.$langs->trans("Description").':</b><br>';
             $text.=$objMod->getDesc().'<br>';
@@ -356,13 +386,20 @@ 
             if ($disabledbyname == 1)
             {
                 $text.=$langs->trans("TriggerDisabledByName").'<br>';
-                if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
-            }
-            else
+                if ($disabledbymodule == 2) {
+                    $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                }
+            } else
             {
-                if ($disabledbymodule == 0) $text.=$langs->trans("TriggerAlwaysActive").'<br>';
-                if ($disabledbymodule == 1) $text.=$langs->trans("TriggerActiveAsModuleActive",$module).'<br>';
-                if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                if ($disabledbymodule == 0) {
+                    $text.=$langs->trans("TriggerAlwaysActive").'<br>';
+                }
+                if ($disabledbymodule == 1) {
+                    $text.=$langs->trans("TriggerActiveAsModuleActive",$module).'<br>';
+                }
+                if ($disabledbymodule == 2) {
+                    $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
+                }
             }
 
             $triggers[$j]['info'] = $text;

dolibarr/htdocs/core/class/google.class.php

Indentation +45 added lines, -45 removed lines

@@ -26,63 +26,63 @@
  */
 class GoogleAPI
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	public $key;
+    public $key;
 
-	/**
-	 * Constructor
-	 *
-	 * @param 	DoliDB		$db			Database handler
-	 * @param	string		$key		Google key
-	 */
-	function __construct($db,$key)
-	{
-		$this->db=$db;
-		$this->key=$key;
-	}
+    /**
+     * Constructor
+     *
+     * @param 	DoliDB		$db			Database handler
+     * @param	string		$key		Google key
+     */
+    function __construct($db,$key)
+    {
+        $this->db=$db;
+        $this->key=$key;
+    }
 
 
-	/**
-	 *  Return geo coordinates of an address
-	 *
-	 *  @param	string	$address	Address
-	 * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
-	 *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
-	 *	@return	string				Coordinates
-	 */
-	function getGeoCoordinatesOfAddress($address)
-	{
-		global $conf;
+    /**
+     *  Return geo coordinates of an address
+     *
+     *  @param	string	$address	Address
+     * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
+     *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
+     *	@return	string				Coordinates
+     */
+    function getGeoCoordinatesOfAddress($address)
+    {
+        global $conf;
 
-		$i=0;
+        $i=0;
 
-		// Desired address
-		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
+        // Desired address
+        $urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
 
-		// Retrieve the URL contents
-		$page = file_get_contents($urladdress);
+        // Retrieve the URL contents
+        $page = file_get_contents($urladdress);
 
-		$code = strstr($page, '<coordinates>');
-		$code = strstr($code, '>');
-		$val=strpos($code, "<");
-		$code = substr($code, 1, $val-1);
-		//print $code;
-		//print "<br>";
-		$latitude = substr($code, 0, strpos($code, ","));
-		$longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
+        $code = strstr($page, '<coordinates>');
+        $code = strstr($code, '>');
+        $val=strpos($code, "<");
+        $code = substr($code, 1, $val-1);
+        //print $code;
+        //print "<br>";
+        $latitude = substr($code, 0, strpos($code, ","));
+        $longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
 
-		// Output the coordinates
-		//echo "Longitude: $longitude ',' Latitude: $latitude";
+        // Output the coordinates
+        //echo "Longitude: $longitude ',' Latitude: $latitude";
 
-		$i++;
-	}
+        $i++;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	public $key;
 
@@ -44,10 +44,10 @@ 
 	 * @param 	DoliDB		$db			Database handler
 	 * @param	string		$key		Google key
 	 */
-	function __construct($db,$key)
+	function __construct($db, $key)
 	{
-		$this->db=$db;
-		$this->key=$key;
+		$this->db = $db;
+		$this->key = $key;
 	}
 
 
@@ -63,7 +63,7 @@ 
 	{
 		global $conf;
 
-		$i=0;
+		$i = 0;
 
 		// Desired address
 		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
@@ -73,12 +73,12 @@ 
 
 		$code = strstr($page, '<coordinates>');
 		$code = strstr($code, '>');
-		$val=strpos($code, "<");
-		$code = substr($code, 1, $val-1);
+		$val = strpos($code, "<");
+		$code = substr($code, 1, $val - 1);
 		//print $code;
 		//print "<br>";
 		$latitude = substr($code, 0, strpos($code, ","));
-		$longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
+		$longitude = substr($code, strpos($code, ",") + 1, dol_strlen(strpos($code, ",")) - 3);
 
 		// Output the coordinates
 		//echo "Longitude: $longitude ',' Latitude: $latitude";

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

Indentation +143 added lines, -143 removed lines

@@ -35,15 +35,15 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
      */
     function __construct($db)
     {
@@ -75,7 +75,7 @@ 
             '50' => $langs->trans("ActionRunningShort"),
             '100' => $langs->trans("ActionDoneShort")
         );
-		// +ActionUncomplete
+        // +ActionUncomplete
 
         if (! empty($conf->use_javascript_ajax))
         {
@@ -127,8 +127,8 @@ 
         }
         if (! empty($conf->use_javascript_ajax) || $onlyselect)
         {
-        	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
+            //var_dump($selected);
+            if ($selected == 'done') $selected='100';
             print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
             if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
             foreach($listofstatus as $key => $val)
@@ -136,7 +136,7 @@ 
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
                 if ($key == '50' && $onlyselect == 2)
                 {
-                	print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';
+                    print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';
                 }
             }
             print '</select>';
@@ -144,12 +144,12 @@ 
 
             if (empty($onlyselect))
             {
-	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
-    	        print '<span class="hideonsmartphone hideifna">%</span>';
+                print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
+                print '<span class="hideonsmartphone hideifna">%</span>';
             }
         }
         else
-		{
+        {
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
         }
     }
@@ -179,18 +179,18 @@ 
         $sortorder='DESC,DESC';
 
         $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+        if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
+            if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
+            elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
+            elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
+            elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
+            elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
+            elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
+            elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
             elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
             elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
             elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
@@ -203,111 +203,111 @@ 
             if ($typeelement == 'project') $projectid = $object->id;
 
             $newcardbutton='';
-			if (! empty($conf->agenda->enabled))
-			{
-				$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:($socid>0?'&socid='.$socid:'')).($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
-				$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-				$newcardbutton.= '</a>';
-			}
-
-        	print '<!-- formactions->showactions -->'."\n";
-        	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
-
-        	$page=0; $param='';
-
-        	$total = 0;
-
-        	print '<div class="div-table-responsive-no-min">';
-        	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
-        	print '<tr class="liste_titre">';
-        	print getTitleFieldOfList('Ref',   0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('By',    0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Type',  0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Date',  0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('',      0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
-        	print '</tr>';
-        	print "\n";
-
-        	$userstatic = new User($this->db);
-
-        	if (count($listofactions))
-        	{
-	        	$cursorevent = 0;
-	        	foreach($listofactions as $action)
-	        	{
-	        		if ($max && $cursorevent >= $max) break;
-
-	        		$ref=$action->getNomUrl(1,-1);
-	        		$label=$action->getNomUrl(0,38);
-
-	        		print '<tr class="oddeven">';
-	        		// Ref
-					print '<td>'.$ref.'</td>';
-					// Onwer
-	        		print '<td>';
-	        		if (! empty($action->userownerid))
-	        		{
-	        			$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
-	        			print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
-	        		}
-	        		print '</td>';
-					// Type
-	        		print '<td>';
-					$imgpicto='';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-					{
-						if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
-						else {
-							if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
-						}
-					}
-					print $imgpicto;
-	        		print $action->type_short ? $action->type_short : $action->type;
-	        		print '</td>';
-	        		// Label
-	        		print '<td>'.$label.'</td>';
-	        		// Date
-	        		print '<td align="center">'.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
-	        		if ($action->datef)
-	        		{
-		        		$tmpa=dol_getdate($action->datep);
-		        		$tmpb=dol_getdate($action->datef);
-		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
-		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
-		        		}
-		        		else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
-	        		}
-	        		print '</td>';
-	        		print '<td align="right">';
-	        		if (! empty($action->author->id))
-	        		{
-	        			print $action->getLibStatut(3);
-	        		}
-	        		print '</td>';
-	        		print '</tr>';
-
-	        		$cursorevent++;
-	        	}
-        	}
-        	else
-        	{
-        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        	}
-
-        	if ($max && $num > $max)
-        	{
-        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
-        	}
-
-        	print '</table>';
-        	print '</div>';
+            if (! empty($conf->agenda->enabled))
+            {
+                $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:($socid>0?'&socid='.$socid:'')).($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
+                $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+                $newcardbutton.= '</a>';
+            }
+
+            print '<!-- formactions->showactions -->'."\n";
+            print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
+
+            $page=0; $param='';
+
+            $total = 0;
+
+            print '<div class="div-table-responsive-no-min">';
+            print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
+            print '<tr class="liste_titre">';
+            print getTitleFieldOfList('Ref',   0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('By',    0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('Type',  0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('Date',  0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
+            print getTitleFieldOfList('',      0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
+            print '</tr>';
+            print "\n";
+
+            $userstatic = new User($this->db);
+
+            if (count($listofactions))
+            {
+                $cursorevent = 0;
+                foreach($listofactions as $action)
+                {
+                    if ($max && $cursorevent >= $max) break;
+
+                    $ref=$action->getNomUrl(1,-1);
+                    $label=$action->getNomUrl(0,38);
+
+                    print '<tr class="oddeven">';
+                    // Ref
+                    print '<td>'.$ref.'</td>';
+                    // Onwer
+                    print '<td>';
+                    if (! empty($action->userownerid))
+                    {
+                        $userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
+                        print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
+                    }
+                    print '</td>';
+                    // Type
+                    print '<td>';
+                    $imgpicto='';
+                    if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+                    {
+                        if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
+                        else {
+                            if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+                            elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+                        }
+                    }
+                    print $imgpicto;
+                    print $action->type_short ? $action->type_short : $action->type;
+                    print '</td>';
+                    // Label
+                    print '<td>'.$label.'</td>';
+                    // Date
+                    print '<td align="center">'.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
+                    if ($action->datef)
+                    {
+                        $tmpa=dol_getdate($action->datep);
+                        $tmpb=dol_getdate($action->datef);
+                        if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
+                        {
+                            if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+                        }
+                        else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
+                    }
+                    print '</td>';
+                    print '<td align="right">';
+                    if (! empty($action->author->id))
+                    {
+                        print $action->getLibStatut(3);
+                    }
+                    print '</td>';
+                    print '</tr>';
+
+                    $cursorevent++;
+                }
+            }
+            else
+            {
+                print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+            }
+
+            if ($max && $num > $max)
+            {
+                print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
+            }
+
+            print '</table>';
+            print '</div>';
         }
 
         return $num;
@@ -338,27 +338,27 @@ 
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
         $caction=new CActionComm($this->db);
 
-       	// Suggest a list with manual events or all auto events
-       	$arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
-       	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
-       	//asort($arraylist);
+            // Suggest a list with manual events or all auto events
+            $arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+            array_unshift($arraylist,'&nbsp;');     // Add empty line at start
+            //asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+            if ($selected == 'manual') $selected='AC_OTH';
+            if ($selected == 'auto')   $selected='AC_OTH_AUTO';
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+            if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
 
-       	$out='';
+            $out='';
 
-		if (! empty($multiselect))
-		{
-	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
-			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
-		}
-		else
-		{
-			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
-		}
+        if (! empty($multiselect))
+        {
+            if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+            $out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
+        }
+        else
+        {
+            $out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
+        }
 
         if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
         {

Spacing +76 added lines, -76 removed lines

@@ -37,7 +37,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -64,10 +64,10 @@ 
      *  @param  string  $morecss        More css on select field
      * 	@return	void
      */
-    function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100')
+    function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100')
     {
         // phpcs:enable
-        global $langs,$conf;
+        global $langs, $conf;
 
         $listofstatus = array(
             '-1' => $langs->trans("ActionNotApplicable"),
@@ -77,7 +77,7 @@ 
         );
 		// +ActionUncomplete
 
-        if (! empty($conf->use_javascript_ajax))
+        if (!empty($conf->use_javascript_ajax))
         {
             print "\n";
             print "<script type=\"text/javascript\">
@@ -98,7 +98,7 @@ 
                 function select_status() {
                     var defaultvalue = $('#select' + htmlname).val();
                     var percentage = $('input[name=percentage]');
-                    var selected = '".(isset($selected)?$selected:'')."';
+                    var selected = '".(isset($selected) ? $selected : '')."';
                     var value = (selected>0?selected:(defaultvalue>=0?defaultvalue:''));
 
                     percentage.val(value);
@@ -125,13 +125,13 @@ 
                 }
                 </script>\n";
         }
-        if (! empty($conf->use_javascript_ajax) || $onlyselect)
+        if (!empty($conf->use_javascript_ajax) || $onlyselect)
         {
         	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
-            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
-            if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
-            foreach($listofstatus as $key => $val)
+        	if ($selected == 'done') $selected = '100';
+            print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
+            if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'></option>';
+            foreach ($listofstatus as $key => $val)
             {
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
                 if ($key == '50' && $onlyselect == 2)
@@ -140,17 +140,17 @@ 
                 }
             }
             print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit=0;
+            if ($selected == 0 || $selected == 100) $canedit = 0;
 
             if (empty($onlyselect))
             {
-	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
+	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
         }
         else
 		{
-            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
+            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';
         }
     }
 
@@ -168,64 +168,64 @@ 
      *  @param	string	$morehtmlright			More html text on right of title line
      *	@return	int								<0 if KO, >=0 if OK
      */
-    function showactions($object, $typeelement, $socid=0, $forceshowtitle=0, $morecss='listactions', $max=0, $moreparambacktopage='', $morehtmlright='')
+    function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlright = '')
     {
-        global $langs,$conf,$user;
+        global $langs, $conf, $user;
         global $bc;
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-        $sortfield='a.datep,a.id';
-        $sortorder='DESC,DESC';
+        $sortfield = 'a.datep,a.id';
+        $sortorder = 'DESC,DESC';
 
-        $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+        $listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
+		if (!is_array($listofactions)) dol_print_error($this->db, 'FailedToGetActions');
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
-
-            $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
+        	if ($typeelement == 'invoice')               $title = $langs->trans('ActionsOnBill');
+        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title = $langs->trans('ActionsOnBill');
+        	elseif ($typeelement == 'propal')            $title = $langs->trans('ActionsOnPropal');
+        	elseif ($typeelement == 'supplier_proposal') $title = $langs->trans('ActionsOnSupplierProposal');
+        	elseif ($typeelement == 'order')             $title = $langs->trans('ActionsOnOrder');
+        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title = $langs->trans('ActionsOnOrder');
+        	elseif ($typeelement == 'shipping')          $title = $langs->trans('ActionsOnShipping');
+            elseif ($typeelement == 'fichinter')         $title = $langs->trans('ActionsOnFicheInter');
+            elseif ($typeelement == 'project')           $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            elseif ($typeelement == 'task')              $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            elseif ($typeelement == 'member')            $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            else $title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
+
+            $urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');
 
             $projectid = $object->fk_project;
             if ($typeelement == 'project') $projectid = $object->id;
 
-            $newcardbutton='';
-			if (! empty($conf->agenda->enabled))
+            $newcardbutton = '';
+			if (!empty($conf->agenda->enabled))
 			{
-				$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:($socid>0?'&socid='.$socid:'')).($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
-				$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-				$newcardbutton.= '</a>';
+				$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(), 'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid > 0 ? '&socid='.$object->socid : ($socid > 0 ? '&socid='.$socid : '')).($projectid > 0 ? '&projectid='.$projectid : '').'&backtopage='.urlencode($urlbacktopage).'"><span class="valignmiddle">'.$langs->trans("AddEvent").'</span>';
+				$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+				$newcardbutton .= '</a>';
 			}
 
         	print '<!-- formactions->showactions -->'."\n";
         	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
 
-        	$page=0; $param='';
+        	$page = 0; $param = '';
 
         	$total = 0;
 
         	print '<div class="div-table-responsive-no-min">';
-        	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
+        	print '<table class="noborder'.($morecss ? ' '.$morecss : '').'" width="100%">';
         	print '<tr class="liste_titre">';
-        	print getTitleFieldOfList('Ref',   0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('By',    0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Type',  0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
         	print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Date',  0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('',      0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
         	print '</tr>';
         	print "\n";
 
@@ -234,37 +234,37 @@ 
         	if (count($listofactions))
         	{
 	        	$cursorevent = 0;
-	        	foreach($listofactions as $action)
+	        	foreach ($listofactions as $action)
 	        	{
 	        		if ($max && $cursorevent >= $max) break;
 
-	        		$ref=$action->getNomUrl(1,-1);
-	        		$label=$action->getNomUrl(0,38);
+	        		$ref = $action->getNomUrl(1, -1);
+	        		$label = $action->getNomUrl(0, 38);
 
 	        		print '<tr class="oddeven">';
 	        		// Ref
 					print '<td>'.$ref.'</td>';
 					// Onwer
 	        		print '<td>';
-	        		if (! empty($action->userownerid))
+	        		if (!empty($action->userownerid))
 	        		{
-	        			$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
+	        			$userstatic->fetch($action->userownerid); // TODO Introduce a cache on users fetched
 	        			print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
 	        		}
 	        		print '</td>';
 					// Type
 	        		print '<td>';
-					$imgpicto='';
-					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+					$imgpicto = '';
+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 					{
-						if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
+						if ($action->type_picto) $imgpicto = img_picto('', $action->type_picto);
 						else {
-							if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+							if ($action->type_code == 'AC_RDV')       $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_TEL')   $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_FAX')   $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_EMAIL') $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+							elseif ($action->type_code == 'AC_INT')   $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+							elseif (!preg_match('/_AUTO/', $action->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
 						}
 					}
 					print $imgpicto;
@@ -276,8 +276,8 @@ 
 	        		print '<td align="center">'.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
 	        		if ($action->datef)
 	        		{
-		        		$tmpa=dol_getdate($action->datep);
-		        		$tmpb=dol_getdate($action->datef);
+		        		$tmpa = dol_getdate($action->datep);
+		        		$tmpb = dol_getdate($action->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
 		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
@@ -286,7 +286,7 @@ 
 	        		}
 	        		print '</td>';
 	        		print '<td align="right">';
-	        		if (! empty($action->author->id))
+	        		if (!empty($action->author->id))
 	        		{
 	        			print $action->getLibStatut(3);
 	        		}
@@ -327,42 +327,42 @@ 
      *  @param  int             $nooutput       1=No output
      * 	@return	string
      */
-    function select_type_actions($selected='', $htmlname='actioncode', $excludetype='', $onlyautoornot=0, $hideinfohelp=0, $multiselect=0, $nooutput=0)
+    function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0)
     {
         // phpcs:enable
-        global $langs,$user,$form,$conf;
+        global $langs, $user, $form, $conf;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (!is_object($form)) $form = new Form($this->db);
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-        $caction=new CActionComm($this->db);
+        $caction = new CActionComm($this->db);
 
        	// Suggest a list with manual events or all auto events
-       	$arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
-       	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
+       	$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+       	array_unshift($arraylist, '&nbsp;'); // Add empty line at start
        	//asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+       	if ($selected == 'manual') $selected = 'AC_OTH';
+       	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+       	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
 
-       	$out='';
+       	$out = '';
 
-		if (! empty($multiselect))
+		if (!empty($multiselect))
 		{
 	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
-			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
+			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		}
 		else
 		{
-			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
+			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
 		}
 
         if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
         {
-            $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
+            $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);
         }
 
         if ($nooutput) return $out;

Braces +87 added lines, -41 removed lines

@@ -128,9 +128,13 @@ 
         if (! empty($conf->use_javascript_ajax) || $onlyselect)
         {
         	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
+        	if ($selected == 'done') {
+        	    $selected='100';
+        	}
             print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
-            if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
+            if ($showempty) {
+                print '<option value=""'.($selected == ''?' selected':'').'></option>';
+            }
             foreach($listofstatus as $key => $val)
             {
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
@@ -140,15 +144,16 @@ 
                 }
             }
             print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit=0;
+            if ($selected == 0 || $selected == 100) {
+                $canedit=0;
+            }
 
             if (empty($onlyselect))
             {
 	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
-        }
-        else
+        } else
 		{
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
         }
@@ -179,28 +184,45 @@ 
         $sortorder='DESC,DESC';
 
         $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+		if (! is_array($listofactions)) {
+		    dol_print_error($this->db,'FailedToGetActions');
+		}
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
+        	if ($typeelement == 'invoice') {
+        	    $title=$langs->trans('ActionsOnBill');
+        	} elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') {
+        	    $title=$langs->trans('ActionsOnBill');
+        	} elseif ($typeelement == 'propal') {
+        	    $title=$langs->trans('ActionsOnPropal');
+        	} elseif ($typeelement == 'supplier_proposal') {
+        	    $title=$langs->trans('ActionsOnSupplierProposal');
+        	} elseif ($typeelement == 'order') {
+        	    $title=$langs->trans('ActionsOnOrder');
+        	} elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') {
+        	    $title=$langs->trans('ActionsOnOrder');
+        	} elseif ($typeelement == 'shipping') {
+        	    $title=$langs->trans('ActionsOnShipping');
+        	} elseif ($typeelement == 'fichinter') {
+                $title=$langs->trans('ActionsOnFicheInter');
+            } elseif ($typeelement == 'project') {
+                $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } elseif ($typeelement == 'task') {
+                $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } elseif ($typeelement == 'member') {
+                $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } else {
+                $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
+            }
 
             $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
 
             $projectid = $object->fk_project;
-            if ($typeelement == 'project') $projectid = $object->id;
+            if ($typeelement == 'project') {
+                $projectid = $object->id;
+            }
 
             $newcardbutton='';
 			if (! empty($conf->agenda->enabled))
@@ -236,7 +258,9 @@ 
 	        	$cursorevent = 0;
 	        	foreach($listofactions as $action)
 	        	{
-	        		if ($max && $cursorevent >= $max) break;
+	        		if ($max && $cursorevent >= $max) {
+	        		    break;
+	        		}
 
 	        		$ref=$action->getNomUrl(1,-1);
 	        		$label=$action->getNomUrl(0,38);
@@ -257,14 +281,22 @@ 
 					$imgpicto='';
 					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 					{
-						if ($action->type_picto) $imgpicto=img_picto('', $action->type_picto);
-						else {
-							if ($action->type_code == 'AC_RDV')       $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_TEL')   $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_FAX')   $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_EMAIL') $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-							elseif ($action->type_code == 'AC_INT')   $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-							elseif (! preg_match('/_AUTO/', $action->type_code)) $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+						if ($action->type_picto) {
+						    $imgpicto=img_picto('', $action->type_picto);
+						} else {
+							if ($action->type_code == 'AC_RDV') {
+							    $imgpicto=img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_TEL') {
+							    $imgpicto=img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_FAX') {
+							    $imgpicto=img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_EMAIL') {
+							    $imgpicto=img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif ($action->type_code == 'AC_INT') {
+							    $imgpicto=img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+							} elseif (! preg_match('/_AUTO/', $action->type_code)) {
+							    $imgpicto=img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+							}
 						}
 					}
 					print $imgpicto;
@@ -280,9 +312,12 @@ 
 		        		$tmpb=dol_getdate($action->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) {
+		        			    print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+		        			}
+		        		} else {
+		        		    print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
 		        		}
-		        		else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
 	        		}
 	        		print '</td>';
 	        		print '<td align="right">';
@@ -295,8 +330,7 @@ 
 
 	        		$cursorevent++;
 	        	}
-        	}
-        	else
+        	} else
         	{
         		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         	}
@@ -332,7 +366,9 @@ 
         // phpcs:enable
         global $langs,$user,$form,$conf;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (! is_object($form)) {
+            $form=new Form($this->db);
+        }
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -343,19 +379,26 @@ 
        	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
        	//asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+       	if ($selected == 'manual') {
+       	    $selected='AC_OTH';
+       	}
+       	if ($selected == 'auto') {
+       	    $selected='AC_OTH_AUTO';
+       	}
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) {
+       	    unset($arraylist['AC_OTH_AUTO']);
+       	}
 
        	$out='';
 
 		if (! empty($multiselect))
 		{
-	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+	        if (!is_array($selected) && !empty($selected)) {
+	            $selected = explode(',', $selected);
+	        }
 			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
-		}
-		else
+		} else
 		{
 			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
 		}
@@ -365,8 +408,11 @@ 
             $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
         }
 
-        if ($nooutput) return $out;
-        else print $out;
+        if ($nooutput) {
+            return $out;
+        } else {
+            print $out;
+        }
         return '';
     }
 }

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

Indentation +21 added lines, -21 removed lines

@@ -27,33 +27,33 @@
  */
 class FormMailing extends Form
 {
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
-
-	/**
-	 * Output a select with destinaries status
-	 *
-	 * @param string   $selectedid     The selected id
-	 * @param string   $htmlname       Name of controm
-	 * @param integer  $show_empty     Show empty option
-	 * @return string HTML select
-	 */
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
+
+    /**
+     * Output a select with destinaries status
+     *
+     * @param string   $selectedid     The selected id
+     * @param string   $htmlname       Name of controm
+     * @param integer  $show_empty     Show empty option
+     * @return string HTML select
+     */
     public function selectDestinariesStatus($selectedid='', $htmlname='dest_status', $show_empty=0)
     {
 
-		global $langs;
-		$langs->load("mails");
+        global $langs;
+        $langs->load("mails");
 
-		require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
-		$mailing = new Mailing($this->db);
+        require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+        $mailing = new Mailing($this->db);
 
-		$options = array();
+        $options = array();
 
-		if ($show_empty) {
-			$options[-2] = '';   // Note -1 is used for error
-		}
+        if ($show_empty) {
+            $options[-2] = '';   // Note -1 is used for error
+        }
 
         $options = $options + $mailing->statut_dest;
 

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
  *  \ingroup    core
  *	\brief      File of predefined functions for HTML forms for mailing module
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 /**
  *  Class to offer components to list and upload files
@@ -40,7 +40,7 @@ 
 	 * @param integer  $show_empty     Show empty option
 	 * @return string HTML select
 	 */
-    public function selectDestinariesStatus($selectedid='', $htmlname='dest_status', $show_empty=0)
+    public function selectDestinariesStatus($selectedid = '', $htmlname = 'dest_status', $show_empty = 0)
     {
 
 		global $langs;
@@ -52,7 +52,7 @@ 
 		$options = array();
 
 		if ($show_empty) {
-			$options[-2] = '';   // Note -1 is used for error
+			$options[-2] = ''; // Note -1 is used for error
 		}
 
         $options = $options + $mailing->statut_dest;

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;
+        }
     }
 }

Indentation +107 added lines, -107 removed lines

@@ -30,19 +30,19 @@ 
 {
     var $tool;      // Store the selected tool
 
-	// If using fckeditor
-	var $editor;
+    // If using fckeditor
+    var $editor;
 
-	// If not using fckeditor
-	var $content;
-	var $htmlname;
-	var $toolbarname;
-	var $toolbarstartexpanded;
-	var $rows;
-	var $cols;
-	var $height;
-	var $width;
-	var $readonly;
+    // If not using fckeditor
+    var $content;
+    var $htmlname;
+    var $toolbarname;
+    var $toolbarstartexpanded;
+    var $rows;
+    var $cols;
+    var $height;
+    var $width;
+    var $readonly;
 
 
     /**
@@ -57,22 +57,22 @@ 
      *                       		             			'In' each window has its own toolbar
      *                              		      			'Out:name' share toolbar into the div called 'name'
      *      @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
-	 *		@param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
-	 *      @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
-	 *      												Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
+     *		@param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
+     *      @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
+     *      												Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
      *      @param  int		$rows                   		Size of rows for textarea tool
-	 *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
-	 *      @param	int		$readonly						0=Read/Edit, 1=Read only
-	 */
+     *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
+     *      @param	int		$readonly						0=Read/Edit, 1=Read only
+     */
     function __construct($htmlname, $content, $width='', $height=200, $toolbarname='Basic', $toolbarlocation='In', $toolbarstartexpanded=false, $uselocalbrowser=true, $okforextendededitor=true, $rows=0, $cols=0, $readonly=0)
     {
-    	global $conf,$langs;
+        global $conf,$langs;
 
-    	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
+        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);
-		$shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
+        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')
         $defaulteditor='ckeditor';
@@ -82,7 +82,7 @@ 
 
         // 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 ($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
@@ -91,50 +91,50 @@ 
             $content=dol_htmlentitiesbr($content);  // If content is not HTML, we convert to HTML.
         }
         if ($this->tool == 'fckeditor')
-    	{
-        	require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
-
-    		$content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
-
-        	$this->editor = new FCKeditor($htmlname);
-        	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
-        	$this->editor->Value	= $content;
-        	$this->editor->Height   = $height;
-        	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';
-        	$this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
-
-    		// Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
-    		// Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
-    		// Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
-        	$modulepart='fckeditor';
-    		$this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
-    		$this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
-
-        	$this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
-        	$this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
-
-        	if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
-        	{
-        		$this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js';
-        		$this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/';
-    		}
-    	}
-
-    	// Define some properties
+        {
+            require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
+
+            $content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
+
+            $this->editor = new FCKeditor($htmlname);
+            $this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
+            $this->editor->Value	= $content;
+            $this->editor->Height   = $height;
+            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';
+            $this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
+
+            // Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
+            // Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
+            // Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
+            $modulepart='fckeditor';
+            $this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
+            $this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
+
+            $this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
+            $this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
+
+            if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
+            {
+                $this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js';
+                $this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/';
+            }
+        }
+
+        // Define some properties
         if (in_array($this->tool,array('textarea','ckeditor','ace')))
         {
-    	    $this->content				= $content;
-    	    $this->htmlname 			= $htmlname;
-    	    $this->toolbarname			= $shorttoolbarname;
-    	    $this->toolbarstartexpanded = $toolbarstartexpanded;
+            $this->content				= $content;
+            $this->htmlname 			= $htmlname;
+            $this->toolbarname			= $shorttoolbarname;
+            $this->toolbarstartexpanded = $toolbarstartexpanded;
             $this->rows					= max(ROWS_3,$rows);
             $this->cols					= (preg_match('/%/',$cols)?$cols:max(40,$cols));	// If $cols is a percent, we keep it, otherwise, we take max
             $this->height				= $height;
             $this->width				= $width;
-    	}
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -152,20 +152,20 @@ 
     function Create($noprint=0, $morejs='', $disallowAnyContent=true, $titlecontent='', $option='')
     {
         // phpcs:enable
-    	global $conf,$langs;
+        global $conf,$langs;
 
-    	$fullpage=false;
-    	if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
-    	{
-    	   $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT);      // Only predefined list of html tags are allowed or all
-    	}
+        $fullpage=false;
+        if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
+        {
+            $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT);      // Only predefined list of html tags are allowed or all
+        }
 
-    	$found=0;
-		$out='';
+        $found=0;
+        $out='';
 
         if ($this->tool == 'fckeditor') // not used anymore
         {
-			$found=1;
+            $found=1;
             $this->editor->Create();
         }
         if (in_array($this->tool,array('textarea','ckeditor')))
@@ -179,12 +179,12 @@ 
 
             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;
-				} else {
-					// $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
+                if (! empty($conf->global->FCKEDITOR_SKIN)) {
+                    $skin = $conf->global->FCKEDITOR_SKIN;
+                } else {
+                    // $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
 
                     /**
                      * Alixar:
@@ -195,10 +195,10 @@ 
                     $skin = CKEDITOR_SKIN;  // In AlixarDispatcher defineConstants()
                 }
 
-            	$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
+                $htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
 
-            	$out.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
-            	$out.= '<script type="text/javascript">
+                $out.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
+                $out.= '<script type="text/javascript">
             			$(document).ready(function () {
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
                             /* should be editor=CKEDITOR.replace but what if serveral editors ? */
@@ -233,8 +233,8 @@ 
                                                         });
                                                 }
                                             }';
-            	if ($this->uselocalbrowser)
-            	{
+                if ($this->uselocalbrowser)
+                {
                     $out.= ','."\n";
                     // To use filemanager with old fckeditor (GPL)
                     $out.= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
@@ -243,7 +243,7 @@ 
                     //$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
                     $out.= "\n";
                     // To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
-					/* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
+                    /* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
                                filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
                                filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',
                                filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files\',
@@ -254,10 +254,10 @@ 
                                filebrowserWindowHeight : \'500\',
                                filebrowserImageWindowWidth : \'900\',
                                filebrowserImageWindowHeight : \'500\'';
-            	}
-            	$out.= '	})'.$morejs;
-            	$out.= '});'."\n";
-            	$out.= '</script>'."\n";
+                }
+                $out.= '	})'.$morejs;
+                $out.= '});'."\n";
+                $out.= '</script>'."\n";
             }
         }
 
@@ -265,19 +265,19 @@ 
         // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
         if (preg_match('/^ace/', $this->tool))
         {
-        	$found=1;
-			$format=$option;
+            $found=1;
+            $format=$option;
 
             $out.= "\n".'<!-- Output Ace editor -->'."\n";
 
-			if ($titlecontent)
-			{
-	            $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
-	            $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
-	            $out.= '</div>';
-	            $out.= '<script type="text/javascript" language="javascript">'."\n";
-	            $out.= 'jQuery(document).ready(function() {'."\n";
-	            $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+            if ($titlecontent)
+            {
+                $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
+                $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+                $out.= '</div>';
+                $out.= '<script type="text/javascript" language="javascript">'."\n";
+                $out.= 'jQuery(document).ready(function() {'."\n";
+                $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
 	            			var oldNbOfLines = 0
@@ -299,21 +299,21 @@ 
 									}
 							});
 						})';
-	            $out.= '</script>'."\n";
-			}
+                $out.= '</script>'."\n";
+            }
 
             $out.= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'');
             $out.= ($this->height?' height: '.$this->height.'px; ':'');
             //$out.=" min-height: 100px;";
             $out.= '">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</pre>';
-        	$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</textarea>';
+            $out.= htmlspecialchars($this->content);
+            $out.= '</pre>';
+            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
+            $out.= htmlspecialchars($this->content);
+            $out.= '</textarea>';
 
-        	$out.= '<script type="text/javascript" language="javascript">'."\n";
-        	$out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+            $out.= '<script type="text/javascript" language="javascript">'."\n";
+            $out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
 					aceEditor.setOptions({
@@ -333,7 +333,7 @@ 
 					//aceEditor.getSession().setMode("ace/mode/javascript_expression");
 					'."\n";
 
-        	$out.= 'jQuery(document).ready(function() {
+            $out.= 'jQuery(document).ready(function() {
 						jQuery(".buttonforacesave").click(function() {
         					console.log("We click on savefile button for component '.$this->htmlname.'");
         					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")
@@ -343,7 +343,7 @@ 
 							else return false;*/
 	        			});
 					})';
-        	$out.= '</script>'."\n";
+            $out.= '</script>'."\n";
         }
 
         if (empty($found))

Spacing +82 added lines, -82 removed lines

@@ -28,7 +28,7 @@ 
  */
 class DolEditor
 {
-    var $tool;      // Store the selected tool
+    var $tool; // Store the selected tool
 
 	// If using fckeditor
 	var $editor;
@@ -64,57 +64,57 @@ 
 	 *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
 	 *      @param	int		$readonly						0=Read/Edit, 1=Read only
 	 */
-    function __construct($htmlname, $content, $width='', $height=200, $toolbarname='Basic', $toolbarlocation='In', $toolbarstartexpanded=false, $uselocalbrowser=true, $okforextendededitor=true, $rows=0, $cols=0, $readonly=0)
+    function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0)
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
     	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);
-		$shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
+    	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')
-        $defaulteditor='ckeditor';
-        $this->tool=empty($conf->global->FCKEDITOR_EDITORNAME)?$defaulteditor:$conf->global->FCKEDITOR_EDITORNAME;
-        $this->uselocalbrowser=$uselocalbrowser;
-        $this->readonly=$readonly;
+        $defaulteditor = 'ckeditor';
+        $this->tool = empty($conf->global->FCKEDITOR_EDITORNAME) ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;
+        $this->uselocalbrowser = $uselocalbrowser;
+        $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 ($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
         if ($this->tool == 'ckeditor')
         {
-            $content=dol_htmlentitiesbr($content);  // If content is not HTML, we convert to HTML.
+            $content = dol_htmlentitiesbr($content); // If content is not HTML, we convert to HTML.
         }
         if ($this->tool == 'fckeditor')
     	{
         	require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
 
-    		$content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
+    		$content = dol_htmlentitiesbr($content); // If content is not HTML, we convert to HTML.
 
         	$this->editor = new FCKeditor($htmlname);
-        	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
-        	$this->editor->Value	= $content;
+        	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/';
+        	$this->editor->Value = $content;
         	$this->editor->Height   = $height;
-        	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)
+        	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';
         	$this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
 
     		// Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
     		// Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
     		// Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
-        	$modulepart='fckeditor';
+        	$modulepart = 'fckeditor';
     		$this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
-    		$this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
+    		$this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/';
 
-        	$this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
-        	$this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
+        	$this->editor->Config['LinkBrowser'] = ($uselocalbrowser ? 'true' : 'false');
+        	$this->editor->Config['ImageBrowser'] = ($uselocalbrowser ? 'true' : 'false');
 
         	if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
         	{
@@ -124,15 +124,15 @@ 
     	}
 
     	// Define some properties
-        if (in_array($this->tool,array('textarea','ckeditor','ace')))
+        if (in_array($this->tool, array('textarea', 'ckeditor', 'ace')))
         {
-    	    $this->content				= $content;
+    	    $this->content = $content;
     	    $this->htmlname 			= $htmlname;
-    	    $this->toolbarname			= $shorttoolbarname;
+    	    $this->toolbarname = $shorttoolbarname;
     	    $this->toolbarstartexpanded = $toolbarstartexpanded;
-            $this->rows					= max(ROWS_3,$rows);
-            $this->cols					= (preg_match('/%/',$cols)?$cols:max(40,$cols));	// If $cols is a percent, we keep it, otherwise, we take max
-            $this->height				= $height;
+            $this->rows					= max(ROWS_3, $rows);
+            $this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max
+            $this->height = $height;
             $this->width				= $width;
     	}
     }
@@ -149,39 +149,39 @@ 
      *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', ...)
      *  @return	void|string
      */
-    function Create($noprint=0, $morejs='', $disallowAnyContent=true, $titlecontent='', $option='')
+    function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '')
     {
         // phpcs:enable
-    	global $conf,$langs;
+    	global $conf, $langs;
 
-    	$fullpage=false;
+    	$fullpage = false;
     	if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
     	{
-    	   $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT);      // Only predefined list of html tags are allowed or all
+    	   $disallowAnyContent = empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all
     	}
 
-    	$found=0;
-		$out='';
+    	$found = 0;
+		$out = '';
 
         if ($this->tool == 'fckeditor') // not used anymore
         {
-			$found=1;
+			$found = 1;
             $this->editor->Create();
         }
-        if (in_array($this->tool,array('textarea','ckeditor')))
+        if (in_array($this->tool, array('textarea', 'ckeditor')))
         {
-            $found=1;
+            $found = 1;
             //$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
             // TODO We do not put the disabled tag because on a read form, it change style with grey.
-            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
-            $out.= $this->content;
-            $out.= '</textarea>';
+            $out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' class="flat">';
+            $out .= $this->content;
+            $out .= '</textarea>';
 
-            if ($this->tool == 'ckeditor' && ! empty($conf->use_javascript_ajax))
+            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)) {
+            	if (!empty($conf->global->FCKEDITOR_SKIN)) {
 					$skin = $conf->global->FCKEDITOR_SKIN;
 				} else {
 					// $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
@@ -192,13 +192,13 @@ 
                      * When updating ckeditor, the moono-lisa skin disappears 
                      * and includes kama and moono.
                      */
-                    $skin = CKEDITOR_SKIN;  // In AlixarDispatcher defineConstants()
+                    $skin = CKEDITOR_SKIN; // In AlixarDispatcher defineConstants()
                 }
 
-            	$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
+            	$htmlencode_force = preg_match('/_encoded$/', $this->toolbarname) ? 'true' : 'false';
 
-            	$out.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
-            	$out.= '<script type="text/javascript">
+            	$out .= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
+            	$out .= '<script type="text/javascript">
             			$(document).ready(function () {
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
                             /* should be editor=CKEDITOR.replace but what if serveral editors ? */
@@ -206,11 +206,11 @@ 
             					{
             						/* property:xxx is same than CKEDITOR.config.property = xxx */
             						customConfig : ckeditorConfig,
-            						readOnly : '.($this->readonly?'true':'false').',
+            						readOnly : '.($this->readonly ? 'true' : 'false').',
                             		htmlEncodeOutput :'.$htmlencode_force.',
-            						allowedContent :'.($disallowAnyContent?'false':'true').',
+            						allowedContent :'.($disallowAnyContent ? 'false' : 'true').',
             						extraAllowedContent : \'\',
-            						fullPage : '.($fullpage?'true':'false').',
+            						fullPage : '.($fullpage ? 'true' : 'false').',
                             		toolbar: \''.$this->toolbarname.'\',
             						toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
             						width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
@@ -235,13 +235,13 @@ 
                                             }';
             	if ($this->uselocalbrowser)
             	{
-                    $out.= ','."\n";
+                    $out .= ','."\n";
                     // To use filemanager with old fckeditor (GPL)
-                    $out.= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
-                    $out.= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';
+                    $out .= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
+                    $out .= '    filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,';
                     //$out.= '    filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=File\',';
                     //$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
-                    $out.= "\n";
+                    $out .= "\n";
                     // To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
 					/* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
                                filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
@@ -250,14 +250,14 @@ 
                                filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images\',
                                filebrowserFlashUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash\','."\n";
 					*/
-                    $out.= '    filebrowserWindowWidth : \'900\',
+                    $out .= '    filebrowserWindowWidth : \'900\',
                                filebrowserWindowHeight : \'500\',
                                filebrowserImageWindowWidth : \'900\',
                                filebrowserImageWindowHeight : \'500\'';
             	}
-            	$out.= '	})'.$morejs;
-            	$out.= '});'."\n";
-            	$out.= '</script>'."\n";
+            	$out .= '	})'.$morejs;
+            	$out .= '});'."\n";
+            	$out .= '</script>'."\n";
             }
         }
 
@@ -265,19 +265,19 @@ 
         // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
         if (preg_match('/^ace/', $this->tool))
         {
-        	$found=1;
-			$format=$option;
+        	$found = 1;
+			$format = $option;
 
-            $out.= "\n".'<!-- Output Ace editor -->'."\n";
+            $out .= "\n".'<!-- Output Ace editor -->'."\n";
 
 			if ($titlecontent)
 			{
-	            $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
-	            $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
-	            $out.= '</div>';
-	            $out.= '<script type="text/javascript" language="javascript">'."\n";
-	            $out.= 'jQuery(document).ready(function() {'."\n";
-	            $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+	            $out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
+	            $out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+	            $out .= '</div>';
+	            $out .= '<script type="text/javascript" language="javascript">'."\n";
+	            $out .= 'jQuery(document).ready(function() {'."\n";
+	            $out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
 	            			var oldNbOfLines = 0
@@ -299,21 +299,21 @@ 
 									}
 							});
 						})';
-	            $out.= '</script>'."\n";
+	            $out .= '</script>'."\n";
 			}
 
-            $out.= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'');
-            $out.= ($this->height?' height: '.$this->height.'px; ':'');
+            $out .= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width ? 'width: '.$this->width.'px; ' : '');
+            $out .= ($this->height ? ' height: '.$this->height.'px; ' : '');
             //$out.=" min-height: 100px;";
-            $out.= '">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</pre>';
-        	$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</textarea>';
+            $out .= '">';
+        	$out .= htmlspecialchars($this->content);
+        	$out .= '</pre>';
+        	$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
+        	$out .= htmlspecialchars($this->content);
+        	$out .= '</textarea>';
 
-        	$out.= '<script type="text/javascript" language="javascript">'."\n";
-        	$out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+        	$out .= '<script type="text/javascript" language="javascript">'."\n";
+        	$out .= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
 					aceEditor.setOptions({
@@ -321,7 +321,7 @@ 
 					   enableLiveAutocompletion: false, // the editor completes the statement while you are typing. Need lib ext-language_tools.js
 					   showPrintMargin: false, // hides the vertical limiting strip
 					   minLines: 10,
-					   maxLines: '.(empty($this->height)?'34':(round($this->height/10))).',
+					   maxLines: '.(empty($this->height) ? '34' : (round($this->height / 10))).',
 				       fontSize: "110%" // ensures that the editor fits in the environment
 					});
 
@@ -333,7 +333,7 @@ 
 					//aceEditor.getSession().setMode("ace/mode/javascript_expression");
 					'."\n";
 
-        	$out.= 'jQuery(document).ready(function() {
+        	$out .= 'jQuery(document).ready(function() {
 						jQuery(".buttonforacesave").click(function() {
         					console.log("We click on savefile button for component '.$this->htmlname.'");
         					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")
@@ -343,12 +343,12 @@ 
 							else return false;*/
 	        			});
 					})';
-        	$out.= '</script>'."\n";
+        	$out .= '</script>'."\n";
         }
 
         if (empty($found))
         {
-            $out.= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
+            $out .= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
         }
 
         if ($noprint) return $out;

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

Indentation +700 added lines, -700 removed lines

@@ -31,589 +31,589 @@ 
  */
 class FormCompany
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
+    /**
+     *	Constructor
+     *
+     *	@param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    	Return list of labels (translated) of third parties type
-	 *
-	 *		@param	int		$mode		0=Return id+label, 1=Return code+label
-	 *      @param  string	$filter     Add a SQL filter to select
-	 *    	@return array      			Array of types
-	 */
-	function typent_array($mode=0, $filter='')
-	{
+    /**
+     *    	Return list of labels (translated) of third parties type
+     *
+     *		@param	int		$mode		0=Return id+label, 1=Return code+label
+     *      @param  string	$filter     Add a SQL filter to select
+     *    	@return array      			Array of types
+     */
+    function typent_array($mode=0, $filter='')
+    {
         // phpcs:enable
-		global $langs,$mysoc;
-
-		$effs = array();
-
-		$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;
-		$sql.= " ORDER by position, id";
-		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-
-			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]='';
-				$i++;
-			}
-			$this->db->free($resql);
-		}
-
-		return $effs;
-	}
+        global $langs,$mysoc;
+
+        $effs = array();
+
+        $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;
+        $sql.= " ORDER by position, id";
+        dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+
+            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]='';
+                $i++;
+            }
+            $this->db->free($resql);
+        }
+
+        return $effs;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Renvoie la liste des types d'effectifs possibles (pas de traduction car nombre)
-	 *
-	 *	@param	int		$mode		0=renvoi id+libelle, 1=renvoi code+libelle
-	 *	@param  string	$filter     Add a SQL filter to select
-	 *  @return array				Array of types d'effectifs
-	 */
-	function effectif_array($mode=0, $filter='')
-	{
+    /**
+     *	Renvoie la liste des types d'effectifs possibles (pas de traduction car nombre)
+     *
+     *	@param	int		$mode		0=renvoi id+libelle, 1=renvoi code+libelle
+     *	@param  string	$filter     Add a SQL filter to select
+     *  @return array				Array of types d'effectifs
+     */
+    function effectif_array($mode=0, $filter='')
+    {
         // phpcs:enable
-		$effs = array();
-
-		$sql = "SELECT id, code, libelle";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
-		$sql.= " WHERE active = 1";
-		if ($filter) $sql.=" ".$filter;
-		$sql .= " ORDER BY id ASC";
-		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-
-			while ($i < $num)
-			{
-				$objp = $this->db->fetch_object($resql);
-				if (! $mode) $key=$objp->id;
-				else $key=$objp->code;
-
-				$effs[$key] = $objp->libelle!='-'?$objp->libelle:'';
-				$i++;
-			}
-			$this->db->free($resql);
-		}
-		return $effs;
-	}
+        $effs = array();
+
+        $sql = "SELECT id, code, libelle";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
+        $sql.= " WHERE active = 1";
+        if ($filter) $sql.=" ".$filter;
+        $sql .= " ORDER BY id ASC";
+        dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+
+            while ($i < $num)
+            {
+                $objp = $this->db->fetch_object($resql);
+                if (! $mode) $key=$objp->id;
+                else $key=$objp->code;
+
+                $effs[$key] = $objp->libelle!='-'?$objp->libelle:'';
+                $i++;
+            }
+            $this->db->free($resql);
+        }
+        return $effs;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Affiche formulaire de selection des modes de reglement
-	 *
-	 *  @param	int		$page        	Page
-	 *  @param  int		$selected    	Id or code preselected
-	 *  @param  string	$htmlname   	Nom du formulaire select
-	 *	@param	int		$empty			Add empty value in list
-	 *	@return	void
-	 */
-	function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0)
-	{
+    /**
+     *  Affiche formulaire de selection des modes de reglement
+     *
+     *  @param	int		$page        	Page
+     *  @param  int		$selected    	Id or code preselected
+     *  @param  string	$htmlname   	Nom du formulaire select
+     *	@param	int		$empty			Add empty value in list
+     *	@return	void
+     */
+    function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0)
+    {
         // phpcs:enable
-		global $user, $langs;
-
-		print '<form method="post" action="'.$page.'">';
-		print '<input type="hidden" name="action" value="setprospectlevel">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-		dol_syslog(get_class($this).'::form_prospect_level',LOG_DEBUG);
-		$sql = "SELECT code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY sortorder";
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$options = array();
-
-			if ($empty) {
-				$options[''] = '';
-			}
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$level = $langs->trans($obj->code);
-
-				if ($level == $obj->code) {
-					$level = $langs->trans($obj->label);
-				}
-
-				$options[$obj->code] = $level;
-			}
-
-			print Form::selectarray($htmlname, $options, $selected);
-		}
-		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>';
-	}
+        global $user, $langs;
+
+        print '<form method="post" action="'.$page.'">';
+        print '<input type="hidden" name="action" value="setprospectlevel">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+        dol_syslog(get_class($this).'::form_prospect_level',LOG_DEBUG);
+        $sql = "SELECT code, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+        $sql.= " WHERE active > 0";
+        $sql.= " ORDER BY sortorder";
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $options = array();
+
+            if ($empty) {
+                $options[''] = '';
+            }
+
+            while ($obj = $this->db->fetch_object($resql)) {
+                $level = $langs->trans($obj->code);
+
+                if ($level == $obj->code) {
+                    $level = $langs->trans($obj->label);
+                }
+
+                $options[$obj->code] = $level;
+            }
+
+            print Form::selectarray($htmlname, $options, $selected);
+        }
+        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>';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne.
-	 *   Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays.
-	 *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
-	 *   un code donnee mais dans ce cas, le champ pays differe).
-	 *   Ainsi les liens avec les departements se font sur un departement independemment de son nom.
-	 *
-	 *   @param     string	$selected        	Code state preselected
-	 *   @param     int		$country_codeid     0=list for all countries, otherwise country code or country rowid to show
-	 *   @param     string	$htmlname			Id of department
-	 *   @return	void
-	 */
-	function select_departement($selected='',$country_codeid=0, $htmlname='state_id')
-	{
+    /**
+     *   Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne.
+     *   Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays.
+     *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
+     *   un code donnee mais dans ce cas, le champ pays differe).
+     *   Ainsi les liens avec les departements se font sur un departement independemment de son nom.
+     *
+     *   @param     string	$selected        	Code state preselected
+     *   @param     int		$country_codeid     0=list for all countries, otherwise country code or country rowid to show
+     *   @param     string	$htmlname			Id of department
+     *   @return	void
+     */
+    function select_departement($selected='',$country_codeid=0, $htmlname='state_id')
+    {
         // phpcs:enable
-		print $this->select_state($selected,$country_codeid, $htmlname);
-	}
+        print $this->select_state($selected,$country_codeid, $htmlname);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne.
-	 *    Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays.
-	 *    La cle de la liste est le code (il peut y avoir plusieurs entree pour
-	 *    un code donnee mais dans ce cas, le champ pays differe).
-	 *    Ainsi les liens avec les departements se font sur un departement independemment de son nom.
-	 *
-	 *    @param	string	$selected        	Code state preselected (mus be state id)
-	 *    @param    integer	$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
-	 *    @param    string	$htmlname			Id of department. If '', we want only the string with <option>
-	 * 	  @return	string						String with HTML select
-	 *    @see select_country
-	 */
-	function select_state($selected='',$country_codeid=0, $htmlname='state_id')
-	{
+    /**
+     *    Retourne la liste deroulante des departements/province/cantons tout pays confondu ou pour un pays donne.
+     *    Dans le cas d'une liste tout pays confondus, l'affichage fait une rupture sur le pays.
+     *    La cle de la liste est le code (il peut y avoir plusieurs entree pour
+     *    un code donnee mais dans ce cas, le champ pays differe).
+     *    Ainsi les liens avec les departements se font sur un departement independemment de son nom.
+     *
+     *    @param	string	$selected        	Code state preselected (mus be state id)
+     *    @param    integer	$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
+     *    @param    string	$htmlname			Id of department. If '', we want only the string with <option>
+     * 	  @return	string						String with HTML select
+     *    @see select_country
+     */
+    function select_state($selected='',$country_codeid=0, $htmlname='state_id')
+    {
         // phpcs:enable
-		global $conf,$langs,$user;
-
-		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid,LOG_DEBUG);
-
-		$langs->load("dict");
-
-		$out='';
-
-		// Serch departements/cantons/province active d'une region et pays actif
-		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
-		$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)."'";
-		$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>';
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			dol_syslog(get_class($this)."::select_departement num=".$num,LOG_DEBUG);
-			if ($num)
-			{
-				$country='';
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($result);
-					if ($obj->code == '0')		// Le code peut etre une chaine
-					{
-						$out.= '<option value="0">&nbsp;</option>';
-					}
-					else {
-						if (! $country || $country != $obj->country)
-						{
-							// Affiche la rupture si on est en mode liste multipays
-							if (! $country_codeid && $obj->country_code)
-							{
-								$out.= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
-								$country=$obj->country;
-							}
-						}
-
-						if ((! empty($selected) && $selected == $obj->rowid)
-						 || (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
-						{
-							$out.= '<option value="'.$obj->rowid.'">';
-						}
-
-						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-						if (!empty($conf->global->MAIN_SHOW_STATE_CODE) &&
-						($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 {
-								$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-						}
-						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 {
-								$out.= ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
-							}
-						}
-
-						$out.= '</option>';
-					}
-					$i++;
-				}
-			}
-			if (! empty($htmlname)) $out.= '</select>';
-			if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		// Make select dynamic
-		if (! empty($htmlname))
-		{
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-			$out .= ajax_combobox($htmlname);
-		}
-
-		return $out;
-	}
+        global $conf,$langs,$user;
+
+        dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid,LOG_DEBUG);
+
+        $langs->load("dict");
+
+        $out='';
+
+        // Serch departements/cantons/province active d'une region et pays actif
+        $sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
+        $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)."'";
+        $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>';
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            dol_syslog(get_class($this)."::select_departement num=".$num,LOG_DEBUG);
+            if ($num)
+            {
+                $country='';
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($result);
+                    if ($obj->code == '0')		// Le code peut etre une chaine
+                    {
+                        $out.= '<option value="0">&nbsp;</option>';
+                    }
+                    else {
+                        if (! $country || $country != $obj->country)
+                        {
+                            // Affiche la rupture si on est en mode liste multipays
+                            if (! $country_codeid && $obj->country_code)
+                            {
+                                $out.= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
+                                $country=$obj->country;
+                            }
+                        }
+
+                        if ((! empty($selected) && $selected == $obj->rowid)
+                         || (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
+                        {
+                            $out.= '<option value="'.$obj->rowid.'">';
+                        }
+
+                        // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                        if (!empty($conf->global->MAIN_SHOW_STATE_CODE) &&
+                        ($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 {
+                                $out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+                            }
+                        }
+                        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 {
+                                $out.= ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+                            }
+                        }
+
+                        $out.= '</option>';
+                    }
+                    $i++;
+                }
+            }
+            if (! empty($htmlname)) $out.= '</select>';
+            if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        // Make select dynamic
+        if (! empty($htmlname))
+        {
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $out .= ajax_combobox($htmlname);
+        }
+
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Retourne la liste deroulante des regions actives dont le pays est actif
-	 *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
-	 *   un code donnee mais dans ce cas, le champ pays et lang differe).
-	 *   Ainsi les liens avec les regions se font sur une region independemment de son name.
-	 *
-	 *   @param		string		$selected		Preselected value
-	 *   @param		string		$htmlname		Name of HTML select field
-	 *   @return	void
-	 */
-	function select_region($selected='',$htmlname='region_id')
-	{
+    /**
+     *   Retourne la liste deroulante des regions actives dont le pays est actif
+     *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
+     *   un code donnee mais dans ce cas, le champ pays et lang differe).
+     *   Ainsi les liens avec les regions se font sur une region independemment de son name.
+     *
+     *   @param		string		$selected		Preselected value
+     *   @param		string		$htmlname		Name of HTML select field
+     *   @return	void
+     */
+    function select_region($selected='',$htmlname='region_id')
+    {
         // phpcs:enable
-		global $conf,$langs;
-		$langs->load("dict");
-
-		$sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
-		$sql.= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
-		$sql.= " ORDER BY c.code, c.label ASC";
-
-		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			print '<select class="flat" name="'.$htmlname.'">';
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				$country='';
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					if ($obj->code == 0) {
-						print '<option value="0">&nbsp;</option>';
-					}
-					else {
-						if ($country == '' || $country != $obj->country)
-						{
-							// Show break
-							$key=$langs->trans("Country".strtoupper($obj->country_code));
-							$valuetoshow=($key != "Country".strtoupper($obj->country_code))?$obj->country_code." - ".$key:$obj->country;
-							print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n";
-							$country=$obj->country;
-						}
-
-						if ($selected > 0 && $selected == $obj->code)
-						{
-							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
-						}
-						else
-						{
-							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
-						}
-					}
-					$i++;
-				}
-			}
-			print '</select>';
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
+        global $conf,$langs;
+        $langs->load("dict");
+
+        $sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
+        $sql.= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
+        $sql.= " ORDER BY c.code, c.label ASC";
+
+        dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            print '<select class="flat" name="'.$htmlname.'">';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                $country='';
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    if ($obj->code == 0) {
+                        print '<option value="0">&nbsp;</option>';
+                    }
+                    else {
+                        if ($country == '' || $country != $obj->country)
+                        {
+                            // Show break
+                            $key=$langs->trans("Country".strtoupper($obj->country_code));
+                            $valuetoshow=($key != "Country".strtoupper($obj->country_code))?$obj->country_code." - ".$key:$obj->country;
+                            print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n";
+                            $country=$obj->country;
+                        }
+
+                        if ($selected > 0 && $selected == $obj->code)
+                        {
+                            print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
+                        }
+                        else
+                        {
+                            print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
+                        }
+                    }
+                    $i++;
+                }
+            }
+            print '</select>';
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return combo list with people title
-	 *
-	 *  @param  string	$selected   	Title preselected
-	 * 	@param	string	$htmlname		Name of HTML select combo field
-	 *  @param  string  $morecss        Add more css on SELECT element
-	 *  @return	string					String with HTML select
-	 */
-	function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
-	{
+    /**
+     *  Return combo list with people title
+     *
+     *  @param  string	$selected   	Title preselected
+     * 	@param	string	$htmlname		Name of HTML select combo field
+     *  @param  string  $morecss        Add more css on SELECT element
+     *  @return	string					String with HTML select
+     */
+    function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
+    {
         // phpcs:enable
-		global $conf,$langs,$user;
-		$langs->load("dict");
-
-		$out='';
-
-		$sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";
-		$sql.= " WHERE active = 1";
-
-		dol_syslog("Form::select_civility", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$out.= '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			$out.= '<option value="">&nbsp;</option>';
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					if ($selected == $obj->code)
-					{
-						$out.= '<option value="'.$obj->code.'" selected>';
-					}
-					else
-					{
-						$out.= '<option value="'.$obj->code.'">';
-					}
-					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-					$out.= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label!='-'?$obj->label:''));
-					$out.= '</option>';
-					$i++;
-				}
-			}
-			$out.= '</select>';
-			if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		return $out;
-	}
+        global $conf,$langs,$user;
+        $langs->load("dict");
+
+        $out='';
+
+        $sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";
+        $sql.= " WHERE active = 1";
+
+        dol_syslog("Form::select_civility", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+            $out.= '<option value="">&nbsp;</option>';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    if ($selected == $obj->code)
+                    {
+                        $out.= '<option value="'.$obj->code.'" selected>';
+                    }
+                    else
+                    {
+                        $out.= '<option value="'.$obj->code.'">';
+                    }
+                    // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+                    $out.= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label!='-'?$obj->label:''));
+                    $out.= '</option>';
+                    $i++;
+                }
+            }
+            $out.= '</select>';
+            if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
-	 *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays.
-	 *
-	 *    @param	string		$selected        	Code forme juridique a pre-selectionne
-	 *    @param    mixed		$country_codeid		0=liste tous pays confondus, sinon code du pays a afficher
-	 *    @param    string		$filter          	Add a SQL filter on list
-	 *    @return	void
-	 *    @deprecated Use print xxx->select_juridicalstatus instead
-	 *    @see select_juridicalstatus()
-	 */
-	function select_forme_juridique($selected='', $country_codeid=0, $filter='')
-	{
+    /**
+     *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
+     *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays.
+     *
+     *    @param	string		$selected        	Code forme juridique a pre-selectionne
+     *    @param    mixed		$country_codeid		0=liste tous pays confondus, sinon code du pays a afficher
+     *    @param    string		$filter          	Add a SQL filter on list
+     *    @return	void
+     *    @deprecated Use print xxx->select_juridicalstatus instead
+     *    @see select_juridicalstatus()
+     */
+    function select_forme_juridique($selected='', $country_codeid=0, $filter='')
+    {
         // phpcs:enable
-		print $this->select_juridicalstatus($selected, $country_codeid, $filter);
-	}
+        print $this->select_juridicalstatus($selected, $country_codeid, $filter);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
-	 *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays
-	 *
-	 *    @param	string		$selected        	Preselected code of juridical type
-	 *    @param    int			$country_codeid     0=list for all countries, otherwise list only country requested
+    /**
+     *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
+     *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays
+     *
+     *    @param	string		$selected        	Preselected code of juridical type
+     *    @param    int			$country_codeid     0=list for all countries, otherwise list only country requested
      *    @param    string		$filter          	Add a SQL filter on list
      *    @param	string		$htmlname			HTML name of select
      *    @return	string							String with HTML select
-	 */
-	function select_juridicalstatus($selected='', $country_codeid=0, $filter='', $htmlname='forme_juridique_code')
-	{
+     */
+    function select_juridicalstatus($selected='', $country_codeid=0, $filter='', $htmlname='forme_juridique_code')
+    {
         // phpcs:enable
-		global $conf,$langs,$user;
-		$langs->load("dict");
-
-		$out='';
-
-		// On recherche les formes juridiques actives des pays actifs
-		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
-		$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;
-		$sql .= " ORDER BY c.code";
-
-		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$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.
-
-			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				$i = 0;
-				$country=''; $arraydata=array();
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-
-					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);
-					}
-					$i++;
-				}
-
-				$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)
-				{
-					$arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
-				}
-
-				foreach($arraydata as $key => $val)
-				{
-					if (! $country || $country != $val['country'])
-					{
-						// Show break when we are in multi country mode
-						if (empty($country_codeid) && $val['country_code'])
-						{
-							$out.= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
-							$country=$val['country'];
-						}
-					}
-
-					if ($selected > 0 && $selected == $val['code'])
-					{
-						$out.= '<option value="'.$val['code'].'" selected>';
-					}
-					else
-					{
-						$out.= '<option value="'.$val['code'].'">';
-					}
-					// If translation exists, we use it, otherwise we use default label in database
-					$out.= $val['label'];
-					$out.= '</option>';
-				}
-			}
-			$out.= '</select>';
-			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
-		{
-			dol_print_error($this->db);
-		}
-
-		return $out;
-	}
-
-
-	/**
-	 *  Output list of third parties.
-	 *
-	 *  @param  object		$object         Object we try to find contacts
-	 *  @param  string		$var_id         Name of id field
-	 *  @param  string		$selected       Pre-selected third party
-	 *  @param  string		$htmlname       Name of HTML form
-	 * 	@param	array		$limitto		Disable answers that are not id in this array list
-	 *  @param	int			$forceid		This is to force another object id than object->id
+        global $conf,$langs,$user;
+        $langs->load("dict");
+
+        $out='';
+
+        // On recherche les formes juridiques actives des pays actifs
+        $sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
+        $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;
+        $sql .= " ORDER BY c.code";
+
+        dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $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.
+
+            $num = $this->db->num_rows($resql);
+            if ($num)
+            {
+                $i = 0;
+                $country=''; $arraydata=array();
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+
+                    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);
+                    }
+                    $i++;
+                }
+
+                $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)
+                {
+                    $arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
+                }
+
+                foreach($arraydata as $key => $val)
+                {
+                    if (! $country || $country != $val['country'])
+                    {
+                        // Show break when we are in multi country mode
+                        if (empty($country_codeid) && $val['country_code'])
+                        {
+                            $out.= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
+                            $country=$val['country'];
+                        }
+                    }
+
+                    if ($selected > 0 && $selected == $val['code'])
+                    {
+                        $out.= '<option value="'.$val['code'].'" selected>';
+                    }
+                    else
+                    {
+                        $out.= '<option value="'.$val['code'].'">';
+                    }
+                    // If translation exists, we use it, otherwise we use default label in database
+                    $out.= $val['label'];
+                    $out.= '</option>';
+                }
+            }
+            $out.= '</select>';
+            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
+        {
+            dol_print_error($this->db);
+        }
+
+        return $out;
+    }
+
+
+    /**
+     *  Output list of third parties.
+     *
+     *  @param  object		$object         Object we try to find contacts
+     *  @param  string		$var_id         Name of id field
+     *  @param  string		$selected       Pre-selected third party
+     *  @param  string		$htmlname       Name of HTML form
+     * 	@param	array		$limitto		Disable answers that are not id in this array list
+     *  @param	int			$forceid		This is to force another object id than object->id
      *  @param	string		$moreparam		String with more param to add into url when noajax search is used.
      *  @param	string		$morecss		More CSS on select component
-	 * 	@return int 						The selected third party ID
-	 */
-	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='', $morecss='')
-	{
-		global $conf, $langs;
-
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
-		{
-			// Use Ajax search
-			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
-
-			$socid=0; $name='';
-			if ($selected > 0)
-			{
-				$tmpthirdparty=new Societe($this->db);
-				$result = $tmpthirdparty->fetch($selected);
-				if ($result > 0)
-				{
-					$socid = $selected;
-					$name = $tmpthirdparty->name;
-				}
-			}
-
-
-			$events=array();
-			// Add an entry 'method' to say 'yes, we must execute url with param action = method';
-			// Add an entry 'url' to say which url to execute
-			// Add an entry htmlname to say which element we must change once url is called
-			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines
-			// 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
-			{
-				print '<script type="text/javascript">
+     * 	@return int 						The selected third party ID
+     */
+    function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='', $morecss='')
+    {
+        global $conf, $langs;
+
+        if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+        {
+            // Use Ajax search
+            $minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
+
+            $socid=0; $name='';
+            if ($selected > 0)
+            {
+                $tmpthirdparty=new Societe($this->db);
+                $result = $tmpthirdparty->fetch($selected);
+                if ($result > 0)
+                {
+                    $socid = $selected;
+                    $name = $tmpthirdparty->name;
+                }
+            }
+
+
+            $events=array();
+            // Add an entry 'method' to say 'yes, we must execute url with param action = method';
+            // Add an entry 'url' to say which url to execute
+            // Add an entry htmlname to say which element we must change once url is called
+            // Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines
+            // 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
+            {
+                print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					$("#search_'.$htmlname.'").change(function() {
 						var obj = '.json_encode($events).';
@@ -661,72 +661,72 @@ 
 					};
 				});
 				</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
-		{
-			// Search to list thirdparties
-			$sql = "SELECT s.rowid, s.nom as name FROM";
-			$sql.= " ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " WHERE s.entity IN (".getEntity('societe').")";
-			// For ajax search we limit here. For combo list, we limit later
-			if (is_array($limitto) && count($limitto))
-			{
-				$sql.= " AND s.rowid IN (".join(',',$limitto).")";
-			}
-			$sql.= " ORDER BY s.nom ASC";
-
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				print '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"';
-				if ($conf->use_javascript_ajax)
-				{
-					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid>0?$forceid:$object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
-					print ' onChange="'.$javaScript.'"';
-				}
-				print '>';
-				$num = $this->db->num_rows($resql);
-				$i = 0;
-				if ($num)
-				{
-					while ($i < $num)
-					{
-						$obj = $this->db->fetch_object($resql);
-						if ($i == 0) $firstCompany = $obj->rowid;
-						$disabled=0;
-						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';
-							print ' selected>'.dol_trunc($obj->name,24).'</option>';
-							$firstCompany = $obj->rowid;
-						}
-						else
-						{
-							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
-							print '>'.dol_trunc($obj->name,24).'</option>';
-						}
-						$i ++;
-					}
-				}
-				print "</select>\n";
-				return $firstCompany;
-			}
-			else
-			{
-				dol_print_error($this->db);
-				print 'Error sql';
-			}
-		}
-	}
+            }
+
+            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
+        {
+            // Search to list thirdparties
+            $sql = "SELECT s.rowid, s.nom as name FROM";
+            $sql.= " ".MAIN_DB_PREFIX."societe as s";
+            $sql.= " WHERE s.entity IN (".getEntity('societe').")";
+            // For ajax search we limit here. For combo list, we limit later
+            if (is_array($limitto) && count($limitto))
+            {
+                $sql.= " AND s.rowid IN (".join(',',$limitto).")";
+            }
+            $sql.= " ORDER BY s.nom ASC";
+
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                print '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"';
+                if ($conf->use_javascript_ajax)
+                {
+                    $javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid>0?$forceid:$object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
+                    print ' onChange="'.$javaScript.'"';
+                }
+                print '>';
+                $num = $this->db->num_rows($resql);
+                $i = 0;
+                if ($num)
+                {
+                    while ($i < $num)
+                    {
+                        $obj = $this->db->fetch_object($resql);
+                        if ($i == 0) $firstCompany = $obj->rowid;
+                        $disabled=0;
+                        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';
+                            print ' selected>'.dol_trunc($obj->name,24).'</option>';
+                            $firstCompany = $obj->rowid;
+                        }
+                        else
+                        {
+                            print '<option value="'.$obj->rowid.'"';
+                            if ($disabled) print ' disabled';
+                            print '>'.dol_trunc($obj->name,24).'</option>';
+                        }
+                        $i ++;
+                    }
+                }
+                print "</select>\n";
+                return $firstCompany;
+            }
+            else
+            {
+                dol_print_error($this->db);
+                print 'Error sql';
+            }
+        }
+    }
 
     /**
      *  Return a select list with types of contacts
@@ -740,59 +740,59 @@ 
      *  @param  string      $morecss        Add more css to select component
      *  @return	void
      */
-	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
-	{
-	    global $user, $langs;
-
-		if (is_object($object) && method_exists($object, 'liste_type_contact'))
-		{
-			$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>';
-			foreach($lesTypes as $key=>$value)
-			{
-				print '<option value="'.$key.'"';
-				if ($key == $selected) print ' selected';
-				print '>'.$value.'</option>';
-			}
-			print "</select>";
-			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-			print "\n";
-		}
-	}
+    function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
+    {
+        global $user, $langs;
+
+        if (is_object($object) && method_exists($object, 'liste_type_contact'))
+        {
+            $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>';
+            foreach($lesTypes as $key=>$value)
+            {
+                print '<option value="'.$key.'"';
+                if ($key == $selected) print ' selected';
+                print '>'.$value.'</option>';
+            }
+            print "</select>";
+            if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print "\n";
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return a select list with zip codes and their town
-	 *
-	 *    @param	string		$selected				Preselected value
-	 *    @param    string		$htmlname				HTML select name
-	 *    @param    string		$fields					Fields
-	 *    @param    int			$fieldsize				Field size
-	 *    @param    int			$disableautocomplete    1 To disable ajax autocomplete features (browser autocomplete may still occurs)
-	 *    @param	string		$moreattrib				Add more attribute on HTML input field
-	 *    @param    string      $morecss                More css
-	 *    @return	string
-	 */
-	function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='')
-	{
+    /**
+     *    Return a select list with zip codes and their town
+     *
+     *    @param	string		$selected				Preselected value
+     *    @param    string		$htmlname				HTML select name
+     *    @param    string		$fields					Fields
+     *    @param    int			$fieldsize				Field size
+     *    @param    int			$disableautocomplete    1 To disable ajax autocomplete features (browser autocomplete may still occurs)
+     *    @param	string		$moreattrib				Add more attribute on HTML input field
+     *    @param    string      $morecss                More css
+     *    @return	string
+     */
+    function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='')
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$out='';
+        $out='';
 
-		$size='';
-		if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
+        $size='';
+        if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
 
-		if ($conf->use_javascript_ajax && empty($disableautocomplete))
-		{
-			$out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
-			$moreattrib.=' autocomplete="off"';
-		}
-		$out.= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss?' '.$morecss:'').'" type="text"'.($moreattrib?' '.$moreattrib:'').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
+        if ($conf->use_javascript_ajax && empty($disableautocomplete))
+        {
+            $out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
+            $moreattrib.=' autocomplete="off"';
+        }
+        $out.= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss?' '.$morecss:'').'" type="text"'.($moreattrib?' '.$moreattrib:'').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
 
-		return $out;
-	}
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -812,30 +812,30 @@ 
 
         $formlength=0;
         if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
-        	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
-        		}
-        	}
-        	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 ($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
+                }
+            }
+            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
+            }
         }
 
         $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;
@@ -862,30 +862,30 @@ 
 
         $num = $this->db->num_rows($tax);
         $i = 0;
-    	if ($num)
-    	{
-    		$valors=explode(":", $tax);
-
-    		if (count($valors) > 1)
-    		{
-    			//montar select
-    			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-    			while ($i <= (count($valors))-1)
-    			{
-    				if ($selected == $valors[$i])
-    				{
-    					print '<option value="'.$valors[$i].'" selected>';
-    				}
-    				else
-    				{
-    					print '<option value="'.$valors[$i].'">';
-    				}
-    				print $valors[$i];
-    				print '</option>';
-    				$i++;
-    			}
-    			print'</select>';
-    		}
-    	}
+        if ($num)
+        {
+            $valors=explode(":", $tax);
+
+            if (count($valors) > 1)
+            {
+                //montar select
+                print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+                while ($i <= (count($valors))-1)
+                {
+                    if ($selected == $valors[$i])
+                    {
+                        print '<option value="'.$valors[$i].'" selected>';
+                    }
+                    else
+                    {
+                        print '<option value="'.$valors[$i].'">';
+                    }
+                    print $valors[$i];
+                    print '</option>';
+                    $i++;
+                }
+                print'</select>';
+            }
+        }
     }
 }

Spacing +159 added lines, -159 removed lines

@@ -39,7 +39,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 *	Constructor
@@ -60,20 +60,20 @@ 
 	 *      @param  string	$filter     Add a SQL filter to select
 	 *    	@return array      			Array of types
 	 */
-	function typent_array($mode=0, $filter='')
+	function typent_array($mode = 0, $filter = '')
 	{
         // phpcs:enable
-		global $langs,$mysoc;
+		global $langs, $mysoc;
 
 		$effs = array();
 
 		$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;
-		$sql.= " ORDER by position, id";
+		$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;
+		$sql .= " ORDER by position, id";
 		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -82,11 +82,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;
 				if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);
 				else $effs[$key] = $objp->libelle;
-				if ($effs[$key]=='-') $effs[$key]='';
+				if ($effs[$key] == '-') $effs[$key] = '';
 				$i++;
 			}
 			$this->db->free($resql);
@@ -103,18 +103,18 @@ 
 	 *	@param  string	$filter     Add a SQL filter to select
 	 *  @return array				Array of types d'effectifs
 	 */
-	function effectif_array($mode=0, $filter='')
+	function effectif_array($mode = 0, $filter = '')
 	{
         // phpcs:enable
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
-		$sql.= " WHERE active = 1";
-		if ($filter) $sql.=" ".$filter;
+		$sql .= " WHERE active = 1";
+		if ($filter) $sql .= " ".$filter;
 		$sql .= " ORDER BY id ASC";
 		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -123,10 +123,10 @@ 
 			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:'';
+				$effs[$key] = $objp->libelle != '-' ? $objp->libelle : '';
 				$i++;
 			}
 			$this->db->free($resql);
@@ -145,7 +145,7 @@ 
 	 *	@param	int		$empty			Add empty value in list
 	 *	@return	void
 	 */
-	function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0)
+	function form_prospect_level($page, $selected = '', $htmlname = 'prospect_level_id', $empty = 0)
 	{
         // phpcs:enable
 		global $user, $langs;
@@ -154,11 +154,11 @@ 
 		print '<input type="hidden" name="action" value="setprospectlevel">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-		dol_syslog(get_class($this).'::form_prospect_level',LOG_DEBUG);
+		dol_syslog(get_class($this).'::form_prospect_level', LOG_DEBUG);
 		$sql = "SELECT code, label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-		$sql.= " WHERE active > 0";
-		$sql.= " ORDER BY sortorder";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
+		$sql .= " WHERE active > 0";
+		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -181,7 +181,7 @@ 
 			print Form::selectarray($htmlname, $options, $selected);
 		}
 		else dol_print_error($this->db);
-		if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		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>';
 	}
@@ -199,10 +199,10 @@ 
 	 *   @param     string	$htmlname			Id of department
 	 *   @return	void
 	 */
-	function select_departement($selected='',$country_codeid=0, $htmlname='state_id')
+	function select_departement($selected = '', $country_codeid = 0, $htmlname = 'state_id')
 	{
         // phpcs:enable
-		print $this->select_state($selected,$country_codeid, $htmlname);
+		print $this->select_state($selected, $country_codeid, $htmlname);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -219,91 +219,91 @@ 
 	 * 	  @return	string						String with HTML select
 	 *    @see select_country
 	 */
-	function select_state($selected='',$country_codeid=0, $htmlname='state_id')
+	function select_state($selected = '', $country_codeid = 0, $htmlname = 'state_id')
 	{
         // phpcs:enable
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid,LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid, LOG_DEBUG);
 
 		$langs->load("dict");
 
-		$out='';
+		$out = '';
 
 		// Serch departements/cantons/province active d'une region et pays actif
 		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.nom as region_name FROM";
-		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
+		$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.code = '".$this->db->escape($country_codeid)."'";
 		$sql .= " ORDER BY c.code, d.code_departement";
 
-		$result=$this->db->query($sql);
+		$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);
+			dol_syslog(get_class($this)."::select_departement num=".$num, LOG_DEBUG);
 			if ($num)
 			{
-				$country='';
+				$country = '';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($result);
 					if ($obj->code == '0')		// Le code peut etre une chaine
 					{
-						$out.= '<option value="0">&nbsp;</option>';
+						$out .= '<option value="0">&nbsp;</option>';
 					}
 					else {
-						if (! $country || $country != $obj->country)
+						if (!$country || $country != $obj->country)
 						{
 							// Affiche la rupture si on est en mode liste multipays
-							if (! $country_codeid && $obj->country_code)
+							if (!$country_codeid && $obj->country_code)
 							{
-								$out.= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
-								$country=$obj->country;
+								$out .= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
+								$country = $obj->country;
 							}
 						}
 
-						if ((! empty($selected) && $selected == $obj->rowid)
-						 || (empty($selected) && ! empty($conf->global->MAIN_FORCE_DEFAULT_STATE_ID) && $conf->global->MAIN_FORCE_DEFAULT_STATE_ID == $obj->rowid))
+						if ((!empty($selected) && $selected == $obj->rowid)
+						 || (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>';
+							$out .= '<option value="'.$obj->rowid.'" selected>';
 						}
 						else
 						{
-							$out.= '<option value="'.$obj->rowid.'">';
+							$out .= '<option value="'.$obj->rowid.'">';
 						}
 
 						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 						if (!empty($conf->global->MAIN_SHOW_STATE_CODE) &&
 						($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:''));
+							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 {
-								$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+								$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						}
 						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:''));
+							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 {
-								$out.= ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
+								$out .= ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						}
 
-						$out.= '</option>';
+						$out .= '</option>';
 					}
 					$i++;
 				}
 			}
-			if (! empty($htmlname)) $out.= '</select>';
-			if (! empty($htmlname) && $user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			if (!empty($htmlname)) $out .= '</select>';
+			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
 		else
 		{
@@ -311,9 +311,9 @@ 
 		}
 
 		// Make select dynamic
-		if (! empty($htmlname))
+		if (!empty($htmlname))
 		{
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 		}
 
@@ -332,19 +332,19 @@ 
 	 *   @param		string		$htmlname		Name of HTML select field
 	 *   @return	void
 	 */
-	function select_region($selected='',$htmlname='region_id')
+	function select_region($selected = '', $htmlname = 'region_id')
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 		$langs->load("dict");
 
 		$sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
-		$sql.= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
-		$sql.= " ORDER BY c.code, c.label ASC";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
+		$sql .= " ORDER BY c.code, c.label ASC";
 
 		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
@@ -352,7 +352,7 @@ 
 			$i = 0;
 			if ($num)
 			{
-				$country='';
+				$country = '';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
@@ -363,10 +363,10 @@ 
 						if ($country == '' || $country != $obj->country)
 						{
 							// Show break
-							$key=$langs->trans("Country".strtoupper($obj->country_code));
-							$valuetoshow=($key != "Country".strtoupper($obj->country_code))?$obj->country_code." - ".$key:$obj->country;
+							$key = $langs->trans("Country".strtoupper($obj->country_code));
+							$valuetoshow = ($key != "Country".strtoupper($obj->country_code)) ? $obj->country_code." - ".$key : $obj->country;
 							print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n";
-							$country=$obj->country;
+							$country = $obj->country;
 						}
 
 						if ($selected > 0 && $selected == $obj->code)
@@ -398,23 +398,23 @@ 
 	 *  @param  string  $morecss        Add more css on SELECT element
 	 *  @return	string					String with HTML select
 	 */
-	function select_civility($selected='',$htmlname='civility_id',$morecss='maxwidth100')
+	function select_civility($selected = '', $htmlname = 'civility_id', $morecss = 'maxwidth100')
 	{
         // phpcs:enable
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 		$langs->load("dict");
 
-		$out='';
+		$out = '';
 
 		$sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";
-		$sql.= " WHERE active = 1";
+		$sql .= " WHERE active = 1";
 
 		dol_syslog("Form::select_civility", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$out.= '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			$out.= '<option value="">&nbsp;</option>';
+			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			$out .= '<option value="">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -424,20 +424,20 @@ 
 					$obj = $this->db->fetch_object($resql);
 					if ($selected == $obj->code)
 					{
-						$out.= '<option value="'.$obj->code.'" selected>';
+						$out .= '<option value="'.$obj->code.'" selected>';
 					}
 					else
 					{
-						$out.= '<option value="'.$obj->code.'">';
+						$out .= '<option value="'.$obj->code.'">';
 					}
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-					$out.= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label!='-'?$obj->label:''));
-					$out.= '</option>';
+					$out .= ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+					$out .= '</option>';
 					$i++;
 				}
 			}
-			$out.= '</select>';
-			if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			$out .= '</select>';
+			if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
 		else
 		{
@@ -459,7 +459,7 @@ 
 	 *    @deprecated Use print xxx->select_juridicalstatus instead
 	 *    @see select_juridicalstatus()
 	 */
-	function select_forme_juridique($selected='', $country_codeid=0, $filter='')
+	function select_forme_juridique($selected = '', $country_codeid = 0, $filter = '')
 	{
         // phpcs:enable
 		print $this->select_juridicalstatus($selected, $country_codeid, $filter);
@@ -476,13 +476,13 @@ 
      *    @param	string		$htmlname			HTML name of select
      *    @return	string							String with HTML select
 	 */
-	function select_juridicalstatus($selected='', $country_codeid=0, $filter='', $htmlname='forme_juridique_code')
+	function select_juridicalstatus($selected = '', $country_codeid = 0, $filter = '', $htmlname = 'forme_juridique_code')
 	{
         // phpcs:enable
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 		$langs->load("dict");
 
-		$out='';
+		$out = '';
 
 		// On recherche les formes juridiques actives des pays actifs
 		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
@@ -494,70 +494,70 @@ 
 		$sql .= " ORDER BY c.code";
 
 		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$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.
+			$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.
 
 			$num = $this->db->num_rows($resql);
 			if ($num)
 			{
 				$i = 0;
-				$country=''; $arraydata=array();
+				$country = ''; $arraydata = array();
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
 
 					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);
+						$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);
 					}
 					$i++;
 				}
 
-				$arraydata=dol_sort_array($arraydata, 'label_sort', 'ASC');
+				$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)
 				{
-					$arraydata[0]=array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
+					$arraydata[0] = array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
 				}
 
-				foreach($arraydata as $key => $val)
+				foreach ($arraydata as $key => $val)
 				{
-					if (! $country || $country != $val['country'])
+					if (!$country || $country != $val['country'])
 					{
 						// Show break when we are in multi country mode
 						if (empty($country_codeid) && $val['country_code'])
 						{
-							$out.= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
-							$country=$val['country'];
+							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
+							$country = $val['country'];
 						}
 					}
 
 					if ($selected > 0 && $selected == $val['code'])
 					{
-						$out.= '<option value="'.$val['code'].'" selected>';
+						$out .= '<option value="'.$val['code'].'" selected>';
 					}
 					else
 					{
-						$out.= '<option value="'.$val['code'].'">';
+						$out .= '<option value="'.$val['code'].'">';
 					}
 					// If translation exists, we use it, otherwise we use default label in database
-					$out.= $val['label'];
-					$out.= '</option>';
+					$out .= $val['label'];
+					$out .= '</option>';
 				}
 			}
-			$out.= '</select>';
-			if ($user->admin) $out.= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			$out .= '</select>';
+			if ($user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
 		    // Make select dynamic
-        	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+        	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	        $out .= ajax_combobox($htmlname);
 
-			$out.= '</div>';
+			$out .= '</div>';
 		}
 		else
 		{
@@ -581,19 +581,19 @@ 
      *  @param	string		$morecss		More CSS on select component
 	 * 	@return int 						The selected third party ID
 	 */
-	function selectCompaniesForNewContact($object, $var_id, $selected='', $htmlname='newcompany', $limitto='', $forceid=0, $moreparam='', $morecss='')
+	function selectCompaniesForNewContact($object, $var_id, $selected = '', $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '', $morecss = '')
 	{
 		global $conf, $langs;
 
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
 		{
 			// Use Ajax search
-			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
+			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT) ? $conf->global->COMPANY_USE_SEARCH_TO_SELECT : 2);
 
-			$socid=0; $name='';
+			$socid = 0; $name = '';
 			if ($selected > 0)
 			{
-				$tmpthirdparty=new Societe($this->db);
+				$tmpthirdparty = new Societe($this->db);
 				$result = $tmpthirdparty->fetch($selected);
 				if ($result > 0)
 				{
@@ -603,13 +603,13 @@ 
 			}
 
 
-			$events=array();
+			$events = array();
 			// Add an entry 'method' to say 'yes, we must execute url with param action = method';
 			// Add an entry 'url' to say which url to execute
 			// Add an entry htmlname to say which element we must change once url is called
 			// Add entry params => array('cssid' => 'attr') to say to remov or add attribute attr if answer of url return  0 or >0 lines
 			// 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'));
+			$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
 			{
@@ -665,29 +665,29 @@ 
 
 			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);
+			print ajax_autocompleter(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
 		}
 		else
 		{
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
-			$sql.= " ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " WHERE s.entity IN (".getEntity('societe').")";
+			$sql .= " ".MAIN_DB_PREFIX."societe as s";
+			$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 			// For ajax search we limit here. For combo list, we limit later
 			if (is_array($limitto) && count($limitto))
 			{
-				$sql.= " AND s.rowid IN (".join(',',$limitto).")";
+				$sql .= " AND s.rowid IN (".join(',', $limitto).")";
 			}
-			$sql.= " ORDER BY s.nom ASC";
+			$sql .= " ORDER BY s.nom ASC";
 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				print '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"';
+				print '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"';
 				if ($conf->use_javascript_ajax)
 				{
-					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid>0?$forceid:$object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
+					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid > 0 ? $forceid : $object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
 					print ' onChange="'.$javaScript.'"';
 				}
 				print '>';
@@ -699,22 +699,22 @@ 
 					{
 						$obj = $this->db->fetch_object($resql);
 						if ($i == 0) $firstCompany = $obj->rowid;
-						$disabled=0;
-						if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid,$limitto)) $disabled=1;
+						$disabled = 0;
+						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';
-							print ' selected>'.dol_trunc($obj->name,24).'</option>';
+							print ' selected>'.dol_trunc($obj->name, 24).'</option>';
 							$firstCompany = $obj->rowid;
 						}
 						else
 						{
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled';
-							print '>'.dol_trunc($obj->name,24).'</option>';
+							print '>'.dol_trunc($obj->name, 24).'</option>';
 						}
-						$i ++;
+						$i++;
 					}
 				}
 				print "</select>\n";
@@ -740,23 +740,23 @@ 
      *  @param  string      $morecss        Add more css to select component
      *  @return	void
      */
-	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='position', $showempty=0, $morecss='')
+	function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '')
 	{
 	    global $user, $langs;
 
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
-			print '<select class="flat valignmiddle'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			print '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($showempty) print '<option value="0"></option>';
-			foreach($lesTypes as $key=>$value)
+			foreach ($lesTypes as $key=>$value)
 			{
 				print '<option value="'.$key.'"';
 				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";
 		}
 	}
@@ -774,22 +774,22 @@ 
 	 *    @param    string      $morecss                More css
 	 *    @return	string
 	 */
-	function select_ziptown($selected='', $htmlname='zipcode', $fields='', $fieldsize=0, $disableautocomplete=0, $moreattrib='',$morecss='')
+	function select_ziptown($selected = '', $htmlname = 'zipcode', $fields = '', $fieldsize = 0, $disableautocomplete = 0, $moreattrib = '', $morecss = '')
 	{
         // phpcs:enable
 		global $conf;
 
-		$out='';
+		$out = '';
 
-		$size='';
-		if (!empty($fieldsize)) $size='size="'.$fieldsize.'"';
+		$size = '';
+		if (!empty($fieldsize)) $size = 'size="'.$fieldsize.'"';
 
 		if ($conf->use_javascript_ajax && empty($disableautocomplete))
 		{
-			$out.= ajax_multiautocompleter($htmlname,$fields,DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
-			$moreattrib.=' autocomplete="off"';
+			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
+			$moreattrib .= ' autocomplete="off"';
 		}
-		$out.= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss?' '.$morecss:'').'" type="text"'.($moreattrib?' '.$moreattrib:'').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
+		$out .= '<input id="'.$htmlname.'" class="maxwidthonsmartphone'.($morecss ? ' '.$morecss : '').'" type="text"'.($moreattrib ? ' '.$moreattrib : '').' name="'.$htmlname.'" '.$size.' value="'.$selected.'">'."\n";
 
 		return $out;
 	}
@@ -805,43 +805,43 @@ 
      *  @param  string  $morecss        More css
      *  @return	string					HTML string with prof id
      */
-    function get_input_id_prof($idprof,$htmlname,$preselected,$country_code,$morecss='maxwidth100onsmartphone quatrevingtpercent')
+    function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent')
     {
         // phpcs:enable
-        global $conf,$langs;
+        global $conf, $langs;
 
-        $formlength=0;
+        $formlength = 0;
         if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
         	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')
         	{
-        		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;
+        $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;
         }
 
-        $maxlength=$formlength;
-        if (empty($formlength)) { $formlength=24; $maxlength=128; }
+        $maxlength = $formlength;
+        if (empty($formlength)) { $formlength = 24; $maxlength = 128; }
 
-        $out = '<input type="text" '.($morecss?'class="'.$morecss.'" ':'').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
+        $out = '<input type="text" '.($morecss ? 'class="'.$morecss.'" ' : '').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 
         return $out;
     }
@@ -858,19 +858,19 @@ 
     function select_localtax($local, $selected, $htmlname)
     {
         // phpcs:enable
-        $tax=get_localtax_by_third($local);
+        $tax = get_localtax_by_third($local);
 
         $num = $this->db->num_rows($tax);
         $i = 0;
     	if ($num)
     	{
-    		$valors=explode(":", $tax);
+    		$valors = explode(":", $tax);
 
     		if (count($valors) > 1)
     		{
     			//montar select
     			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-    			while ($i <= (count($valors))-1)
+    			while ($i <= (count($valors)) - 1)
     			{
     				if ($selected == $valors[$i])
     				{

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

Indentation +1668 added lines, -1668 removed lines

@@ -45,188 +45,188 @@ 
  */
 class SMTPs
 {
-	/**
-	 * Host Name or IP of SMTP Server to use
-	 */
-	var $_smtpsHost = 'localhost';
-
-	/**
-	 * SMTP Server Port definition. 25 is default value
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_smtpsPort = '25';
-
-	/**
-	 * Secure SMTP Server access ID
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_smtpsID = null;
-
-	/**
-	 * Secure SMTP Server access Password
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_smtpsPW = null;
-
-	/**
-	 * Who sent the Message
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_msgFrom = null;
-
-	/**
-	 * Where are replies and errors to be sent to
-	 * This can be defined via a INI file or via a setter method
-	 */
-	var $_msgReplyTo = null;
-
-	/**
-	 * Who will the Message be sent to; TO, CC, BCC
-	 * Multi-diminsional array containg addresses the message will
-	 * be sent TO, CC or BCC
-	 */
-	var $_msgRecipients = null;
-
-	/**
-	 * Message Subject
-	 */
-	var $_msgSubject = null;
-
-	/**
-	 * Message Content
-	 */
-	var $_msgContent = null;
-
-	/**
-	 * Custom X-Headers
-	 */
-	var $_msgXheader = null;
-
-	/**
-	 * Character set
-	 * Defaulted to 'iso-8859-1'
-	 */
-	var $_smtpsCharSet = 'iso-8859-1';
-
-	/**
-	 * Message Sensitivity
-	 * Defaults to ZERO - None
-	 */
-	var $_msgSensitivity = 0;
-
-	/**
-	 * Message Sensitivity
-	 */
-	var $_arySensitivity = array ( false,
-                                  'Personal',
-                                  'Private',
-                                  'Company Confidential' );
-
-	/**
-	 * Message Sensitivity
-	 * Defaults to 3 - Normal
-	 */
-	var $_msgPriority = 3;
-
-	/**
-	 * Message Priority
-	 */
-	var $_aryPriority = array ( 'Bulk',
+    /**
+     * Host Name or IP of SMTP Server to use
+     */
+    var $_smtpsHost = 'localhost';
+
+    /**
+     * SMTP Server Port definition. 25 is default value
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_smtpsPort = '25';
+
+    /**
+     * Secure SMTP Server access ID
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_smtpsID = null;
+
+    /**
+     * Secure SMTP Server access Password
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_smtpsPW = null;
+
+    /**
+     * Who sent the Message
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_msgFrom = null;
+
+    /**
+     * Where are replies and errors to be sent to
+     * This can be defined via a INI file or via a setter method
+     */
+    var $_msgReplyTo = null;
+
+    /**
+     * Who will the Message be sent to; TO, CC, BCC
+     * Multi-diminsional array containg addresses the message will
+     * be sent TO, CC or BCC
+     */
+    var $_msgRecipients = null;
+
+    /**
+     * Message Subject
+     */
+    var $_msgSubject = null;
+
+    /**
+     * Message Content
+     */
+    var $_msgContent = null;
+
+    /**
+     * Custom X-Headers
+     */
+    var $_msgXheader = null;
+
+    /**
+     * Character set
+     * Defaulted to 'iso-8859-1'
+     */
+    var $_smtpsCharSet = 'iso-8859-1';
+
+    /**
+     * Message Sensitivity
+     * Defaults to ZERO - None
+     */
+    var $_msgSensitivity = 0;
+
+    /**
+     * Message Sensitivity
+     */
+    var $_arySensitivity = array ( false,
+                                    'Personal',
+                                    'Private',
+                                    'Company Confidential' );
+
+    /**
+     * Message Sensitivity
+     * Defaults to 3 - Normal
+     */
+    var $_msgPriority = 3;
+
+    /**
+     * Message Priority
+     */
+    var $_aryPriority = array ( 'Bulk',
                                 'Highest',
                                 'High',
                                 'Normal',
                                 'Low',
                                 'Lowest' );
 
-	/**
-	 * Content-Transfer-Encoding
-	 * Defaulted to 0 - 7bit
-	 */
-	var $_smtpsTransEncodeType = 0;
-
-	/**
-	 * Content-Transfer-Encoding
-	 */
-	var $_smtpsTransEncodeTypes = array( '7bit',               // Simple 7-bit ASCII
-                                         '8bit',               // 8-bit coding with line termination characters
-                                         'base64',             // 3 octets encoded into 4 sextets with offset
-                                         'binary',             // Arbitrary binary stream
-                                         'mac-binhex40',       // Macintosh binary to hex encoding
-                                         'quoted-printable',   // Mostly 7-bit, with 8-bit characters encoded as "=HH"
-                                         'uuencode' );         // UUENCODE encoding
-
-	/**
-	 * Content-Transfer-Encoding
-	 * Defaulted to '7bit'
-	 */
-	var $_smtpsTransEncode = '7bit';
-
-	/**
-	 * Boundary String for MIME seperation
-	 */
-	var $_smtpsBoundary = null;
-
-	/**
-	 * Related Boundary
-	 */
-	var $_smtpsRelatedBoundary = null;
-
-	/**
-	 * Alternative Boundary
-	 */
-	var $_smtpsAlternativeBoundary = null;
-
-	/**
-	 * Determines the method inwhich the message are to be sent.
-	 * - 'sockets' [0] - conect via network to SMTP server - default
-	 * - 'pipe     [1] - use UNIX path to EXE
-	 * - 'phpmail  [2] - use the PHP built-in mail function
-	 * NOTE: Only 'sockets' is implemented
-	 */
-	var $_transportType = 0;
-
-	/**
-	 * If '$_transportType' is set to '1', then this variable is used
-	 * to define the UNIX file system path to the sendmail execuable
-	 */
-	var $_mailPath = '/usr/lib/sendmail';
-
-	/**
-	 * Sets the SMTP server timeout in seconds.
-	 */
-	var $_smtpTimeout = 10;
-
-	/**
-	 * Determines whether to calculate message MD5 checksum.
-	 */
-	var $_smtpMD5 = false;
-
-	/**
-	 * Class error codes and messages
-	 */
-	var $_smtpsErrors = null;
-
-	/**
-	 * Defines log level
-	 *  0 - no logging
-	 *  1 - connectivity logging
-	 *  2 - message generation logging
-	 *  3 - detail logging
-	 */
-	var $_log_level = 0;
-
-	/**
-	 * Place Class in" debug" mode
-	 */
-	var $_debug = false;
-
-
-	// @CHANGE LDR
-	var $log = '';
-	var $_errorsTo = '';
-	var $_deliveryReceipt = 0;
-	var $_trackId = '';
-	var $_moreInHeader = '';
+    /**
+     * Content-Transfer-Encoding
+     * Defaulted to 0 - 7bit
+     */
+    var $_smtpsTransEncodeType = 0;
+
+    /**
+     * Content-Transfer-Encoding
+     */
+    var $_smtpsTransEncodeTypes = array( '7bit',               // Simple 7-bit ASCII
+                                            '8bit',               // 8-bit coding with line termination characters
+                                            'base64',             // 3 octets encoded into 4 sextets with offset
+                                            'binary',             // Arbitrary binary stream
+                                            'mac-binhex40',       // Macintosh binary to hex encoding
+                                            'quoted-printable',   // Mostly 7-bit, with 8-bit characters encoded as "=HH"
+                                            'uuencode' );         // UUENCODE encoding
+
+    /**
+     * Content-Transfer-Encoding
+     * Defaulted to '7bit'
+     */
+    var $_smtpsTransEncode = '7bit';
+
+    /**
+     * Boundary String for MIME seperation
+     */
+    var $_smtpsBoundary = null;
+
+    /**
+     * Related Boundary
+     */
+    var $_smtpsRelatedBoundary = null;
+
+    /**
+     * Alternative Boundary
+     */
+    var $_smtpsAlternativeBoundary = null;
+
+    /**
+     * Determines the method inwhich the message are to be sent.
+     * - 'sockets' [0] - conect via network to SMTP server - default
+     * - 'pipe     [1] - use UNIX path to EXE
+     * - 'phpmail  [2] - use the PHP built-in mail function
+     * NOTE: Only 'sockets' is implemented
+     */
+    var $_transportType = 0;
+
+    /**
+     * If '$_transportType' is set to '1', then this variable is used
+     * to define the UNIX file system path to the sendmail execuable
+     */
+    var $_mailPath = '/usr/lib/sendmail';
+
+    /**
+     * Sets the SMTP server timeout in seconds.
+     */
+    var $_smtpTimeout = 10;
+
+    /**
+     * Determines whether to calculate message MD5 checksum.
+     */
+    var $_smtpMD5 = false;
+
+    /**
+     * Class error codes and messages
+     */
+    var $_smtpsErrors = null;
+
+    /**
+     * Defines log level
+     *  0 - no logging
+     *  1 - connectivity logging
+     *  2 - message generation logging
+     *  3 - detail logging
+     */
+    var $_log_level = 0;
+
+    /**
+     * Place Class in" debug" mode
+     */
+    var $_debug = false;
+
+
+    // @CHANGE LDR
+    var $log = '';
+    var $_errorsTo = '';
+    var $_deliveryReceipt = 0;
+    var $_trackId = '';
+    var $_moreInHeader = '';
 
 
     /**
@@ -235,20 +235,20 @@ 
      * @param	int		$_val		Value
      * @return	void
      */
-	function setDeliveryReceipt($_val = 0)
-	{
-		$this->_deliveryReceipt = $_val;
-	}
+    function setDeliveryReceipt($_val = 0)
+    {
+        $this->_deliveryReceipt = $_val;
+    }
 
     /**
      * get delivery receipt
      *
      * @return	int		Delivery receipt
      */
-	function getDeliveryReceipt()
-	{
-		return $this->_deliveryReceipt;
-	}
+    function getDeliveryReceipt()
+    {
+        return $this->_deliveryReceipt;
+    }
 
     /**
      * Set trackid
@@ -256,10 +256,10 @@ 
      * @param	string		$_val		Value
      * @return	void
      */
-	function setTrackId($_val = '')
-	{
-		$this->_trackId = $_val;
-	}
+    function setTrackId($_val = '')
+    {
+        $this->_trackId = $_val;
+    }
 
     /**
      * Set moreInHeader
@@ -267,30 +267,30 @@ 
      * @param	string		$_val		Value
      * @return	void
      */
-	function setMoreInHeader($_val = '')
-	{
-		$this->_moreinheader = $_val;
-	}
+    function setMoreInHeader($_val = '')
+    {
+        $this->_moreinheader = $_val;
+    }
 
-	/**
+    /**
      * get trackid
      *
      * @return	string		Track id
      */
-	function getTrackId()
-	{
-		return $this->_trackId;
-	}
+    function getTrackId()
+    {
+        return $this->_trackId;
+    }
 
-	/**
-	 * get moreInHeader
-	 *
-	 * @return	string		moreInHeader
-	 */
-	function getMoreInHeader()
-	{
-	    return $this->_moreinheader;
-	}
+    /**
+     * get moreInHeader
+     *
+     * @return	string		moreInHeader
+     */
+    function getMoreInHeader()
+    {
+        return $this->_moreinheader;
+    }
 
     /**
      * Set errors to
@@ -298,11 +298,11 @@ 
      * @param	string		$_strErrorsTo		Errors to
      * @return	void
      */
-	function setErrorsTo($_strErrorsTo)
-	{
-		if ( $_strErrorsTo )
-		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
-	}
+    function setErrorsTo($_strErrorsTo)
+    {
+        if ( $_strErrorsTo )
+        $this->_errorsTo = $this->_strip_email($_strErrorsTo);
+    }
 
     /**
      * Get errors to
@@ -310,143 +310,143 @@ 
      * @param	boolean		$_part		Variant
      * @return	string					Errors to
      */
-	function getErrorsTo($_part = true )
-	{
-		$_retValue = '';
-
-		if ( $_part === true )
-		$_retValue = $this->_errorsTo;
-		else
-		$_retValue = $this->_errorsTo[$_part];
-
-		return $_retValue;
-	}
-
-	/**
-	 * Set debug
-	 *
-	 * @param	boolean		$_vDebug		Value for debug
-	 * @return 	void
-	 */
-	function setDebug($_vDebug = false )
-	{
-		$this->_debug = $_vDebug;
-	}
-
-	/**
-	 * build RECIPIENT List, all addresses who will recieve this message
-	 *
-	 * @return void
-	 */
-	function buildRCPTlist()
-	{
-		// Pull TO list
-		$_aryToList = $this->getTO();
-	}
+    function getErrorsTo($_part = true )
+    {
+        $_retValue = '';
+
+        if ( $_part === true )
+        $_retValue = $this->_errorsTo;
+        else
+        $_retValue = $this->_errorsTo[$_part];
+
+        return $_retValue;
+    }
+
+    /**
+     * Set debug
+     *
+     * @param	boolean		$_vDebug		Value for debug
+     * @return 	void
+     */
+    function setDebug($_vDebug = false )
+    {
+        $this->_debug = $_vDebug;
+    }
+
+    /**
+     * build RECIPIENT List, all addresses who will recieve this message
+     *
+     * @return void
+     */
+    function buildRCPTlist()
+    {
+        // Pull TO list
+        $_aryToList = $this->getTO();
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Attempt a connection to mail server
-	 *
-	 * @return mixed  $_retVal   Boolean indicating success or failure on connection
-	 */
-	function _server_connect()
-	{
+    /**
+     * Attempt a connection to mail server
+     *
+     * @return mixed  $_retVal   Boolean indicating success or failure on connection
+     */
+    function _server_connect()
+    {
         // phpcs:enable
-		// Default return value
-		$_retVal = true;
-
-		// We have to make sure the HOST given is valid
-		// This is done here because '@fsockopen' will not give me this
-		// information if it failes to connect because it can't find the HOST
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
-
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
-
-		// @CHANGE LDR
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-		if ( (! is_ip($host)) && ((gethostbyname($host)) == $host))
-		{
-			$this->_setErr(99, $host . ' is either offline or is an invalid host name.');
-			$_retVal = false;
-		}
-		else
-		{
-			//See if we can connect to the SMTP server
-			if ($this->socket = @fsockopen(
-    			preg_replace('@tls://@i','',$this->getHost()),       // Host to 'hit', IP or domain
-    			$this->getPort(),       // which Port number to use
-    			$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
-			{
-				// 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;
-			}
-			// This connection attempt failed.
-			else
-			{
-				// @CHANGE LDR
-				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;
-			}
-		}
-
-		return $_retVal;
-	}
+        // Default return value
+        $_retVal = true;
+
+        // We have to make sure the HOST given is valid
+        // This is done here because '@fsockopen' will not give me this
+        // information if it failes to connect because it can't find the HOST
+        $host=$this->getHost();
+        $usetls = preg_match('@tls://@i',$host);
+
+        $host=preg_replace('@tcp://@i','',$host);	// Remove prefix
+        $host=preg_replace('@ssl://@i','',$host);	// Remove prefix
+        $host=preg_replace('@tls://@i','',$host);	// Remove prefix
+
+        // @CHANGE LDR
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+        if ( (! is_ip($host)) && ((gethostbyname($host)) == $host))
+        {
+            $this->_setErr(99, $host . ' is either offline or is an invalid host name.');
+            $_retVal = false;
+        }
+        else
+        {
+            //See if we can connect to the SMTP server
+            if ($this->socket = @fsockopen(
+                preg_replace('@tls://@i','',$this->getHost()),       // Host to 'hit', IP or domain
+                $this->getPort(),       // which Port number to use
+                $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
+            {
+                // 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;
+            }
+            // This connection attempt failed.
+            else
+            {
+                // @CHANGE LDR
+                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;
+            }
+        }
+
+        return $_retVal;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Attempt mail server authentication for a secure connection
-	 *
-	 * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication
-	 */
-	function _server_authenticate()
-	{
+    /**
+     * Attempt mail server authentication for a secure connection
+     *
+     * @return boolean|null  $_retVal   Boolean indicating success or failure of authentication
+     */
+    function _server_authenticate()
+    {
         // phpcs:enable
-		global $conf;
-
-		// Send the RFC2554 specified EHLO.
-		// This improvment as provided by 'SirSir' to
-		// accomodate both SMTP AND ESMTP capable servers
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
-
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
-
-		if ($usetls) $host='tls://'.$host;
-
-		$hosth = $host;
-
-		if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-		{
-			// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-			$hosth = $this->getFrom('addr');
-			$hosth = preg_replace('/^.*</', '', $hosth);
-			$hosth = preg_replace('/>.*$/', '', $hosth);
-			$hosth = preg_replace('/.*@/', '', $hosth);
-		}
-
-		if ( $_retVal = $this->socket_send_str('EHLO ' . $hosth, '250') )
-		{
-			if ($usetls)
-			{
-			    /*
+        global $conf;
+
+        // Send the RFC2554 specified EHLO.
+        // This improvment as provided by 'SirSir' to
+        // accomodate both SMTP AND ESMTP capable servers
+        $host=$this->getHost();
+        $usetls = preg_match('@tls://@i',$host);
+
+        $host=preg_replace('@tcp://@i','',$host);	// Remove prefix
+        $host=preg_replace('@ssl://@i','',$host);	// Remove prefix
+        $host=preg_replace('@tls://@i','',$host);	// Remove prefix
+
+        if ($usetls) $host='tls://'.$host;
+
+        $hosth = $host;
+
+        if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+        {
+            // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+            $hosth = $this->getFrom('addr');
+            $hosth = preg_replace('/^.*</', '', $hosth);
+            $hosth = preg_replace('/>.*$/', '', $hosth);
+            $hosth = preg_replace('/.*@/', '', $hosth);
+        }
+
+        if ( $_retVal = $this->socket_send_str('EHLO ' . $hosth, '250') )
+        {
+            if ($usetls)
+            {
+                /*
 			    The following dialog illustrates how a client and server can start a TLS STARTTLS session
 			    S: <waits for connection on TCP port 25>
 			    C: <opens connection>
@@ -465,130 +465,130 @@ 
                 S: 250 AUTH LOGIN
 			    C: <continues by sending an SMTP command
 			    */
-				if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
-				{
-					$this->_setErr(131, 'STARTTLS connection is not supported.');
-					return $_retVal;
-				}
-
-				// Before 5.6.7:
-				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT
-				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
-				// PHP >= 5.6.7:
-				// STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
-				// STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT
-
-				$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
-				if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
-					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
-					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
-				}
-
-				if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))
-				{
-					$this->_setErr(132, 'STARTTLS connection failed.');
-					return $_retVal;
-				}
-				// Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
-				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
-				if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250'))
-				{
-					$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
-					return $_retVal;
-				}
-			}
-			// Send Authentication to Server
-			// Check for errors along the way
-			$this->socket_send_str('AUTH LOGIN', '334');
-
-			// User name will not return any error, server will take anything we give it.
-			$this->socket_send_str(base64_encode($this->_smtpsID), '334');
-
-			// 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
-		{
-			$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
-		}
-
-		return $_retVal;
-	}
-
-	/**
-	 * Now send the message
-	 *
-	 * @param  boolean $_bolTestMsg  whether to run this method in 'Test' mode.
-	 * @param  boolean $_bolDebug    whether to log all communication between this Class and the Mail Server.
-	 * @return boolean|null   void
-	 *                 $_strMsg      If this is run in 'Test' mode, the actual message structure will be returned
-	 */
-	function sendMsg($_bolTestMsg = false, $_bolDebug = false)
-	{
-		global $conf;
-
-		/**
-		 * Default return value
-		 */
-		$_retVal = false;
-
-		// Connect to Server
-		if ( $this->socket = $this->_server_connect() )
-		{
-			// If a User ID *and* a password is given, assume Authentication is desired
-			if( !empty($this->_smtpsID) && !empty($this->_smtpsPW) )
-			{
-				// Send the RFC2554 specified EHLO.
-				$_retVal = $this->_server_authenticate();
-			}
-
-			// This is a "normal" SMTP Server "handshack"
-			else
-			{
-				// Send the RFC821 specified HELO.
-				$host=$this->getHost();
-				$usetls = preg_match('@tls://@i',$host);
-
-				$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-				$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-				$host=preg_replace('@tls://@i','',$host);	// Remove prefix
-
-				$hosth = $host;
-
-				if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-				{
-					// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
-					$hosth = $this->getFrom('addr');
-					$hosth = preg_replace('/^.*</', '', $hosth);
-					$hosth = preg_replace('/>.*$/', '', $hosth);
-					$hosth = preg_replace('/.*@/', '', $hosth);
-				}
-
-				$_retVal = $this->socket_send_str('HELO ' . $hosth, '250');
-			}
-
-			// Well, did we get to the server?
-			if ( $_retVal )
-			{
-				// From this point onward most server response codes should be 250
-				// Specify who the mail is from....
-				// This has to be the raw email address, strip the "name" off
-				$this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
-
-				// 'RCPT TO:' must be given a single address, so this has to loop
-				// through the list of addresses, regardless of TO, CC or BCC
-				// and send it out "single file"
-				foreach ( $this->get_RCPT_list() as $_address )
-				{
-				    /* Note:
+                if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
+                {
+                    $this->_setErr(131, 'STARTTLS connection is not supported.');
+                    return $_retVal;
+                }
+
+                // Before 5.6.7:
+                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_SSLv2_CLIENT|STREAM_CRYPTO_METHOD_SSLv3_CLIENT
+                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+                // PHP >= 5.6.7:
+                // STREAM_CRYPTO_METHOD_SSLv23_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT|STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+                // STREAM_CRYPTO_METHOD_TLS_CLIENT = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT
+
+                $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+                if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+                    $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+                }
+
+                if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))
+                {
+                    $this->_setErr(132, 'STARTTLS connection failed.');
+                    return $_retVal;
+                }
+                // Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
+                // the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
+                if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250'))
+                {
+                    $this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
+                    return $_retVal;
+                }
+            }
+            // Send Authentication to Server
+            // Check for errors along the way
+            $this->socket_send_str('AUTH LOGIN', '334');
+
+            // User name will not return any error, server will take anything we give it.
+            $this->socket_send_str(base64_encode($this->_smtpsID), '334');
+
+            // 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
+        {
+            $this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
+        }
+
+        return $_retVal;
+    }
+
+    /**
+     * Now send the message
+     *
+     * @param  boolean $_bolTestMsg  whether to run this method in 'Test' mode.
+     * @param  boolean $_bolDebug    whether to log all communication between this Class and the Mail Server.
+     * @return boolean|null   void
+     *                 $_strMsg      If this is run in 'Test' mode, the actual message structure will be returned
+     */
+    function sendMsg($_bolTestMsg = false, $_bolDebug = false)
+    {
+        global $conf;
+
+        /**
+         * Default return value
+         */
+        $_retVal = false;
+
+        // Connect to Server
+        if ( $this->socket = $this->_server_connect() )
+        {
+            // If a User ID *and* a password is given, assume Authentication is desired
+            if( !empty($this->_smtpsID) && !empty($this->_smtpsPW) )
+            {
+                // Send the RFC2554 specified EHLO.
+                $_retVal = $this->_server_authenticate();
+            }
+
+            // This is a "normal" SMTP Server "handshack"
+            else
+            {
+                // Send the RFC821 specified HELO.
+                $host=$this->getHost();
+                $usetls = preg_match('@tls://@i',$host);
+
+                $host=preg_replace('@tcp://@i','',$host);	// Remove prefix
+                $host=preg_replace('@ssl://@i','',$host);	// Remove prefix
+                $host=preg_replace('@tls://@i','',$host);	// Remove prefix
+
+                $hosth = $host;
+
+                if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+                {
+                    // If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
+                    $hosth = $this->getFrom('addr');
+                    $hosth = preg_replace('/^.*</', '', $hosth);
+                    $hosth = preg_replace('/>.*$/', '', $hosth);
+                    $hosth = preg_replace('/.*@/', '', $hosth);
+                }
+
+                $_retVal = $this->socket_send_str('HELO ' . $hosth, '250');
+            }
+
+            // Well, did we get to the server?
+            if ( $_retVal )
+            {
+                // From this point onward most server response codes should be 250
+                // Specify who the mail is from....
+                // This has to be the raw email address, strip the "name" off
+                $this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
+
+                // 'RCPT TO:' must be given a single address, so this has to loop
+                // through the list of addresses, regardless of TO, CC or BCC
+                // and send it out "single file"
+                foreach ( $this->get_RCPT_list() as $_address )
+                {
+                    /* Note:
 				     * BCC email addresses must be listed in the RCPT TO command list,
                      * but the BCC header should not be printed under the DATA command.
 				     * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
 				     */
 
-    				/*
+                    /*
 					 * TODO
 					 * After each 'RCPT TO:' is sent, we need to make sure it was kosher,
 					 * if not, the whole message will fail
@@ -596,1237 +596,1237 @@ 
 					 * mark the last address as "bad" and start the address loop over again.
 					 * If any address fails, the entire message fails.
 					 */
-					$this->socket_send_str('RCPT TO: <' . $_address . '>', '250');
-				}
-
-				// Tell the server we are ready to start sending data
-				// with any custom headers...
-				// This is the last response code we look for until the end of the message.
-				$this->socket_send_str('DATA', '354');
-
-				// Now we are ready for the message...
-				// Ok, all the ingredients are mixed in let's cook this puppy...
-				$this->socket_send_str($this->getHeader().$this->getBodyContent() . "\r\n" . '.', '250');
-
-				// Now tell the server we are done and close the socket...
-				fputs($this->socket, 'QUIT');
-				fclose($this->socket);
-			}
-		}
-
-		return $_retVal;
-	}
-
-	// =============================================================
-	// ** Setter & Getter methods
-
-	// ** Basic System configuration
-
-	/**
-	 * setConfig() is used to populate select class properties from either
-	 * a user defined INI file or the systems 'php.ini' file
-	 *
-	 * If a user defined INI is to be used, the files complete path is passed
-	 * as the method single parameter. The INI can define any class and/or
-	 * user properties. Only properties defined within this file will be setter
-	 * and/or orverwritten
-	 *
-	 * If the systems 'php.ini' file is to be used, the method is called without
-	 * parameters. In this case, only HOST, PORT and FROM properties will be set
-	 * as they are the only properties that are defined within the 'php.ini'.
-	 *
-	 * If secure SMTP is to be used, the user ID and Password can be defined with
-	 * the user INI file, but the properties are not defined with the systems
-	 * 'php.ini'file, they must be defined via their setter methods
-	 *
-	 * This method can be called twice, if desired. Once without a parameter to
-	 * load the properties as defined within the systems 'php.ini' file, and a
-	 * second time, with a path to a user INI file for other properties to be
-	 * defined.
-	 *
-	 * @param mixed $_strConfigPath path to config file or VOID
-	 * @return boolean
-	 */
-	function setConfig($_strConfigPath = null)
-	{
-		/**
-		 * Returns constructed SELECT Object string or boolean upon failure
-		 * Default value is set at true
-		 */
-		$_retVal = true;
-
-		// if we have a path...
-		if ( ! empty ($_strConfigPath) )
-		{
-			// If the path is not valid, this will NOT generate an error,
-			// it will simply return false.
-			if ( ! @include $_strConfigPath)
-			{
-				$this->_setErr(110, '"' . $_strConfigPath . '" is not a valid path.');
-				$_retVal = false;
-			}
-		}
-
-		// Read the Systems php.ini file
-		else
-		{
-			// 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 ( $_port = ini_get('smtp_port') )
-			$this->setPort($_port);
-
-			if ( $_from = ini_get('sendmail_from') )
-			$this->setFrom($_from);
-		}
-
-		// Send back what we have
-		return $_retVal;
-	}
-
-	/**
-	 * Determines the method inwhich the messages are to be sent.
-	 * - 'sockets' [0] - conect via network to SMTP server
-	 * - 'pipe     [1] - use UNIX path to EXE
-	 * - 'phpmail  [2] - use the PHP built-in mail function
-	 *
-	 * @param int $_type  Interger value representing Mail Transport Type
-	 * @return void
-	 */
-	function setTransportType($_type = 0)
-	{
-		if ( ( is_numeric($_type) ) &&
-		( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
-		$this->_transportType = $_type;
-	}
-
-	/**
-	 * Return the method inwhich the message is to be sent.
-	 * - 'sockets' [0] - conect via network to SMTP server
-	 * - 'pipe     [1] - use UNIX path to EXE
-	 * - 'phpmail  [2] - use the PHP built-in mail function
-	 *
-	 * @return int $_strHost Host Name or IP of the Mail Server to use
-	 */
-	function getTransportType()
-	{
-		return $this->_transportType;
-	}
-
-	/**
-	 * Path to the sendmail execuable
-	 *
-	 * @param string $_path Path to the sendmail execuable
-	 * @return boolean
-	 *
-	 */
-	function setMailPath($_path)
-	{
-		// This feature is not yet implemented
-		return true;
-
-		//if ( $_path ) $this->_mailPath = $_path;
-	}
-
-	/**
-	 * Defines the Host Name or IP of the Mail Server to use.
-	 * This is defaulted to 'localhost'
-	 * This is  used only with 'socket' based mail transmission
-	 *
-	 * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use
-	 * @return 	void
-	 */
-	function setHost($_strHost)
-	{
-		if ( $_strHost )
-		$this->_smtpsHost = $_strHost;
-	}
-
-	/**
-	 * Retrieves the Host Name or IP of the Mail Server to use
-	 * This is  used only with 'socket' based mail transmission
-	 *
-	 * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use
-	 */
-	function getHost()
-	{
-		return $this->_smtpsHost;
-	}
-
-	/**
-	 * Defines the Port Number of the Mail Server to use
-	 * This is defaulted to '25'
-	 * This is  used only with 'socket' based mail transmission
-	 *
-	 * @param 	int 	$_intPort 		Port Number of the Mail Server to use
-	 * @return 	void
-	 */
-	function setPort($_intPort)
-	{
-		if ( ( is_numeric($_intPort) ) &&
-		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
-		$this->_smtpsPort = $_intPort;
-	}
-
-	/**
-	 * Retrieves the Port Number of the Mail Server to use
-	 * This is  used only with 'socket' based mail transmission
-	 *
-	 * @return 	string 		Port Number of the Mail Server to use
-	 */
-	function getPort()
-	{
-		return $this->_smtpsPort;
-	}
-
-	/**
-	 * User Name for authentication on Mail Server
-	 *
-	 * @param 	string 	$_strID 	User Name for authentication on Mail Server
-	 * @return 	void
-	 */
-	function setID($_strID)
-	{
-		$this->_smtpsID = $_strID;
-	}
-
-	/**
-	 * Retrieves the User Name for authentication on Mail Server
-	 *
-	 * @return string 	User Name for authentication on Mail Server
-	 */
-	function getID()
-	{
-		return $this->_smtpsID;
-	}
-
-	/**
-	 * User Password for authentication on Mail Server
-	 *
-	 * @param 	string 	$_strPW 	User Password for authentication on Mail Server
-	 * @return 	void
-	 */
-	function setPW($_strPW)
-	{
-		$this->_smtpsPW = $_strPW;
-	}
-
-	/**
-	 * Retrieves the User Password for authentication on Mail Server
-	 *
-	 * @return 	string 		User Password for authentication on Mail Server
-	 */
-	function getPW()
-	{
-		return $this->_smtpsPW;
-	}
-
-	/**
-	 * Character set used for current message
-	 * Character set is defaulted to 'iso-8859-1';
-	 *
-	 * @param string $_strCharSet Character set used for current message
-	 * @return void
-	 */
-	function setCharSet($_strCharSet)
-	{
-		if ( $_strCharSet )
-		$this->_smtpsCharSet = $_strCharSet;
-	}
-
-	/**
-	 * Retrieves the Character set used for current message
-	 *
-	 * @return string $_smtpsCharSet Character set used for current message
-	 */
-	function getCharSet()
-	{
-		return $this->_smtpsCharSet;
-	}
-
-	/**
-	 * Content-Transfer-Encoding, Defaulted to '7bit'
-	 * This can be changed for 2byte characers sets
-	 * Known Encode Types
-	 *  - 7bit               Simple 7-bit ASCII
-	 *  - 8bit               8-bit coding with line termination characters
-	 *  - base64             3 octets encoded into 4 sextets with offset
-	 *  - binary             Arbitrary binary stream
-	 *  - mac-binhex40       Macintosh binary to hex encoding
-	 *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
-	 *  - uuencode           UUENCODE encoding
-	 *
-	 * @param string $_strTransEncode Content-Transfer-Encoding
-	 * @return void
-	 */
-	function setTransEncode($_strTransEncode)
-	{
-		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncode = $_strTransEncode;
-	}
-
-	/**
-	 * Retrieves the Content-Transfer-Encoding
-	 *
-	 * @return string $_smtpsTransEncode Content-Transfer-Encoding
-	 */
-	function getTransEncode()
-	{
-		return $this->_smtpsTransEncode;
-	}
-
-	/**
-	 * Content-Transfer-Encoding, Defaulted to '0' [ZERO]
-	 * This can be changed for 2byte characers sets
-	 * Known Encode Types
-	 *  - [0] 7bit               Simple 7-bit ASCII
-	 *  - [1] 8bit               8-bit coding with line termination characters
-	 *  - [2] base64             3 octets encoded into 4 sextets with offset
-	 *  - [3] binary             Arbitrary binary stream
-	 *  - [4] mac-binhex40       Macintosh binary to hex encoding
-	 *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
-	 *  - [6] uuencode           UUENCODE encoding
-	 *
-	 * @param string $_strTransEncodeType Content-Transfer-Encoding
-	 * @return void
-	 *
-	 */
-	function setTransEncodeType($_strTransEncodeType)
-	{
-		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncodeType = $_strTransEncodeType;
-	}
-
-	/**
-	 * Retrieves the Content-Transfer-Encoding
-	 *
-	 * @return 	string 		Content-Transfer-Encoding
-	 */
-	function getTransEncodeType()
-	{
-		return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];
-	}
-
-
-	// ** Message Construction
-
-	/**
-	 * FROM Address from which mail will be sent
-	 *
-	 * @param 	string 	$_strFrom 	Address from which mail will be sent
-	 * @return 	void
-	 */
-	function setFrom($_strFrom)
-	{
-		if ( $_strFrom )
-		$this->_msgFrom = $this->_strip_email($_strFrom);
-	}
-
-	/**
-	 * Retrieves the Address from which mail will be sent
-	 *
-	 * @param  	boolean $_part		To "strip" 'Real name' from address
-	 * @return 	string 				Address from which mail will be sent
-	 */
-	function getFrom($_part = true)
-	{
-		$_retValue = '';
-
-		if ( $_part === true )
-		$_retValue = $this->_msgFrom;
-		else
-		$_retValue = $this->_msgFrom[$_part];
-
-		return $_retValue;
-	}
-
-	/**
-	 * Reply-To Address from which mail will be the reply-to
-	 *
-	 * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to
-	 * @return 	void
-	 */
-	function setReplyTo($_strReplyTo)
-	{
-	    if ( $_strReplyTo )
-	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
-	}
-
-	/**
-	 * Retrieves the Address from which mail will be the reply-to
-	 *
-	 * @param  	boolean $_part		To "strip" 'Real name' from address
-	 * @return 	string 				Address from which mail will be the reply-to
-	 */
-	function getReplyTo($_part = true)
-	{
-	    $_retValue = '';
-
-	    if ( $_part === true )
-	        $_retValue = $this->_msgReplyTo;
-	    else
-	        $_retValue = $this->_msgReplyTo[$_part];
-
-	    return $_retValue;
-	}
-
-	/**
-	 * Inserts given addresses into structured format.
-	 * This method takes a list of given addresses, via an array
-	 * or a COMMA delimted string, and inserts them into a highly
-	 * structured array. This array is designed to remove duplicate
-	 * addresses and to sort them by Domain.
-	 *
-	 * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
-	 * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses
-	 * @return void
-	 *
-	 */
-	function _buildAddrList($_type, $_addrList)
-	{
-		// Pull existing list
-		$aryHost = $this->_msgRecipients;
-
-		// Only run this if we have something
-		if ( !empty ($_addrList ))
-		{
-			// $_addrList can be a STRING or an array
-			if ( is_string($_addrList) )
-			{
-				// This could be a COMMA delimited string
-				if ( strstr($_addrList, ',') )
-				// "explode "list" into an array
-				$_addrList = explode(',', $_addrList);
-
-				// Stick it in an array
-				else
-				$_addrList = array($_addrList);
-			}
-
-			// take the array of addresses and split them further
-			foreach ( $_addrList as $_strAddr )
-			{
-				// Strip off the end '>'
-				$_strAddr = str_replace('>', '', $_strAddr);
-
-				// Seperate "Real Name" from eMail address
-				$_tmpaddr = null;
-				$_tmpaddr = explode('<', $_strAddr);
-
-				// We have a "Real Name" and eMail address
-				if ( count($_tmpaddr) == 2 )
-				{
-					$_tmpHost = explode('@', $_tmpaddr[1]);
-					$_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
-					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
-				}
-				// We only have an eMail address
-				else
-				{
-					// Strip off the beggining '<'
-					$_strAddr = str_replace('<', '', $_strAddr);
-
-					$_tmpHost = explode('@', $_strAddr);
-					$_tmpHost[0] = trim($_tmpHost[0]);
-					$_tmpHost[1] = trim($_tmpHost[1]);
-
-					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';
-				}
-			}
-		}
-		// replace list
-		$this->_msgRecipients = $aryHost;
-	}
+                    $this->socket_send_str('RCPT TO: <' . $_address . '>', '250');
+                }
+
+                // Tell the server we are ready to start sending data
+                // with any custom headers...
+                // This is the last response code we look for until the end of the message.
+                $this->socket_send_str('DATA', '354');
+
+                // Now we are ready for the message...
+                // Ok, all the ingredients are mixed in let's cook this puppy...
+                $this->socket_send_str($this->getHeader().$this->getBodyContent() . "\r\n" . '.', '250');
+
+                // Now tell the server we are done and close the socket...
+                fputs($this->socket, 'QUIT');
+                fclose($this->socket);
+            }
+        }
+
+        return $_retVal;
+    }
+
+    // =============================================================
+    // ** Setter & Getter methods
+
+    // ** Basic System configuration
+
+    /**
+     * setConfig() is used to populate select class properties from either
+     * a user defined INI file or the systems 'php.ini' file
+     *
+     * If a user defined INI is to be used, the files complete path is passed
+     * as the method single parameter. The INI can define any class and/or
+     * user properties. Only properties defined within this file will be setter
+     * and/or orverwritten
+     *
+     * If the systems 'php.ini' file is to be used, the method is called without
+     * parameters. In this case, only HOST, PORT and FROM properties will be set
+     * as they are the only properties that are defined within the 'php.ini'.
+     *
+     * If secure SMTP is to be used, the user ID and Password can be defined with
+     * the user INI file, but the properties are not defined with the systems
+     * 'php.ini'file, they must be defined via their setter methods
+     *
+     * This method can be called twice, if desired. Once without a parameter to
+     * load the properties as defined within the systems 'php.ini' file, and a
+     * second time, with a path to a user INI file for other properties to be
+     * defined.
+     *
+     * @param mixed $_strConfigPath path to config file or VOID
+     * @return boolean
+     */
+    function setConfig($_strConfigPath = null)
+    {
+        /**
+         * Returns constructed SELECT Object string or boolean upon failure
+         * Default value is set at true
+         */
+        $_retVal = true;
+
+        // if we have a path...
+        if ( ! empty ($_strConfigPath) )
+        {
+            // If the path is not valid, this will NOT generate an error,
+            // it will simply return false.
+            if ( ! @include $_strConfigPath)
+            {
+                $this->_setErr(110, '"' . $_strConfigPath . '" is not a valid path.');
+                $_retVal = false;
+            }
+        }
+
+        // Read the Systems php.ini file
+        else
+        {
+            // 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 ( $_port = ini_get('smtp_port') )
+            $this->setPort($_port);
+
+            if ( $_from = ini_get('sendmail_from') )
+            $this->setFrom($_from);
+        }
+
+        // Send back what we have
+        return $_retVal;
+    }
+
+    /**
+     * Determines the method inwhich the messages are to be sent.
+     * - 'sockets' [0] - conect via network to SMTP server
+     * - 'pipe     [1] - use UNIX path to EXE
+     * - 'phpmail  [2] - use the PHP built-in mail function
+     *
+     * @param int $_type  Interger value representing Mail Transport Type
+     * @return void
+     */
+    function setTransportType($_type = 0)
+    {
+        if ( ( is_numeric($_type) ) &&
+        ( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
+        $this->_transportType = $_type;
+    }
+
+    /**
+     * Return the method inwhich the message is to be sent.
+     * - 'sockets' [0] - conect via network to SMTP server
+     * - 'pipe     [1] - use UNIX path to EXE
+     * - 'phpmail  [2] - use the PHP built-in mail function
+     *
+     * @return int $_strHost Host Name or IP of the Mail Server to use
+     */
+    function getTransportType()
+    {
+        return $this->_transportType;
+    }
+
+    /**
+     * Path to the sendmail execuable
+     *
+     * @param string $_path Path to the sendmail execuable
+     * @return boolean
+     *
+     */
+    function setMailPath($_path)
+    {
+        // This feature is not yet implemented
+        return true;
+
+        //if ( $_path ) $this->_mailPath = $_path;
+    }
+
+    /**
+     * Defines the Host Name or IP of the Mail Server to use.
+     * This is defaulted to 'localhost'
+     * This is  used only with 'socket' based mail transmission
+     *
+     * @param 	string 	$_strHost 		Host Name or IP of the Mail Server to use
+     * @return 	void
+     */
+    function setHost($_strHost)
+    {
+        if ( $_strHost )
+        $this->_smtpsHost = $_strHost;
+    }
+
+    /**
+     * Retrieves the Host Name or IP of the Mail Server to use
+     * This is  used only with 'socket' based mail transmission
+     *
+     * @return 	string 	$_strHost 		Host Name or IP of the Mail Server to use
+     */
+    function getHost()
+    {
+        return $this->_smtpsHost;
+    }
+
+    /**
+     * Defines the Port Number of the Mail Server to use
+     * This is defaulted to '25'
+     * This is  used only with 'socket' based mail transmission
+     *
+     * @param 	int 	$_intPort 		Port Number of the Mail Server to use
+     * @return 	void
+     */
+    function setPort($_intPort)
+    {
+        if ( ( is_numeric($_intPort) ) &&
+        ( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
+        $this->_smtpsPort = $_intPort;
+    }
+
+    /**
+     * Retrieves the Port Number of the Mail Server to use
+     * This is  used only with 'socket' based mail transmission
+     *
+     * @return 	string 		Port Number of the Mail Server to use
+     */
+    function getPort()
+    {
+        return $this->_smtpsPort;
+    }
+
+    /**
+     * User Name for authentication on Mail Server
+     *
+     * @param 	string 	$_strID 	User Name for authentication on Mail Server
+     * @return 	void
+     */
+    function setID($_strID)
+    {
+        $this->_smtpsID = $_strID;
+    }
+
+    /**
+     * Retrieves the User Name for authentication on Mail Server
+     *
+     * @return string 	User Name for authentication on Mail Server
+     */
+    function getID()
+    {
+        return $this->_smtpsID;
+    }
+
+    /**
+     * User Password for authentication on Mail Server
+     *
+     * @param 	string 	$_strPW 	User Password for authentication on Mail Server
+     * @return 	void
+     */
+    function setPW($_strPW)
+    {
+        $this->_smtpsPW = $_strPW;
+    }
+
+    /**
+     * Retrieves the User Password for authentication on Mail Server
+     *
+     * @return 	string 		User Password for authentication on Mail Server
+     */
+    function getPW()
+    {
+        return $this->_smtpsPW;
+    }
+
+    /**
+     * Character set used for current message
+     * Character set is defaulted to 'iso-8859-1';
+     *
+     * @param string $_strCharSet Character set used for current message
+     * @return void
+     */
+    function setCharSet($_strCharSet)
+    {
+        if ( $_strCharSet )
+        $this->_smtpsCharSet = $_strCharSet;
+    }
+
+    /**
+     * Retrieves the Character set used for current message
+     *
+     * @return string $_smtpsCharSet Character set used for current message
+     */
+    function getCharSet()
+    {
+        return $this->_smtpsCharSet;
+    }
+
+    /**
+     * Content-Transfer-Encoding, Defaulted to '7bit'
+     * This can be changed for 2byte characers sets
+     * Known Encode Types
+     *  - 7bit               Simple 7-bit ASCII
+     *  - 8bit               8-bit coding with line termination characters
+     *  - base64             3 octets encoded into 4 sextets with offset
+     *  - binary             Arbitrary binary stream
+     *  - mac-binhex40       Macintosh binary to hex encoding
+     *  - quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
+     *  - uuencode           UUENCODE encoding
+     *
+     * @param string $_strTransEncode Content-Transfer-Encoding
+     * @return void
+     */
+    function setTransEncode($_strTransEncode)
+    {
+        if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
+        $this->_smtpsTransEncode = $_strTransEncode;
+    }
+
+    /**
+     * Retrieves the Content-Transfer-Encoding
+     *
+     * @return string $_smtpsTransEncode Content-Transfer-Encoding
+     */
+    function getTransEncode()
+    {
+        return $this->_smtpsTransEncode;
+    }
+
+    /**
+     * Content-Transfer-Encoding, Defaulted to '0' [ZERO]
+     * This can be changed for 2byte characers sets
+     * Known Encode Types
+     *  - [0] 7bit               Simple 7-bit ASCII
+     *  - [1] 8bit               8-bit coding with line termination characters
+     *  - [2] base64             3 octets encoded into 4 sextets with offset
+     *  - [3] binary             Arbitrary binary stream
+     *  - [4] mac-binhex40       Macintosh binary to hex encoding
+     *  - [5] quoted-printable   Mostly 7-bit, with 8-bit characters encoded as "=HH"
+     *  - [6] uuencode           UUENCODE encoding
+     *
+     * @param string $_strTransEncodeType Content-Transfer-Encoding
+     * @return void
+     *
+     */
+    function setTransEncodeType($_strTransEncodeType)
+    {
+        if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
+        $this->_smtpsTransEncodeType = $_strTransEncodeType;
+    }
+
+    /**
+     * Retrieves the Content-Transfer-Encoding
+     *
+     * @return 	string 		Content-Transfer-Encoding
+     */
+    function getTransEncodeType()
+    {
+        return $this->_smtpsTransEncodeTypes[$this->_smtpsTransEncodeType];
+    }
+
+
+    // ** Message Construction
+
+    /**
+     * FROM Address from which mail will be sent
+     *
+     * @param 	string 	$_strFrom 	Address from which mail will be sent
+     * @return 	void
+     */
+    function setFrom($_strFrom)
+    {
+        if ( $_strFrom )
+        $this->_msgFrom = $this->_strip_email($_strFrom);
+    }
+
+    /**
+     * Retrieves the Address from which mail will be sent
+     *
+     * @param  	boolean $_part		To "strip" 'Real name' from address
+     * @return 	string 				Address from which mail will be sent
+     */
+    function getFrom($_part = true)
+    {
+        $_retValue = '';
+
+        if ( $_part === true )
+        $_retValue = $this->_msgFrom;
+        else
+        $_retValue = $this->_msgFrom[$_part];
+
+        return $_retValue;
+    }
+
+    /**
+     * Reply-To Address from which mail will be the reply-to
+     *
+     * @param 	string 	$_strReplyTo 	Address from which mail will be the reply-to
+     * @return 	void
+     */
+    function setReplyTo($_strReplyTo)
+    {
+        if ( $_strReplyTo )
+            $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+    }
+
+    /**
+     * Retrieves the Address from which mail will be the reply-to
+     *
+     * @param  	boolean $_part		To "strip" 'Real name' from address
+     * @return 	string 				Address from which mail will be the reply-to
+     */
+    function getReplyTo($_part = true)
+    {
+        $_retValue = '';
+
+        if ( $_part === true )
+            $_retValue = $this->_msgReplyTo;
+        else
+            $_retValue = $this->_msgReplyTo[$_part];
+
+        return $_retValue;
+    }
+
+    /**
+     * Inserts given addresses into structured format.
+     * This method takes a list of given addresses, via an array
+     * or a COMMA delimted string, and inserts them into a highly
+     * structured array. This array is designed to remove duplicate
+     * addresses and to sort them by Domain.
+     *
+     * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
+     * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses
+     * @return void
+     *
+     */
+    function _buildAddrList($_type, $_addrList)
+    {
+        // Pull existing list
+        $aryHost = $this->_msgRecipients;
+
+        // Only run this if we have something
+        if ( !empty ($_addrList ))
+        {
+            // $_addrList can be a STRING or an array
+            if ( is_string($_addrList) )
+            {
+                // This could be a COMMA delimited string
+                if ( strstr($_addrList, ',') )
+                // "explode "list" into an array
+                $_addrList = explode(',', $_addrList);
+
+                // Stick it in an array
+                else
+                $_addrList = array($_addrList);
+            }
+
+            // take the array of addresses and split them further
+            foreach ( $_addrList as $_strAddr )
+            {
+                // Strip off the end '>'
+                $_strAddr = str_replace('>', '', $_strAddr);
+
+                // Seperate "Real Name" from eMail address
+                $_tmpaddr = null;
+                $_tmpaddr = explode('<', $_strAddr);
+
+                // We have a "Real Name" and eMail address
+                if ( count($_tmpaddr) == 2 )
+                {
+                    $_tmpHost = explode('@', $_tmpaddr[1]);
+                    $_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
+                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
+                }
+                // We only have an eMail address
+                else
+                {
+                    // Strip off the beggining '<'
+                    $_strAddr = str_replace('<', '', $_strAddr);
+
+                    $_tmpHost = explode('@', $_strAddr);
+                    $_tmpHost[0] = trim($_tmpHost[0]);
+                    $_tmpHost[1] = trim($_tmpHost[1]);
+
+                    $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = '';
+                }
+            }
+        }
+        // replace list
+        $this->_msgRecipients = $aryHost;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Returns an array of the various parts of an email address
-	 * This assumes a well formed address:
-	 * - "Real name" <username@domain.tld>
-	 * - "Real Name" is optional
-	 * - if "Real Name" does not exist, the angle brackets are optional
-	 * This will split an email address into 4 or 5 parts.
-	 * - $_aryEmail[org]  = orignal string
-	 * - $_aryEmail[real] = "real name" - if there is one
-	 * - $_aryEmail[addr] = address part "username@domain.tld"
-	 * - $_aryEmail[host] = "domain.tld"
-	 * - $_aryEmail[user] = "userName"
-	 *
-	 *	@param		string		$_strAddr		Email address
-	 * 	@return 	array	 					An array of the various parts of an email address
-	 */
-	function _strip_email($_strAddr)
-	{
+    /**
+     * Returns an array of the various parts of an email address
+     * This assumes a well formed address:
+     * - "Real name" <username@domain.tld>
+     * - "Real Name" is optional
+     * - if "Real Name" does not exist, the angle brackets are optional
+     * This will split an email address into 4 or 5 parts.
+     * - $_aryEmail[org]  = orignal string
+     * - $_aryEmail[real] = "real name" - if there is one
+     * - $_aryEmail[addr] = address part "username@domain.tld"
+     * - $_aryEmail[host] = "domain.tld"
+     * - $_aryEmail[user] = "userName"
+     *
+     *	@param		string		$_strAddr		Email address
+     * 	@return 	array	 					An array of the various parts of an email address
+     */
+    function _strip_email($_strAddr)
+    {
         // phpcs:enable
-		// Keep the orginal
-		$_aryEmail['org'] = $_strAddr;
+        // Keep the orginal
+        $_aryEmail['org'] = $_strAddr;
 
-		// Set entire string to Lower Case
-		$_strAddr = strtolower($_strAddr);
+        // Set entire string to Lower Case
+        $_strAddr = strtolower($_strAddr);
 
-		// Drop "stuff' off the end
-		$_strAddr = trim($_strAddr, ' ">');
+        // Drop "stuff' off the end
+        $_strAddr = trim($_strAddr, ' ">');
 
-		// Seperate "Real Name" from eMail address, if we have one
-		$_tmpAry = explode('<', $_strAddr);
+        // Seperate "Real Name" from eMail address, if we have one
+        $_tmpAry = explode('<', $_strAddr);
 
-		// Do we have a "Real name"
-		if ( count($_tmpAry) == 2 )
-		{
-			// We may not really have a "Real Name"
-			if ( $_tmpAry[0])
-			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+        // Do we have a "Real name"
+        if ( count($_tmpAry) == 2 )
+        {
+            // We may not really have a "Real Name"
+            if ( $_tmpAry[0])
+            $_aryEmail['real'] = trim($_tmpAry[0], ' ">');
 
-			$_aryEmail['addr'] = $_tmpAry[1];
-		}
-		else
-		$_aryEmail['addr'] = $_tmpAry[0];
+            $_aryEmail['addr'] = $_tmpAry[1];
+        }
+        else
+        $_aryEmail['addr'] = $_tmpAry[0];
 
-		// Pull User Name and Host.tld apart
-		list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
+        // Pull User Name and Host.tld apart
+        list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
 
-		// Put the brackets back around the address
-		$_aryEmail['addr'] = '<' . $_aryEmail['addr'] . '>';
+        // Put the brackets back around the address
+        $_aryEmail['addr'] = '<' . $_aryEmail['addr'] . '>';
 
-		return $_aryEmail;
-	}
+        return $_aryEmail;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Returns an array of bares addresses for use with 'RCPT TO:'
-	 * This is a "build as you go" method. Each time this method is called
-	 * the underlaying array is destroyed and reconstructed.
-	 *
-	 * @return 		array		Returns an array of bares addresses
-	 */
-	function get_RCPT_list()
-	{
+    /**
+     * Returns an array of bares addresses for use with 'RCPT TO:'
+     * This is a "build as you go" method. Each time this method is called
+     * the underlaying array is destroyed and reconstructed.
+     *
+     * @return 		array		Returns an array of bares addresses
+     */
+    function get_RCPT_list()
+    {
         // phpcs:enable
-		/**
-		 * An array of bares addresses for use with 'RCPT TO:'
-		 */
-		$_RCPT_list=array();
-
-		// walk down Recipients array and pull just email addresses
-		foreach ( $this->_msgRecipients as $_host => $_list )
-		{
-			foreach ( $_list as $_subList )
-			{
-				foreach ( $_subList as $_name => $_addr )
-				{
-					// build RCPT list
-					$_RCPT_list[] = $_name . '@' . $_host;
-				}
-			}
-		}
-
-		return $_RCPT_list;
-	}
+        /**
+         * An array of bares addresses for use with 'RCPT TO:'
+         */
+        $_RCPT_list=array();
+
+        // walk down Recipients array and pull just email addresses
+        foreach ( $this->_msgRecipients as $_host => $_list )
+        {
+            foreach ( $_list as $_subList )
+            {
+                foreach ( $_subList as $_name => $_addr )
+                {
+                    // build RCPT list
+                    $_RCPT_list[] = $_name . '@' . $_host;
+                }
+            }
+        }
+
+        return $_RCPT_list;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Returns an array of addresses for a specific type; TO, CC or BCC
-	 *
-	 * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')
-	 * @return 		string|false 				Array of emaill address
-	 */
-	function get_email_list($_which = null)
-	{
+    /**
+     * Returns an array of addresses for a specific type; TO, CC or BCC
+     *
+     * @param 		string 	       $_which 	    Which collection of addresses to return ('to', 'cc', 'bcc')
+     * @return 		string|false 				Array of emaill address
+     */
+    function get_email_list($_which = null)
+    {
         // phpcs:enable
-		// We need to know which address segment to pull
-		if ( $_which )
-		{
-			// Make sure we have addresses to process
-			if ( $this->_msgRecipients )
-			{
-				$_RCPT_list=array();
-				// walk down Recipients array and pull just email addresses
-				foreach ( $this->_msgRecipients as $_host => $_list )
-				{
-					if ( $this->_msgRecipients[$_host][$_which] )
-					{
-						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
-						{
-							if ( $_realName )	// @CHANGE LDR
-							{
-								$_realName = '"' . $_realName . '"';
-								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
-							}
-							else
-							{
-								$_RCPT_list[] = $_addr . '@' . $_host;
-							}
-						}
-					}
-				}
-
-				return implode(', ', $_RCPT_list);
-			}
-			else
-			{
-				$this->_setErr(101, 'No eMail Address for message to be sent to.');
-				return false;
-			}
-		}
-		else
-		{
-			$this->_setErr(102, 'eMail type not defined.');
-			return false;
-		}
-	}
-
-	/**
-	 * TO Address[es] inwhich to send mail to
-	 *
-	 * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to
-	 * @return 	void
-	 */
-	function setTO($_addrTo)
-	{
-		if ( $_addrTo )
-		$this->_buildAddrList('to', $_addrTo);
-	}
-
-	/**
-	 * Retrieves the TO Address[es] inwhich to send mail to
-	 *
-	 * @return 	string 	TO Address[es] inwhich to send mail to
-	 */
-	function getTo()
-	{
-		return $this->get_email_list('to');
-	}
-
-	/**
-	 * CC Address[es] inwhich to send mail to
-	 *
-	 * @param 	string	$_strCC		CC Address[es] inwhich to send mail to
-	 * @return 	void
-	 */
-	function setCC($_strCC)
-	{
-		if ( $_strCC )
-		$this->_buildAddrList('cc', $_strCC);
-	}
-
-	/**
-	 * Retrieves the CC Address[es] inwhich to send mail to
-	 *
-	 * @return 	string 		CC Address[es] inwhich to send mail to
-	 */
-	function getCC()
-	{
-		return $this->get_email_list('cc');
-	}
-
-	/**
-	 * BCC Address[es] inwhich to send mail to
-	 *
-	 * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to
-	 * @return 	void
-	 */
-	function setBCC($_strBCC)
-	{
-		if ( $_strBCC )
-		$this->_buildAddrList('bcc', $_strBCC);
-	}
-
-	/**
-	 * Retrieves the BCC Address[es] inwhich to send mail to
-	 *
-	 * @return 	string		BCC Address[es] inwhich to send mail to
-	 */
-	function getBCC()
-	{
-		return $this->get_email_list('bcc');
-	}
-
-	/**
-	 * Message Subject
-	 *
-	 * @param 	string 	$_strSubject	Message Subject
-	 * @return 	void
-	 */
-	function setSubject($_strSubject = '')
-	{
-		if ( $_strSubject )
-		$this->_msgSubject = $_strSubject;
-	}
-
-	/**
-	 * Retrieves the Message Subject
-	 *
-	 * @return 	string 		Message Subject
-	 */
-	function getSubject()
-	{
-		return $this->_msgSubject;
-	}
-
-	/**
-	 * Constructes and returns message header
-	 *
-	 * @return string Complete message header
-	 */
-	function getHeader()
-	{
-		global $conf;
-
-		$_header = 'From: '       . $this->getFrom('org') . "\r\n"
-		. 'To: '         . $this->getTO()          . "\r\n";
-
-		if ( $this->getCC() )
-		$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
-
-		/* Note:
+        // We need to know which address segment to pull
+        if ( $_which )
+        {
+            // Make sure we have addresses to process
+            if ( $this->_msgRecipients )
+            {
+                $_RCPT_list=array();
+                // walk down Recipients array and pull just email addresses
+                foreach ( $this->_msgRecipients as $_host => $_list )
+                {
+                    if ( $this->_msgRecipients[$_host][$_which] )
+                    {
+                        foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
+                        {
+                            if ( $_realName )	// @CHANGE LDR
+                            {
+                                $_realName = '"' . $_realName . '"';
+                                $_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
+                            }
+                            else
+                            {
+                                $_RCPT_list[] = $_addr . '@' . $_host;
+                            }
+                        }
+                    }
+                }
+
+                return implode(', ', $_RCPT_list);
+            }
+            else
+            {
+                $this->_setErr(101, 'No eMail Address for message to be sent to.');
+                return false;
+            }
+        }
+        else
+        {
+            $this->_setErr(102, 'eMail type not defined.');
+            return false;
+        }
+    }
+
+    /**
+     * TO Address[es] inwhich to send mail to
+     *
+     * @param 	string 	$_addrTo 	TO Address[es] inwhich to send mail to
+     * @return 	void
+     */
+    function setTO($_addrTo)
+    {
+        if ( $_addrTo )
+        $this->_buildAddrList('to', $_addrTo);
+    }
+
+    /**
+     * Retrieves the TO Address[es] inwhich to send mail to
+     *
+     * @return 	string 	TO Address[es] inwhich to send mail to
+     */
+    function getTo()
+    {
+        return $this->get_email_list('to');
+    }
+
+    /**
+     * CC Address[es] inwhich to send mail to
+     *
+     * @param 	string	$_strCC		CC Address[es] inwhich to send mail to
+     * @return 	void
+     */
+    function setCC($_strCC)
+    {
+        if ( $_strCC )
+        $this->_buildAddrList('cc', $_strCC);
+    }
+
+    /**
+     * Retrieves the CC Address[es] inwhich to send mail to
+     *
+     * @return 	string 		CC Address[es] inwhich to send mail to
+     */
+    function getCC()
+    {
+        return $this->get_email_list('cc');
+    }
+
+    /**
+     * BCC Address[es] inwhich to send mail to
+     *
+     * @param 	string		$_strBCC	Recipients BCC Address[es] inwhich to send mail to
+     * @return 	void
+     */
+    function setBCC($_strBCC)
+    {
+        if ( $_strBCC )
+        $this->_buildAddrList('bcc', $_strBCC);
+    }
+
+    /**
+     * Retrieves the BCC Address[es] inwhich to send mail to
+     *
+     * @return 	string		BCC Address[es] inwhich to send mail to
+     */
+    function getBCC()
+    {
+        return $this->get_email_list('bcc');
+    }
+
+    /**
+     * Message Subject
+     *
+     * @param 	string 	$_strSubject	Message Subject
+     * @return 	void
+     */
+    function setSubject($_strSubject = '')
+    {
+        if ( $_strSubject )
+        $this->_msgSubject = $_strSubject;
+    }
+
+    /**
+     * Retrieves the Message Subject
+     *
+     * @return 	string 		Message Subject
+     */
+    function getSubject()
+    {
+        return $this->_msgSubject;
+    }
+
+    /**
+     * Constructes and returns message header
+     *
+     * @return string Complete message header
+     */
+    function getHeader()
+    {
+        global $conf;
+
+        $_header = 'From: '       . $this->getFrom('org') . "\r\n"
+        . 'To: '         . $this->getTO()          . "\r\n";
+
+        if ( $this->getCC() )
+        $_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+
+        /* Note:
 		 * BCC email addresses must be listed in the RCPT TO command list,
 		 * but the BCC header should not be printed under the DATA command.
 		 * So it is included into the function sendMsg() but not here.
 		 * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
 		 */
-		/*
+        /*
 		if ( $this->getBCC() )
 		$_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";
         */
 
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
-
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
-
-		$host=dol_getprefix('email');
-
-		//NOTE: Message-ID should probably contain the username of the user who sent the msg
-		$_header .= 'Subject: '    . $this->getSubject()     . "\r\n";
-		$_header .= 'Date: '       . date("r")               . "\r\n";
-
-		$trackid = $this->getTrackId();
-		if ($trackid)
-		{
-			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$_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
-		{
-			$_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";
-
-		//$_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->_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";
-
-		$_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";
-		$_header .= 'Mime-Version: 1.0' . "\r\n";
-
-
-		return $_header;
-	}
-
-	/**
-	 * Message Content
-	 *
-	 * @param 	string 	$strContent		Message Content
-	 * @param	string	$strType		Type
-	 * @return 	void
-	 */
-	function setBodyContent($strContent, $strType = 'plain')
-	{
-		//if ( $strContent )
-		//{
-		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);
-
-		$strContentAltText = '';
-		if ($strType == 'html')
-		{
-			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
-			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
-			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
-		}
-
-		// Make RFC2045 Compliant
-		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-		$strContent = rtrim(wordwrap($strContent, 75, "\r\n"));   // TODO Using this method creates unexpected line break on text/plain content.
-
-		$this->_msgContent[$strType] = array();
-
-		$this->_msgContent[$strType]['mimeType'] = $strMimeType;
-		$this->_msgContent[$strType]['data']     = $strContent;
-		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
-
-		if ( $this->getMD5flag() )
-		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
-		//}
-	}
-
-	/**
-	 * Retrieves the Message Content
-	 *
-	 * @return 	string			Message Content
-	 */
-	function getBodyContent()
-	{
-	    global $conf;
-
-		// Generate a new Boundary string
-		$this->_setBoundary();
-
-		// What type[s] of content do we have
-		$_types = array_keys($this->_msgContent);
-
-		// How many content types do we have
-		$keyCount = count($_types);
-
-		// If we have ZERO, we have a problem
-		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))
-		{
-			$_msgData = $this->_msgContent;
-			$_msgData = $_msgData[$_types[0]];
-
-			$content = 'Content-Type: ' . $_msgData['mimeType'] . '; charset="' . $this->getCharSet() . '"' . "\r\n"
-			. 'Content-Transfer-Encoding: ' . $this->getTransEncodeType() . "\r\n"
-			. 'Content-Disposition: inline'  . "\r\n"
-			. 'Content-Description: Message' . "\r\n";
-
-			if ( $this->getMD5flag() )
-			$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
-
-			$content .= "\r\n"
-			.  $_msgData['data'] . "\r\n";
-		}
-
-		// If we have more than ONE, we use the multi-part format
-		else if( $keyCount >= 1 || ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
-		{
-			// Since this is an actual multi-part message
-			// We need to define a content message Boundary
-			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
-
-			//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
-			$content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary('mixed') . '"'   . "\r\n";
-
-			//                     . "\r\n"
-			//                     . 'This is a multi-part message in MIME format.' . "\r\n";
-			$content .= "Content-Transfer-Encoding: 8bit\r\n";
-			$content .= "\r\n";
-
-			$content .= "--" . $this->_getBoundary('mixed') . "\r\n";
-
-			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";
-			}
-
-
-			// $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'
-
-
-			// Loop through message content array
-			foreach ($this->_msgContent as $type => $_content )
-			{
-				if ( $type == 'attachment' )
-				{
-					// loop through all attachments
-					foreach ( $_content as $_file => $_data )
-					{
-						$content .= "--" . $this->_getBoundary('mixed') . "\r\n"
-						.  'Content-Disposition: attachment; filename="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Description: ' . $_data['fileName'] ."\r\n";
-
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
-
-						$content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
-					}
-				}
-				// @CHANGE LDR
-				else if ( $type == 'image' )
-				{
-					// loop through all images
-					foreach ( $_content as $_image => $_data )
-					{
-						$content .= "--" . $this->_getBoundary('related') . "\r\n";  // always related for an inline image
-
-						$content .= 'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
-
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
-
-						$content .= "\r\n"
-						. $_data['data'] . "\r\n";
-					}
-
-					// always end related and end alternative after inline images
-					$content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
-					$content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
-					$content.= "\r\n";
-				}
-				else
-				{
-					if (key_exists('image', $this->_msgContent))
-					{
-						$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-						$content.= "\r\n" . ($_content['dataText']?$_content['dataText']:strip_tags($_content['data'])) . "\r\n"; // Add plain text message
-						$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
-						$content.= 'Content-Type: multipart/related; boundary="' . $this->_getBoundary('related') . '"' . "\r\n";
-						$content.= "\r\n";
-						$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
-					{
-					    $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
-    					$content .= "\r\n";
-	       				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
-
-	       				$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-	       				$content.= "\r\n". $_content['dataText'] . "\r\n";
-	       				$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
-					}
-
-					$content .= 'Content-Type: ' . $_content['mimeType'] . '; '
-					//                             . 'charset="' . $this->getCharSet() . '"';
-					. 'charset=' . $this->getCharSet() . '';
-
-					//                    $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
-					$content .=  "\r\n";
-					//                    $content .= 'Content-Transfer-Encoding: ';
-					//                    $content .= ($type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
-					//                    $content .=  "\r\n"
-					//                             . 'Content-Disposition: inline'  . "\r\n"
-					//                             . 'Content-Description: ' . $type . ' message' . "\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
-					{
-					    $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
-					}
-
-					$content .= "\r\n";
-				}
-			}
-
-			// Close message boundries
-			//            $content .= "\r\n--" . $this->_getBoundary() . '--' . "\r\n" ;
-			$content .= "--" . $this->_getBoundary('mixed') . '--' . "\r\n" ;
-		}
-
-		return $content;
-	}
-
-	/**
-	 * File attachments are added to the content array as sub-arrays,
-	 * allowing for multiple attachments for each outbound email
-	 *
-	 * @param string $strContent  File data to attach to message
-	 * @param string $strFileName File Name to give to attachment
-	 * @param string $strMimeType File Mime Type of attachment
-	 * @return void
-	 */
-	function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
-	{
-		if ( $strContent )
-		{
-			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n"));    // 76 max is defined into http://tools.ietf.org/html/rfc2047
-
-			$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
-			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
-			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
-
-			if ( $this->getMD5flag() )
-			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
-		}
-	}
-
-
-	// @CHANGE LDR
-
-	/**
-	 * Image attachments are added to the content array as sub-arrays,
-	 * allowing for multiple images for each outbound email
-	 *
-	 * @param 	string $strContent  	Image data to attach to message
-	 * @param 	string $strImageName 	Image Name to give to attachment
-	 * @param 	string $strMimeType 	Image Mime Type of attachment
-	 * @param 	string $strImageCid		CID
-	 * @return 	void
-	 */
-	function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
-	{
-		if ($strContent)
-		{
-			$this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
-			$this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
-			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
-			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
-
-			if ( $this->getMD5flag() )
-			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
-		}
-	}
-	// END @CHANGE LDR
-
-
-	/**
-	 * Message Content Sensitivity
-	 * Message Sensitivity values:
-	 *   - [0] None - default
-	 *   - [1] Personal
-	 *   - [2] Private
-	 *   - [3] Company Confidential
-	 *
-	 * @param 	integer	$_value		Message Sensitivity
-	 * @return 	void
-	 */
-	function setSensitivity($_value = 0)
-	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
-		$this->_msgSensitivity = $_value;
-	}
-
-	/**
-	 * Returns Message Content Sensitivity string
-	 * Message Sensitivity values:
-	 *   - [0] None - default
-	 *   - [1] Personal
-	 *   - [2] Private
-	 *   - [3] Company Confidential
-	 *
-	 * @return 	void
-	 */
-	function getSensitivity()
-	{
-		return $this->_arySensitivity[$this->_msgSensitivity];
-	}
-
-	/**
-	 * Message Content Priority
-	 * Message Priority values:
-	 *  - [0] 'Bulk'
-	 *  - [1] 'Highest'
-	 *  - [2] 'High'
-	 *  - [3] 'Normal' - default
-	 *  - [4] 'Low'
-	 *  - [5] 'Lowest'
-	 *
-	 * @param 	integer 	$_value 	Message Priority
-	 * @return 	void
-	 */
-	function setPriority( $_value = 3 )
-	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
-		$this->_msgPriority = $_value;
-	}
-
-	/**
-	 * Message Content Priority
-	 * Message Priority values:
-	 *  - [0] 'Bulk'
-	 *  - [1] 'Highest'
-	 *  - [2] 'High'
-	 *  - [3] 'Normal' - default
-	 *  - [4] 'Low'
-	 *  - [5] 'Lowest'
-	 *
-	 * @return string
-	 */
-	function getPriority()
-	{
-		return 'Importance: ' . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'Priority: '   . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'X-Priority: ' . $this->_msgPriority . ' (' . $this->_aryPriority[$this->_msgPriority] . ')' . "\r\n";
-	}
-
-	/**
-	 * Set flag which determines whether to calculate message MD5 checksum.
-	 *
-	 * @param 	string 	$_flag		Message Priority
-	 * @return 	void
-	 */
-	function setMD5flag($_flag = false)
-	{
-		$this->_smtpMD5 = $_flag;
-	}
-
-	/**
-	 * Gets flag which determines whether to calculate message MD5 checksum.
-	 *
-	 * @return 	boolean 				Message Priority
-	 */
-	function getMD5flag()
-	{
-		return $this->_smtpMD5;
-	}
-
-	/**
-	 * Message X-Header Content
-	 * This is a simple "insert". Whatever is given will be placed
-	 * "as is" into the Xheader array.
-	 *
-	 * @param string $strXdata Message X-Header Content
-	 * @return void
-	 */
-	function setXheader($strXdata)
-	{
-		if ( $strXdata )
-		$this->_msgXheader[] = $strXdata;
-	}
-
-	/**
-	 * Retrieves the Message X-Header Content
-	 *
-	 * @return string[] $_msgContent Message X-Header Content
-	 */
-	function getXheader()
-	{
-		return $this->_msgXheader;
-	}
-
-	/**
-	 * Generates Random string for MIME message Boundary
-	 *
-	 * @return void
-	 */
-	function _setBoundary()
-	{
-		$this->_smtpsBoundary = "multipart_x." . time() . ".x_boundary";
-		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
-		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
-	}
-
-	/**
-	 * Retrieves the MIME message Boundary
-	 *
-	 * @param  string $type				Type of boundary
-	 * @return string $_smtpsBoundary 	MIME message Boundary
-	 */
-	function _getBoundary($type='mixed')
-	{
-		if ($type == 'mixed') return $this->_smtpsBoundary;
-		else if ($type == 'related') return $this->_smtpsRelatedBoundary;
-		else if ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
-	}
+        $host=$this->getHost();
+        $usetls = preg_match('@tls://@i',$host);
+
+        $host=preg_replace('@tcp://@i','',$host);	// Remove prefix
+        $host=preg_replace('@ssl://@i','',$host);	// Remove prefix
+        $host=preg_replace('@tls://@i','',$host);	// Remove prefix
+
+        $host=dol_getprefix('email');
+
+        //NOTE: Message-ID should probably contain the username of the user who sent the msg
+        $_header .= 'Subject: '    . $this->getSubject()     . "\r\n";
+        $_header .= 'Date: '       . date("r")               . "\r\n";
+
+        $trackid = $this->getTrackId();
+        if ($trackid)
+        {
+            // References is kept in response and Message-ID is returned into In-Reply-To:
+            $_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
+        {
+            $_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";
+
+        //$_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->_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";
+
+        $_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";
+        $_header .= 'Mime-Version: 1.0' . "\r\n";
+
+
+        return $_header;
+    }
+
+    /**
+     * Message Content
+     *
+     * @param 	string 	$strContent		Message Content
+     * @param	string	$strType		Type
+     * @return 	void
+     */
+    function setBodyContent($strContent, $strType = 'plain')
+    {
+        //if ( $strContent )
+        //{
+        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);
+
+        $strContentAltText = '';
+        if ($strType == 'html')
+        {
+            // Similar code to forge a text from html is also in CMailFile.class.php
+            $strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
+            $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
+            $strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
+        }
+
+        // Make RFC2045 Compliant
+        //$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
+        $strContent = rtrim(wordwrap($strContent, 75, "\r\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+
+        $this->_msgContent[$strType] = array();
+
+        $this->_msgContent[$strType]['mimeType'] = $strMimeType;
+        $this->_msgContent[$strType]['data']     = $strContent;
+        $this->_msgContent[$strType]['dataText'] = $strContentAltText;
+
+        if ( $this->getMD5flag() )
+        $this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+        //}
+    }
+
+    /**
+     * Retrieves the Message Content
+     *
+     * @return 	string			Message Content
+     */
+    function getBodyContent()
+    {
+        global $conf;
+
+        // Generate a new Boundary string
+        $this->_setBoundary();
+
+        // What type[s] of content do we have
+        $_types = array_keys($this->_msgContent);
+
+        // How many content types do we have
+        $keyCount = count($_types);
+
+        // If we have ZERO, we have a problem
+        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))
+        {
+            $_msgData = $this->_msgContent;
+            $_msgData = $_msgData[$_types[0]];
+
+            $content = 'Content-Type: ' . $_msgData['mimeType'] . '; charset="' . $this->getCharSet() . '"' . "\r\n"
+            . 'Content-Transfer-Encoding: ' . $this->getTransEncodeType() . "\r\n"
+            . 'Content-Disposition: inline'  . "\r\n"
+            . 'Content-Description: Message' . "\r\n";
+
+            if ( $this->getMD5flag() )
+            $content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+
+            $content .= "\r\n"
+            .  $_msgData['data'] . "\r\n";
+        }
+
+        // If we have more than ONE, we use the multi-part format
+        else if( $keyCount >= 1 || ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+        {
+            // Since this is an actual multi-part message
+            // We need to define a content message Boundary
+            // NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
+
+            //$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
+            $content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary('mixed') . '"'   . "\r\n";
+
+            //                     . "\r\n"
+            //                     . 'This is a multi-part message in MIME format.' . "\r\n";
+            $content .= "Content-Transfer-Encoding: 8bit\r\n";
+            $content .= "\r\n";
+
+            $content .= "--" . $this->_getBoundary('mixed') . "\r\n";
+
+            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";
+            }
+
+
+            // $this->_msgContent must be sorted with key 'text' or 'html' first then 'image' then 'attachment'
+
+
+            // Loop through message content array
+            foreach ($this->_msgContent as $type => $_content )
+            {
+                if ( $type == 'attachment' )
+                {
+                    // loop through all attachments
+                    foreach ( $_content as $_file => $_data )
+                    {
+                        $content .= "--" . $this->_getBoundary('mixed') . "\r\n"
+                        .  'Content-Disposition: attachment; filename="' . $_data['fileName'] . '"' . "\r\n"
+                        .  'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['fileName'] . '"' . "\r\n"
+                        .  'Content-Transfer-Encoding: base64' . "\r\n"
+                        .  'Content-Description: ' . $_data['fileName'] ."\r\n";
+
+                        if ( $this->getMD5flag() )
+                        $content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+
+                        $content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
+                    }
+                }
+                // @CHANGE LDR
+                else if ( $type == 'image' )
+                {
+                    // loop through all images
+                    foreach ( $_content as $_image => $_data )
+                    {
+                        $content .= "--" . $this->_getBoundary('related') . "\r\n";  // always related for an inline image
+
+                        $content .= 'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['imageName'] . '"' . "\r\n"
+                        .  'Content-Transfer-Encoding: base64' . "\r\n"
+                        .  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
+                        .  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
+
+                        if ( $this->getMD5flag() )
+                        $content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+
+                        $content .= "\r\n"
+                        . $_data['data'] . "\r\n";
+                    }
+
+                    // always end related and end alternative after inline images
+                    $content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
+                    $content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
+                    $content.= "\r\n";
+                }
+                else
+                {
+                    if (key_exists('image', $this->_msgContent))
+                    {
+                        $content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
+                        $content.= "\r\n" . ($_content['dataText']?$_content['dataText']:strip_tags($_content['data'])) . "\r\n"; // Add plain text message
+                        $content.= "--" . $this->_getBoundary('alternative') . "\r\n";
+                        $content.= 'Content-Type: multipart/related; boundary="' . $this->_getBoundary('related') . '"' . "\r\n";
+                        $content.= "\r\n";
+                        $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
+                    {
+                        $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+                        $content .= "\r\n";
+                            $content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+
+                            $content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
+                            $content.= "\r\n". $_content['dataText'] . "\r\n";
+                            $content.= "--" . $this->_getBoundary('alternative') . "\r\n";
+                    }
+
+                    $content .= 'Content-Type: ' . $_content['mimeType'] . '; '
+                    //                             . 'charset="' . $this->getCharSet() . '"';
+                    . 'charset=' . $this->getCharSet() . '';
+
+                    //                    $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
+                    $content .=  "\r\n";
+                    //                    $content .= 'Content-Transfer-Encoding: ';
+                    //                    $content .= ($type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
+                    //                    $content .=  "\r\n"
+                    //                             . 'Content-Disposition: inline'  . "\r\n"
+                    //                             . 'Content-Description: ' . $type . ' message' . "\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
+                    {
+                        $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
+                    }
+
+                    $content .= "\r\n";
+                }
+            }
+
+            // Close message boundries
+            //            $content .= "\r\n--" . $this->_getBoundary() . '--' . "\r\n" ;
+            $content .= "--" . $this->_getBoundary('mixed') . '--' . "\r\n" ;
+        }
+
+        return $content;
+    }
+
+    /**
+     * File attachments are added to the content array as sub-arrays,
+     * allowing for multiple attachments for each outbound email
+     *
+     * @param string $strContent  File data to attach to message
+     * @param string $strFileName File Name to give to attachment
+     * @param string $strMimeType File Mime Type of attachment
+     * @return void
+     */
+    function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
+    {
+        if ( $strContent )
+        {
+            $strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n"));    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+
+            $this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
+            $this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
+            $this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
+
+            if ( $this->getMD5flag() )
+            $this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+        }
+    }
+
+
+    // @CHANGE LDR
+
+    /**
+     * Image attachments are added to the content array as sub-arrays,
+     * allowing for multiple images for each outbound email
+     *
+     * @param 	string $strContent  	Image data to attach to message
+     * @param 	string $strImageName 	Image Name to give to attachment
+     * @param 	string $strMimeType 	Image Mime Type of attachment
+     * @param 	string $strImageCid		CID
+     * @return 	void
+     */
+    function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
+    {
+        if ($strContent)
+        {
+            $this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
+            $this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
+            $this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
+            $this->_msgContent['image'][$strImageName]['data']     = $strContent;
+
+            if ( $this->getMD5flag() )
+            $this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+        }
+    }
+    // END @CHANGE LDR
+
+
+    /**
+     * Message Content Sensitivity
+     * Message Sensitivity values:
+     *   - [0] None - default
+     *   - [1] Personal
+     *   - [2] Private
+     *   - [3] Company Confidential
+     *
+     * @param 	integer	$_value		Message Sensitivity
+     * @return 	void
+     */
+    function setSensitivity($_value = 0)
+    {
+        if ( ( is_numeric($_value) ) &&
+        ( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
+        $this->_msgSensitivity = $_value;
+    }
+
+    /**
+     * Returns Message Content Sensitivity string
+     * Message Sensitivity values:
+     *   - [0] None - default
+     *   - [1] Personal
+     *   - [2] Private
+     *   - [3] Company Confidential
+     *
+     * @return 	void
+     */
+    function getSensitivity()
+    {
+        return $this->_arySensitivity[$this->_msgSensitivity];
+    }
+
+    /**
+     * Message Content Priority
+     * Message Priority values:
+     *  - [0] 'Bulk'
+     *  - [1] 'Highest'
+     *  - [2] 'High'
+     *  - [3] 'Normal' - default
+     *  - [4] 'Low'
+     *  - [5] 'Lowest'
+     *
+     * @param 	integer 	$_value 	Message Priority
+     * @return 	void
+     */
+    function setPriority( $_value = 3 )
+    {
+        if ( ( is_numeric($_value) ) &&
+        ( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
+        $this->_msgPriority = $_value;
+    }
+
+    /**
+     * Message Content Priority
+     * Message Priority values:
+     *  - [0] 'Bulk'
+     *  - [1] 'Highest'
+     *  - [2] 'High'
+     *  - [3] 'Normal' - default
+     *  - [4] 'Low'
+     *  - [5] 'Lowest'
+     *
+     * @return string
+     */
+    function getPriority()
+    {
+        return 'Importance: ' . $this->_aryPriority[$this->_msgPriority] . "\r\n"
+        . 'Priority: '   . $this->_aryPriority[$this->_msgPriority] . "\r\n"
+        . 'X-Priority: ' . $this->_msgPriority . ' (' . $this->_aryPriority[$this->_msgPriority] . ')' . "\r\n";
+    }
+
+    /**
+     * Set flag which determines whether to calculate message MD5 checksum.
+     *
+     * @param 	string 	$_flag		Message Priority
+     * @return 	void
+     */
+    function setMD5flag($_flag = false)
+    {
+        $this->_smtpMD5 = $_flag;
+    }
+
+    /**
+     * Gets flag which determines whether to calculate message MD5 checksum.
+     *
+     * @return 	boolean 				Message Priority
+     */
+    function getMD5flag()
+    {
+        return $this->_smtpMD5;
+    }
+
+    /**
+     * Message X-Header Content
+     * This is a simple "insert". Whatever is given will be placed
+     * "as is" into the Xheader array.
+     *
+     * @param string $strXdata Message X-Header Content
+     * @return void
+     */
+    function setXheader($strXdata)
+    {
+        if ( $strXdata )
+        $this->_msgXheader[] = $strXdata;
+    }
+
+    /**
+     * Retrieves the Message X-Header Content
+     *
+     * @return string[] $_msgContent Message X-Header Content
+     */
+    function getXheader()
+    {
+        return $this->_msgXheader;
+    }
+
+    /**
+     * Generates Random string for MIME message Boundary
+     *
+     * @return void
+     */
+    function _setBoundary()
+    {
+        $this->_smtpsBoundary = "multipart_x." . time() . ".x_boundary";
+        $this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
+        $this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
+    }
+
+    /**
+     * Retrieves the MIME message Boundary
+     *
+     * @param  string $type				Type of boundary
+     * @return string $_smtpsBoundary 	MIME message Boundary
+     */
+    function _getBoundary($type='mixed')
+    {
+        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
-	/**
-	 * This function has been modified as provided by SirSir to allow multiline responses when
-	 * using SMTP Extensions
-	 *
-	 * @param	Handler		$socket			Socket handler
-	 * @param	string		$response		Response. Example: "550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"
-	 * @return	boolean						True or false
-	 */
-	function server_parse($socket, $response)
-	{
+    /**
+     * This function has been modified as provided by SirSir to allow multiline responses when
+     * using SMTP Extensions
+     *
+     * @param	Handler		$socket			Socket handler
+     * @param	string		$response		Response. Example: "550 5.7.1  https://support.google.com/a/answer/6140680#invalidcred j21sm814390wre.3"
+     * @return	boolean						True or false
+     */
+    function server_parse($socket, $response)
+    {
         // phpcs:enable
-		/**
-		 * Returns constructed SELECT Object string or boolean upon failure
-		 * Default value is set at true
-		 */
-		$_retVal = true;
+        /**
+         * Returns constructed SELECT Object string or boolean upon failure
+         * Default value is set at true
+         */
+        $_retVal = true;
 
-		$server_response = '';
+        $server_response = '';
 
         // avoid infinite loop
         $limit=0;
 
-		while (substr($server_response,3,1) != ' ' && $limit<100)
-		{
-			if (! ($server_response = fgets($socket, 256)))
-			{
-				$this->_setErr(121, "Couldn't get mail server response codes");
-				$_retVal = false;
-				break;
-			}
+        while (substr($server_response,3,1) != ' ' && $limit<100)
+        {
+            if (! ($server_response = fgets($socket, 256)))
+            {
+                $this->_setErr(121, "Couldn't get mail server response codes");
+                $_retVal = false;
+                break;
+            }
             $limit++;
-		}
+        }
 
-		if (! (substr($server_response, 0, 3) == $response))
-		{
-			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
-			$_retVal = false;
-		}
+        if (! (substr($server_response, 0, 3) == $response))
+        {
+            $this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
+            $_retVal = false;
+        }
 
-		return $_retVal;
-	}
+        return $_retVal;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Send str
-	 *
-	 * @param	string		$_strSend		String to send
-	 * @param 	string		$_returnCode	Return code
-	 * @param 	string		$CRLF			CRLF
-	 * @return 	boolean|null						True or false
-	 */
-	function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
-	{
+    /**
+     * Send str
+     *
+     * @param	string		$_strSend		String to send
+     * @param 	string		$_returnCode	Return code
+     * @param 	string		$CRLF			CRLF
+     * @return 	boolean|null						True or false
+     */
+    function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
+    {
         // phpcs:enable
-		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.=$_strSend;	// @CHANGE LDR for log
+        fputs($this->socket, $_strSend . $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);
+    }
 
-	// =============================================================
-	// ** Error handling methods
+    // =============================================================
+    // ** Error handling methods
 
-	/**
-	 * Defines errors codes and messages for Class
-	 *
-	 * @param  int    $_errNum  Error Code Number
-	 * @param  string $_errMsg  Error Message
-	 * @return void
+    /**
+     * Defines errors codes and messages for Class
+     *
+     * @param  int    $_errNum  Error Code Number
+     * @param  string $_errMsg  Error Message
+     * @return void
      */
     function _setErr( $_errNum, $_errMsg )
     {
@@ -1836,25 +1836,25 @@ 
         );
     }
 
-	/**
-	 * Returns errors codes and messages for Class
-	 *
-	 * @return string $_errMsg  Error Message
-	 */
-	function getErrors()
-	{
-		$_errMsg = array();
-
-		if (is_array($this->_smtpsErrors))
-		{
-			foreach ( $this->_smtpsErrors as $_err => $_info )
-			{
-				$_errMsg[] = 'Error [' . $_info['num'] .']: '. $_info['msg'];
-			}
-		}
-
-		return implode("\n", $_errMsg);
-	}
+    /**
+     * Returns errors codes and messages for Class
+     *
+     * @return string $_errMsg  Error Message
+     */
+    function getErrors()
+    {
+        $_errMsg = array();
+
+        if (is_array($this->_smtpsErrors))
+        {
+            foreach ( $this->_smtpsErrors as $_err => $_info )
+            {
+                $_errMsg[] = 'Error [' . $_info['num'] .']: '. $_info['msg'];
+            }
+        }
+
+        return implode("\n", $_errMsg);
+    }
 }
 
 

Spacing +218 added lines, -218 removed lines

@@ -117,10 +117,10 @@ 
 	/**
 	 * Message Sensitivity
 	 */
-	var $_arySensitivity = array ( false,
+	var $_arySensitivity = array(false,
                                   'Personal',
                                   'Private',
-                                  'Company Confidential' );
+                                  'Company Confidential');
 
 	/**
 	 * Message Sensitivity
@@ -131,12 +131,12 @@ 
 	/**
 	 * Message Priority
 	 */
-	var $_aryPriority = array ( 'Bulk',
+	var $_aryPriority = array('Bulk',
                                 'Highest',
                                 'High',
                                 'Normal',
                                 'Low',
-                                'Lowest' );
+                                'Lowest');
 
 	/**
 	 * Content-Transfer-Encoding
@@ -147,13 +147,13 @@ 
 	/**
 	 * Content-Transfer-Encoding
 	 */
-	var $_smtpsTransEncodeTypes = array( '7bit',               // Simple 7-bit ASCII
-                                         '8bit',               // 8-bit coding with line termination characters
-                                         'base64',             // 3 octets encoded into 4 sextets with offset
-                                         'binary',             // Arbitrary binary stream
-                                         'mac-binhex40',       // Macintosh binary to hex encoding
-                                         'quoted-printable',   // Mostly 7-bit, with 8-bit characters encoded as "=HH"
-                                         'uuencode' );         // UUENCODE encoding
+	var $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII
+                                         '8bit', // 8-bit coding with line termination characters
+                                         'base64', // 3 octets encoded into 4 sextets with offset
+                                         'binary', // Arbitrary binary stream
+                                         'mac-binhex40', // Macintosh binary to hex encoding
+                                         'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"
+                                         'uuencode'); // UUENCODE encoding
 
 	/**
 	 * Content-Transfer-Encoding
@@ -300,7 +300,7 @@ 
      */
 	function setErrorsTo($_strErrorsTo)
 	{
-		if ( $_strErrorsTo )
+		if ($_strErrorsTo)
 		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
 	}
 
@@ -310,11 +310,11 @@ 
      * @param	boolean		$_part		Variant
      * @return	string					Errors to
      */
-	function getErrorsTo($_part = true )
+	function getErrorsTo($_part = true)
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
+		if ($_part === true)
 		$_retValue = $this->_errorsTo;
 		else
 		$_retValue = $this->_errorsTo[$_part];
@@ -328,7 +328,7 @@ 
 	 * @param	boolean		$_vDebug		Value for debug
 	 * @return 	void
 	 */
-	function setDebug($_vDebug = false )
+	function setDebug($_vDebug = false)
 	{
 		$this->_debug = $_vDebug;
 	}
@@ -359,29 +359,29 @@ 
 		// We have to make sure the HOST given is valid
 		// This is done here because '@fsockopen' will not give me this
 		// information if it failes to connect because it can't find the HOST
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
 		// @CHANGE LDR
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if ( (! is_ip($host)) && ((gethostbyname($host)) == $host))
+		if ((!is_ip($host)) && ((gethostbyname($host)) == $host))
 		{
-			$this->_setErr(99, $host . ' is either offline or is an invalid host name.');
+			$this->_setErr(99, $host.' is either offline or is an invalid host name.');
 			$_retVal = false;
 		}
 		else
 		{
 			//See if we can connect to the SMTP server
 			if ($this->socket = @fsockopen(
-    			preg_replace('@tls://@i','',$this->getHost()),       // Host to 'hit', IP or domain
-    			$this->getPort(),       // which Port number to use
-    			$this->errno,           // actual system level error
-    			$this->errstr,          // and any text that goes with the error
+    			preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
+    			$this->getPort(), // which Port number to use
+    			$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
 			{
@@ -392,14 +392,14 @@ 
 				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") )
+				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;
 			}
@@ -422,18 +422,18 @@ 
 		// Send the RFC2554 specified EHLO.
 		// This improvment as provided by 'SirSir' to
 		// accomodate both SMTP AND ESMTP capable servers
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$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;
 
-		if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+		if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
 		{
 			// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
 			$hosth = $this->getFrom('addr');
@@ -442,7 +442,7 @@ 
 			$hosth = preg_replace('/.*@/', '', $hosth);
 		}
 
-		if ( $_retVal = $this->socket_send_str('EHLO ' . $hosth, '250') )
+		if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
 		{
 			if ($usetls)
 			{
@@ -493,7 +493,7 @@ 
 				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
 				if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250'))
 				{
-					$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
+					$this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
 					return $_retVal;
 				}
 			}
@@ -506,12 +506,12 @@ 
 
 			// 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') )
+			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.');
+			$this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
 		}
 
 		return $_retVal;
@@ -535,10 +535,10 @@ 
 		$_retVal = false;
 
 		// Connect to Server
-		if ( $this->socket = $this->_server_connect() )
+		if ($this->socket = $this->_server_connect())
 		{
 			// If a User ID *and* a password is given, assume Authentication is desired
-			if( !empty($this->_smtpsID) && !empty($this->_smtpsPW) )
+			if (!empty($this->_smtpsID) && !empty($this->_smtpsPW))
 			{
 				// Send the RFC2554 specified EHLO.
 				$_retVal = $this->_server_authenticate();
@@ -548,16 +548,16 @@ 
 			else
 			{
 				// Send the RFC821 specified HELO.
-				$host=$this->getHost();
-				$usetls = preg_match('@tls://@i',$host);
+				$host = $this->getHost();
+				$usetls = preg_match('@tls://@i', $host);
 
-				$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-				$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-				$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+				$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+				$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+				$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
 				$hosth = $host;
 
-				if (! empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
+				if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
 				{
 					// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
 					$hosth = $this->getFrom('addr');
@@ -566,21 +566,21 @@ 
 					$hosth = preg_replace('/.*@/', '', $hosth);
 				}
 
-				$_retVal = $this->socket_send_str('HELO ' . $hosth, '250');
+				$_retVal = $this->socket_send_str('HELO '.$hosth, '250');
 			}
 
 			// Well, did we get to the server?
-			if ( $_retVal )
+			if ($_retVal)
 			{
 				// From this point onward most server response codes should be 250
 				// Specify who the mail is from....
 				// This has to be the raw email address, strip the "name" off
-				$this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
+				$this->socket_send_str('MAIL FROM: '.$this->getFrom('addr'), '250');
 
 				// 'RCPT TO:' must be given a single address, so this has to loop
 				// through the list of addresses, regardless of TO, CC or BCC
 				// and send it out "single file"
-				foreach ( $this->get_RCPT_list() as $_address )
+				foreach ($this->get_RCPT_list() as $_address)
 				{
 				    /* Note:
 				     * BCC email addresses must be listed in the RCPT TO command list,
@@ -596,7 +596,7 @@ 
 					 * mark the last address as "bad" and start the address loop over again.
 					 * If any address fails, the entire message fails.
 					 */
-					$this->socket_send_str('RCPT TO: <' . $_address . '>', '250');
+					$this->socket_send_str('RCPT TO: <'.$_address.'>', '250');
 				}
 
 				// Tell the server we are ready to start sending data
@@ -606,7 +606,7 @@ 
 
 				// Now we are ready for the message...
 				// Ok, all the ingredients are mixed in let's cook this puppy...
-				$this->socket_send_str($this->getHeader().$this->getBodyContent() . "\r\n" . '.', '250');
+				$this->socket_send_str($this->getHeader().$this->getBodyContent()."\r\n".'.', '250');
 
 				// Now tell the server we are done and close the socket...
 				fputs($this->socket, 'QUIT');
@@ -656,13 +656,13 @@ 
 		$_retVal = true;
 
 		// if we have a path...
-		if ( ! empty ($_strConfigPath) )
+		if (!empty ($_strConfigPath))
 		{
 			// If the path is not valid, this will NOT generate an error,
 			// it will simply return false.
-			if ( ! @include $_strConfigPath)
+			if (!@include $_strConfigPath)
 			{
-				$this->_setErr(110, '"' . $_strConfigPath . '" is not a valid path.');
+				$this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');
 				$_retVal = false;
 			}
 		}
@@ -672,13 +672,13 @@ 
 		{
 			// 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') )
+			if ($_host = ini_get('SMTPs'))
 			$this->setHost($_host);
 
-			if ( $_port = ini_get('smtp_port') )
+			if ($_port = ini_get('smtp_port'))
 			$this->setPort($_port);
 
-			if ( $_from = ini_get('sendmail_from') )
+			if ($_from = ini_get('sendmail_from'))
 			$this->setFrom($_from);
 		}
 
@@ -697,8 +697,8 @@ 
 	 */
 	function setTransportType($_type = 0)
 	{
-		if ( ( is_numeric($_type) ) &&
-		( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
+		if ((is_numeric($_type)) &&
+		(($_type >= 0) && ($_type <= 3)))
 		$this->_transportType = $_type;
 	}
 
@@ -740,7 +740,7 @@ 
 	 */
 	function setHost($_strHost)
 	{
-		if ( $_strHost )
+		if ($_strHost)
 		$this->_smtpsHost = $_strHost;
 	}
 
@@ -765,8 +765,8 @@ 
 	 */
 	function setPort($_intPort)
 	{
-		if ( ( is_numeric($_intPort) ) &&
-		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
+		if ((is_numeric($_intPort)) &&
+		(($_intPort >= 1) && ($_intPort <= 65536)))
 		$this->_smtpsPort = $_intPort;
 	}
 
@@ -832,7 +832,7 @@ 
 	 */
 	function setCharSet($_strCharSet)
 	{
-		if ( $_strCharSet )
+		if ($_strCharSet)
 		$this->_smtpsCharSet = $_strCharSet;
 	}
 
@@ -920,7 +920,7 @@ 
 	 */
 	function setFrom($_strFrom)
 	{
-		if ( $_strFrom )
+		if ($_strFrom)
 		$this->_msgFrom = $this->_strip_email($_strFrom);
 	}
 
@@ -934,7 +934,7 @@ 
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
+		if ($_part === true)
 		$_retValue = $this->_msgFrom;
 		else
 		$_retValue = $this->_msgFrom[$_part];
@@ -950,7 +950,7 @@ 
 	 */
 	function setReplyTo($_strReplyTo)
 	{
-	    if ( $_strReplyTo )
+	    if ($_strReplyTo)
 	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
 	}
 
@@ -964,7 +964,7 @@ 
 	{
 	    $_retValue = '';
 
-	    if ( $_part === true )
+	    if ($_part === true)
 	        $_retValue = $this->_msgReplyTo;
 	    else
 	        $_retValue = $this->_msgReplyTo[$_part];
@@ -990,13 +990,13 @@ 
 		$aryHost = $this->_msgRecipients;
 
 		// Only run this if we have something
-		if ( !empty ($_addrList ))
+		if (!empty ($_addrList))
 		{
 			// $_addrList can be a STRING or an array
-			if ( is_string($_addrList) )
+			if (is_string($_addrList))
 			{
 				// This could be a COMMA delimited string
-				if ( strstr($_addrList, ',') )
+				if (strstr($_addrList, ','))
 				// "explode "list" into an array
 				$_addrList = explode(',', $_addrList);
 
@@ -1006,7 +1006,7 @@ 
 			}
 
 			// take the array of addresses and split them further
-			foreach ( $_addrList as $_strAddr )
+			foreach ($_addrList as $_strAddr)
 			{
 				// Strip off the end '>'
 				$_strAddr = str_replace('>', '', $_strAddr);
@@ -1016,7 +1016,7 @@ 
 				$_tmpaddr = explode('<', $_strAddr);
 
 				// We have a "Real Name" and eMail address
-				if ( count($_tmpaddr) == 2 )
+				if (count($_tmpaddr) == 2)
 				{
 					$_tmpHost = explode('@', $_tmpaddr[1]);
 					$_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
@@ -1073,10 +1073,10 @@ 
 		$_tmpAry = explode('<', $_strAddr);
 
 		// Do we have a "Real name"
-		if ( count($_tmpAry) == 2 )
+		if (count($_tmpAry) == 2)
 		{
 			// We may not really have a "Real Name"
-			if ( $_tmpAry[0])
+			if ($_tmpAry[0])
 			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
 
 			$_aryEmail['addr'] = $_tmpAry[1];
@@ -1085,10 +1085,10 @@ 
 		$_aryEmail['addr'] = $_tmpAry[0];
 
 		// Pull User Name and Host.tld apart
-		list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
+		list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
 
 		// Put the brackets back around the address
-		$_aryEmail['addr'] = '<' . $_aryEmail['addr'] . '>';
+		$_aryEmail['addr'] = '<'.$_aryEmail['addr'].'>';
 
 		return $_aryEmail;
 	}
@@ -1107,17 +1107,17 @@ 
 		/**
 		 * An array of bares addresses for use with 'RCPT TO:'
 		 */
-		$_RCPT_list=array();
+		$_RCPT_list = array();
 
 		// walk down Recipients array and pull just email addresses
-		foreach ( $this->_msgRecipients as $_host => $_list )
+		foreach ($this->_msgRecipients as $_host => $_list)
 		{
-			foreach ( $_list as $_subList )
+			foreach ($_list as $_subList)
 			{
-				foreach ( $_subList as $_name => $_addr )
+				foreach ($_subList as $_name => $_addr)
 				{
 					// build RCPT list
-					$_RCPT_list[] = $_name . '@' . $_host;
+					$_RCPT_list[] = $_name.'@'.$_host;
 				}
 			}
 		}
@@ -1136,27 +1136,27 @@ 
 	{
         // phpcs:enable
 		// We need to know which address segment to pull
-		if ( $_which )
+		if ($_which)
 		{
 			// Make sure we have addresses to process
-			if ( $this->_msgRecipients )
+			if ($this->_msgRecipients)
 			{
-				$_RCPT_list=array();
+				$_RCPT_list = array();
 				// walk down Recipients array and pull just email addresses
-				foreach ( $this->_msgRecipients as $_host => $_list )
+				foreach ($this->_msgRecipients as $_host => $_list)
 				{
-					if ( $this->_msgRecipients[$_host][$_which] )
+					if ($this->_msgRecipients[$_host][$_which])
 					{
-						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
+						foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName)
 						{
-							if ( $_realName )	// @CHANGE LDR
+							if ($_realName)	// @CHANGE LDR
 							{
-								$_realName = '"' . $_realName . '"';
-								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
+								$_realName = '"'.$_realName.'"';
+								$_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
 							}
 							else
 							{
-								$_RCPT_list[] = $_addr . '@' . $_host;
+								$_RCPT_list[] = $_addr.'@'.$_host;
 							}
 						}
 					}
@@ -1185,7 +1185,7 @@ 
 	 */
 	function setTO($_addrTo)
 	{
-		if ( $_addrTo )
+		if ($_addrTo)
 		$this->_buildAddrList('to', $_addrTo);
 	}
 
@@ -1207,7 +1207,7 @@ 
 	 */
 	function setCC($_strCC)
 	{
-		if ( $_strCC )
+		if ($_strCC)
 		$this->_buildAddrList('cc', $_strCC);
 	}
 
@@ -1229,7 +1229,7 @@ 
 	 */
 	function setBCC($_strBCC)
 	{
-		if ( $_strBCC )
+		if ($_strBCC)
 		$this->_buildAddrList('bcc', $_strBCC);
 	}
 
@@ -1251,7 +1251,7 @@ 
 	 */
 	function setSubject($_strSubject = '')
 	{
-		if ( $_strSubject )
+		if ($_strSubject)
 		$this->_msgSubject = $_strSubject;
 	}
 
@@ -1274,11 +1274,11 @@ 
 	{
 		global $conf;
 
-		$_header = 'From: '       . $this->getFrom('org') . "\r\n"
-		. 'To: '         . $this->getTO()          . "\r\n";
+		$_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,
@@ -1291,57 +1291,57 @@ 
 		$_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";
         */
 
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-		$host=dol_getprefix('email');
+		$host = dol_getprefix('email');
 
 		//NOTE: Message-ID should probably contain the username of the user who sent the msg
-		$_header .= 'Subject: '    . $this->getSubject()     . "\r\n";
-		$_header .= 'Date: '       . date("r")               . "\r\n";
+		$_header .= 'Subject: '.$this->getSubject()."\r\n";
+		$_header .= 'Date: '.date("r")."\r\n";
 
 		$trackid = $this->getTrackId();
 		if ($trackid)
 		{
 			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$_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";
+			$_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
 		{
-			$_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
+			$_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 )
+		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";
-		$_header .= 'Mime-Version: 1.0' . "\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";
+		$_header .= 'Mime-Version: 1.0'."\r\n";
 
 
 		return $_header;
@@ -1358,7 +1358,7 @@ 
 	{
 		//if ( $strContent )
 		//{
-		if ( $strType == 'html' )
+		if ($strType == 'html')
 		$strMimeType = 'text/html';
 		else
 		$strMimeType = 'text/plain';
@@ -1370,14 +1370,14 @@ 
 		if ($strType == 'html')
 		{
 			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
+			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
 			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
 			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
 		}
 
 		// Make RFC2045 Compliant
 		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-		$strContent = rtrim(wordwrap($strContent, 75, "\r\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+		$strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.
 
 		$this->_msgContent[$strType] = array();
 
@@ -1385,7 +1385,7 @@ 
 		$this->_msgContent[$strType]['data']     = $strContent;
 		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
 
-		if ( $this->getMD5flag() )
+		if ($this->getMD5flag())
 		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
 		//}
 	}
@@ -1409,49 +1409,49 @@ 
 		$keyCount = count($_types);
 
 		// If we have ZERO, we have a problem
-		if( $keyCount === 0 )
+		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))
+		else if ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
 		{
 			$_msgData = $this->_msgContent;
 			$_msgData = $_msgData[$_types[0]];
 
-			$content = 'Content-Type: ' . $_msgData['mimeType'] . '; charset="' . $this->getCharSet() . '"' . "\r\n"
-			. 'Content-Transfer-Encoding: ' . $this->getTransEncodeType() . "\r\n"
-			. 'Content-Disposition: inline'  . "\r\n"
-			. 'Content-Description: Message' . "\r\n";
+			$content = 'Content-Type: '.$_msgData['mimeType'].'; charset="'.$this->getCharSet().'"'."\r\n"
+			. 'Content-Transfer-Encoding: '.$this->getTransEncodeType()."\r\n"
+			. '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";
+			.  $_msgData['data']."\r\n";
 		}
 
 		// If we have more than ONE, we use the multi-part format
-		else if( $keyCount >= 1 || ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+		else if ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
 		{
 			// Since this is an actual multi-part message
 			// We need to define a content message Boundary
 			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
 
 			//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
-			$content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary('mixed') . '"'   . "\r\n";
+			$content = 'Content-Type: multipart/mixed; boundary="'.$this->_getBoundary('mixed').'"'."\r\n";
 
 			//                     . "\r\n"
 			//                     . 'This is a multi-part message in MIME format.' . "\r\n";
 			$content .= "Content-Transfer-Encoding: 8bit\r\n";
 			$content .= "\r\n";
 
-			$content .= "--" . $this->_getBoundary('mixed') . "\r\n";
+			$content .= "--".$this->_getBoundary('mixed')."\r\n";
 
 			if (key_exists('image', $this->_msgContent))     // If inline image found
 			{
-				$content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+				$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
 				$content .= "\r\n";
-				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+				$content .= "--".$this->_getBoundary('alternative')."\r\n";
 			}
 
 
@@ -1459,93 +1459,93 @@ 
 
 
 			// Loop through message content array
-			foreach ($this->_msgContent as $type => $_content )
+			foreach ($this->_msgContent as $type => $_content)
 			{
-				if ( $type == 'attachment' )
+				if ($type == 'attachment')
 				{
 					// loop through all attachments
-					foreach ( $_content as $_file => $_data )
+					foreach ($_content as $_file => $_data)
 					{
-						$content .= "--" . $this->_getBoundary('mixed') . "\r\n"
-						.  'Content-Disposition: attachment; filename="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Description: ' . $_data['fileName'] ."\r\n";
+						$content .= "--".$this->_getBoundary('mixed')."\r\n"
+						.  'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"
+						.  'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"
+						.  '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";
+						$content .= "\r\n".$_data['data']."\r\n\r\n";
 					}
 				}
 				// @CHANGE LDR
-				else if ( $type == 'image' )
+				else if ($type == 'image')
 				{
 					// loop through all images
-					foreach ( $_content as $_image => $_data )
+					foreach ($_content as $_image => $_data)
 					{
-						$content .= "--" . $this->_getBoundary('related') . "\r\n";  // always related for an inline image
+						$content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image
 
-						$content .= 'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
+						$content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"
+						.  'Content-Transfer-Encoding: base64'."\r\n"
+						.  '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";
+						. $_data['data']."\r\n";
 					}
 
 					// always end related and end alternative after inline images
-					$content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
-					$content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
-					$content.= "\r\n";
+					$content .= "--".$this->_getBoundary('related')."--"."\r\n";
+					$content .= "\r\n"."--".$this->_getBoundary('alternative')."--"."\r\n";
+					$content .= "\r\n";
 				}
 				else
 				{
 					if (key_exists('image', $this->_msgContent))
 					{
-						$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-						$content.= "\r\n" . ($_content['dataText']?$_content['dataText']:strip_tags($_content['data'])) . "\r\n"; // Add plain text message
-						$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
-						$content.= 'Content-Type: multipart/related; boundary="' . $this->_getBoundary('related') . '"' . "\r\n";
-						$content.= "\r\n";
-						$content.= "--" . $this->_getBoundary('related') . "\r\n";
+						$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+						$content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message
+						$content .= "--".$this->_getBoundary('alternative')."\r\n";
+						$content .= 'Content-Type: multipart/related; boundary="'.$this->_getBoundary('related').'"'."\r\n";
+						$content .= "\r\n";
+						$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 .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
     					$content .= "\r\n";
-	       				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+	       				$content .= "--".$this->_getBoundary('alternative')."\r\n";
 
-	       				$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-	       				$content.= "\r\n". $_content['dataText'] . "\r\n";
-	       				$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
+	       				$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+	       				$content .= "\r\n".$_content['dataText']."\r\n";
+	       				$content .= "--".$this->_getBoundary('alternative')."\r\n";
 					}
 
-					$content .= 'Content-Type: ' . $_content['mimeType'] . '; '
+					$content .= 'Content-Type: '.$_content['mimeType'].'; '
 					//                             . 'charset="' . $this->getCharSet() . '"';
-					. 'charset=' . $this->getCharSet() . '';
+					. 'charset='.$this->getCharSet().'';
 
 					//                    $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
-					$content .=  "\r\n";
+					$content .= "\r\n";
 					//                    $content .= 'Content-Transfer-Encoding: ';
 					//                    $content .= ($type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
 					//                    $content .=  "\r\n"
 					//                             . '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";
+					$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 .= "--".$this->_getBoundary('alternative')."--"."\r\n";
 					}
 
 					$content .= "\r\n";
@@ -1554,7 +1554,7 @@ 
 
 			// Close message boundries
 			//            $content .= "\r\n--" . $this->_getBoundary() . '--' . "\r\n" ;
-			$content .= "--" . $this->_getBoundary('mixed') . '--' . "\r\n" ;
+			$content .= "--".$this->_getBoundary('mixed').'--'."\r\n";
 		}
 
 		return $content;
@@ -1571,15 +1571,15 @@ 
 	 */
 	function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
 	{
-		if ( $strContent )
+		if ($strContent)
 		{
-			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n"));    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 
 			$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
 			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
 			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
+			if ($this->getMD5flag())
 			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
 		}
 	}
@@ -1606,7 +1606,7 @@ 
 			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
 			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
+			if ($this->getMD5flag())
 			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
 		}
 	}
@@ -1626,8 +1626,8 @@ 
 	 */
 	function setSensitivity($_value = 0)
 	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 3)))
 		$this->_msgSensitivity = $_value;
 	}
 
@@ -1659,10 +1659,10 @@ 
 	 * @param 	integer 	$_value 	Message Priority
 	 * @return 	void
 	 */
-	function setPriority( $_value = 3 )
+	function setPriority($_value = 3)
 	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 5)))
 		$this->_msgPriority = $_value;
 	}
 
@@ -1680,9 +1680,9 @@ 
 	 */
 	function getPriority()
 	{
-		return 'Importance: ' . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'Priority: '   . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'X-Priority: ' . $this->_msgPriority . ' (' . $this->_aryPriority[$this->_msgPriority] . ')' . "\r\n";
+		return 'Importance: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'Priority: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'X-Priority: '.$this->_msgPriority.' ('.$this->_aryPriority[$this->_msgPriority].')'."\r\n";
 	}
 
 	/**
@@ -1716,7 +1716,7 @@ 
 	 */
 	function setXheader($strXdata)
 	{
-		if ( $strXdata )
+		if ($strXdata)
 		$this->_msgXheader[] = $strXdata;
 	}
 
@@ -1737,7 +1737,7 @@ 
 	 */
 	function _setBoundary()
 	{
-		$this->_smtpsBoundary = "multipart_x." . time() . ".x_boundary";
+		$this->_smtpsBoundary = "multipart_x.".time().".x_boundary";
 		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
 		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
 	}
@@ -1748,7 +1748,7 @@ 
 	 * @param  string $type				Type of boundary
 	 * @return string $_smtpsBoundary 	MIME message Boundary
 	 */
-	function _getBoundary($type='mixed')
+	function _getBoundary($type = 'mixed')
 	{
 		if ($type == 'mixed') return $this->_smtpsBoundary;
 		else if ($type == 'related') return $this->_smtpsRelatedBoundary;
@@ -1776,11 +1776,11 @@ 
 		$server_response = '';
 
         // avoid infinite loop
-        $limit=0;
+        $limit = 0;
 
-		while (substr($server_response,3,1) != ' ' && $limit<100)
+		while (substr($server_response, 3, 1) != ' ' && $limit < 100)
 		{
-			if (! ($server_response = fgets($socket, 256)))
+			if (!($server_response = fgets($socket, 256)))
 			{
 				$this->_setErr(121, "Couldn't get mail server response codes");
 				$_retVal = false;
@@ -1789,7 +1789,7 @@ 
             $limit++;
 		}
 
-		if (! (substr($server_response, 0, 3) == $response))
+		if (!(substr($server_response, 0, 3) == $response))
 		{
 			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
 			$_retVal = false;
@@ -1807,14 +1807,14 @@ 
 	 * @param 	string		$CRLF			CRLF
 	 * @return 	boolean|null						True or false
 	 */
-	function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
+	function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")
 	{
         // phpcs:enable
-		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 .= $_strSend; // @CHANGE LDR for log
+		fputs($this->socket, $_strSend.$CRLF);
+		if ($this->_debug) $this->log .= ' ('.$_returnCode.')'.$CRLF;
 
-		if ( $_returnCode )
+		if ($_returnCode)
 		return $this->server_parse($this->socket, $_returnCode);
 	}
 
@@ -1828,7 +1828,7 @@ 
 	 * @param  string $_errMsg  Error Message
 	 * @return void
      */
-    function _setErr( $_errNum, $_errMsg )
+    function _setErr($_errNum, $_errMsg)
     {
         $this->_smtpsErrors[] = array(
             'num' => $_errNum,
@@ -1847,9 +1847,9 @@ 
 
 		if (is_array($this->_smtpsErrors))
 		{
-			foreach ( $this->_smtpsErrors as $_err => $_info )
+			foreach ($this->_smtpsErrors as $_err => $_info)
 			{
-				$_errMsg[] = 'Error [' . $_info['num'] .']: '. $_info['msg'];
+				$_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];
 			}
 		}
 

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

Indentation +47 added lines, -47 removed lines

@@ -29,25 +29,25 @@ 
  */
 abstract class CommonObjectLine extends CommonObject
 {
-	/**
-	 * Id of the line
-	 * @var int
-	 */
-	public $id;
+    /**
+     * Id of the line
+     * @var int
+     */
+    public $id;
 
-	/**
-	 * Id of the line
-	 * @var int
-	 * @deprecated Try to use id property as possible (even if field into database is still rowid)
-	 * @see id
-	 */
-	public $rowid;
+    /**
+     * Id of the line
+     * @var int
+     * @deprecated Try to use id property as possible (even if field into database is still rowid)
+     * @see id
+     */
+    public $rowid;
 
-	/**
-	 * Product/service unit code ('km', 'm', 'p', ...)
-	 * @var string
-	 */
-	public $fk_unit;
+    /**
+     * Product/service unit code ('km', 'm', 'p', ...)
+     * @var string
+     */
+    public $fk_unit;
 
 
     /**
@@ -57,40 +57,40 @@ 
      * 	@param	string $type Label type (long or short)
      *	@return	string|int <0 if ko, label if ok
      */
-	public function getLabelOfUnit($type='long')
-	{
-		global $langs;
+    public function getLabelOfUnit($type='long')
+    {
+        global $langs;
 
-		if (!$this->fk_unit) {
-			return '';
-		}
+        if (!$this->fk_unit) {
+            return '';
+        }
 
-		$langs->load('products');
+        $langs->load('products');
 
-		$label_type = 'label';
+        $label_type = 'label';
 
-		if ($type == 'short')
-		{
-			$label_type = 'short_label';
-		}
+        if ($type == 'short')
+        {
+            $label_type = 'short_label';
+        }
 
-		$sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
-		$resql = $this->db->query($sql);
-		if($resql && $this->db->num_rows($resql) > 0)
-		{
-			$res = $this->db->fetch_array($resql);
-			$label = $res[$label_type];
-			$this->db->free($resql);
-			return $label;
-		}
-		else
-		{
-			$this->error=$this->db->error().' sql='.$sql;
-			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
-	// Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code.
+        $sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
+        $resql = $this->db->query($sql);
+        if($resql && $this->db->num_rows($resql) > 0)
+        {
+            $res = $this->db->fetch_array($resql);
+            $label = $res[$label_type];
+            $this->db->free($resql);
+            return $label;
+        }
+        else
+        {
+            $this->error=$this->db->error().' sql='.$sql;
+            dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
+    // Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code.
 
-	// For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits.
+    // For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits.
 }

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
      * 	@param	string $type Label type (long or short)
      *	@return	string|int <0 if ko, label if ok
      */
-	public function getLabelOfUnit($type='long')
+	public function getLabelOfUnit($type = 'long')
 	{
 		global $langs;
 
@@ -76,7 +76,7 @@ 
 
 		$sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
 		$resql = $this->db->query($sql);
-		if($resql && $this->db->num_rows($resql) > 0)
+		if ($resql && $this->db->num_rows($resql) > 0)
 		{
 			$res = $this->db->fetch_array($resql);
 			$label = $res[$label_type];
@@ -85,7 +85,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error().' sql='.$sql;
+			$this->error = $this->db->error().' sql='.$sql;
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
 		}

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