alxarafe / alixar

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

Indentation +170 added lines, -170 removed lines

@@ -29,100 +29,100 @@ 
  */
 class HookManager
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 	
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
     // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
     var $contextarray=array();
 
-	// Array with instantiated classes
-	var $hooks=array();
-
-	// Array result
-	var $resArray=array();
-	// Printable result
-	var $resPrint='';
-	// Nb of qualified hook ran
-	var $resNbOfHooks=0;
-
-	/**
-	 * Constructor
-	 *
-	 * @param	DoliDB		$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *	Init array $this->hooks with instantiated action controlers.
-	 *  First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file.
-	 *  This makes $conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...))
-	 *  When initHooks function is called, with initHooks(list_of_contexts), an array $this->hooks is defined with instance of controler
-	 *  class found into file /mymodule/class/actions_mymodule.class.php (if module has declared the context as a managed context).
-	 *  Then when a hook executeHooks('aMethod'...) is called, the method aMethod found into class will be executed.
-	 *
-	 *	@param	string[]	$arraycontext	    Array list of searched hooks tab/features. For example: 'thirdpartycard' (for hook methods into page card thirdparty), 'thirdpartydao' (for hook methods into Societe), ...
-	 *	@return	int							    Always 1
-	 */
-	function initHooks($arraycontext)
-	{
-		global $conf;
-
-		// Test if there is hooks to manage
+    // Array with instantiated classes
+    var $hooks=array();
+
+    // Array result
+    var $resArray=array();
+    // Printable result
+    var $resPrint='';
+    // Nb of qualified hook ran
+    var $resNbOfHooks=0;
+
+    /**
+     * Constructor
+     *
+     * @param	DoliDB		$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *	Init array $this->hooks with instantiated action controlers.
+     *  First, a hook is declared by a module by adding a constant MAIN_MODULE_MYMODULENAME_HOOKS with value 'nameofcontext1:nameofcontext2:...' into $this->const of module descriptor file.
+     *  This makes $conf->hooks_modules loaded with an entry ('modulename'=>array(nameofcontext1,nameofcontext2,...))
+     *  When initHooks function is called, with initHooks(list_of_contexts), an array $this->hooks is defined with instance of controler
+     *  class found into file /mymodule/class/actions_mymodule.class.php (if module has declared the context as a managed context).
+     *  Then when a hook executeHooks('aMethod'...) is called, the method aMethod found into class will be executed.
+     *
+     *	@param	string[]	$arraycontext	    Array list of searched hooks tab/features. For example: 'thirdpartycard' (for hook methods into page card thirdparty), 'thirdpartydao' (for hook methods into Societe), ...
+     *	@return	int							    Always 1
+     */
+    function initHooks($arraycontext)
+    {
+        global $conf;
+
+        // Test if there is hooks to manage
         if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
 
         // For backward compatibility
-		if (! is_array($arraycontext)) $arraycontext=array($arraycontext);
-
-		$this->contextarray=array_unique(array_merge($arraycontext,$this->contextarray));    // All contexts are concatenated
-
-		foreach($conf->modules_parts['hooks'] as $module => $hooks)	// Loop on each module that brings hooks
-		{
-			if (empty($conf->$module->enabled)) continue;
-
-			//dol_syslog(get_class($this).'::initHooks module='.$module.' arraycontext='.join(',',$arraycontext));
-			foreach($arraycontext as $context)
-			{
-				if (is_array($hooks)) $arrayhooks=$hooks;    // New system
-				else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
-
-				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if initialized hook is handled by module
-				{
-					// Include actions class overwriting hooks
-					if (! is_object($this->hooks[$context][$module]))	// If set, class was already loaded
-					{
-						$path 		= '/'.$module.'/class/';
-						$actionfile = 'actions_'.$module.'.class.php';
-
-						dol_syslog(get_class($this).'::initHooks Loading hook class for context '.$context.": ".$actionfile, LOG_INFO);
-						$resaction=dol_include_once($path.$actionfile);
-						if ($resaction)
-						{
-							$controlclassname = 'Actions'.ucfirst($module);
-							$actionInstance = new $controlclassname($this->db);
-							$this->hooks[$context][$module] = $actionInstance;
-						}
-					}
-				}
-			}
-		}
-		return 1;
-	}
+        if (! is_array($arraycontext)) $arraycontext=array($arraycontext);
+
+        $this->contextarray=array_unique(array_merge($arraycontext,$this->contextarray));    // All contexts are concatenated
+
+        foreach($conf->modules_parts['hooks'] as $module => $hooks)	// Loop on each module that brings hooks
+        {
+            if (empty($conf->$module->enabled)) continue;
+
+            //dol_syslog(get_class($this).'::initHooks module='.$module.' arraycontext='.join(',',$arraycontext));
+            foreach($arraycontext as $context)
+            {
+                if (is_array($hooks)) $arrayhooks=$hooks;    // New system
+                else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
+
+                if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if initialized hook is handled by module
+                {
+                    // Include actions class overwriting hooks
+                    if (! is_object($this->hooks[$context][$module]))	// If set, class was already loaded
+                    {
+                        $path 		= '/'.$module.'/class/';
+                        $actionfile = 'actions_'.$module.'.class.php';
+
+                        dol_syslog(get_class($this).'::initHooks Loading hook class for context '.$context.": ".$actionfile, LOG_INFO);
+                        $resaction=dol_include_once($path.$actionfile);
+                        if ($resaction)
+                        {
+                            $controlclassname = 'Actions'.ucfirst($module);
+                            $actionInstance = new $controlclassname($this->db);
+                            $this->hooks[$context][$module] = $actionInstance;
+                        }
+                    }
+                }
+            }
+        }
+        return 1;
+    }
 
     /**
      * 		Execute hooks (if they were initialized) for the given method
@@ -136,8 +136,8 @@ 
      *                                          All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
      * 											$this->error or this->errors are also defined by class called by this function if error.
      */
-	function executeHooks($method, $parameters=array(), &$object='', &$action='')
-	{
+    function executeHooks($method, $parameters=array(), &$object='', &$action='')
+    {
         if (! is_array($this->hooks) || empty($this->hooks)) return '';
 
         $parameters['context']=join(':',$this->contextarray);
@@ -145,67 +145,67 @@ 
 
         // Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated because a 'addreplace' hook can also return resPrint and resArray).
         $hooktype='output';
-		if (in_array(
-			$method,
-			array(
-				'addCalendarChoice',
-				'addMoreActionsButtons',
-				'addMoreMassActions',
-				'addSearchEntry',
-				'addStatisticLine',
-				'createDictionaryFieldlist',
-				'editDictionaryFieldlist',
-				'getFormMail',
-				'deleteFile',
-				'doActions',
-				'doMassActions',
-				'formatEvent',
-				'formCreateThirdpartyOptions',
-				'formObjectOptions',
-				'formattachOptions',
-				'formBuilddocLineOptions',
-				'formatNotificationMessage',
-				'getFormMail',
-				'getIdProfUrl',
-				'getDirList',
-				'moveUploadedFile',
-				'moreHtmlStatus',
-				'pdf_build_address',
-				'pdf_writelinedesc',
-			    'pdf_getlinenum',
-			    'pdf_getlineref',
-			    'pdf_getlineref_supplier',
-			    'pdf_getlinevatrate',
-			    'pdf_getlineupexcltax',
-			    'pdf_getlineupwithtax',
-			    'pdf_getlineqty',
-			    'pdf_getlineqty_asked',
-			    'pdf_getlineqty_shipped',
-			    'pdf_getlineqty_keeptoship',
-			    'pdf_getlineunit',
-			    'pdf_getlineremisepercent',
-			    'pdf_getlineprogress',
-			    'pdf_getlinetotalexcltax',
-			    'pdf_getlinetotalwithtax',
-				'paymentsupplierinvoices',
-				'printAddress',
-				'printSearchForm',
-				'printTabsHead',
-				'printObjectLine',
-				'printObjectSubLine',
-				'restrictedArea',
-				'sendMail',
-				'sendMailAfter',
-				'showLinkToObjectBlock',
-				'setContentSecurityPolicy',
-				'setHtmlTitle'
-				)
-			)) $hooktype='addreplace';
+        if (in_array(
+            $method,
+            array(
+                'addCalendarChoice',
+                'addMoreActionsButtons',
+                'addMoreMassActions',
+                'addSearchEntry',
+                'addStatisticLine',
+                'createDictionaryFieldlist',
+                'editDictionaryFieldlist',
+                'getFormMail',
+                'deleteFile',
+                'doActions',
+                'doMassActions',
+                'formatEvent',
+                'formCreateThirdpartyOptions',
+                'formObjectOptions',
+                'formattachOptions',
+                'formBuilddocLineOptions',
+                'formatNotificationMessage',
+                'getFormMail',
+                'getIdProfUrl',
+                'getDirList',
+                'moveUploadedFile',
+                'moreHtmlStatus',
+                'pdf_build_address',
+                'pdf_writelinedesc',
+                'pdf_getlinenum',
+                'pdf_getlineref',
+                'pdf_getlineref_supplier',
+                'pdf_getlinevatrate',
+                'pdf_getlineupexcltax',
+                'pdf_getlineupwithtax',
+                'pdf_getlineqty',
+                'pdf_getlineqty_asked',
+                'pdf_getlineqty_shipped',
+                'pdf_getlineqty_keeptoship',
+                'pdf_getlineunit',
+                'pdf_getlineremisepercent',
+                'pdf_getlineprogress',
+                'pdf_getlinetotalexcltax',
+                'pdf_getlinetotalwithtax',
+                'paymentsupplierinvoices',
+                'printAddress',
+                'printSearchForm',
+                'printTabsHead',
+                'printObjectLine',
+                'printObjectSubLine',
+                'restrictedArea',
+                'sendMail',
+                'sendMailAfter',
+                'showLinkToObjectBlock',
+                'setContentSecurityPolicy',
+                'setHtmlTitle'
+                )
+            )) $hooktype='addreplace';
 
         if ($method == 'insertExtraFields')
         {
-        	$hooktype='returnvalue';	// @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
-        	dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
+            $hooktype='returnvalue';	// @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
+            dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
         }
 
         // Init return properties
@@ -220,12 +220,12 @@ 
             {
                 foreach($modules as $module => $actionclassinstance)
                 {
-                	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
+                    //print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
 
                     // test to avoid running twice a hook, when a module implements several active contexts
                     if (in_array($module,$modulealreadyexecuted)) continue;
 
-                	// jump to next module/class if method does not exist
+                    // jump to next module/class if method does not exist
                     if (! method_exists($actionclassinstance,$method)) continue;
 
                     $this->resNbOfHooks++;
@@ -243,34 +243,34 @@ 
                     // Hooks that must return int (hooks with type 'addreplace')
                     if ($hooktype == 'addreplace')
                     {
-                    	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-                    	if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
-                    	{
-                    		$error++;
-                    		$this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
-                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
-                    	}
-
-                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                        $resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+                        if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
+                        {
+                            $error++;
+                            $this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
+                            dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
+                        }
+
+                        if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                        if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
                     }
                     // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
                     else
-					{
-                    	// TODO. this test should be done into the method of hook by returning nothing
-                    	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
-
-                    	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
-                    	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-
-                    	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
-                    	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
-                    	if (! is_array($resaction) && ! is_numeric($resaction))
-                    	{
-                    		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-                    		if (empty($actionclassinstance->resprints)) { $this->resPrint.=$resaction; $resaction=0; }
-                    	}
+                    {
+                        // TODO. this test should be done into the method of hook by returning nothing
+                        if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+
+                        //dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
+                        $resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+
+                        if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                        if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                        // TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
+                        if (! is_array($resaction) && ! is_numeric($resaction))
+                        {
+                            dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
+                            if (empty($actionclassinstance->resprints)) { $this->resPrint.=$resaction; $resaction=0; }
+                        }
                     }
 
                     //print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
@@ -282,5 +282,5 @@ 
         }
 
         return ($error?-1:$resaction);
-	}
+    }
 }

Spacing +44 added lines, -44 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -45,17 +45,17 @@ 
 	public $errors = array();
 
     // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
-    var $contextarray=array();
+    var $contextarray = array();
 
 	// Array with instantiated classes
-	var $hooks=array();
+	var $hooks = array();
 
 	// Array result
-	var $resArray=array();
+	var $resArray = array();
 	// Printable result
-	var $resPrint='';
+	var $resPrint = '';
 	// Nb of qualified hook ran
-	var $resNbOfHooks=0;
+	var $resNbOfHooks = 0;
 
 	/**
 	 * Constructor
@@ -84,33 +84,33 @@ 
 		global $conf;
 
 		// Test if there is hooks to manage
-        if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
+        if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
 
         // For backward compatibility
-		if (! is_array($arraycontext)) $arraycontext=array($arraycontext);
+		if (!is_array($arraycontext)) $arraycontext = array($arraycontext);
 
-		$this->contextarray=array_unique(array_merge($arraycontext,$this->contextarray));    // All contexts are concatenated
+		$this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
 
-		foreach($conf->modules_parts['hooks'] as $module => $hooks)	// Loop on each module that brings hooks
+		foreach ($conf->modules_parts['hooks'] as $module => $hooks)	// Loop on each module that brings hooks
 		{
 			if (empty($conf->$module->enabled)) continue;
 
 			//dol_syslog(get_class($this).'::initHooks module='.$module.' arraycontext='.join(',',$arraycontext));
-			foreach($arraycontext as $context)
+			foreach ($arraycontext as $context)
 			{
-				if (is_array($hooks)) $arrayhooks=$hooks;    // New system
-				else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
+				if (is_array($hooks)) $arrayhooks = $hooks; // New system
+				else $arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)
 
 				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if initialized hook is handled by module
 				{
 					// Include actions class overwriting hooks
-					if (! is_object($this->hooks[$context][$module]))	// If set, class was already loaded
+					if (!is_object($this->hooks[$context][$module]))	// If set, class was already loaded
 					{
-						$path 		= '/'.$module.'/class/';
+						$path = '/'.$module.'/class/';
 						$actionfile = 'actions_'.$module.'.class.php';
 
 						dol_syslog(get_class($this).'::initHooks Loading hook class for context '.$context.": ".$actionfile, LOG_INFO);
-						$resaction=dol_include_once($path.$actionfile);
+						$resaction = dol_include_once($path.$actionfile);
 						if ($resaction)
 						{
 							$controlclassname = 'Actions'.ucfirst($module);
@@ -136,15 +136,15 @@ 
      *                                          All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
      * 											$this->error or this->errors are also defined by class called by this function if error.
      */
-	function executeHooks($method, $parameters=array(), &$object='', &$action='')
+	function executeHooks($method, $parameters = array(), &$object = '', &$action = '')
 	{
-        if (! is_array($this->hooks) || empty($this->hooks)) return '';
+        if (!is_array($this->hooks) || empty($this->hooks)) return '';
 
-        $parameters['context']=join(':',$this->contextarray);
+        $parameters['context'] = join(':', $this->contextarray);
         //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
         // Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated because a 'addreplace' hook can also return resPrint and resArray).
-        $hooktype='output';
+        $hooktype = 'output';
 		if (in_array(
 			$method,
 			array(
@@ -200,41 +200,41 @@ 
 				'setContentSecurityPolicy',
 				'setHtmlTitle'
 				)
-			)) $hooktype='addreplace';
+			)) $hooktype = 'addreplace';
 
         if ($method == 'insertExtraFields')
         {
-        	$hooktype='returnvalue';	// @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
+        	$hooktype = 'returnvalue'; // @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
         	dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
         }
 
         // Init return properties
-        $this->resPrint=''; $this->resArray=array(); $this->resNbOfHooks=0;
+        $this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;
 
         // Loop on each hook to qualify modules that have declared context
-        $modulealreadyexecuted=array();
-        $resaction=0; $error=0; $result='';
-        foreach($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
+        $modulealreadyexecuted = array();
+        $resaction = 0; $error = 0; $result = '';
+        foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
         {
-            if (! empty($modules))
+            if (!empty($modules))
             {
-                foreach($modules as $module => $actionclassinstance)
+                foreach ($modules as $module => $actionclassinstance)
                 {
                 	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
 
                     // test to avoid running twice a hook, when a module implements several active contexts
-                    if (in_array($module,$modulealreadyexecuted)) continue;
+                    if (in_array($module, $modulealreadyexecuted)) continue;
 
                 	// jump to next module/class if method does not exist
-                    if (! method_exists($actionclassinstance,$method)) continue;
+                    if (!method_exists($actionclassinstance, $method)) continue;
 
                     $this->resNbOfHooks++;
 
-                    $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice
+                    $modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice
 
                     // Clean class (an error may have been set from a previous call of another method for same module/hook)
-                    $actionclassinstance->error=0;
-                    $actionclassinstance->errors=array();
+                    $actionclassinstance->error = 0;
+                    $actionclassinstance->errors = array();
 
                     dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
 
@@ -244,32 +244,32 @@ 
                     if ($hooktype == 'addreplace')
                     {
                     	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-                    	if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
+                    	if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
                     	{
                     		$error++;
-                    		$this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
-                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
+                    		$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
+                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
                     	}
 
-                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
                     }
                     // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
                     else
 					{
                     	// TODO. this test should be done into the method of hook by returning nothing
-                    	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+                    	if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
                     	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
                     	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
-                    	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                    	if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
                     	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
-                    	if (! is_array($resaction) && ! is_numeric($resaction))
+                    	if (!is_array($resaction) && !is_numeric($resaction))
                     	{
                     		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-                    		if (empty($actionclassinstance->resprints)) { $this->resPrint.=$resaction; $resaction=0; }
+                    		if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }
                     	}
                     }
 
@@ -281,6 +281,6 @@ 
             }
         }
 
-        return ($error?-1:$resaction);
+        return ($error ?-1 : $resaction);
 	}
 }

Braces +47 added lines, -15 removed lines

@@ -84,29 +84,43 @@ 
 		global $conf;
 
 		// Test if there is hooks to manage
-        if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
+        if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) {
+            return;
+        }
 
         // For backward compatibility
-		if (! is_array($arraycontext)) $arraycontext=array($arraycontext);
+		if (! is_array($arraycontext)) {
+		    $arraycontext=array($arraycontext);
+		}
 
 		$this->contextarray=array_unique(array_merge($arraycontext,$this->contextarray));    // All contexts are concatenated
 
-		foreach($conf->modules_parts['hooks'] as $module => $hooks)	// Loop on each module that brings hooks
+		foreach($conf->modules_parts['hooks'] as $module => $hooks) {
+		    // Loop on each module that brings hooks
 		{
 			if (empty($conf->$module->enabled)) continue;
+		}
 
 			//dol_syslog(get_class($this).'::initHooks module='.$module.' arraycontext='.join(',',$arraycontext));
 			foreach($arraycontext as $context)
 			{
-				if (is_array($hooks)) $arrayhooks=$hooks;    // New system
-				else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
+				if (is_array($hooks)) {
+				    $arrayhooks=$hooks;
+				}
+				// New system
+				else {
+				    $arrayhooks=explode(':',$hooks);
+				}
+				// Old system (for backward compatibility)
 
-				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if initialized hook is handled by module
+				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks)) {
+				    // We instantiate action class only if initialized hook is handled by module
 				{
 					// Include actions class overwriting hooks
 					if (! is_object($this->hooks[$context][$module]))	// If set, class was already loaded
 					{
 						$path 		= '/'.$module.'/class/';
+				}
 						$actionfile = 'actions_'.$module.'.class.php';
 
 						dol_syslog(get_class($this).'::initHooks Loading hook class for context '.$context.": ".$actionfile, LOG_INFO);
@@ -138,7 +152,9 @@ 
      */
 	function executeHooks($method, $parameters=array(), &$object='', &$action='')
 	{
-        if (! is_array($this->hooks) || empty($this->hooks)) return '';
+        if (! is_array($this->hooks) || empty($this->hooks)) {
+            return '';
+        }
 
         $parameters['context']=join(':',$this->contextarray);
         //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
@@ -200,7 +216,9 @@ 
 				'setContentSecurityPolicy',
 				'setHtmlTitle'
 				)
-			)) $hooktype='addreplace';
+			)) {
+		    $hooktype='addreplace';
+		}
 
         if ($method == 'insertExtraFields')
         {
@@ -214,7 +232,8 @@ 
         // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
         $resaction=0; $error=0; $result='';
-        foreach($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
+        foreach($this->hooks as $context => $modules) {
+            // $this->hooks is an array with context as key and value is an array of modules that handle this context
         {
             if (! empty($modules))
             {
@@ -224,9 +243,12 @@ 
 
                     // test to avoid running twice a hook, when a module implements several active contexts
                     if (in_array($module,$modulealreadyexecuted)) continue;
+        }
 
                 	// jump to next module/class if method does not exist
-                    if (! method_exists($actionclassinstance,$method)) continue;
+                    if (! method_exists($actionclassinstance,$method)) {
+                        continue;
+                    }
 
                     $this->resNbOfHooks++;
 
@@ -251,20 +273,30 @@ 
                     		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
                     	}
 
-                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results)) {
+                    	    $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                    	}
+                    	if (! empty($actionclassinstance->resprints)) {
+                    	    $this->resPrint.=$actionclassinstance->resprints;
+                    	}
                     }
                     // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
                     else
 					{
                     	// TODO. this test should be done into the method of hook by returning nothing
-                    	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+                    	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) {
+                    	    continue;
+                    	}
 
                     	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
                     	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
-                    	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                    	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) {
+                    	    $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                    	}
+                    	if (! empty($actionclassinstance->resprints)) {
+                    	    $this->resPrint.=$actionclassinstance->resprints;
+                    	}
                     	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
                     	if (! is_array($resaction) && ! is_numeric($resaction))
                     	{

dolibarr/htdocs/core/class/menubase.class.php

Indentation +156 added lines, -156 removed lines

@@ -45,9 +45,9 @@ 
     public $errors = array();
 
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
     public $menu_handler;
     public $module;
@@ -86,9 +86,9 @@ 
 
 
     /**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db 		    Database handler
+     *	Constructor
+     *
+     *  @param		DoliDB		$db 		    Database handler
      *  @param     	string		$menu_handler	Menu handler
      */
     function __construct($db,$menu_handler='')
@@ -137,22 +137,22 @@ 
         // an insert with a forced id.
         if (in_array($this->db->type,array('pgsql')))
         {
-          $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
-          $resqlrowid=$this->db->query($sql);
-          if ($resqlrowid)
-          {
-               $obj=$this->db->fetch_object($resqlrowid);
-               $maxrowid=$obj->maxrowid;
-
-               // Max rowid can be empty if there is no record yet
-               if(empty($maxrowid)) $maxrowid=1;
-
-               $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
-               //print $sql; exit;
-               $resqlrowidset=$this->db->query($sql);
-               if (! $resqlrowidset) dol_print_error($this->db);
-          }
-          else dol_print_error($this->db);
+            $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
+            $resqlrowid=$this->db->query($sql);
+            if ($resqlrowid)
+            {
+                $obj=$this->db->fetch_object($resqlrowid);
+                $maxrowid=$obj->maxrowid;
+
+                // Max rowid can be empty if there is no record yet
+                if(empty($maxrowid)) $maxrowid=1;
+
+                $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
+                //print $sql; exit;
+                $resqlrowidset=$this->db->query($sql);
+                if (! $resqlrowidset) dol_print_error($this->db);
+            }
+            else dol_print_error($this->db);
         }
 
         // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
@@ -167,74 +167,74 @@ 
         $result=$this->db->query($sql);
         if ($result)
         {
-        	$row = $this->db->fetch_row($result);
-
-        	if ($row[0] == 0)   // If not found
-        	{
-		        // Insert request
-		        $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
-		        $sql.= "menu_handler,";
-		        $sql.= "entity,";
-		        $sql.= "module,";
-		        $sql.= "type,";
-		        $sql.= "mainmenu,";
-		        $sql.= "leftmenu,";
-		        $sql.= "fk_menu,";
-		        $sql.= "fk_mainmenu,";
-		        $sql.= "fk_leftmenu,";
-		        $sql.= "position,";
-		        $sql.= "url,";
-		        $sql.= "target,";
-		        $sql.= "titre,";
-		        $sql.= "langs,";
-		        $sql.= "perms,";
-		        $sql.= "enabled,";
-		        $sql.= "usertype";
-		        $sql.= ") VALUES (";
-		        $sql.= " '".$this->db->escape($this->menu_handler)."',";
-		        $sql.= " '".$this->db->escape($conf->entity)."',";
-		        $sql.= " '".$this->db->escape($this->module)."',";
-		        $sql.= " '".$this->db->escape($this->type)."',";
-		        $sql.= " ".($this->mainmenu?"'".$this->db->escape($this->mainmenu)."'":"''").",";    // Can't be null
-		        $sql.= " ".($this->leftmenu?"'".$this->db->escape($this->leftmenu)."'":"null").",";
-		        $sql.= " ".((int) $this->fk_menu).",";
-		        $sql.= " ".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
-		        $sql.= " ".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
-		        $sql.= " ".((int) $this->position).",";
-		        $sql.= " '".$this->db->escape($this->url)."',";
-		        $sql.= " '".$this->db->escape($this->target)."',";
-		        $sql.= " '".$this->db->escape($this->titre)."',";
-		        $sql.= " '".$this->db->escape($this->langs)."',";
-		        $sql.= " '".$this->db->escape($this->perms)."',";
-		        $sql.= " '".$this->db->escape($this->enabled)."',";
-		        $sql.= " '".$this->db->escape($this->user)."'";
-		        $sql.= ")";
-
-		        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		        $resql=$this->db->query($sql);
-		        if ($resql)
-		        {
-		            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");
-		            dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
-
-		            return $this->id;
-		        }
-		        else
-		        {
-		            $this->error="Error ".$this->db->lasterror();
-		            return -1;
-		        }
-        	}
-        	else
-        	{
-        		dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);
-        		$this->error = 'Error Menu entry already exists';
-        		return 0;
-        	}
+            $row = $this->db->fetch_row($result);
+
+            if ($row[0] == 0)   // If not found
+            {
+                // Insert request
+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
+                $sql.= "menu_handler,";
+                $sql.= "entity,";
+                $sql.= "module,";
+                $sql.= "type,";
+                $sql.= "mainmenu,";
+                $sql.= "leftmenu,";
+                $sql.= "fk_menu,";
+                $sql.= "fk_mainmenu,";
+                $sql.= "fk_leftmenu,";
+                $sql.= "position,";
+                $sql.= "url,";
+                $sql.= "target,";
+                $sql.= "titre,";
+                $sql.= "langs,";
+                $sql.= "perms,";
+                $sql.= "enabled,";
+                $sql.= "usertype";
+                $sql.= ") VALUES (";
+                $sql.= " '".$this->db->escape($this->menu_handler)."',";
+                $sql.= " '".$this->db->escape($conf->entity)."',";
+                $sql.= " '".$this->db->escape($this->module)."',";
+                $sql.= " '".$this->db->escape($this->type)."',";
+                $sql.= " ".($this->mainmenu?"'".$this->db->escape($this->mainmenu)."'":"''").",";    // Can't be null
+                $sql.= " ".($this->leftmenu?"'".$this->db->escape($this->leftmenu)."'":"null").",";
+                $sql.= " ".((int) $this->fk_menu).",";
+                $sql.= " ".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
+                $sql.= " ".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
+                $sql.= " ".((int) $this->position).",";
+                $sql.= " '".$this->db->escape($this->url)."',";
+                $sql.= " '".$this->db->escape($this->target)."',";
+                $sql.= " '".$this->db->escape($this->titre)."',";
+                $sql.= " '".$this->db->escape($this->langs)."',";
+                $sql.= " '".$this->db->escape($this->perms)."',";
+                $sql.= " '".$this->db->escape($this->enabled)."',";
+                $sql.= " '".$this->db->escape($this->user)."'";
+                $sql.= ")";
+
+                dol_syslog(get_class($this)."::create", LOG_DEBUG);
+                $resql=$this->db->query($sql);
+                if ($resql)
+                {
+                    $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");
+                    dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
+
+                    return $this->id;
+                }
+                else
+                {
+                    $this->error="Error ".$this->db->lasterror();
+                    return -1;
+                }
+            }
+            else
+            {
+                dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);
+                $this->error = 'Error Menu entry already exists';
+                return 0;
+            }
         }
         else
         {
-        	return -1;
+            return -1;
         }
     }
 
@@ -480,16 +480,16 @@ 
         $mainmenu=$mymainmenu;  // To export to dol_eval function
         $leftmenu=$myleftmenu;  // To export to dol_eval function
 
-		// Detect what is top mainmenu id
+        // Detect what is top mainmenu id
         $menutopid='';
         foreach($tabMenu as $key => $val)
         {
-        	// Define menutopid of mainmenu
-        	if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
-        	{
-        		$menutopid=$val['rowid'];
-        		break;
-        	}
+            // Define menutopid of mainmenu
+            if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
+            {
+                $menutopid=$val['rowid'];
+                break;
+            }
         }
 
         // We initialize newmenu with first already found menu entries
@@ -501,50 +501,50 @@ 
         // Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
         foreach($tabMenu as $key => $val)
         {
-        	//var_dump($tabMenu);
-        	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
-        	{
-        		//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
-        		//var_dump($this->newmenu->liste);exit;
-
-        		if (empty($val['fk_leftmenu']))
-        		{
-        			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-        			//var_dump($this->newmenu->liste);
-        		}
-        		else
-        		{
-        			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
-        			$searchlastsub=0;$lastid=0;$nextid=0;$found=0;
-        			foreach($this->newmenu->liste as $keyparent => $valparent)
-        			{
-        				//var_dump($valparent);
-        				if ($searchlastsub)    // If we started to search for last submenu
-        				{
-        					if ($valparent['level'] >= $searchlastsub) $lastid=$keyparent;
-        					if ($valparent['level'] < $searchlastsub)
-        					{
-        						$nextid=$keyparent;
-        						break;
-        					}
-        				}
-        				if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu'])
-        				{
-        					//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
-        					// Now we look to find last subelement of this parent (we add at end)
-        					$searchlastsub=($valparent['level']+1);
-        					$lastid=$keyparent;
-        					$found=1;
-        				}
-        			}
-        			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
-        			if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-        			else {
-        			    dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
-        			    //print "Parent menu not found !!<br>";
-        			}
-        		}
-        	}
+            //var_dump($tabMenu);
+            if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
+            {
+                //print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
+                //var_dump($this->newmenu->liste);exit;
+
+                if (empty($val['fk_leftmenu']))
+                {
+                    $this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+                    //var_dump($this->newmenu->liste);
+                }
+                else
+                {
+                    // Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
+                    $searchlastsub=0;$lastid=0;$nextid=0;$found=0;
+                    foreach($this->newmenu->liste as $keyparent => $valparent)
+                    {
+                        //var_dump($valparent);
+                        if ($searchlastsub)    // If we started to search for last submenu
+                        {
+                            if ($valparent['level'] >= $searchlastsub) $lastid=$keyparent;
+                            if ($valparent['level'] < $searchlastsub)
+                            {
+                                $nextid=$keyparent;
+                                break;
+                            }
+                        }
+                        if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu'])
+                        {
+                            //print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
+                            // Now we look to find last subelement of this parent (we add at end)
+                            $searchlastsub=($valparent['level']+1);
+                            $lastid=$keyparent;
+                            $found=1;
+                        }
+                    }
+                    //print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
+                    if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+                    else {
+                        dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
+                        //print "Parent menu not found !!<br>";
+                    }
+                }
+            }
         }
 
         return $this->newmenu;
@@ -577,10 +577,10 @@ 
         if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
         if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
         $sql.= " ORDER BY m.position, m.rowid";
-		//print $sql;
+        //print $sql;
 
-		//$tmp1=microtime(true);
-		//print '>>> 1 0<br>';
+        //$tmp1=microtime(true);
+        //print '>>> 1 0<br>';
         dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
@@ -598,9 +598,9 @@ 
                 $perms = true;
                 if ($menu['perms'])
                 {
-                	$tmpcond=$menu['perms'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
-                	$perms = verifCond($tmpcond);
+                    $tmpcond=$menu['perms'];
+                    if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                    $perms = verifCond($tmpcond);
                     //print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
                 }
 
@@ -608,21 +608,21 @@ 
                 $enabled = true;
                 if ($menu['enabled'])
                 {
-                	$tmpcond=$menu['enabled'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                    $tmpcond=$menu['enabled'];
+                    if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
                     $enabled = verifCond($tmpcond);
                 }
 
                 // Define $title
                 if ($enabled)
                 {
-                	$title = $langs->trans($menu['titre']);		// If $menu['titre'] start with $, a dol_eval is done.
-                	//var_dump($title.'-'.$menu['titre']);
+                    $title = $langs->trans($menu['titre']);		// If $menu['titre'] start with $, a dol_eval is done.
+                    //var_dump($title.'-'.$menu['titre']);
                     if ($title == $menu['titre'])   // Translation not found
                     {
                         if (! empty($menu['langs']))    // If there is a dedicated translation file
                         {
-                        	//print 'Load file '.$menu['langs'].'<br>';
+                            //print 'Load file '.$menu['langs'].'<br>';
                             $langs->load($menu['langs']);
                         }
 
@@ -636,18 +636,18 @@ 
                         }
                         else if (preg_match('/\|\|/',$menu['titre'])) // To manage different translation (Title||AltTitle@ConditionForAltTitle)
                         {
-                        	$tab_title = explode("||",$menu['titre']);
-                        	$alt_title = explode("@",$tab_title[1]);
-                        	$title_enabled = verifCond($alt_title[1]);
-                        	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
+                            $tab_title = explode("||",$menu['titre']);
+                            $alt_title = explode("@",$tab_title[1]);
+                            $title_enabled = verifCond($alt_title[1]);
+                            $title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
                         }
                         else
                         {
                             $title = $langs->trans($menu['titre']);
                         }
                     }
-					//$tmp4=microtime(true);
-					//print '>>> 3 '.($tmp4 - $tmp3).'<br>';
+                    //$tmp4=microtime(true);
+                    //print '>>> 3 '.($tmp4 - $tmp3).'<br>';
 
                     // We complete tabMenu
                     $tabMenu[$b]['rowid']       = $menu['rowid'];
@@ -712,5 +712,5 @@ 
                 $this->recur($tab, $tab[$x]['rowid'], ($level+1));
             }
         }
-   }
+    }
 }

Spacing +203 added lines, -203 removed lines

@@ -78,7 +78,7 @@ 
     public $titre;
     public $langs;
     public $level;
-    public $leftmenu;		//<! Not used
+    public $leftmenu; //<! Not used
     public $perms;
     public $enabled;
     public $user;
@@ -91,7 +91,7 @@ 
 	 *  @param		DoliDB		$db 		    Database handler
      *  @param     	string		$menu_handler	Menu handler
      */
-    function __construct($db,$menu_handler='')
+    function __construct($db, $menu_handler = '')
     {
         $this->db = $db;
         $this->menu_handler = $menu_handler;
@@ -105,29 +105,29 @@ 
      *      @param      User	$user       User that create
      *      @return     int      			<0 if KO, Id of record if OK
      */
-    function create($user=null)
+    function create($user = null)
     {
         global $conf, $langs;
 
         // Clean parameters
-        $this->menu_handler=trim($this->menu_handler);
-        $this->module=trim($this->module);
-        $this->type=trim($this->type);
-        $this->mainmenu=trim($this->mainmenu);
-        $this->leftmenu=trim($this->leftmenu);
-        $this->fk_menu = (int) $this->fk_menu;          // If -1, fk_mainmenu and fk_leftmenu must be defined
-        $this->fk_mainmenu=trim($this->fk_mainmenu);
-        $this->fk_leftmenu=trim($this->fk_leftmenu);
+        $this->menu_handler = trim($this->menu_handler);
+        $this->module = trim($this->module);
+        $this->type = trim($this->type);
+        $this->mainmenu = trim($this->mainmenu);
+        $this->leftmenu = trim($this->leftmenu);
+        $this->fk_menu = (int) $this->fk_menu; // If -1, fk_mainmenu and fk_leftmenu must be defined
+        $this->fk_mainmenu = trim($this->fk_mainmenu);
+        $this->fk_leftmenu = trim($this->fk_leftmenu);
         $this->position = (int) $this->position;
-        $this->url=trim($this->url);
-        $this->target=trim($this->target);
-        $this->titre=trim($this->titre);
-        $this->langs=trim($this->langs);
-        $this->perms=trim($this->perms);
-        $this->enabled=trim($this->enabled);
-        $this->user=trim($this->user);
-        if (empty($this->position)) $this->position=0;
-        if (! $this->level) $this->level=0;
+        $this->url = trim($this->url);
+        $this->target = trim($this->target);
+        $this->titre = trim($this->titre);
+        $this->langs = trim($this->langs);
+        $this->perms = trim($this->perms);
+        $this->enabled = trim($this->enabled);
+        $this->user = trim($this->user);
+        if (empty($this->position)) $this->position = 0;
+        if (!$this->level) $this->level = 0;
 
         // Check parameters
         if (empty($this->menu_handler)) return -1;
@@ -135,36 +135,36 @@ 
         // For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
         // may use an already used value because its internal cursor does not increase when we do
         // an insert with a forced id.
-        if (in_array($this->db->type,array('pgsql')))
+        if (in_array($this->db->type, array('pgsql')))
         {
           $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
-          $resqlrowid=$this->db->query($sql);
+          $resqlrowid = $this->db->query($sql);
           if ($resqlrowid)
           {
-               $obj=$this->db->fetch_object($resqlrowid);
-               $maxrowid=$obj->maxrowid;
+               $obj = $this->db->fetch_object($resqlrowid);
+               $maxrowid = $obj->maxrowid;
 
                // Max rowid can be empty if there is no record yet
-               if(empty($maxrowid)) $maxrowid=1;
+               if (empty($maxrowid)) $maxrowid = 1;
 
                $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
                //print $sql; exit;
-               $resqlrowidset=$this->db->query($sql);
-               if (! $resqlrowidset) dol_print_error($this->db);
+               $resqlrowidset = $this->db->query($sql);
+               if (!$resqlrowidset) dol_print_error($this->db);
           }
           else dol_print_error($this->db);
         }
 
         // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
         $sql = "SELECT count(*)";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu";
-        $sql.= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";
-        $sql.= " AND fk_menu = ".((int) $this->fk_menu);
-        $sql.= " AND position = ".((int) $this->position);
-        $sql.= " AND url = '".$this->db->escape($this->url)."'";
-        $sql.= " AND entity = ".$conf->entity;
-
-        $result=$this->db->query($sql);
+        $sql .= " FROM ".MAIN_DB_PREFIX."menu";
+        $sql .= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";
+        $sql .= " AND fk_menu = ".((int) $this->fk_menu);
+        $sql .= " AND position = ".((int) $this->position);
+        $sql .= " AND url = '".$this->db->escape($this->url)."'";
+        $sql .= " AND entity = ".$conf->entity;
+
+        $result = $this->db->query($sql);
         if ($result)
         {
         	$row = $this->db->fetch_row($result);
@@ -173,45 +173,45 @@ 
         	{
 		        // Insert request
 		        $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
-		        $sql.= "menu_handler,";
-		        $sql.= "entity,";
-		        $sql.= "module,";
-		        $sql.= "type,";
-		        $sql.= "mainmenu,";
-		        $sql.= "leftmenu,";
-		        $sql.= "fk_menu,";
-		        $sql.= "fk_mainmenu,";
-		        $sql.= "fk_leftmenu,";
-		        $sql.= "position,";
-		        $sql.= "url,";
-		        $sql.= "target,";
-		        $sql.= "titre,";
-		        $sql.= "langs,";
-		        $sql.= "perms,";
-		        $sql.= "enabled,";
-		        $sql.= "usertype";
-		        $sql.= ") VALUES (";
-		        $sql.= " '".$this->db->escape($this->menu_handler)."',";
-		        $sql.= " '".$this->db->escape($conf->entity)."',";
-		        $sql.= " '".$this->db->escape($this->module)."',";
-		        $sql.= " '".$this->db->escape($this->type)."',";
-		        $sql.= " ".($this->mainmenu?"'".$this->db->escape($this->mainmenu)."'":"''").",";    // Can't be null
-		        $sql.= " ".($this->leftmenu?"'".$this->db->escape($this->leftmenu)."'":"null").",";
-		        $sql.= " ".((int) $this->fk_menu).",";
-		        $sql.= " ".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
-		        $sql.= " ".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
-		        $sql.= " ".((int) $this->position).",";
-		        $sql.= " '".$this->db->escape($this->url)."',";
-		        $sql.= " '".$this->db->escape($this->target)."',";
-		        $sql.= " '".$this->db->escape($this->titre)."',";
-		        $sql.= " '".$this->db->escape($this->langs)."',";
-		        $sql.= " '".$this->db->escape($this->perms)."',";
-		        $sql.= " '".$this->db->escape($this->enabled)."',";
-		        $sql.= " '".$this->db->escape($this->user)."'";
-		        $sql.= ")";
+		        $sql .= "menu_handler,";
+		        $sql .= "entity,";
+		        $sql .= "module,";
+		        $sql .= "type,";
+		        $sql .= "mainmenu,";
+		        $sql .= "leftmenu,";
+		        $sql .= "fk_menu,";
+		        $sql .= "fk_mainmenu,";
+		        $sql .= "fk_leftmenu,";
+		        $sql .= "position,";
+		        $sql .= "url,";
+		        $sql .= "target,";
+		        $sql .= "titre,";
+		        $sql .= "langs,";
+		        $sql .= "perms,";
+		        $sql .= "enabled,";
+		        $sql .= "usertype";
+		        $sql .= ") VALUES (";
+		        $sql .= " '".$this->db->escape($this->menu_handler)."',";
+		        $sql .= " '".$this->db->escape($conf->entity)."',";
+		        $sql .= " '".$this->db->escape($this->module)."',";
+		        $sql .= " '".$this->db->escape($this->type)."',";
+		        $sql .= " ".($this->mainmenu ? "'".$this->db->escape($this->mainmenu)."'" : "''").","; // Can't be null
+		        $sql .= " ".($this->leftmenu ? "'".$this->db->escape($this->leftmenu)."'" : "null").",";
+		        $sql .= " ".((int) $this->fk_menu).",";
+		        $sql .= " ".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
+		        $sql .= " ".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
+		        $sql .= " ".((int) $this->position).",";
+		        $sql .= " '".$this->db->escape($this->url)."',";
+		        $sql .= " '".$this->db->escape($this->target)."',";
+		        $sql .= " '".$this->db->escape($this->titre)."',";
+		        $sql .= " '".$this->db->escape($this->langs)."',";
+		        $sql .= " '".$this->db->escape($this->perms)."',";
+		        $sql .= " '".$this->db->escape($this->enabled)."',";
+		        $sql .= " '".$this->db->escape($this->user)."'";
+		        $sql .= ")";
 
 		        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		        $resql=$this->db->query($sql);
+		        $resql = $this->db->query($sql);
 		        if ($resql)
 		        {
 		            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");
@@ -221,7 +221,7 @@ 
 		        }
 		        else
 		        {
-		            $this->error="Error ".$this->db->lasterror();
+		            $this->error = "Error ".$this->db->lasterror();
 		            return -1;
 		        }
         	}
@@ -245,57 +245,57 @@ 
      *  @param  int		$notrigger	    0=no, 1=yes (no update trigger)
      *  @return int 		        	<0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
         global $conf, $langs;
 
         // Clean parameters
-        $this->rowid=trim($this->rowid);
-        $this->menu_handler=trim($this->menu_handler);
-        $this->module=trim($this->module);
-        $this->type=trim($this->type);
-        $this->mainmenu=trim($this->mainmenu);
-        $this->leftmenu=trim($this->leftmenu);
+        $this->rowid = trim($this->rowid);
+        $this->menu_handler = trim($this->menu_handler);
+        $this->module = trim($this->module);
+        $this->type = trim($this->type);
+        $this->mainmenu = trim($this->mainmenu);
+        $this->leftmenu = trim($this->leftmenu);
         $this->fk_menu = (int) $this->fk_menu;
-        $this->fk_mainmenu=trim($this->fk_mainmenu);
-        $this->fk_leftmenu=trim($this->fk_leftmenu);
+        $this->fk_mainmenu = trim($this->fk_mainmenu);
+        $this->fk_leftmenu = trim($this->fk_leftmenu);
         $this->position = (int) $this->position;
-        $this->url=trim($this->url);
-        $this->target=trim($this->target);
-        $this->titre=trim($this->titre);
-        $this->langs=trim($this->langs);
-        $this->perms=trim($this->perms);
-        $this->enabled=trim($this->enabled);
-        $this->user=trim($this->user);
+        $this->url = trim($this->url);
+        $this->target = trim($this->target);
+        $this->titre = trim($this->titre);
+        $this->langs = trim($this->langs);
+        $this->perms = trim($this->perms);
+        $this->enabled = trim($this->enabled);
+        $this->user = trim($this->user);
 
         // Check parameters
         // Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
-        $sql.= " menu_handler='".$this->db->escape($this->menu_handler)."',";
-        $sql.= " module='".$this->db->escape($this->module)."',";
-        $sql.= " type='".$this->db->escape($this->type)."',";
-        $sql.= " mainmenu='".$this->db->escape($this->mainmenu)."',";
-        $sql.= " leftmenu='".$this->db->escape($this->leftmenu)."',";
-        $sql.= " fk_menu=".$this->fk_menu.",";
-        $sql.= " fk_mainmenu=".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
-        $sql.= " fk_leftmenu=".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
-        $sql.= " position=".($this->position > 0 ? $this->position : 0).",";
-        $sql.= " url='".$this->db->escape($this->url)."',";
-        $sql.= " target='".$this->db->escape($this->target)."',";
-        $sql.= " titre='".$this->db->escape($this->titre)."',";
-        $sql.= " langs='".$this->db->escape($this->langs)."',";
-        $sql.= " perms='".$this->db->escape($this->perms)."',";
-        $sql.= " enabled='".$this->db->escape($this->enabled)."',";
-        $sql.= " usertype='".$this->db->escape($this->user)."'";
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " menu_handler='".$this->db->escape($this->menu_handler)."',";
+        $sql .= " module='".$this->db->escape($this->module)."',";
+        $sql .= " type='".$this->db->escape($this->type)."',";
+        $sql .= " mainmenu='".$this->db->escape($this->mainmenu)."',";
+        $sql .= " leftmenu='".$this->db->escape($this->leftmenu)."',";
+        $sql .= " fk_menu=".$this->fk_menu.",";
+        $sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
+        $sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
+        $sql .= " position=".($this->position > 0 ? $this->position : 0).",";
+        $sql .= " url='".$this->db->escape($this->url)."',";
+        $sql .= " target='".$this->db->escape($this->target)."',";
+        $sql .= " titre='".$this->db->escape($this->titre)."',";
+        $sql .= " langs='".$this->db->escape($this->langs)."',";
+        $sql .= " perms='".$this->db->escape($this->perms)."',";
+        $sql .= " enabled='".$this->db->escape($this->enabled)."',";
+        $sql .= " usertype='".$this->db->escape($this->user)."'";
+        $sql .= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql)
+        if (!$resql)
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
 
@@ -310,42 +310,42 @@ 
      *   @param		User    $user       User that load
      *   @return	int         		<0 if KO, >0 if OK
      */
-    function fetch($id, $user=null)
+    function fetch($id, $user = null)
     {
         global $langs;
 
         $sql = "SELECT";
-        $sql.= " t.rowid,";
-        $sql.= " t.menu_handler,";
-        $sql.= " t.entity,";
-        $sql.= " t.module,";
-        $sql.= " t.type,";
-        $sql.= " t.mainmenu,";
-        $sql.= " t.leftmenu,";
-        $sql.= " t.fk_menu,";
-        $sql.= " t.fk_mainmenu,";
-        $sql.= " t.fk_leftmenu,";
-        $sql.= " t.position,";
-        $sql.= " t.url,";
-        $sql.= " t.target,";
-        $sql.= " t.titre,";
-        $sql.= " t.langs,";
-        $sql.= " t.perms,";
-        $sql.= " t.enabled,";
-        $sql.= " t.usertype as user,";
-        $sql.= " t.tms";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu as t";
-        $sql.= " WHERE t.rowid = ".$id;
+        $sql .= " t.rowid,";
+        $sql .= " t.menu_handler,";
+        $sql .= " t.entity,";
+        $sql .= " t.module,";
+        $sql .= " t.type,";
+        $sql .= " t.mainmenu,";
+        $sql .= " t.leftmenu,";
+        $sql .= " t.fk_menu,";
+        $sql .= " t.fk_mainmenu,";
+        $sql .= " t.fk_leftmenu,";
+        $sql .= " t.position,";
+        $sql .= " t.url,";
+        $sql .= " t.target,";
+        $sql .= " t.titre,";
+        $sql .= " t.langs,";
+        $sql .= " t.perms,";
+        $sql .= " t.enabled,";
+        $sql .= " t.usertype as user,";
+        $sql .= " t.tms";
+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as t";
+        $sql .= " WHERE t.rowid = ".$id;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
+                $this->id = $obj->rowid;
 
                 $this->menu_handler = $obj->menu_handler;
                 $this->entity = $obj->entity;
@@ -362,7 +362,7 @@ 
                 $this->titre = $obj->titre;
                 $this->langs = $obj->langs;
                 $this->perms = $obj->perms;
-                $this->enabled = str_replace("\"","'",$obj->enabled);
+                $this->enabled = str_replace("\"", "'", $obj->enabled);
                 $this->user = $obj->user;
                 $this->tms = $this->db->jdate($obj->tms);
             }
@@ -372,7 +372,7 @@ 
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -389,13 +389,13 @@ 
         global $conf, $langs;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql)
+        if (!$resql)
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
 
@@ -412,24 +412,24 @@ 
      */
     function initAsSpecimen()
     {
-        $this->id=0;
-
-        $this->menu_handler='all';
-        $this->module='specimen';
-        $this->type='top';
-        $this->mainmenu='';
-        $this->fk_menu='0';
-        $this->position='';
-        $this->url='http://dummy';
-        $this->target='';
-        $this->titre='Specimen menu';
-        $this->langs='';
-        $this->level='';
-        $this->leftmenu='';
-        $this->perms='';
-        $this->enabled='';
-        $this->user='';
-        $this->tms='';
+        $this->id = 0;
+
+        $this->menu_handler = 'all';
+        $this->module = 'specimen';
+        $this->type = 'top';
+        $this->mainmenu = '';
+        $this->fk_menu = '0';
+        $this->position = '';
+        $this->url = 'http://dummy';
+        $this->target = '';
+        $this->titre = 'Specimen menu';
+        $this->langs = '';
+        $this->level = '';
+        $this->leftmenu = '';
+        $this->perms = '';
+        $this->enabled = '';
+        $this->user = '';
+        $this->tms = '';
     }
 
 
@@ -445,16 +445,16 @@ 
      */
     function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
     {
-        global $langs, $user, $conf;	// To export to dol_eval function
-        global $mainmenu,$leftmenu;		// To export to dol_eval function
+        global $langs, $user, $conf; // To export to dol_eval function
+        global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+        $mainmenu = $mymainmenu; // To export to dol_eval function
+        $leftmenu = $myleftmenu; // To export to dol_eval function
 
-        $newTabMenu=array();
-        foreach($tabMenu as $val)
+        $newTabMenu = array();
+        foreach ($tabMenu as $val)
         {
-            if ($val['type']=='top') $newTabMenu[]=$val;
+            if ($val['type'] == 'top') $newTabMenu[] = $val;
         }
 
         return $newTabMenu;
@@ -474,20 +474,20 @@ 
      */
     function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
     {
-        global $langs, $user, $conf; 	// To export to dol_eval function
-        global $mainmenu,$leftmenu; 	// To export to dol_eval function
+        global $langs, $user, $conf; // To export to dol_eval function
+        global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+        $mainmenu = $mymainmenu; // To export to dol_eval function
+        $leftmenu = $myleftmenu; // To export to dol_eval function
 
 		// Detect what is top mainmenu id
-        $menutopid='';
-        foreach($tabMenu as $key => $val)
+        $menutopid = '';
+        foreach ($tabMenu as $key => $val)
         {
         	// Define menutopid of mainmenu
         	if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
         	{
-        		$menutopid=$val['rowid'];
+        		$menutopid = $val['rowid'];
         		break;
         	}
         }
@@ -499,7 +499,7 @@ 
         $this->recur($tabMenu, $menutopid, 1);
 
         // Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
-        foreach($tabMenu as $key => $val)
+        foreach ($tabMenu as $key => $val)
         {
         	//var_dump($tabMenu);
         	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
@@ -515,16 +515,16 @@ 
         		else
         		{
         			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
-        			$searchlastsub=0;$lastid=0;$nextid=0;$found=0;
-        			foreach($this->newmenu->liste as $keyparent => $valparent)
+        			$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;
+        			foreach ($this->newmenu->liste as $keyparent => $valparent)
         			{
         				//var_dump($valparent);
         				if ($searchlastsub)    // If we started to search for last submenu
         				{
-        					if ($valparent['level'] >= $searchlastsub) $lastid=$keyparent;
+        					if ($valparent['level'] >= $searchlastsub) $lastid = $keyparent;
         					if ($valparent['level'] < $searchlastsub)
         					{
-        						$nextid=$keyparent;
+        						$nextid = $keyparent;
         						break;
         					}
         				}
@@ -532,9 +532,9 @@ 
         				{
         					//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
         					// Now we look to find last subelement of this parent (we add at end)
-        					$searchlastsub=($valparent['level']+1);
-        					$lastid=$keyparent;
-        					$found=1;
+        					$searchlastsub = ($valparent['level'] + 1);
+        					$lastid = $keyparent;
+        					$found = 1;
         				}
         			}
         			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
@@ -566,17 +566,17 @@ 
         global $langs, $user, $conf; // To export to dol_eval function
         global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $menutopid=0;
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+        $menutopid = 0;
+        $mainmenu = $mymainmenu; // To export to dol_eval function
+        $leftmenu = $myleftmenu; // To export to dol_eval function
 
         $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-        $sql.= " WHERE m.entity IN (0,".$conf->entity.")";
-        $sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
-        if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
-        if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
-        $sql.= " ORDER BY m.position, m.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
+        $sql .= " WHERE m.entity IN (0,".$conf->entity.")";
+        $sql .= " AND m.menu_handler IN ('".$menu_handler."','all')";
+        if ($type_user == 0) $sql .= " AND m.usertype IN (0,2)";
+        if ($type_user == 1) $sql .= " AND m.usertype IN (1,2)";
+        $sql .= " ORDER BY m.position, m.rowid";
 		//print $sql;
 
 		//$tmp1=microtime(true);
@@ -598,8 +598,8 @@ 
                 $perms = true;
                 if ($menu['perms'])
                 {
-                	$tmpcond=$menu['perms'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                	$tmpcond = $menu['perms'];
+                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
                 	$perms = verifCond($tmpcond);
                     //print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
                 }
@@ -608,19 +608,19 @@ 
                 $enabled = true;
                 if ($menu['enabled'])
                 {
-                	$tmpcond=$menu['enabled'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                	$tmpcond = $menu['enabled'];
+                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
                     $enabled = verifCond($tmpcond);
                 }
 
                 // Define $title
                 if ($enabled)
                 {
-                	$title = $langs->trans($menu['titre']);		// If $menu['titre'] start with $, a dol_eval is done.
+                	$title = $langs->trans($menu['titre']); // If $menu['titre'] start with $, a dol_eval is done.
                 	//var_dump($title.'-'.$menu['titre']);
                     if ($title == $menu['titre'])   // Translation not found
                     {
-                        if (! empty($menu['langs']))    // If there is a dedicated translation file
+                        if (!empty($menu['langs']))    // If there is a dedicated translation file
                         {
                         	//print 'Load file '.$menu['langs'].'<br>';
                             $langs->load($menu['langs']);
@@ -629,15 +629,15 @@ 
                         $substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
                         $menu['titre'] = make_substitutions($menu['titre'], $substitarray);
 
-                        if (preg_match("/\//",$menu['titre'])) // To manage translation when title is string1/string2
+                        if (preg_match("/\//", $menu['titre'])) // To manage translation when title is string1/string2
                         {
-                            $tab_titre = explode("/",$menu['titre']);
+                            $tab_titre = explode("/", $menu['titre']);
                             $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
                         }
-                        else if (preg_match('/\|\|/',$menu['titre'])) // To manage different translation (Title||AltTitle@ConditionForAltTitle)
+                        else if (preg_match('/\|\|/', $menu['titre'])) // To manage different translation (Title||AltTitle@ConditionForAltTitle)
                         {
-                        	$tab_title = explode("||",$menu['titre']);
-                        	$alt_title = explode("@",$tab_title[1]);
+                        	$tab_title = explode("||", $menu['titre']);
+                        	$alt_title = explode("@", $tab_title[1]);
                         	$title_enabled = verifCond($alt_title[1]);
                         	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
                         }
@@ -654,10 +654,10 @@ 
                     $tabMenu[$b]['module']      = $menu['module'];
                     $tabMenu[$b]['fk_menu']     = $menu['fk_menu'];
                     $tabMenu[$b]['url']         = $menu['url'];
-                    if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b]['url']))
+                    if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url']))
                     {
-                        if (preg_match('/\?/',$tabMenu[$b]['url'])) $tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
-                        else $tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
+                        if (preg_match('/\?/', $tabMenu[$b]['url'])) $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];
+                        else $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];
                     }
                     $tabMenu[$b]['titre']       = $title;
                     $tabMenu[$b]['target']      = $menu['target'];
@@ -706,10 +706,10 @@ 
         for ($x = 0; $x < $num; $x++)
         {
             //si un element a pour pere : $pere
-            if ( (($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
+            if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
             {
-                $this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level-1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
-                $this->recur($tab, $tab[$x]['rowid'], ($level+1));
+                $this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
+                $this->recur($tab, $tab[$x]['rowid'], ($level + 1));
             }
         }
    }

Braces +67 added lines, -36 removed lines

@@ -126,11 +126,17 @@ 
         $this->perms=trim($this->perms);
         $this->enabled=trim($this->enabled);
         $this->user=trim($this->user);
-        if (empty($this->position)) $this->position=0;
-        if (! $this->level) $this->level=0;
+        if (empty($this->position)) {
+            $this->position=0;
+        }
+        if (! $this->level) {
+            $this->level=0;
+        }
 
         // Check parameters
-        if (empty($this->menu_handler)) return -1;
+        if (empty($this->menu_handler)) {
+            return -1;
+        }
 
         // For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
         // may use an already used value because its internal cursor does not increase when we do
@@ -145,14 +151,19 @@ 
                $maxrowid=$obj->maxrowid;
 
                // Max rowid can be empty if there is no record yet
-               if(empty($maxrowid)) $maxrowid=1;
+               if(empty($maxrowid)) {
+                   $maxrowid=1;
+               }
 
                $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
                //print $sql; exit;
                $resqlrowidset=$this->db->query($sql);
-               if (! $resqlrowidset) dol_print_error($this->db);
+               if (! $resqlrowidset) {
+                   dol_print_error($this->db);
+               }
+          } else {
+              dol_print_error($this->db);
           }
-          else dol_print_error($this->db);
         }
 
         // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
@@ -169,10 +180,12 @@ 
         {
         	$row = $this->db->fetch_row($result);
 
-        	if ($row[0] == 0)   // If not found
+        	if ($row[0] == 0) {
+        	    // If not found
         	{
 		        // Insert request
 		        $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
+        	}
 		        $sql.= "menu_handler,";
 		        $sql.= "entity,";
 		        $sql.= "module,";
@@ -218,21 +231,18 @@ 
 		            dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
 
 		            return $this->id;
-		        }
-		        else
+		        } else
 		        {
 		            $this->error="Error ".$this->db->lasterror();
 		            return -1;
 		        }
-        	}
-        	else
+        	} else
         	{
         		dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);
         		$this->error = 'Error Menu entry already exists';
         		return 0;
         	}
-        }
-        else
+        } else
         {
         	return -1;
         }
@@ -369,8 +379,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -454,7 +463,9 @@ 
         $newTabMenu=array();
         foreach($tabMenu as $val)
         {
-            if ($val['type']=='top') $newTabMenu[]=$val;
+            if ($val['type']=='top') {
+                $newTabMenu[]=$val;
+            }
         }
 
         return $newTabMenu;
@@ -502,7 +513,8 @@ 
         foreach($tabMenu as $key => $val)
         {
         	//var_dump($tabMenu);
-        	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
+        	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu) {
+        	    // We found a menu entry not linked to parent with good mainmenu
         	{
         		//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
         		//var_dump($this->newmenu->liste);exit;
@@ -510,18 +522,20 @@ 
         		if (empty($val['fk_leftmenu']))
         		{
         			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+        	}
         			//var_dump($this->newmenu->liste);
-        		}
-        		else
+        		} else
         		{
         			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
         			$searchlastsub=0;$lastid=0;$nextid=0;$found=0;
         			foreach($this->newmenu->liste as $keyparent => $valparent)
         			{
         				//var_dump($valparent);
-        				if ($searchlastsub)    // If we started to search for last submenu
+        				if ($searchlastsub) {
+        				    // If we started to search for last submenu
         				{
         					if ($valparent['level'] >= $searchlastsub) $lastid=$keyparent;
+        				}
         					if ($valparent['level'] < $searchlastsub)
         					{
         						$nextid=$keyparent;
@@ -538,8 +552,9 @@ 
         				}
         			}
         			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
-        			if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-        			else {
+        			if ($found) {
+        			    $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+        			} else {
         			    dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
         			    //print "Parent menu not found !!<br>";
         			}
@@ -574,8 +589,12 @@ 
         $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
         $sql.= " WHERE m.entity IN (0,".$conf->entity.")";
         $sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
-        if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
-        if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
+        if ($type_user == 0) {
+            $sql.= " AND m.usertype IN (0,2)";
+        }
+        if ($type_user == 1) {
+            $sql.= " AND m.usertype IN (1,2)";
+        }
         $sql.= " ORDER BY m.position, m.rowid";
 		//print $sql;
 
@@ -599,7 +618,10 @@ 
                 if ($menu['perms'])
                 {
                 	$tmpcond=$menu['perms'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                	if ($leftmenu == 'all') {
+                	    $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);
+                	}
+                	// Force part of condition to true
                 	$perms = verifCond($tmpcond);
                     //print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
                 }
@@ -609,7 +631,10 @@ 
                 if ($menu['enabled'])
                 {
                 	$tmpcond=$menu['enabled'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);	// Force part of condition to true
+                	if ($leftmenu == 'all') {
+                	    $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond);
+                	}
+                	// Force part of condition to true
                     $enabled = verifCond($tmpcond);
                 }
 
@@ -618,30 +643,34 @@ 
                 {
                 	$title = $langs->trans($menu['titre']);		// If $menu['titre'] start with $, a dol_eval is done.
                 	//var_dump($title.'-'.$menu['titre']);
-                    if ($title == $menu['titre'])   // Translation not found
+                    if ($title == $menu['titre']) {
+                        // Translation not found
                     {
                         if (! empty($menu['langs']))    // If there is a dedicated translation file
                         {
                         	//print 'Load file '.$menu['langs'].'<br>';
                             $langs->load($menu['langs']);
+                    }
                         }
 
                         $substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
                         $menu['titre'] = make_substitutions($menu['titre'], $substitarray);
 
-                        if (preg_match("/\//",$menu['titre'])) // To manage translation when title is string1/string2
+                        if (preg_match("/\//",$menu['titre'])) {
+                            // To manage translation when title is string1/string2
                         {
                             $tab_titre = explode("/",$menu['titre']);
-                            $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
                         }
-                        else if (preg_match('/\|\|/',$menu['titre'])) // To manage different translation (Title||AltTitle@ConditionForAltTitle)
+                            $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
+                        } else if (preg_match('/\|\|/',$menu['titre'])) {
+                            // To manage different translation (Title||AltTitle@ConditionForAltTitle)
                         {
                         	$tab_title = explode("||",$menu['titre']);
+                        }
                         	$alt_title = explode("@",$tab_title[1]);
                         	$title_enabled = verifCond($alt_title[1]);
                         	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
-                        }
-                        else
+                        } else
                         {
                             $title = $langs->trans($menu['titre']);
                         }
@@ -656,8 +685,11 @@ 
                     $tabMenu[$b]['url']         = $menu['url'];
                     if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b]['url']))
                     {
-                        if (preg_match('/\?/',$tabMenu[$b]['url'])) $tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
-                        else $tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
+                        if (preg_match('/\?/',$tabMenu[$b]['url'])) {
+                            $tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
+                        } else {
+                            $tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
+                        }
                     }
                     $tabMenu[$b]['titre']       = $title;
                     $tabMenu[$b]['target']      = $menu['target'];
@@ -683,8 +715,7 @@ 
             // into the leftMenuCharger later to avoid useless operations.
 
             return 1;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             return -1;

dolibarr/htdocs/core/class/dolreceiptprinter.class.php

Braces +1 added lines, -2 removed lines

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

Spacing +47 added lines, -47 removed lines

@@ -92,7 +92,7 @@ 
  *
  */
 
-require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/Escpos.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/mike42/escpos-php/Escpos.php';
 
 
 /**
@@ -118,7 +118,7 @@ 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
     /**
      * @var string[] Error codes (or messages)
@@ -134,7 +134,7 @@ 
      */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
         $this->tags = array(
             'dol_align_left',
             'dol_align_center',
@@ -218,8 +218,8 @@ 
         $line = 0;
         $obj = array();
         $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql .= ' WHERE entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -286,8 +286,8 @@ 
         $line = 0;
         $obj = array();
         $sql = 'SELECT rowid, name, template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql .= ' WHERE entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -311,7 +311,7 @@ 
      *  @param    string    $htmlname       select html name
      *  @return  int                        0 if OK; >0 if KO
      */
-    function selectTypePrinter($selected='', $htmlname='printertypeid')
+    function selectTypePrinter($selected = '', $htmlname = 'printertypeid')
     {
         global $langs;
 
@@ -335,7 +335,7 @@ 
      *  @param    string    $htmlname       select html name
      *  @return  int                        0 if OK; >0 if KO
      */
-    function selectProfilePrinter($selected='', $htmlname='printerprofileid')
+    function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')
     {
         global $langs;
 
@@ -368,10 +368,10 @@ 
         global $conf;
         $error = 0;
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' (name, fk_type, fk_profile, parameter, entity)';
-        $sql.= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
+        $sql .= ' (name, fk_type, fk_profile, parameter, entity)';
+        $sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -395,13 +395,13 @@ 
         global $conf;
         $error = 0;
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', fk_type='.$type;
-        $sql.= ', fk_profile='.$profile;
-        $sql.= ', parameter="'.$this->db->escape($parameter).'"';
-        $sql.= ' WHERE rowid='.$printerid;
+        $sql .= ' SET name="'.$this->db->escape($name).'"';
+        $sql .= ', fk_type='.$type;
+        $sql .= ', fk_profile='.$profile;
+        $sql .= ', parameter="'.$this->db->escape($parameter).'"';
+        $sql .= ' WHERE rowid='.$printerid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -421,9 +421,9 @@ 
         global $conf;
         $error = 0;
         $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid='.$printerid;
+        $sql .= ' WHERE rowid='.$printerid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -445,11 +445,11 @@ 
         global $conf;
         $error = 0;
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', template="'.$this->db->escape($template).'"';
-        $sql.= ' WHERE rowid='.$templateid;
+        $sql .= ' SET name="'.$this->db->escape($name).'"';
+        $sql .= ', template="'.$this->db->escape($template).'"';
+        $sql .= ' WHERE rowid='.$templateid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -469,9 +469,9 @@ 
         // phpcs:enable
         global $conf;
         $error = 0;
-        $img = new EscposImage(DOL_BASE_URI . '/theme/common/dolibarr_logo_bw.png');
+        $img = new EscposImage(DOL_BASE_URI.'/theme/common/dolibarr_logo_bw.png');
         $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
+        if ($ret > 0) {
             setEventMessages($this->error, $this->errors, 'errors');
         } else {
             try {
@@ -543,35 +543,35 @@ 
         $level = 0;
         $html = '<table border="1" style="width:210px"><pre>';
         $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
+        if ($ret > 0) {
             setEventMessages($this->error, $this->errors, 'errors');
         }
         else
         {
             $nboflines = count($vals);
-            for ($line=0; $line < $nboflines; $line++)
+            for ($line = 0; $line < $nboflines; $line++)
             {
                 switch ($vals[$line]['tag']) {
                     case 'DOL_ALIGN_CENTER':
                         $this->printer->setJustification(Escpos::JUSTIFY_CENTER);
-                        $html.='<center>';
+                        $html .= '<center>';
                         $this->printer->text($vals[$line]['value']);
                         break;
                     case 'DOL_ALIGN_RIGHT':
                         $this->printer->setJustification(Escpos::JUSTIFY_RIGHT);
-                        $html.='<right>';
+                        $html .= '<right>';
                         break;
                     case 'DOL_ALIGN_LEFT':
                         $this->printer->setJustification(Escpos::JUSTIFY_LEFT);
-                        $html.='<left>';
+                        $html .= '<left>';
                         break;
                     case 'DOL_OPEN_DRAWER':
                         $this->printer->pulse();
-                        $html.= ' &#991;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#991;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_ACTIVATE_BUZZER':
                         //$this->printer->buzzer();
-                        $html.= ' &#x266b;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#x266b;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_PRINT_BARCODE':
                         // $vals[$line]['value'] -> barcode($content, $type)
@@ -584,15 +584,15 @@ 
                     case 'DOL_PRINT_QRCODE':
                         // $vals[$line]['value'] -> qrCode($content, $ec, $size, $model)
                         $this->printer->qrcode($vals[$line]['value']);
-                        $html.='QRCODE: '.$vals[$line]['value'];
+                        $html .= 'QRCODE: '.$vals[$line]['value'];
                         break;
                     case 'DOL_CUT_PAPER_FULL':
                         $this->printer->cut(Escpos::CUT_FULL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_CUT_PAPER_PARTIAL':
                         $this->printer->cut(Escpos::CUT_PARTIAL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_USE_FONT_A':
                         $this->printer->setFont(Escpos::FONT_A);
@@ -608,13 +608,13 @@ 
                         break;
                     default:
                         $this->printer->text($vals[$line]['value']);
-                        $html.= nl2br($vals[$line]['value']);
+                        $html .= nl2br($vals[$line]['value']);
                         $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$line]['tag']).'&gt;';
                         $error++;
                         break;
                 }
             }
-            $html.= '</pre></table>';
+            $html .= '</pre></table>';
             print $html;
             // Close and print
             // uncomment next line to see content sent to printer
@@ -635,9 +635,9 @@ 
         global $conf;
         $error = 0;
         $sql = 'SELECT template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE rowid='.$templateid;
-        $sql.= ' AND entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql .= ' WHERE rowid='.$templateid;
+        $sql .= ' AND entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_array($resql);
@@ -667,11 +667,11 @@ 
     {
         // phpcs:enable
         global $conf;
-        $error=0;
+        $error = 0;
         $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid = '.$printerid;
-        $sql.= ' AND entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql .= ' WHERE rowid = '.$printerid;
+        $sql .= ' AND entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_array($resql);
@@ -683,12 +683,12 @@ 
             $error++;
             $this->errors[] = 'PrinterDontExist';
         }
-        if (! $error) {
+        if (!$error) {
             $parameter = $obj['parameter'];
             try {
                 switch ($obj['fk_type']) {
                     case 1:
-                        require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
+                        require_once DOL_DOCUMENT_ROOT.'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
                         $this->connector = new DummyPrintConnector();
                         break;
                     case 2:

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

dolibarr/htdocs/core/class/fiscalyear.class.php

Indentation +380 added lines, -380 removed lines

@@ -28,384 +28,384 @@
  */
 class Fiscalyear extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='fiscalyear';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='accounting_fiscalyear';
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	public $table_element_line = '';
-
-	/**
-	 * @var int Field with ID of parent key if this field has a parent
-	 */
-	public $fk_element = '';
-
-	/**
-	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 * @var int
-	 */
-	public $ismultientitymanaged = 1;
-
-	/**
-	 * @var int ID
-	 */
-	public $rowid;
-
-	/**
-	 * @var string fiscal year label
-	 */
-	public $label;
-
-	public $date_start;
-	public $date_end;
-	public $datec;
-	public $statut;		// 0=open, 1=closed
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	public $statuts=array();
-	public $statuts_short=array();
-
-	/**
-	 * Constructor
-	 *
-	 * @param	DoliDB		$db		Database handler
-	 */
-	function __construct(DoliDB $db)
-	{
-		global $langs;
-
-		$this->db = $db;
-
-		$this->statuts_short = array(0 => 'Opened', 1 => 'Closed');
-		$this->statuts = array(0 => 'Opened', 1 => 'Closed');
-	}
-
-	/**
-	 *	Create object in database
-	 *
-	 *	@param		User	$user   User making creation
-	 *	@return 	int				<0 if KO, >0 if OK
-	 */
-	function create($user)
-	{
-		global $conf;
-
-		$error = 0;
-
-		$now=dol_now();
-
-		$this->db->begin();
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";
-		$sql.= "label";
-		$sql.= ", date_start";
-		$sql.= ", date_end";
-		$sql.= ", statut";
-		$sql.= ", entity";
-		$sql.= ", datec";
-		$sql.= ", fk_user_author";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->label)."'";
-		$sql.= ", '".$this->db->idate($this->date_start)."'";
-		$sql.= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'":"null");
-		$sql.= ", 0";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ". $user->id;
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
-
-			$result=$this->update($user);
-			if ($result > 0)
-			{
-				$this->db->commit();
-				return $this->id;
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				$this->db->rollback();
-				return $result;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->lasterror()." sql=".$sql;
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *	Update record
-	 *
-	 *	@param	User	$user		User making update
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function update($user)
-	{
-		global $langs;
-
-		// Check parameters
-		if (empty($this->date_start) && empty($this->date_end))
-		{
-			$this->error='ErrorBadParameter';
-			return -1;
-		}
-
-		$this->db->begin();
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_fiscalyear";
-		$sql .= " SET label = '".$this->db->escape($this->label)."'";
-		$sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
-		$sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
-		$sql .= ", statut = '".$this->db->escape($this->statut?$this->statut:0)."'";
-		$sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
-		$sql .= ", fk_user_modif = " . $user->id;
-		$sql .= " WHERE rowid = ".$this->id;
-
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog($this->error, LOG_ERR);
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	* Load an object from database
-	*
-	* @param	int		$id		Id of record to load
-	* @return	int				<0 if KO, >0 if OK
-	*/
-	function fetch($id)
-	{
-		$sql = "SELECT rowid, label, date_start, date_end, statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
-		$sql.= " WHERE rowid = ".$id;
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ( $result )
-		{
-			$obj = $this->db->fetch_object($result);
-
-			$this->id			= $obj->rowid;
-			$this->ref			= $obj->rowid;
-			$this->date_start	= $this->db->jdate($obj->date_start);
-			$this->date_end		= $this->db->jdate($obj->date_end);
-			$this->label		= $obj->label;
-			$this->statut	    = $obj->statut;
-
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-   /**
-	*	Delete record
-	*
-	*	@param	int		$id		Id of record to delete
-	*	@return	int				<0 if KO, >0 if OK
-	*/
-	function delete($id)
-	{
-		$this->db->begin();
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE rowid = ".$id;
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 * Give a label from a status
-	 *
-	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 * @return  string   		   	Label
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->statut,$mode);
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Give a label from a status
-	 *
-	 *  @param	int		$statut     Id status
-	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-	 *  @return string      		Label
-	 */
-	function LibStatut($statut,$mode=0)
-	{
-		// phpcs:enable
-		global $langs;
-
-		if ($mode == 0)
-		{
-			return $langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 1)
-		{
-			return $langs->trans($this->statuts_short[$statut]);
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
-		}
-	}
-
-	/**
-	 * Information on record
-	 *
-	 * @param	int		$id      Id of record
-	 * @return	void
-	 */
-	function info($id)
-	{
-		$sql = 'SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,';
-		$sql.= ' fy.tms';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
-		$sql.= ' WHERE fy.rowid = '.$id;
-
-		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
-		$result = $this->db->query($sql);
-
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_modif)
-				{
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->tms);
-			}
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 *  Return the number of entries by fiscal year
-	 *
-	 *	@param	int		$datestart	Date start to scan
-	 *	@param	int		$dateend	Date end to scan
-	 *	@return	string				Number of entries
-	 */
-	function getAccountancyEntriesByFiscalYear($datestart, $dateend)
-	{
-		global $conf;
-
-		$sql = "SELECT count(DISTINCT piece_num) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
-
-		return $nb;
-	}
-
-	/**
-	 *  Return the number of movements by fiscal year
-	 *
-	 *	@param	int		$datestart	Date start to scan
-	 *	@param	int		$dateend	Date end to scan
-	 *	@return	string				Number of movements
-	 */
-	function getAccountancyMovementsByFiscalYear($datestart, $dateend)
-	{
-		global $conf;
-
-		$sql = "SELECT count(rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
-
-		return $nb;
-	}
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='fiscalyear';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='accounting_fiscalyear';
+
+    /**
+     * @var int    Name of subtable line
+     */
+    public $table_element_line = '';
+
+    /**
+     * @var int Field with ID of parent key if this field has a parent
+     */
+    public $fk_element = '';
+
+    /**
+     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     * @var int
+     */
+    public $ismultientitymanaged = 1;
+
+    /**
+     * @var int ID
+     */
+    public $rowid;
+
+    /**
+     * @var string fiscal year label
+     */
+    public $label;
+
+    public $date_start;
+    public $date_end;
+    public $datec;
+    public $statut;		// 0=open, 1=closed
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    public $statuts=array();
+    public $statuts_short=array();
+
+    /**
+     * Constructor
+     *
+     * @param	DoliDB		$db		Database handler
+     */
+    function __construct(DoliDB $db)
+    {
+        global $langs;
+
+        $this->db = $db;
+
+        $this->statuts_short = array(0 => 'Opened', 1 => 'Closed');
+        $this->statuts = array(0 => 'Opened', 1 => 'Closed');
+    }
+
+    /**
+     *	Create object in database
+     *
+     *	@param		User	$user   User making creation
+     *	@return 	int				<0 if KO, >0 if OK
+     */
+    function create($user)
+    {
+        global $conf;
+
+        $error = 0;
+
+        $now=dol_now();
+
+        $this->db->begin();
+
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";
+        $sql.= "label";
+        $sql.= ", date_start";
+        $sql.= ", date_end";
+        $sql.= ", statut";
+        $sql.= ", entity";
+        $sql.= ", datec";
+        $sql.= ", fk_user_author";
+        $sql.= ") VALUES (";
+        $sql.= " '".$this->db->escape($this->label)."'";
+        $sql.= ", '".$this->db->idate($this->date_start)."'";
+        $sql.= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'":"null");
+        $sql.= ", 0";
+        $sql.= ", ".$conf->entity;
+        $sql.= ", '".$this->db->idate($now)."'";
+        $sql.= ", ". $user->id;
+        $sql.= ")";
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
+
+            $result=$this->update($user);
+            if ($result > 0)
+            {
+                $this->db->commit();
+                return $this->id;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                $this->db->rollback();
+                return $result;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->lasterror()." sql=".$sql;
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     *	Update record
+     *
+     *	@param	User	$user		User making update
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function update($user)
+    {
+        global $langs;
+
+        // Check parameters
+        if (empty($this->date_start) && empty($this->date_end))
+        {
+            $this->error='ErrorBadParameter';
+            return -1;
+        }
+
+        $this->db->begin();
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX."accounting_fiscalyear";
+        $sql .= " SET label = '".$this->db->escape($this->label)."'";
+        $sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
+        $sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
+        $sql .= ", statut = '".$this->db->escape($this->statut?$this->statut:0)."'";
+        $sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
+        $sql .= ", fk_user_modif = " . $user->id;
+        $sql .= " WHERE rowid = ".$this->id;
+
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_syslog($this->error, LOG_ERR);
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Load an object from database
+     *
+     * @param	int		$id		Id of record to load
+     * @return	int				<0 if KO, >0 if OK
+     */
+    function fetch($id)
+    {
+        $sql = "SELECT rowid, label, date_start, date_end, statut";
+        $sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
+        $sql.= " WHERE rowid = ".$id;
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ( $result )
+        {
+            $obj = $this->db->fetch_object($result);
+
+            $this->id			= $obj->rowid;
+            $this->ref			= $obj->rowid;
+            $this->date_start	= $this->db->jdate($obj->date_start);
+            $this->date_end		= $this->db->jdate($obj->date_end);
+            $this->label		= $obj->label;
+            $this->statut	    = $obj->statut;
+
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    /**
+     *	Delete record
+     *
+     *	@param	int		$id		Id of record to delete
+     *	@return	int				<0 if KO, >0 if OK
+     */
+    function delete($id)
+    {
+        $this->db->begin();
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE rowid = ".$id;
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $this->db->commit();
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Give a label from a status
+     *
+     * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+     * @return  string   		   	Label
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->statut,$mode);
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     *  Give a label from a status
+     *
+     *  @param	int		$statut     Id status
+     *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+     *  @return string      		Label
+     */
+    function LibStatut($statut,$mode=0)
+    {
+        // phpcs:enable
+        global $langs;
+
+        if ($mode == 0)
+        {
+            return $langs->trans($this->statuts[$statut]);
+        }
+        elseif ($mode == 1)
+        {
+            return $langs->trans($this->statuts_short[$statut]);
+        }
+        elseif ($mode == 2)
+        {
+            if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+            elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+        }
+        elseif ($mode == 3)
+        {
+            if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+            elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+        }
+        elseif ($mode == 4)
+        {
+            if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+            elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+        }
+        elseif ($mode == 5)
+        {
+            if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+            elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+        }
+    }
+
+    /**
+     * Information on record
+     *
+     * @param	int		$id      Id of record
+     * @return	void
+     */
+    function info($id)
+    {
+        $sql = 'SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,';
+        $sql.= ' fy.tms';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
+        $sql.= ' WHERE fy.rowid = '.$id;
+
+        dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
+        $result = $this->db->query($sql);
+
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+                $this->id = $obj->rowid;
+                if ($obj->fk_user_author)
+                {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_author);
+                    $this->user_creation = $cuser;
+                }
+                if ($obj->fk_user_modif)
+                {
+                    $muser = new User($this->db);
+                    $muser->fetch($obj->fk_user_modif);
+                    $this->user_modification = $muser;
+                }
+                $this->date_creation     = $this->db->jdate($obj->datec);
+                $this->date_modification = $this->db->jdate($obj->tms);
+            }
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     *  Return the number of entries by fiscal year
+     *
+     *	@param	int		$datestart	Date start to scan
+     *	@param	int		$dateend	Date end to scan
+     *	@return	string				Number of entries
+     */
+    function getAccountancyEntriesByFiscalYear($datestart, $dateend)
+    {
+        global $conf;
+
+        $sql = "SELECT count(DISTINCT piece_num) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
+        $sql.= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $nb = $obj->nb;
+        }
+        else dol_print_error($this->db);
+
+        return $nb;
+    }
+
+    /**
+     *  Return the number of movements by fiscal year
+     *
+     *	@param	int		$datestart	Date start to scan
+     *	@param	int		$dateend	Date end to scan
+     *	@return	string				Number of movements
+     */
+    function getAccountancyMovementsByFiscalYear($datestart, $dateend)
+    {
+        global $conf;
+
+        $sql = "SELECT count(rowid) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
+        $sql.= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $nb = $obj->nb;
+        }
+        else dol_print_error($this->db);
+
+        return $nb;
+    }
 }

Spacing +60 added lines, -60 removed lines

@@ -21,7 +21,7 @@ 
  *		\brief      File of class to manage fiscal years
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * Class to manage fiscal year
@@ -31,12 +31,12 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='fiscalyear';
+	public $element = 'fiscalyear';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='accounting_fiscalyear';
+	public $table_element = 'accounting_fiscalyear';
 
 	/**
 	 * @var int    Name of subtable line
@@ -67,15 +67,15 @@ 
 	public $date_start;
 	public $date_end;
 	public $datec;
-	public $statut;		// 0=open, 1=closed
+	public $statut; // 0=open, 1=closed
 
 	/**
 	 * @var int Entity
 	 */
 	public $entity;
 
-	public $statuts=array();
-	public $statuts_short=array();
+	public $statuts = array();
+	public $statuts_short = array();
 
 	/**
 	 * Constructor
@@ -104,27 +104,27 @@ 
 
 		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";
-		$sql.= "label";
-		$sql.= ", date_start";
-		$sql.= ", date_end";
-		$sql.= ", statut";
-		$sql.= ", entity";
-		$sql.= ", datec";
-		$sql.= ", fk_user_author";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->label)."'";
-		$sql.= ", '".$this->db->idate($this->date_start)."'";
-		$sql.= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'":"null");
-		$sql.= ", 0";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ". $user->id;
-		$sql.= ")";
+		$sql .= "label";
+		$sql .= ", date_start";
+		$sql .= ", date_end";
+		$sql .= ", statut";
+		$sql .= ", entity";
+		$sql .= ", datec";
+		$sql .= ", fk_user_author";
+		$sql .= ") VALUES (";
+		$sql .= " '".$this->db->escape($this->label)."'";
+		$sql .= ", '".$this->db->idate($this->date_start)."'";
+		$sql .= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$sql .= ", 0";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".$user->id;
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -132,7 +132,7 @@ 
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
 
-			$result=$this->update($user);
+			$result = $this->update($user);
 			if ($result > 0)
 			{
 				$this->db->commit();
@@ -140,14 +140,14 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror()." sql=".$sql;
+			$this->error = $this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
 		}
@@ -166,7 +166,7 @@ 
 		// Check parameters
 		if (empty($this->date_start) && empty($this->date_end))
 		{
-			$this->error='ErrorBadParameter';
+			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
 
@@ -176,9 +176,9 @@ 
 		$sql .= " SET label = '".$this->db->escape($this->label)."'";
 		$sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
 		$sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
-		$sql .= ", statut = '".$this->db->escape($this->statut?$this->statut:0)."'";
-		$sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
-		$sql .= ", fk_user_modif = " . $user->id;
+		$sql .= ", statut = '".$this->db->escape($this->statut ? $this->statut : 0)."'";
+		$sql .= ", datec = ".($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
+		$sql .= ", fk_user_modif = ".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -190,7 +190,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
@@ -206,27 +206,27 @@ 
 	function fetch($id)
 	{
 		$sql = "SELECT rowid, label, date_start, date_end, statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
-		$sql.= " WHERE rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
+		$sql .= " WHERE rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
 			$obj = $this->db->fetch_object($result);
 
-			$this->id			= $obj->rowid;
-			$this->ref			= $obj->rowid;
+			$this->id = $obj->rowid;
+			$this->ref = $obj->rowid;
 			$this->date_start	= $this->db->jdate($obj->date_start);
-			$this->date_end		= $this->db->jdate($obj->date_end);
-			$this->label		= $obj->label;
+			$this->date_end = $this->db->jdate($obj->date_end);
+			$this->label = $obj->label;
 			$this->statut	    = $obj->statut;
 
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -252,7 +252,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -264,9 +264,9 @@ 
 	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 * @return  string   		   	Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -277,7 +277,7 @@ 
 	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @return string      		Label
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
 		// phpcs:enable
 		global $langs;
@@ -292,23 +292,23 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
-			elseif ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut == 0) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			elseif ($statut == 1) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8').' '.$langs->trans($this->statuts_short[$statut]);
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+			if ($statut == 0 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+			elseif ($statut == 1 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8');
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 0 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
+			elseif ($statut == 1 && !empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]), 'statut8').' '.$langs->trans($this->statuts[$statut]);
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
-			elseif ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
+			if ($statut == 0 && !empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut4');
+			elseif ($statut == 1 && !empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]), 'statut6');
 		}
 	}
 
@@ -321,9 +321,9 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,';
-		$sql.= ' fy.tms';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
-		$sql.= ' WHERE fy.rowid = '.$id;
+		$sql .= ' fy.tms';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
+		$sql .= ' WHERE fy.rowid = '.$id;
 
 		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -369,10 +369,10 @@ 
 		global $conf;
 
 		$sql = "SELECT count(DISTINCT piece_num) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
+		$sql .= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -395,10 +395,10 @@ 
 		global $conf;
 
 		$sql = "SELECT count(rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
-		$sql.= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
+		$sql .= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);

Braces +35 added lines, -32 removed lines

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

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

Indentation +181 added lines, -181 removed lines

@@ -27,33 +27,33 @@ 
  */
 class Ctypent // extends CommonObject
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
-	//var $element='ctypent';			//!< Id that identify managed objects
-	//var $table_element='ctypent';	//!< Name of table without prefix where object is stored
+    //var $element='ctypent';			//!< Id that identify managed objects
+    //var $table_element='ctypent';	//!< Name of table without prefix where object is stored
 
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
-	public $code;
-	public $libelle;
-	public $active;
-	public $module;
+    public $code;
+    public $libelle;
+    public $active;
+    public $module;
 
 
 
@@ -78,83 +78,83 @@ 
      */
     function create($user, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
+        // Clean parameters
 
-		if (isset($this->id)) $this->id=trim($this->id);
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+        if (isset($this->id)) $this->id=trim($this->id);
+        if (isset($this->code)) $this->code=trim($this->code);
+        if (isset($this->libelle)) $this->libelle=trim($this->libelle);
+        if (isset($this->active)) $this->active=trim($this->active);
+        if (isset($this->module)) $this->module=trim($this->module);
 
 
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
 
-		$sql.= "id,";
-		$sql.= "code,";
-		$sql.= "libelle,";
-		$sql.= "active,";
-		$sql.= "module";
+        $sql.= "id,";
+        $sql.= "code,";
+        $sql.= "libelle,";
+        $sql.= "active,";
+        $sql.= "module";
 
 
         $sql.= ") VALUES (";
 
-		$sql.= " ".(! isset($this->id)?'NULL':"'".$this->db->escape($this->id)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->active($this->active)."'").",";
-		$sql.= " ".(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'")."";
+        $sql.= " ".(! isset($this->id)?'NULL':"'".$this->db->escape($this->id)."'").",";
+        $sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
+        $sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").",";
+        $sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->active($this->active)."'").",";
+        $sql.= " ".(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'")."";
 
 
-		$sql.= ")";
+        $sql.= ")";
 
-		$this->db->begin();
+        $this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
-		if (! $error)
+        if (! $error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
 
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-			}
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
         }
 
         // Commit or rollback
         if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
             return $this->id;
-		}
+        }
     }
 
 
@@ -168,14 +168,14 @@ 
      */
     function fetch($id,$code='',$label='')
     {
-    	global $langs;
+        global $langs;
         $sql = "SELECT";
-		$sql.= " t.id,";
-		$sql.= " t.code,";
-		$sql.= " t.libelle as label,";
-		$sql.= " t.fk_country as country_id,";
-		$sql.= " t.active,";
-		$sql.= " t.module";
+        $sql.= " t.id,";
+        $sql.= " t.code,";
+        $sql.= " t.libelle as label,";
+        $sql.= " t.fk_country as country_id,";
+        $sql.= " t.active,";
+        $sql.= " t.module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
         if ($id)   $sql.= " WHERE t.id = ".$id;
         elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
@@ -189,11 +189,11 @@ 
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id    = $obj->id;
-				$this->code = $obj->code;
-				$this->libelle = $obj->label;
-				$this->country_id = $obj->country_id;
-				$this->active = $obj->active;
-				$this->module = $obj->module;
+                $this->code = $obj->code;
+                $this->libelle = $obj->label;
+                $this->country_id = $obj->country_id;
+                $this->active = $obj->active;
+                $this->module = $obj->module;
             }
             $this->db->free($resql);
 
@@ -201,7 +201,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+                $this->error="Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -216,120 +216,120 @@ 
      */
     function update($user=null, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+        // Clean parameters
+        if (isset($this->code)) $this->code=trim($this->code);
+        if (isset($this->libelle)) $this->libelle=trim($this->libelle);
+        if (isset($this->active)) $this->active=trim($this->active);
+        if (isset($this->module)) $this->module=trim($this->module);
 
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null").",";
-		$sql.= " module=".(isset($this->module)?"'".$this->db->escape($this->module)."'":"null")."";
+        $sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
+        $sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
+        $sql.= " active=".(isset($this->active)?$this->active:"null").",";
+        $sql.= " module=".(isset($this->module)?"'".$this->db->escape($this->module)."'":"null")."";
         $sql.= " WHERE id=".$this->id;
 
-		$this->db->begin();
+        $this->db->begin();
 
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
-		}
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
     }
 
 
- 	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE id=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action call a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
-			}
-		}
+        /**
+         *  Delete object in database
+         *
+         *	@param  User	$user        User that delete
+         *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+         *  @return	int					 <0 if KO, >0 if OK
+         */
+    function delete($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_typent";
+        $sql.= " WHERE id=".$this->id;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
 }

Spacing +68 added lines, -68 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -76,18 +76,18 @@ 
      *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return     int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
-		if (isset($this->id)) $this->id=trim($this->id);
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->id)) $this->id = trim($this->id);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
+		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->module)) $this->module = trim($this->module);
 
 
 
@@ -97,35 +97,35 @@ 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_typent(";
 
-		$sql.= "id,";
-		$sql.= "code,";
-		$sql.= "libelle,";
-		$sql.= "active,";
-		$sql.= "module";
+		$sql .= "id,";
+		$sql .= "code,";
+		$sql .= "libelle,";
+		$sql .= "active,";
+		$sql .= "module";
 
 
-        $sql.= ") VALUES (";
+        $sql .= ") VALUES (";
 
-		$sql.= " ".(! isset($this->id)?'NULL':"'".$this->db->escape($this->id)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->active($this->active)."'").",";
-		$sql.= " ".(! isset($this->module)?'NULL':"'".$this->db->escape($this->module)."'")."";
+		$sql .= " ".(!isset($this->id) ? 'NULL' : "'".$this->db->escape($this->id)."'").",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->libelle) ? 'NULL' : "'".$this->db->escape($this->libelle)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->active($this->active)."'").",";
+		$sql .= " ".(!isset($this->module) ? 'NULL' : "'".$this->db->escape($this->module)."'")."";
 
 
-		$sql.= ")";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -142,13 +142,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -166,29 +166,29 @@ 
      *  @param		string	$label	Label
      *  @return     int          	<0 if KO, >0 if OK
      */
-    function fetch($id,$code='',$label='')
+    function fetch($id, $code = '', $label = '')
     {
     	global $langs;
         $sql = "SELECT";
-		$sql.= " t.id,";
-		$sql.= " t.code,";
-		$sql.= " t.libelle as label,";
-		$sql.= " t.fk_country as country_id,";
-		$sql.= " t.active,";
-		$sql.= " t.module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-        if ($id)   $sql.= " WHERE t.id = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-        elseif ($label) $sql.= " WHERE t.libelle = '".$this->db->escape($label)."'";
-
-        $resql=$this->db->query($sql);
+		$sql .= " t.id,";
+		$sql .= " t.code,";
+		$sql .= " t.libelle as label,";
+		$sql .= " t.fk_country as country_id,";
+		$sql .= " t.active,";
+		$sql .= " t.module";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";
+        if ($id)   $sql .= " WHERE t.id = ".$id;
+        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+        elseif ($label) $sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";
+
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->id;
+                $this->id = $obj->id;
 				$this->code = $obj->code;
 				$this->libelle = $obj->label;
 				$this->country_id = $obj->country_id;
@@ -201,7 +201,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -214,16 +214,16 @@ 
      *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return     int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->module)) $this->module=trim($this->module);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
+		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->module)) $this->module = trim($this->module);
 
 
 		// Check parameters
@@ -231,21 +231,21 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_typent SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null").",";
-		$sql.= " module=".(isset($this->module)?"'".$this->db->escape($this->module)."'":"null")."";
-        $sql.= " WHERE id=".$this->id;
+		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " libelle=".(isset($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null").",";
+		$sql .= " module=".(isset($this->module) ? "'".$this->db->escape($this->module)."'" : "null")."";
+        $sql .= " WHERE id=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -262,13 +262,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -285,23 +285,23 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE id=".$this->id;
+		$sql .= " WHERE id=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -318,13 +318,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{

Braces +38 added lines, -20 removed lines

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

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

Indentation +16 added lines, -16 removed lines

@@ -35,9 +35,9 @@ 
     public $db;
     
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -64,19 +64,19 @@ 
         print Form::selectarray($htmlname, $account->type_lib, $selected);
     }
 
-	/**
-	 * Returns the name of the Iban label. India uses 'IFSC' and the rest of the world 'IBAN' name.
-	 *
-	 * @param Account $account Account object
-	 * @return string
-	 */
-	public static function getIBANLabel(Account $account)
-	{
-		if ($account->getCountryCode() == 'IN') {
-			return 'IFSC';
-		}
+    /**
+     * Returns the name of the Iban label. India uses 'IFSC' and the rest of the world 'IBAN' name.
+     *
+     * @param Account $account Account object
+     * @return string
+     */
+    public static function getIBANLabel(Account $account)
+    {
+        if ($account->getCountryCode() == 'IN') {
+            return 'IFSC';
+        }
 
-		return 'IBANNumber';
-	}
+        return 'IBANNumber';
+    }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**