alxarafe / alixar

dolibarr/htdocs/core/class/events.class.php

Indentation +237 added lines, -237 removed lines

@@ -34,62 +34,62 @@ 
  */
 class Events // extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='events';
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='events';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='events';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='events';
 
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
     /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	public $tms;
-	public $type;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	public $dateevent;
-
-	/**
-	 * @var string description
-	 */
-	public $description;
-
-	// List of all Audit/Security events supported by triggers
-	public $eventstolog=array(
-		array('id'=>'USER_LOGIN',             'test'=>1),
-		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
-	    array('id'=>'USER_LOGOUT',            'test'=>1),
-		array('id'=>'USER_CREATE',            'test'=>1),
-		array('id'=>'USER_MODIFY',            'test'=>1),
-		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
-		array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
-		array('id'=>'USER_DELETE',            'test'=>1),
-	/*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    public $tms;
+    public $type;
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    public $dateevent;
+
+    /**
+     * @var string description
+     */
+    public $description;
+
+    // List of all Audit/Security events supported by triggers
+    public $eventstolog=array(
+        array('id'=>'USER_LOGIN',             'test'=>1),
+        array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
+        array('id'=>'USER_LOGOUT',            'test'=>1),
+        array('id'=>'USER_CREATE',            'test'=>1),
+        array('id'=>'USER_MODIFY',            'test'=>1),
+        array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
+        array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
+        array('id'=>'USER_DELETE',            'test'=>1),
+    /*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
 	    array('id'=>'USER_REMOVEFROMGROUP',   'test'=>1), deprecated. Replace with USER_MODIFY */
-		array('id'=>'GROUP_CREATE',           'test'=>1),
-		array('id'=>'GROUP_MODIFY',           'test'=>1),
-		array('id'=>'GROUP_DELETE',           'test'=>1),
-	/*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
+        array('id'=>'GROUP_CREATE',           'test'=>1),
+        array('id'=>'GROUP_MODIFY',           'test'=>1),
+        array('id'=>'GROUP_DELETE',           'test'=>1),
+    /*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
 		array('id'=>'COMPANY_CREATE',         'test'=>$conf->societe->enabled),
 		array('id'=>'CONTRACT_VALIDATE',      'test'=>$conf->contrat->enabled),
 		array('id'=>'PROPAL_VALIDATE',        'test'=>$conf->propal->enabled),
@@ -111,199 +111,199 @@ 
 		array('id'=>'MEMBER_RESILIATE',       'test'=>$conf->adherent->enabled),
 		array('id'=>'MEMBER_DELETE',          'test'=>$conf->adherent->enabled),
 	*/
-	);
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *   Create in database
-	 *
-	 *   @param      User	$user       User that create
-	 *   @return     int     		    <0 if KO, >0 if OK
-	 */
-	function create($user)
-	{
-		global $conf, $langs;
-
-		// Clean parameters
-		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
-
-		// Check parameters
-		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
-
-		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
-		$sql.= "type,";
-		$sql.= "entity,";
-		$sql.= "ip,";
-		$sql.= "user_agent,";
-		$sql.= "dateevent,";
-		$sql.= "fk_user,";
-		$sql.= "description";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->type)."',";
-		$sql.= " ".$conf->entity.",";
-		$sql.= " '".$this->db->escape(getUserRemoteIP())."',";
-		$sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
-		$sql.= " '".$this->db->idate($this->dateevent)."',";
-		$sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
-		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
-		$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."events");
-			return $this->id;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 * Update database
-	 *
-	 * @param	User    $user        	User that modify
-	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
-	 * @return  int         			<0 if KO, >0 if OK
-	 */
-	function update($user=null, $notrigger=0)
-	{
-		global $conf, $langs;
-
-		// Clean parameters
-		$this->id=trim($this->id);
-		$this->type=trim($this->type);
-		$this->description=trim($this->description);
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->db->escape($this->type)."',";
-		$sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
-		$sql.= " description='".$this->db->escape($this->description)."'";
-		$sql.= " WHERE rowid=".$this->id;
-
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-		return 1;
-	}
-
-
-	/**
-	 *  Load object in memory from database
-	 *
-	 *  @param	int		$id         Id object
-	 *  @param  User	$user       User that load
-	 *  @return int         		<0 if KO, >0 if OK
-	 */
-	function fetch($id, $user=null)
-	{
-		global $langs;
-
-		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.tms,";
-		$sql.= " t.type,";
-		$sql.= " t.entity,";
-		$sql.= " t.dateevent,";
-		$sql.= " t.description,";
-		$sql.= " t.ip,";
-		$sql.= " t.user_agent";
-		$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
-		$sql.= " WHERE t.rowid = ".$id;
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id    = $obj->rowid;
-				$this->tms = $this->db->jdate($obj->tms);
-				$this->type = $obj->type;
-				$this->entity = $obj->entity;
-				$this->dateevent = $this->db->jdate($obj->dateevent);
-				$this->description = $obj->description;
-				$this->ip = $obj->ip;
-				$this->user_agent = $obj->user_agent;
-			}
-			$this->db->free($resql);
-
-			return 1;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Delete object in database
-	 *
-	 *	@param	User	$user       User that delete
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function delete($user)
-	{
-		global $conf, $langs;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
-		$sql.= " WHERE rowid=".$this->id;
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-
-		return 1;
-	}
-
-
-	/**
+    );
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *   Create in database
+     *
+     *   @param      User	$user       User that create
+     *   @return     int     		    <0 if KO, >0 if OK
+     */
+    function create($user)
+    {
+        global $conf, $langs;
+
+        // Clean parameters
+        $this->description=trim($this->description);
+        if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+
+        // Check parameters
+        if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
+
+        // Insert request
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
+        $sql.= "type,";
+        $sql.= "entity,";
+        $sql.= "ip,";
+        $sql.= "user_agent,";
+        $sql.= "dateevent,";
+        $sql.= "fk_user,";
+        $sql.= "description";
+        $sql.= ") VALUES (";
+        $sql.= " '".$this->db->escape($this->type)."',";
+        $sql.= " ".$conf->entity.",";
+        $sql.= " '".$this->db->escape(getUserRemoteIP())."',";
+        $sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
+        $sql.= " '".$this->db->idate($this->dateevent)."',";
+        $sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
+        $sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
+        $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."events");
+            return $this->id;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     * Update database
+     *
+     * @param	User    $user        	User that modify
+     * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
+     * @return  int         			<0 if KO, >0 if OK
+     */
+    function update($user=null, $notrigger=0)
+    {
+        global $conf, $langs;
+
+        // Clean parameters
+        $this->id=trim($this->id);
+        $this->type=trim($this->type);
+        $this->description=trim($this->description);
+
+        // Check parameters
+        // Put here code to add control on parameters values
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
+        $sql.= " type='".$this->db->escape($this->type)."',";
+        $sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
+        $sql.= " description='".$this->db->escape($this->description)."'";
+        $sql.= " WHERE rowid=".$this->id;
+
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+        return 1;
+    }
+
+
+    /**
+     *  Load object in memory from database
+     *
+     *  @param	int		$id         Id object
+     *  @param  User	$user       User that load
+     *  @return int         		<0 if KO, >0 if OK
+     */
+    function fetch($id, $user=null)
+    {
+        global $langs;
+
+        $sql = "SELECT";
+        $sql.= " t.rowid,";
+        $sql.= " t.tms,";
+        $sql.= " t.type,";
+        $sql.= " t.entity,";
+        $sql.= " t.dateevent,";
+        $sql.= " t.description,";
+        $sql.= " t.ip,";
+        $sql.= " t.user_agent";
+        $sql.= " FROM ".MAIN_DB_PREFIX."events as t";
+        $sql.= " WHERE t.rowid = ".$id;
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id    = $obj->rowid;
+                $this->tms = $this->db->jdate($obj->tms);
+                $this->type = $obj->type;
+                $this->entity = $obj->entity;
+                $this->dateevent = $this->db->jdate($obj->dateevent);
+                $this->description = $obj->description;
+                $this->ip = $obj->ip;
+                $this->user_agent = $obj->user_agent;
+            }
+            $this->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Delete object in database
+     *
+     *	@param	User	$user       User that delete
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function delete($user)
+    {
+        global $conf, $langs;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
+        $sql.= " WHERE rowid=".$this->id;
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+
+        return 1;
+    }
+
+
+    /**
      *  Initialise an instance with random values.
      *  Used to build previews or test instances.
      *	id must be 0 if object instance is a specimen.
      *
      *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		$this->id=0;
-
-		$this->tms=time();
-		$this->type='';
-		$this->dateevent=time();
-		$this->description='This is a specimen event';
-	}
+     */
+    function initAsSpecimen()
+    {
+        $this->id=0;
+
+        $this->tms=time();
+        $this->type='';
+        $this->dateevent=time();
+        $this->description='This is a specimen event';
+    }
 }

Spacing +68 added lines, -68 removed lines

@@ -37,12 +37,12 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='events';
+	public $element = 'events';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='events';
+	public $table_element = 'events';
 
 	/**
 	 * @var int ID
@@ -57,7 +57,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	public $tms;
 	public $type;
@@ -75,20 +75,20 @@ 
 	public $description;
 
 	// List of all Audit/Security events supported by triggers
-	public $eventstolog=array(
-		array('id'=>'USER_LOGIN',             'test'=>1),
-		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
-	    array('id'=>'USER_LOGOUT',            'test'=>1),
-		array('id'=>'USER_CREATE',            'test'=>1),
-		array('id'=>'USER_MODIFY',            'test'=>1),
-		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
-		array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
-		array('id'=>'USER_DELETE',            'test'=>1),
+	public $eventstolog = array(
+		array('id'=>'USER_LOGIN', 'test'=>1),
+		array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
+	    array('id'=>'USER_LOGOUT', 'test'=>1),
+		array('id'=>'USER_CREATE', 'test'=>1),
+		array('id'=>'USER_MODIFY', 'test'=>1),
+		array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
+		array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
+		array('id'=>'USER_DELETE', 'test'=>1),
 	/*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
 	    array('id'=>'USER_REMOVEFROMGROUP',   'test'=>1), deprecated. Replace with USER_MODIFY */
-		array('id'=>'GROUP_CREATE',           'test'=>1),
-		array('id'=>'GROUP_MODIFY',           'test'=>1),
-		array('id'=>'GROUP_DELETE',           'test'=>1),
+		array('id'=>'GROUP_CREATE', 'test'=>1),
+		array('id'=>'GROUP_MODIFY', 'test'=>1),
+		array('id'=>'GROUP_DELETE', 'test'=>1),
 	/*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
 		array('id'=>'COMPANY_CREATE',         'test'=>$conf->societe->enabled),
 		array('id'=>'CONTRACT_VALIDATE',      'test'=>$conf->contrat->enabled),
@@ -136,33 +136,33 @@ 
 		global $conf, $langs;
 
 		// Clean parameters
-		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		$this->description = trim($this->description);
+		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent = $_SERVER['HTTP_USER_AGENT'];
 
 		// Check parameters
-		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
+		if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; }
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
-		$sql.= "type,";
-		$sql.= "entity,";
-		$sql.= "ip,";
-		$sql.= "user_agent,";
-		$sql.= "dateevent,";
-		$sql.= "fk_user,";
-		$sql.= "description";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->type)."',";
-		$sql.= " ".$conf->entity.",";
-		$sql.= " '".$this->db->escape(getUserRemoteIP())."',";
-		$sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
-		$sql.= " '".$this->db->idate($this->dateevent)."',";
-		$sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
-		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
-		$sql.= ")";
+		$sql .= "type,";
+		$sql .= "entity,";
+		$sql .= "ip,";
+		$sql .= "user_agent,";
+		$sql .= "dateevent,";
+		$sql .= "fk_user,";
+		$sql .= "description";
+		$sql .= ") VALUES (";
+		$sql .= " '".$this->db->escape($this->type)."',";
+		$sql .= " ".$conf->entity.",";
+		$sql .= " '".$this->db->escape(getUserRemoteIP())."',";
+		$sql .= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent, 250))."'" : 'NULL').",";
+		$sql .= " '".$this->db->idate($this->dateevent)."',";
+		$sql .= " ".($user->id ? "'".$this->db->escape($user->id)."'" : 'NULL').",";
+		$sql .= " '".$this->db->escape(dol_trunc($this->description, 250))."'";
+		$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."events");
@@ -170,7 +170,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -183,30 +183,30 @@ 
 	 * @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->id=trim($this->id);
-		$this->type=trim($this->type);
-		$this->description=trim($this->description);
+		$this->id = trim($this->id);
+		$this->type = trim($this->type);
+		$this->description = trim($this->description);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->db->escape($this->type)."',";
-		$sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
-		$sql.= " description='".$this->db->escape($this->description)."'";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " type='".$this->db->escape($this->type)."',";
+		$sql .= " dateevent='".$this->db->idate($this->dateevent)."',";
+		$sql .= " description='".$this->db->escape($this->description)."'";
+		$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;
 		}
 		return 1;
@@ -220,31 +220,31 @@ 
 	 *  @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.tms,";
-		$sql.= " t.type,";
-		$sql.= " t.entity,";
-		$sql.= " t.dateevent,";
-		$sql.= " t.description,";
-		$sql.= " t.ip,";
-		$sql.= " t.user_agent";
-		$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
-		$sql.= " WHERE t.rowid = ".$id;
+		$sql .= " t.rowid,";
+		$sql .= " t.tms,";
+		$sql .= " t.type,";
+		$sql .= " t.entity,";
+		$sql .= " t.dateevent,";
+		$sql .= " t.description,";
+		$sql .= " t.ip,";
+		$sql .= " t.user_agent";
+		$sql .= " FROM ".MAIN_DB_PREFIX."events 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->tms = $this->db->jdate($obj->tms);
 				$this->type = $obj->type;
 				$this->entity = $obj->entity;
@@ -259,7 +259,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -276,13 +276,13 @@ 
 		global $conf, $langs;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
-		$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;
 		}
 
@@ -299,11 +299,11 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$this->id=0;
+		$this->id = 0;
 
-		$this->tms=time();
-		$this->type='';
-		$this->dateevent=time();
-		$this->description='This is a specimen event';
+		$this->tms = time();
+		$this->type = '';
+		$this->dateevent = time();
+		$this->description = 'This is a specimen event';
 	}
 }

Braces +5 added lines, -5 removed lines

@@ -137,7 +137,9 @@ 
 
 		// Clean parameters
 		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) {
+		    $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		}
 
 		// Check parameters
 		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
@@ -167,8 +169,7 @@ 
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -256,8 +257,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;

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

Indentation +418 added lines, -418 removed lines

@@ -32,436 +32,436 @@ 
  */
 class Ctyperesource
 {
-	/**
-	 * @var string Id to identify managed objects
-	 */
-	public $element = 'ctyperesource';
+    /**
+     * @var string Id to identify managed objects
+     */
+    public $element = 'ctyperesource';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'c_type_resource';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'c_type_resource';
 
-	/**
-	 * @var CtyperesourceLine[] Lines
-	 */
-	public $lines = array();
+    /**
+     * @var CtyperesourceLine[] Lines
+     */
+    public $lines = array();
 
-	public $code;
+    public $code;
 
-	/**
+    /**
      * @var string Type resource label
      */
     public $label;
 
-	public $active;
+    public $active;
+
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        // Clean parameters
+
+        if (isset($this->code)) {
+                $this->code = trim($this->code);
+        }
+        if (isset($this->label)) {
+                $this->label = trim($this->label);
+        }
+        if (isset($this->active)) {
+                $this->active = trim($this->active);
+        }
+
 
 
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
+        // Check parameters
+        // Put here code to add control on parameters values
 
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
+        // Insert request
+        $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 
-		$error = 0;
+        $sql.= 'code,';
+        $sql.= 'label';
+        $sql.= 'active';
 
-		// Clean parameters
 
-		if (isset($this->code)) {
-			 $this->code = trim($this->code);
-		}
-		if (isset($this->label)) {
-			 $this->label = trim($this->label);
-		}
-		if (isset($this->active)) {
-			 $this->active = trim($this->active);
-		}
+        $sql .= ') VALUES (';
 
+        $sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
+        $sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
+        $sql .= ' '.(! isset($this->active)?'NULL':$this->active);
 
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        $sql .= ')';
 
-		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+        $this->db->begin();
 
-		$sql.= 'code,';
-		$sql.= 'label';
-		$sql.= 'active';
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+        }
 
+        if (!$error) {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 
-		$sql .= ') VALUES (';
+            // Uncomment this and change MYOBJECT to your own tag if you
+            // want this action to call a trigger.
+            //if (!$notrigger) {
 
-		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
-		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+            //  // Call triggers
+            //  $result=$this->call_trigger('MYOBJECT_CREATE',$user);
+            //  if ($result < 0) $error++;
+            //  // End call triggers
+            //}
+        }
 
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
 
-		$sql .= ')';
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
 
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action to call a trigger.
-			//if (!$notrigger) {
-
-			//  // Call triggers
-			//  $result=$this->call_trigger('MYOBJECT_CREATE',$user);
-			//  if ($result < 0) $error++;
-			//  // End call triggers
-			//}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $code code
-	 * @param string $label Label
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id,$code='',$label='')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-
-		$sql .= " t.code,";
-		$sql .= " t.label,";
-		$sql .= " t.active";
-
-
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
-
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-
-				$this->code = $obj->code;
-				$this->label = $obj->label;
-				$this->active = $obj->active;
-			}
-
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			// $this->fetch_optionals();
-
-			// $this->fetch_lines();
-
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-
-		$sql .= " t.code,";
-		$sql .= " t.label,";
-		$sql .= " t.active";
-
-
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new self($this->db);
-
-				$line->id = $obj->rowid;
-
-				$line->code = $obj->code;
-				$line->label = $obj->label;
-				$line->active = $obj->active;
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		$error = 0;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		// Clean parameters
-
-		if (isset($this->code)) {
-			 $this->code = trim($this->code);
-		}
-		if (isset($this->label)) {
-			 $this->label = trim($this->label);
-		}
-		if (isset($this->active)) {
-			 $this->active = trim($this->active);
-		}
-
-		// Check parameters
-		// Put here code to add a control on parameters values
-
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-
-		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
-		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
-
-
-		$sql .= ' WHERE rowid=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// Uncomment this and change MYOBJECT to your own tag if you
-		// want this action calls a trigger.
-		//if (!$error && !$notrigger) {
-
-		//  // Call triggers
-		//  $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-		//  // End call triggers
-		//}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		// Uncomment this and change MYOBJECT to your own tag if you
-		// want this action calls a trigger.
-		//if (!$error && !$notrigger) {
-
-		//  // Call triggers
-		//  $result=$this->call_trigger('MYOBJECT_DELETE',$user);
-		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-		//  // End call triggers
-		//}
-
-		// If you need to delete child tables to, you can insert them here
-
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Ctyperesource($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-
-		$this->code = '';
-		$this->label = '';
-		$this->active = '';
-	}
+            return $this->id;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param int    $id  Id object
+     * @param string $code code
+     * @param string $label Label
+     *
+     * @return int <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id,$code='',$label='')
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= ' t.rowid,';
+
+        $sql .= " t.code,";
+        $sql .= " t.label,";
+        $sql .= " t.active";
+
+
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+        if ($id)   $sql.= " WHERE t.id = ".$id;
+        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $numrows = $this->db->num_rows($resql);
+            if ($numrows) {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id = $obj->rowid;
+
+                $this->code = $obj->code;
+                $this->label = $obj->label;
+                $this->active = $obj->active;
+            }
+
+            // Retrieve all extrafields for invoice
+            // fetch optionals attributes and labels
+            // $this->fetch_optionals();
+
+            // $this->fetch_lines();
+
+            $this->db->free($resql);
+
+            if ($numrows) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param string $sortorder Sort Order
+     * @param string $sortfield Sort field
+     * @param int    $limit     offset limit
+     * @param int    $offset    offset limit
+     * @param array  $filter    filter array
+     * @param string $filtermode filter mode (AND or OR)
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= ' t.rowid,';
+
+        $sql .= " t.code,";
+        $sql .= " t.label,";
+        $sql .= " t.active";
+
+
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+        // Manage filter
+        $sqlwhere = array();
+        if (count($filter) > 0) {
+            foreach ($filter as $key => $value) {
+                $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+            }
+        }
+
+        if (count($sqlwhere) > 0) {
+            $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+        }
+        if (!empty($sortfield)) {
+            $sql .= $this->db->order($sortfield,$sortorder);
+        }
+        if (!empty($limit)) {
+            $sql .=  ' ' . $this->db->plimit($limit, $offset);
+        }
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $num = $this->db->num_rows($resql);
+
+            while ($obj = $this->db->fetch_object($resql)) {
+                $line = new self($this->db);
+
+                $line->id = $obj->rowid;
+
+                $line->code = $obj->code;
+                $line->label = $obj->label;
+                $line->active = $obj->active;
+            }
+            $this->db->free($resql);
+
+            return $num;
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        $error = 0;
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        // Clean parameters
+
+        if (isset($this->code)) {
+                $this->code = trim($this->code);
+        }
+        if (isset($this->label)) {
+                $this->label = trim($this->label);
+        }
+        if (isset($this->active)) {
+                $this->active = trim($this->active);
+        }
+
+        // Check parameters
+        // Put here code to add a control on parameters values
+
+        // Update request
+        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+
+        $sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
+        $sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
+        $sql .= ' active = '.(isset($this->active)?$this->active:"null");
+
+
+        $sql .= ' WHERE rowid=' . $this->id;
+
+        $this->db->begin();
+
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+        }
+
+        // Uncomment this and change MYOBJECT to your own tag if you
+        // want this action calls a trigger.
+        //if (!$error && !$notrigger) {
+
+        //  // Call triggers
+        //  $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+        //  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+        //  // End call triggers
+        //}
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user      User that deletes
+     * @param bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        $this->db->begin();
+
+        // Uncomment this and change MYOBJECT to your own tag if you
+        // want this action calls a trigger.
+        //if (!$error && !$notrigger) {
+
+        //  // Call triggers
+        //  $result=$this->call_trigger('MYOBJECT_DELETE',$user);
+        //  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+        //  // End call triggers
+        //}
+
+        // If you need to delete child tables to, you can insert them here
+
+        if (!$error) {
+            $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+            $sql .= ' WHERE rowid=' . $this->id;
+
+            $resql = $this->db->query($sql);
+            if (!$resql) {
+                $error ++;
+                $this->errors[] = 'Error ' . $this->db->lasterror();
+                dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+            }
+        }
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Load an object from its id and create a new one in database
+     *
+     * @param int $fromid Id of object to clone
+     *
+     * @return int New id of clone
+     */
+    public function createFromClone($fromid)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        global $user;
+        $error = 0;
+        $object = new Ctyperesource($this->db);
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetch($fromid);
+        // Reset object
+        $object->id = 0;
+
+        // Clear fields
+        // ...
+
+        // Create clone
+        $result = $object->create($user);
+
+        // Other options
+        if ($result < 0) {
+            $error ++;
+            $this->errors = $object->errors;
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+
+            return $object->id;
+        } else {
+            $this->db->rollback();
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->id = 0;
+
+        $this->code = '';
+        $this->label = '';
+        $this->active = '';
+    }
 }
 
 /**
@@ -469,24 +469,24 @@ 
  */
 class CtyperesourceLine
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
-	 * @var mixed Sample line property 1
-	 */
-	public $code;
+    /**
+     * @var mixed Sample line property 1
+     */
+    public $code;
 
-	/**
+    /**
      * @var string Type resource line label
      */
     public $label;
 
-	public $active;
+    public $active;
 
-	/**
-	 * @var mixed Sample line property 2
-	 */
+    /**
+     * @var mixed Sample line property 2
+     */
 }

Spacing +47 added lines, -47 removed lines

@@ -99,18 +99,18 @@ 
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
 
-		$sql.= 'code,';
-		$sql.= 'label';
-		$sql.= 'active';
+		$sql .= 'code,';
+		$sql .= 'label';
+		$sql .= 'active';
 
 
 		$sql .= ') VALUES (';
 
-		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
-		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+		$sql .= ' '.(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").',';
+		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(!isset($this->active) ? 'NULL' : $this->active);
 
 
 		$sql .= ')';
@@ -119,13 +119,13 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action to call a trigger.
@@ -142,7 +142,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -159,7 +159,7 @@ 
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id,$code='',$label='')
+	public function fetch($id, $code = '', $label = '')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -171,10 +171,10 @@ 
 		$sql .= " t.active";
 
 
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if ($id)   $sql .= " WHERE t.id = ".$id;
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql .= " WHERE t.label = '".$this->db->escape($label)."'";
 
 
 		$resql = $this->db->query($sql);
@@ -204,10 +204,10 @@ 
 				return 0;
 			}
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -223,7 +223,7 @@ 
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -235,24 +235,24 @@ 
 		$sql .= " t.active";
 
 
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+				$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 			}
 		}
 
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' WHERE '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		 $sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -272,10 +272,10 @@ 
 
 			return $num;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -309,22 +309,22 @@ 
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
 
-		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
-		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+		$sql .= ' code = '.(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").',';
+		$sql .= ' label = '.(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").',';
+		$sql .= ' active = '.(isset($this->active) ? $this->active : "null");
 
 
-		$sql .= ' WHERE rowid=' . $this->id;
+		$sql .= ' WHERE rowid='.$this->id;
 
 		$this->db->begin();
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		// Uncomment this and change MYOBJECT to your own tag if you
@@ -341,7 +341,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -378,14 +378,14 @@ 
 		// If you need to delete child tables to, you can insert them here
 
 		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' WHERE rowid='.$this->id;
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			}
 		}
 
@@ -393,7 +393,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -431,9 +431,9 @@ 
 
 		// Other options
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		// End
@@ -444,7 +444,7 @@ 
 		} else {
 			$this->db->rollback();
 
-			return - 1;
+			return -1;
 		}
 	}
 

Braces +7 added lines, -3 removed lines

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

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

Indentation +6 added lines, -6 removed lines

@@ -102,7 +102,7 @@ 
      */
     function show_form($morecss='titlefield', $showform=1)
     {
-     // phpcs:enable
+        // phpcs:enable
         global $conf, $langs, $user, $form;
 
         if (! is_object($form)) $form=new Form($this->db);
@@ -218,13 +218,13 @@ 
                         $classname=ucfirst($classfile);
                         if (class_exists($classname))
                         {
-                        	$sms = new $classname($this->db);
-                        	$resultsender = $sms->SmsSenderList();
+                            $sms = new $classname($this->db);
+                            $resultsender = $sms->SmsSenderList();
                         }
                         else
                         {
-                        	$sms = new stdClass();
-                        	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
+                            $sms = new stdClass();
+                            $sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
                     }
                     catch(Exception $e)
@@ -236,7 +236,7 @@ 
                 else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
-	                $resultsender=array();
+                    $resultsender=array();
                     $resultsender[0]->number=$this->fromsms;
                 }
 

Spacing +50 added lines, -50 removed lines

@@ -22,7 +22,7 @@ 
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -45,7 +45,7 @@ 
     public $toname;
     public $tomail;
 
-    public $withsubstit;			// Show substitution array
+    public $withsubstit; // Show substitution array
     public $withfrom;
     public $withto;
     public $withtopic;
@@ -57,18 +57,18 @@ 
     public $withtopicreadonly;
     public $withcancel;
 
-    public $substit=array();
-    public $param=array();
+    public $substit = array();
+    public $param = array();
 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
     /**
      * @var string[]	Array of error strings
      */
-    public $errors=array();
+    public $errors = array();
 
 
     /**
@@ -80,16 +80,16 @@ 
     {
         $this->db = $db;
 
-        $this->withfrom=1;
-        $this->withto=1;
-        $this->withtopic=1;
-        $this->withbody=1;
+        $this->withfrom = 1;
+        $this->withto = 1;
+        $this->withtopic = 1;
+        $this->withbody = 1;
 
-        $this->withfromreadonly=1;
-        $this->withreplytoreadonly=1;
-        $this->withtoreadonly=0;
-        $this->withtopicreadonly=0;
-        $this->withbodyreadonly=0;
+        $this->withfromreadonly = 1;
+        $this->withreplytoreadonly = 1;
+        $this->withtoreadonly = 0;
+        $this->withtopicreadonly = 0;
+        $this->withbodyreadonly = 0;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -100,17 +100,17 @@ 
      *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)
      *	@return	void
      */
-    function show_form($morecss='titlefield', $showform=1)
+    function show_form($morecss = 'titlefield', $showform = 1)
     {
      // phpcs:enable
         global $conf, $langs, $user, $form;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (!is_object($form)) $form = new Form($this->db);
 
         // Load translation files required by the page
         $langs->loadLangs(array('other', 'mails', 'sms'));
 
-        $soc=new Societe($this->db);
+        $soc = new Societe($this->db);
         if (!empty($this->withtosocid) && $this->withtosocid > 0)
         {
             $soc->fetch($this->withtosocid);
@@ -141,15 +141,15 @@ 
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+        if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
-            $help="";
-            foreach($this->substit as $key => $val)
+            $help = "";
+            foreach ($this->substit as $key => $val)
             {
-                $help.=$key.' -> '.$langs->trans($val).'<br>';
+                $help .= $key.' -> '.$langs->trans($val).'<br>';
             }
-            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"),$help);
+            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);
             print "</td></tr>\n";
         }
 
@@ -164,7 +164,7 @@ 
                 if ($this->fromtype == 'user')
                 {
                     $langs->load("users");
-                    $fuser=new User($this->db);
+                    $fuser = new User($this->db);
                     $fuser->fetch($this->fromid);
                     print $fuser->getNomUrl(1);
                     print ' &nbsp; ';
@@ -203,19 +203,19 @@ 
                             $resultsender = $sms->SmsSenderList();
                         }
                     }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
-                        dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                     }
                 }
                 else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
-                    $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
-                    $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
+                    $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
+                    $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
                     try
                     {
-                        $classname=ucfirst($classfile);
+                        $classname = ucfirst($classfile);
                         if (class_exists($classname))
                         {
                         	$sms = new $classname($this->db);
@@ -224,26 +224,26 @@ 
                         else
                         {
                         	$sms = new stdClass();
-                        	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
+                        	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
                     }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
-                        dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
                 }
                 else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
-	                $resultsender=array();
-                    $resultsender[0]->number=$this->fromsms;
+	                $resultsender = array();
+                    $resultsender[0]->number = $this->fromsms;
                 }
 
                 if (is_array($resultsender) && count($resultsender) > 0)
                 {
                     print '<select name="fromsms" id="fromsms" class="flat">';
-                    foreach($resultsender as $obj)
+                    foreach ($resultsender as $obj)
                     {
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
@@ -252,7 +252,7 @@ 
                 else
                 {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && ! empty($sms->error)) print ' '.$sms->error;
+                    if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
                     print '</span>';
                 }
                 print '</td>';
@@ -265,22 +265,22 @@ 
         {
             print '<tr><td>';
             //$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
-            $moretext='';
-            print $form->textwithpicto($langs->trans("SmsTo"),$moretext);
+            $moretext = '';
+            print $form->textwithpicto($langs->trans("SmsTo"), $moretext);
             print '</td><td>';
             if ($this->withtoreadonly)
             {
-                print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+                print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
             }
             else
             {
-                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?GETPOST("sendto"):$this->withto):"+")."\">";
-                if (! empty($this->withtosocid) && $this->withtosocid > 0)
+                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
+                if (!empty($this->withtosocid) && $this->withtosocid > 0)
                 {
-                    $liste=array();
+                    $liste = array();
                     foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)
                     {
-                        $liste[$key]=$value;
+                        $liste[$key] = $value;
                     }
                     print " ".$langs->trans("or")." ";
                     //var_dump($_REQUEST);exit;
@@ -294,14 +294,14 @@ 
         // Message
         if ($this->withbody)
         {
-            $defaultmessage='';
-            if ($this->param["models"]=='body')
+            $defaultmessage = '';
+            if ($this->param["models"] == 'body')
             {
-                $defaultmessage=$this->withbody;
+                $defaultmessage = $this->withbody;
             }
-            $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
-            $defaultmessage=str_replace('\n',"\n",$defaultmessage);
+            $defaultmessage = make_substitutions($defaultmessage, $this->substit);
+            if (isset($_POST["message"])) $defaultmessage = $_POST["message"];
+            $defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
             print "<tr>";
             print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
@@ -314,7 +314,7 @@ 
             else
             {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
-                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160-dol_strlen($defaultmessage)).'</span></div></td>';
+                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
             }
             print "</td></tr>\n";
         }

Braces +31 added lines, -28 removed lines

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

dolibarr/htdocs/core/class/rssparser.class.php

Indentation +39 added lines, -39 removed lines

@@ -32,9 +32,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     private $_format='';
     private $_urlRSS;
@@ -61,7 +61,7 @@ 
      */
     public function __construct($db)
     {
-    	$this->db = $db;
+        $this->db = $db;
     }
 
     /**
@@ -252,28 +252,28 @@ 
 
         if ($str !== false)
         {
-	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-	        {
-	            //print 'xx'.LIBXML_NOCDATA;
-	            libxml_use_internal_errors(false);
-	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
-	        {
-	            $xmlparser=xml_parser_create('');
-	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
-	            }
-
-	            xml_set_object($xmlparser, $this);
-	            xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
-	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
-	            $status = xml_parse($xmlparser, $str);
-	            xml_parser_free($xmlparser);
-	            $rss=$this;
-	            //var_dump($rss->_format);exit;
-	        }
+            // Convert $str into xml
+            if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+            {
+                //print 'xx'.LIBXML_NOCDATA;
+                libxml_use_internal_errors(false);
+                $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
+            }
+            else
+            {
+                $xmlparser=xml_parser_create('');
+                if (!is_resource($xmlparser)) {
+                    $this->error="ErrorFailedToCreateParser"; return -1;
+                }
+
+                xml_set_object($xmlparser, $this);
+                xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
+                xml_set_character_data_handler($xmlparser, 'feed_cdata');
+                $status = xml_parse($xmlparser, $str);
+                xml_parser_free($xmlparser);
+                $rss=$this;
+                //var_dump($rss->_format);exit;
+            }
         }
 
         // If $rss loaded
@@ -287,16 +287,16 @@ 
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
-                	fwrite($fp, $str);
-                	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-                	@chmod($newpathofdestfile, octdec($newmask));
+                    fwrite($fp, $str);
+                    fclose($fp);
+                    if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                    @chmod($newpathofdestfile, octdec($newmask));
 
-	                $this->_lastfetchdate=$nowgmt;
+                    $this->_lastfetchdate=$nowgmt;
                 }
                 else
                 {
-                	print 'Error, failed to open file '.$newpathofdestfile.' for write';
+                    print 'Error, failed to open file '.$newpathofdestfile.' for write';
                 }
             }
 
@@ -435,13 +435,13 @@ 
 
                     // Add record to result array
                     $this->_rssarray[$i] = array(
-    					'link'=>$itemLink,
-    					'title'=>$itemTitle,
-    					'description'=>$itemDescription,
-    					'pubDate'=>$itemPubDate,
-    					'category'=>$itemCategory,
-    				    'id'=>$itemId,
-    				    'author'=>$itemAuthor);
+                        'link'=>$itemLink,
+                        'title'=>$itemTitle,
+                        'description'=>$itemDescription,
+                        'pubDate'=>$itemPubDate,
+                        'category'=>$itemCategory,
+                        'id'=>$itemId,
+                        'author'=>$itemAuthor);
                     //var_dump($this->_rssarray);
 
                     $i++;

Spacing +86 added lines, -86 removed lines

@@ -34,9 +34,9 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-    private $_format='';
+    private $_format = '';
     private $_urlRSS;
     private $_language;
     private $_generator;
@@ -46,8 +46,8 @@ 
     private $_link;
     private $_title;
     private $_description;
-    private $_lastfetchdate;    // Last successful fetch
-    private $_rssarray=array();
+    private $_lastfetchdate; // Last successful fetch
+    private $_rssarray = array();
 
     // For parsing with xmlparser
     var $stack               = array(); // parser stack
@@ -184,40 +184,40 @@ 
      * 	@param	string	$cachedir	Directory where to save cache file
      *	@return	int					<0 if KO, >0 if OK
      */
-    public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
+    public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
     {
         global $conf;
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $rss='';
-        $str='';    // This will contain content of feed
+        $rss = '';
+        $str = ''; // This will contain content of feed
 
         // Check parameters
-        if (! dol_is_url($urlRSS))
+        if (!dol_is_url($urlRSS))
         {
-            $this->error="ErrorBadUrl";
+            $this->error = "ErrorBadUrl";
             return -1;
         }
 
         $this->_urlRSS = $urlRSS;
-        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
-        $newmask='0644';
+        $newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)
+        $newmask = '0644';
 
         //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
         $nowgmt = dol_now();
 
         // Search into cache
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0 && $cachedir)
         {
-            $filedate=dol_filemtime($newpathofdestfile);
+            $filedate = dol_filemtime($newpathofdestfile);
             if ($filedate >= ($nowgmt - $cachedelay))
             {
                 //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
-                $foundintocache=1;
+                $foundintocache = 1;
 
-                $this->_lastfetchdate=$filedate;
+                $this->_lastfetchdate = $filedate;
             }
             else
             {
@@ -233,13 +233,13 @@ 
         else
         {
             try {
-                ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
+                ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
                 ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                if (!empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
@@ -253,7 +253,7 @@ 
         if ($str !== false)
         {
 	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+	        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 	        {
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
@@ -261,9 +261,9 @@ 
 	        }
 	        else
 	        {
-	            $xmlparser=xml_parser_create('');
+	            $xmlparser = xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
+	                $this->error = "ErrorFailedToCreateParser"; return -1;
 	            }
 
 	            xml_set_object($xmlparser, $this);
@@ -271,7 +271,7 @@ 
 	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
 	            $status = xml_parse($xmlparser, $str);
 	            xml_parser_free($xmlparser);
-	            $rss=$this;
+	            $rss = $this;
 	            //var_dump($rss->_format);exit;
 	        }
         }
@@ -283,16 +283,16 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (!dol_is_dir($cachedir)) dol_mkdir($cachedir);
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
                 	fwrite($fp, $str);
                 	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                	if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
                 	@chmod($newpathofdestfile, octdec($newmask));
 
-	                $this->_lastfetchdate=$nowgmt;
+	                $this->_lastfetchdate = $nowgmt;
                 }
                 else
                 {
@@ -300,21 +300,21 @@ 
                 }
             }
 
-            unset($str);    // Free memory
+            unset($str); // Free memory
 
             if (empty($rss->_format))    // If format not detected automatically
             {
-                $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+                $rss->_format = 'rss';
+                if (empty($rss->channel)) $rss->_format = 'atom';
             }
 
-            $items=array();
+            $items = array();
 
             // Save description entries
             if ($rss->_format == 'rss')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
                     if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
@@ -338,14 +338,14 @@ 
                     if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
             else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
                     if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
@@ -364,10 +364,10 @@ 
                     if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
-                    $tmprss=xml2php($rss); $items=$tmprss['entry'];
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                    $tmprss = xml2php($rss); $items = $tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -376,12 +376,12 @@ 
             // Loop on each record
             if (is_array($items))
             {
-                foreach($items as $item)
+                foreach ($items as $item)
                 {
                     //var_dump($item);exit;
                     if ($rss->_format == 'rss')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (string) $item->link;
                             $itemTitle = (string) $item->title;
@@ -401,7 +401,7 @@ 
                         }
 
                         // Loop on each category
-                        $itemCategory=array();
+                        $itemCategory = array();
                         if (is_array($item->category))
                         {
                             foreach ($item->category as $cat)
@@ -412,14 +412,14 @@ 
                     }
                     else if ($rss->_format == 'atom')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                         else
                         {
@@ -428,7 +428,7 @@ 
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                     }
                     else print 'ErrorBadFeedFormat';
@@ -446,7 +446,7 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb)    break; // We get all records we want
                 }
             }
 
@@ -454,7 +454,7 @@ 
         }
         else
         {
-            $this->error='ErrorFailedToLoadRSSFile';
+            $this->error = 'ErrorFailedToLoadRSSFile';
             return -1;
         }
     }
@@ -482,7 +482,7 @@ 
         {
             list($ns, $el) = explode(':', $element, 2);
         }
-        if ( $ns and $ns != 'rdf' )
+        if ($ns and $ns != 'rdf')
         {
             $this->current_namespace = $ns;
         }
@@ -490,15 +490,15 @@ 
         // if feed type isn't set, then this is first element of feed identify feed from root element
         if (empty($this->_format))
         {
-            if ( $el == 'rdf' ) {
+            if ($el == 'rdf') {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
             }
-            elseif ( $el == 'rss' ) {
+            elseif ($el == 'rss') {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
             }
-            elseif ( $el == 'feed' ) {
+            elseif ($el == 'feed') {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -506,14 +506,14 @@ 
             return;
         }
 
-        if ( $el == 'channel' )
+        if ($el == 'channel')
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' )
+        elseif ($el == 'item' or $el == 'entry')
         {
             $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about'];
             }
         }
@@ -537,10 +537,10 @@ 
         }
 
         // handle atom content constructs
-        elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
 
@@ -548,7 +548,7 @@ 
         }
 
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->_format == 'atom' and $this->incontent )
+        elseif ($this->_format == 'atom' and $this->incontent)
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
@@ -562,14 +562,14 @@ 
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->_format == 'atom' and $el == 'link' )
+        elseif ($this->_format == 'atom' and $el == 'link')
         {
-            if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
+            if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
 
             $this->append($link_el, $attrs['href']);
@@ -622,26 +622,26 @@ 
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
         {
             $this->intextinput = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
         {
             $this->inimage = false;
         }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' )
+        elseif ($el == 'channel' or $el == 'feed')
         {
             $this->inchannel = false;
         }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        elseif ($this->_format == 'atom' and $this->incontent) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el )
+            if ($this->stack[0] == $el)
             {
                 $this->append_content("</$el>");
             }
@@ -666,10 +666,10 @@ 
      *  @param	string	$str2		Str2
      *  @return	string				String cancatenated
      */
-    function concat(&$str1, $str2="")
+    function concat(&$str1, $str2 = "")
     {
-        if (!isset($str1) ) {
-            $str1="";
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -684,11 +684,11 @@ 
     function append_content($text)
     {
         // phpcs:enable
-        if ( $this->initem ) {
-            $this->concat($this->current_item[ $this->incontent ], $text);
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat($this->channel[ $this->incontent ], $text);
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
 
@@ -704,33 +704,33 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace )
+        if ($this->current_namespace)
         {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->channel[$this->current_namespace][$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->textinput[$this->current_namespace][$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
+                $this->concat($this->image[$this->current_namespace][$el], $text);
             }
         }
         else {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $el ], $text);
+                $this->concat($this->textinput[$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $el ], $text);
+                $this->concat($this->image[$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $el ], $text);
+                $this->concat($this->channel[$el], $text);
             }
         }
     }
@@ -748,18 +748,18 @@ 
     $fils = 0;
     $tab = false;
     $array = array();
-    foreach($xml->children() as $key => $value)
+    foreach ($xml->children() as $key => $value)
     {
         $child = xml2php($value);
 
         //To deal with the attributes
-        foreach($value->attributes() as $ak=>$av)
+        foreach ($value->attributes() as $ak=>$av)
         {
             $child[$ak] = (string) $av;
         }
 
         //Let see if the new child is not in the array
-        if ($tab === false && in_array($key,array_keys($array)))
+        if ($tab === false && in_array($key, array_keys($array)))
         {
             //If this element is already in the array we will create an indexed array
             $tmp = $array[$key];
@@ -768,7 +768,7 @@ 
             $array[$key][] = $child;
             $tab = true;
         }
-        elseif($tab === true)
+        elseif ($tab === true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
@@ -783,7 +783,7 @@ 
     }
 
 
-    if ($fils==0)
+    if ($fils == 0)
     {
         return (string) $xml;
     }

Braces +148 added lines, -107 removed lines

@@ -218,19 +218,19 @@ 
                 $foundintocache=1;
 
                 $this->_lastfetchdate=$filedate;
-            }
-            else
+            } else
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
             }
         }
 
         // Load file into $str
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+            // Cache file found and is not too old
         {
             $str = file_get_contents($newpathofdestfile);
         }
-        else
+        } else
         {
             try {
                 ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
@@ -238,14 +238,17 @@ 
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) {
+                    $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                }
+                if (! empty($conf->global->MAIN_PROXY_USE)) {
+                    $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                }
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
                 $str = file_get_contents($this->_urlRSS, false, $context);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
             }
         }
@@ -258,8 +261,7 @@ 
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
 	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
+	        } else
 	        {
 	            $xmlparser=xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
@@ -283,18 +285,21 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (! dol_is_dir($cachedir)) {
+                    dol_mkdir($cachedir);
+                }
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
                 	fwrite($fp, $str);
                 	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                	if (! empty($conf->global->MAIN_UMASK)) {
+                	    $newmask=$conf->global->MAIN_UMASK;
+                	}
                 	@chmod($newpathofdestfile, octdec($newmask));
 
 	                $this->_lastfetchdate=$nowgmt;
-                }
-                else
+                } else
                 {
                 	print 'Error, failed to open file '.$newpathofdestfile.' for write';
                 }
@@ -302,10 +307,14 @@ 
 
             unset($str);    // Free memory
 
-            if (empty($rss->_format))    // If format not detected automatically
+            if (empty($rss->_format)) {
+                // If format not detected automatically
             {
                 $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+            }
+                if (empty($rss->channel)) {
+                    $rss->_format='atom';
+                }
             }
 
             $items=array();
@@ -316,58 +325,114 @@ 
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
-                    if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
-                    if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
-                    if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
-                    if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
-                    if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
-                    if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
-                    if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-                }
-                else
+                    if (!empty($rss->channel->language)) {
+                        $this->_language = (string) $rss->channel->language;
+                    }
+                    if (!empty($rss->channel->generator)) {
+                        $this->_generator = (string) $rss->channel->generator;
+                    }
+                    if (!empty($rss->channel->copyright)) {
+                        $this->_copyright = (string) $rss->channel->copyright;
+                    }
+                    if (!empty($rss->channel->lastbuilddate)) {
+                        $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+                    }
+                    if (!empty($rss->channel->image->url[0])) {
+                        $this->_imageurl = (string) $rss->channel->image->url[0];
+                    }
+                    if (!empty($rss->channel->link)) {
+                        $this->_link = (string) $rss->channel->link;
+                    }
+                    if (!empty($rss->channel->title)) {
+                        $this->_title = (string) $rss->channel->title;
+                    }
+                    if (!empty($rss->channel->description)) {
+                        $this->_description = (string) $rss->channel->description;
+                    }
+                } else
                 {
                     //var_dump($rss->channel);
-                    if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-                    if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
-                    if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
-                    if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-                    if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
+                    if (!empty($rss->channel['language'])) {
+                        $this->_language = (string) $rss->channel['language'];
+                    }
+                    if (!empty($rss->channel['generator'])) {
+                        $this->_generator = (string) $rss->channel['generator'];
+                    }
+                    if (!empty($rss->channel['copyright'])) {
+                        $this->_copyright = (string) $rss->channel['copyright'];
+                    }
+                    if (!empty($rss->channel['lastbuilddate'])) {
+                        $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+                    }
+                    if (!empty($rss->image['url'])) {
+                        $this->_imageurl = (string) $rss->image['url'];
+                    }
+                    if (!empty($rss->channel['link'])) {
+                        $this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                        $this->_title = (string) $rss->channel['title'];
+                    }
+                    if (!empty($rss->channel['description'])) {
+                        $this->_description = (string) $rss->channel['description'];
+                    }
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                    $items=$rss->channel->item;
+                }
+                // With simplexml
+                else {
+                    $items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
-            }
-            else if ($rss->_format == 'atom')
+            } else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
-                    if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
-                    if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
-                    if (!empty($rss->title))         $this->_title = (string) $rss->title;
-                    if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-                }
-                else
+                    if (!empty($rss->generator)) {
+                        $this->_generator = (string) $rss->generator;
+                    }
+                    if (!empty($rss->lastbuilddate)) {
+                        $this->_lastbuilddate = (string) $rss->modified;
+                    }
+                    if (!empty($rss->link->href)) {
+                        $this->_link = (string) $rss->link->href;
+                    }
+                    if (!empty($rss->title)) {
+                        $this->_title = (string) $rss->title;
+                    }
+                    if (!empty($rss->description)) {
+                        $this->_description = (string) $rss->description;
+                    }
+                } else
                 {
                     //if (!empty($rss->channel['rss_language']))      $this->_language = (string) $rss->channel['rss_language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
+                    if (!empty($rss->channel['generator'])) {
+                        $this->_generator = (string) $rss->channel['generator'];
+                    }
                     //if (!empty($rss->channel['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
-                    if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    if (!empty($rss->channel['modified'])) {
+                        $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    }
                     //if (!empty($rss->image['rss_url']))             $this->_imageurl = (string) $rss->image['rss_url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
+                    if (!empty($rss->channel['link'])) {
+                        $this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                        $this->_title = (string) $rss->channel['title'];
+                    }
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
                     $tmprss=xml2php($rss); $items=$tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else {
+                    $items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -389,8 +454,7 @@ 
                             $itemPubDate = (string) $item->pubDate;
                             $itemId = '';
                             $itemAuthor = '';
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (string) $item['link'];
                             $itemTitle = (string) $item['title'];
@@ -409,8 +473,7 @@ 
                                 $itemCategory[] = (string) $cat;
                             }
                         }
-                    }
-                    else if ($rss->_format == 'atom')
+                    } else if ($rss->_format == 'atom')
                     {
                         if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
@@ -420,8 +483,7 @@ 
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
@@ -430,8 +492,9 @@ 
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
                         }
+                    } else {
+                        print 'ErrorBadFeedFormat';
                     }
-                    else print 'ErrorBadFeedFormat';
 
                     // Add record to result array
                     $this->_rssarray[$i] = array(
@@ -446,13 +509,15 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb) {
+                        break;
+                    }
+                    // We get all records we want
                 }
             }
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error='ErrorFailedToLoadRSSFile';
             return -1;
@@ -493,12 +558,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -509,8 +572,7 @@ 
         if ( $el == 'channel' )
         {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
+        } elseif ($el == 'item' or $el == 'entry' )
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
@@ -526,9 +588,7 @@ 
         $el == 'textinput' )
         {
             $this->intextinput = true;
-        }
-
-        elseif (
+        } elseif (
         $this->_format == 'rss' and
         $this->current_namespace == '' and
         $el == 'image' )
@@ -567,8 +627,7 @@ 
             if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
 
@@ -595,8 +654,7 @@ 
         if ($this->_format == 'atom' and $this->incontent)
         {
             $this->append_content($text);
-        }
-        else
+        } else
         {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
@@ -621,37 +679,30 @@ 
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
         {
             $this->intextinput = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
         {
             $this->inimage = false;
-        }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        } elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
+        } elseif ($el == 'channel' or $el == 'feed' )
         {
             $this->inchannel = false;
-        }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        } elseif ($this->_format == 'atom' and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
             if ( $this->stack[0] == $el )
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift($this->stack);
-        }
-        else {
+        } else {
             array_shift($this->stack);
         }
 
@@ -686,8 +737,7 @@ 
         // phpcs:enable
         if ( $this->initem ) {
             $this->concat($this->current_item[ $this->incontent ], $text);
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat($this->channel[ $this->incontent ], $text);
         }
     }
@@ -708,28 +758,21 @@ 
         {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $el ], $text);
             }
         }
@@ -767,13 +810,11 @@ 
             $array[$key][] = $tmp;
             $array[$key][] = $child;
             $tab = true;
-        }
-        elseif($tab === true)
+        } elseif($tab === true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
-        }
-        else
+        } else
         {
             //Add a simple element
             $array[$key] = $child;

dolibarr/htdocs/core/class/genericobject.class.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  *	\ingroup    core
  *	\brief      File of class of generic business class
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -36,6 +36,6 @@ 
      */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
     }
 }

dolibarr/htdocs/core/class/menu.class.php

Indentation +3 added lines, -3 removed lines

@@ -31,11 +31,11 @@ 
     var $liste;
 
     /**
-	 *	Constructor
+     *	Constructor
      */
     function __construct()
     {
-      	$this->liste = array();
+            $this->liste = array();
     }
 
     /**
@@ -67,7 +67,7 @@ 
      */
     function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
     {
-    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
     }
 
     /**

Spacing +10 added lines, -10 removed lines

@@ -65,9 +65,9 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
+    function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
     {
-    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+    	$this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
     }
 
     /**
@@ -88,12 +88,12 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
+    function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
     {
-        $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
-        $array_end   = array_slice($this->liste,($idafter+1));
-        $this->liste=array_merge($array_start,$array_new,$array_end);
+        $array_start = array_slice($this->liste, 0, ($idafter + 1));
+        $array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
+        $array_end   = array_slice($this->liste, ($idafter + 1));
+        $this->liste = array_merge($array_start, $array_new, $array_end);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -117,10 +117,10 @@ 
      */
     function getNbOfVisibleMenuEntries()
     {
-        $nb=0;
-        foreach($this->liste as $val)
+        $nb = 0;
+        foreach ($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (!empty($val['enabled'])) $nb++;
         }
         return $nb;
     }

Braces +3 added lines, -1 removed lines

@@ -120,7 +120,9 @@
         $nb=0;
         foreach($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (! empty($val['enabled'])) {
+                $nb++;
+            }
         }
         return $nb;
     }

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

Indentation +1425 added lines, -1425 removed lines

@@ -36,323 +36,323 @@ 
  */
 class CMailFile
 {
-	public $sendcontext;
-	public $sendmode;
-	public $sendsetup;
-
-	var $subject;      	// Topic:       Subject of email
-	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
-	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
-	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
-	// Return-Path: Email where to send bounds.
-	var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
-	var $errors_to;		// Errors-To:	Email where to send errors.
-	var $addr_to;
-	var $addr_cc;
-	var $addr_bcc;
-	var $trackid;
-
-	var $mixed_boundary;
-	var $related_boundary;
-	var $alternative_boundary;
-	var $deliveryreceipt;
-
-	var $eol;
-	var $eol2;
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	var $smtps;			// Contains SMTPs object (if this method is used)
-	var $phpmailer;		// Contains PHPMailer object (if this method is used)
-
-	/**
-	 * @var string CSS
-	 */
-	public $css;
-	//! Defined css style for body background
-	var $styleCSS;
-	//! Defined background directly in body tag
-	var $bodyCSS;
-
-	var $headers;
-	var $message;
-
-	// Image
-	var $html;
-	var $image_boundary;
-	var $atleastoneimage=0;    // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
-	var $html_images=array();
-	var $images_encoded=array();
-	var $image_types = array(
+    public $sendcontext;
+    public $sendmode;
+    public $sendsetup;
+
+    var $subject;      	// Topic:       Subject of email
+    var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
+    // Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
+    //              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
+    // Return-Path: Email where to send bounds.
+    var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
+    var $errors_to;		// Errors-To:	Email where to send errors.
+    var $addr_to;
+    var $addr_cc;
+    var $addr_bcc;
+    var $trackid;
+
+    var $mixed_boundary;
+    var $related_boundary;
+    var $alternative_boundary;
+    var $deliveryreceipt;
+
+    var $eol;
+    var $eol2;
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    var $smtps;			// Contains SMTPs object (if this method is used)
+    var $phpmailer;		// Contains PHPMailer object (if this method is used)
+
+    /**
+     * @var string CSS
+     */
+    public $css;
+    //! Defined css style for body background
+    var $styleCSS;
+    //! Defined background directly in body tag
+    var $bodyCSS;
+
+    var $headers;
+    var $message;
+
+    // Image
+    var $html;
+    var $image_boundary;
+    var $atleastoneimage=0;    // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
+    var $html_images=array();
+    var $images_encoded=array();
+    var $image_types = array(
         'gif'  => 'image/gif',
-		'jpg'  => 'image/jpeg',
-		'jpeg' => 'image/jpeg',
-		'jpe'  => 'image/jpeg',
-		'bmp'  => 'image/bmp',
-		'png'  => 'image/png',
-		'tif'  => 'image/tiff',
+        'jpg'  => 'image/jpeg',
+        'jpeg' => 'image/jpeg',
+        'jpe'  => 'image/jpeg',
+        'bmp'  => 'image/bmp',
+        'png'  => 'image/png',
+        'tif'  => 'image/tiff',
         'tiff' => 'image/tiff',
     );
 
 
-	/**
-	 *	CMailFile
-	 *
-	 *	@param 	string	$subject             Topic/Subject of mail
-	 *	@param 	string	$to                  Recipients emails (RFC 2822: "Name firstname <email>[, ...]" or "email[, ...]" or "<email>[, ...]"). Note: the keyword '__SUPERVISOREMAIL__' is not allowed here and must be replaced by caller.
-	 *	@param 	string	$from                Sender email      (RFC 2822: "Name firstname <email>[, ...]" or "email[, ...]" or "<email>[, ...]")
-	 *	@param 	string	$msg                 Message
-	 *	@param 	array	$filename_list       List of files to attach (full path of filename on file system)
-	 *	@param 	array	$mimetype_list       List of MIME type of attached files
-	 *	@param 	array	$mimefilename_list   List of attached file name in message
-	 *	@param 	string	$addr_cc             Email cc
-	 *	@param 	string	$addr_bcc            Email bcc (Note: This is autocompleted with MAIN_MAIL_AUTOCOPY_TO if defined)
-	 *	@param 	int		$deliveryreceipt     Ask a delivery receipt
-	 *	@param 	int		$msgishtml           1=String IS already html, 0=String IS NOT html, -1=Unknown make autodetection (with fast mode, not reliable)
-	 *	@param 	string	$errors_to      	 Email for errors-to
-	 *	@param	string	$css                 Css option
-	 *	@param	string	$trackid             Tracking string (contains type and id of related element)
-	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)
-	 *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define with sending mode and parameters to use)
-	 *  @param	string	$replyto			 Reply-to email (will be set to same value than From by default if not provided)
-	 */
-	function __construct($subject, $to, $from, $msg, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=0, $errors_to='', $css='', $trackid='', $moreinheader='', $sendcontext='standard', $replyto='')
-	{
-		global $conf, $dolibarr_main_data_root;
-
-		$this->sendcontext = $sendcontext;
-
-		if (empty($replyto)) $replyto=$from;
-
-		// Define this->sendmode
-		$this->sendmode = '';
-		if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
-		{
-			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
-		}
-		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
-		if (empty($this->sendmode)) $this->sendmode='mail';
-
-		// We define end of line (RFC 821).
-		$this->eol="\r\n";
-		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
-		$this->eol2="\r\n";
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-		{
-			$this->eol="\n";
-			$this->eol2="\n";
-			$moreinheader = str_replace("\r\n","\n",$moreinheader);
-		}
-
-		// On defini mixed_boundary
-		$this->mixed_boundary = "multipart_x." . time() . ".x_boundary";
-
-		// On defini related_boundary
-		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);	// Force md5 hash (does not contains special chars)
-
-		// On defini alternative_boundary
-		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
-
-		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
-		dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
-
-		if (empty($subject))
-		{
-			dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
-			$this->error='ErrorSubjectIsRequired';
-			return;
-		}
-		if (empty($msg))
-		{
-		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
-		    $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
-		}
-
-		// Detect if message is HTML (use fast method)
-		if ($msgishtml == -1)
-		{
-			$this->msgishtml = 0;
-			if (dol_textishtml($msg)) $this->msgishtml = 1;
-		}
-		else
-		{
-			$this->msgishtml = $msgishtml;
-		}
-
-		global $dolibarr_main_url_root;
-
-		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-		// Replace relative /viewimage to absolute path
-		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
-
-		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
-
-		// Detect images
-		if ($this->msgishtml)
-		{
-			$this->html = $msg;
-
-			if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
-			{
-				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
-			}
-
-			// Define if there is at least one file
-			if ($findimg)
-			{
-				foreach ($this->html_images as $i => $val)
-				{
-					if ($this->html_images[$i])
-					{
-						$this->atleastoneimage=1;
-						dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
-					}
-				}
-			}
-		}
-
-		// Define if there is at least one file
-		if (is_array($filename_list))
-		{
-			foreach ($filename_list as $i => $val)
-			{
-				if ($filename_list[$i])
-				{
-					$this->atleastonefile=1;
-					dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i], LOG_DEBUG);
-				}
-			}
-		}
-
-		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
-
-		// Action according to choosed sending method
-		if ($this->sendmode == 'mail')
-		{
-			// Use mail php function (default PHP method)
-			// ------------------------------------------
-
-			$smtp_headers = "";
-			$mime_headers = "";
-			$text_body = "";
-			$files_encoded = "";
-
-			// Define smtp_headers
-			$this->subject = $subject;
-			$this->addr_from = $from;
-			$this->reply_to = $replyto;
-			$this->errors_to = $errors_to;
-			$this->addr_to = $to;
-			$this->addr_cc = $addr_cc;
-			$this->addr_bcc = $addr_bcc;
-			$this->deliveryreceipt = $deliveryreceipt;
-			$this->trackid = $trackid;
-
-			$smtp_headers = $this->write_smtpheaders();
-			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
-
-			// Define mime_headers
-			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
-
-			if (! empty($this->html))
-			{
-				if (!empty($css))
-				{
-					$this->css = $css;
-					$this->buildCSS();    // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
-				}
-
-				$msg = $this->html;
-			}
-
-			// Define body in text_body
-			$text_body = $this->write_body($msg);
-
-			// Add attachments to text_encoded
-			if ($this->atleastonefile)
-			{
-				$files_encoded = $this->write_files($filename_list,$mimetype_list,$mimefilename_list);
-			}
-
-			// We now define $this->headers and $this->message
-			$this->headers = $smtp_headers . $mime_headers;
-			// On nettoie le header pour qu'il ne se termine pas par un retour chariot.
-			// Ceci evite aussi les lignes vides en fin qui peuvent etre interpretees
-			// comme des injections mail par les serveurs de messagerie.
-			$this->headers = preg_replace("/([\r\n]+)$/i","",$this->headers);
-
-			//$this->message = $this->eol.'This is a message with multiple parts in MIME format.'.$this->eol;
-			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
-			$this->message.= $text_body . $files_encoded;
-			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
-		}
-		else if ($this->sendmode == 'smtps')
-		{
-			// Use SMTPS library
-			// ------------------------------------------
-
-			require_once DOL_DOCUMENT_ROOT.'/core/class/smtps.class.php';
-			$smtps = new SMTPs();
-			$smtps->setCharSet($conf->file->character_set_client);
-
-			$smtps->setSubject($this->encodetorfc2822($subject));
-			$smtps->setTO($this->getValidAddress($to,0,1));
-			$smtps->setFrom($this->getValidAddress($from,0,1));
-			$smtps->setTrackId($trackid);
-			$smtps->setReplyTo($this->getValidAddress($replyto,0,1));
-
-			if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
-
-			if (! empty($this->html))
-			{
-				if (!empty($css))
-				{
-					$this->css = $css;
-					$this->buildCSS();
-				}
-				$msg = $this->html;
-				$msg = $this->checkIfHTML($msg);
-			}
-
-			if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
-			else $smtps->setBodyContent($msg,'plain');
-
-			if ($this->atleastoneimage)
-			{
-				foreach ($this->images_encoded as $img)
-				{
-					$smtps->setImageInline($img['image_encoded'],$img['name'],$img['content_type'],$img['cid']);
-				}
-			}
-
-			if ($this->atleastonefile)
-			{
-				foreach ($filename_list as $i => $val)
-				{
-					$content=file_get_contents($filename_list[$i]);
-					$smtps->setAttachment($content,$mimefilename_list[$i],$mimetype_list[$i]);
-				}
-			}
-
-			$smtps->setCC($addr_cc);
-			$smtps->setBCC($addr_bcc);
-			$smtps->setErrorsTo($errors_to);
-			$smtps->setDeliveryReceipt($deliveryreceipt);
-
-			$this->smtps=$smtps;
-		}
-		else if ($this->sendmode == 'swiftmailer')
-		{
-			// Use Swift Mailer library
-			// ------------------------------------------
+    /**
+     *	CMailFile
+     *
+     *	@param 	string	$subject             Topic/Subject of mail
+     *	@param 	string	$to                  Recipients emails (RFC 2822: "Name firstname <email>[, ...]" or "email[, ...]" or "<email>[, ...]"). Note: the keyword '__SUPERVISOREMAIL__' is not allowed here and must be replaced by caller.
+     *	@param 	string	$from                Sender email      (RFC 2822: "Name firstname <email>[, ...]" or "email[, ...]" or "<email>[, ...]")
+     *	@param 	string	$msg                 Message
+     *	@param 	array	$filename_list       List of files to attach (full path of filename on file system)
+     *	@param 	array	$mimetype_list       List of MIME type of attached files
+     *	@param 	array	$mimefilename_list   List of attached file name in message
+     *	@param 	string	$addr_cc             Email cc
+     *	@param 	string	$addr_bcc            Email bcc (Note: This is autocompleted with MAIN_MAIL_AUTOCOPY_TO if defined)
+     *	@param 	int		$deliveryreceipt     Ask a delivery receipt
+     *	@param 	int		$msgishtml           1=String IS already html, 0=String IS NOT html, -1=Unknown make autodetection (with fast mode, not reliable)
+     *	@param 	string	$errors_to      	 Email for errors-to
+     *	@param	string	$css                 Css option
+     *	@param	string	$trackid             Tracking string (contains type and id of related element)
+     *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)
+     *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define with sending mode and parameters to use)
+     *  @param	string	$replyto			 Reply-to email (will be set to same value than From by default if not provided)
+     */
+    function __construct($subject, $to, $from, $msg, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=0, $errors_to='', $css='', $trackid='', $moreinheader='', $sendcontext='standard', $replyto='')
+    {
+        global $conf, $dolibarr_main_data_root;
+
+        $this->sendcontext = $sendcontext;
+
+        if (empty($replyto)) $replyto=$from;
+
+        // Define this->sendmode
+        $this->sendmode = '';
+        if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
+        {
+            $this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
+        }
+        if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
+        if (empty($this->sendmode)) $this->sendmode='mail';
+
+        // We define end of line (RFC 821).
+        $this->eol="\r\n";
+        // We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
+        $this->eol2="\r\n";
+        if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+        {
+            $this->eol="\n";
+            $this->eol2="\n";
+            $moreinheader = str_replace("\r\n","\n",$moreinheader);
+        }
+
+        // On defini mixed_boundary
+        $this->mixed_boundary = "multipart_x." . time() . ".x_boundary";
+
+        // On defini related_boundary
+        $this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);	// Force md5 hash (does not contains special chars)
+
+        // On defini alternative_boundary
+        $this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
+
+        dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
+        dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
+
+        if (empty($subject))
+        {
+            dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
+            $this->error='ErrorSubjectIsRequired';
+            return;
+        }
+        if (empty($msg))
+        {
+            dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
+            $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
+        }
+
+        // Detect if message is HTML (use fast method)
+        if ($msgishtml == -1)
+        {
+            $this->msgishtml = 0;
+            if (dol_textishtml($msg)) $this->msgishtml = 1;
+        }
+        else
+        {
+            $this->msgishtml = $msgishtml;
+        }
+
+        global $dolibarr_main_url_root;
+
+        // Define $urlwithroot
+        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+        // Replace relative /viewimage to absolute path
+        $msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
+
+        if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
+
+        // Detect images
+        if ($this->msgishtml)
+        {
+            $this->html = $msg;
+
+            if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
+            {
+                $findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
+            }
+
+            // Define if there is at least one file
+            if ($findimg)
+            {
+                foreach ($this->html_images as $i => $val)
+                {
+                    if ($this->html_images[$i])
+                    {
+                        $this->atleastoneimage=1;
+                        dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
+                    }
+                }
+            }
+        }
+
+        // Define if there is at least one file
+        if (is_array($filename_list))
+        {
+            foreach ($filename_list as $i => $val)
+            {
+                if ($filename_list[$i])
+                {
+                    $this->atleastonefile=1;
+                    dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i], LOG_DEBUG);
+                }
+            }
+        }
+
+        // Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
+        if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+
+        // Action according to choosed sending method
+        if ($this->sendmode == 'mail')
+        {
+            // Use mail php function (default PHP method)
+            // ------------------------------------------
+
+            $smtp_headers = "";
+            $mime_headers = "";
+            $text_body = "";
+            $files_encoded = "";
+
+            // Define smtp_headers
+            $this->subject = $subject;
+            $this->addr_from = $from;
+            $this->reply_to = $replyto;
+            $this->errors_to = $errors_to;
+            $this->addr_to = $to;
+            $this->addr_cc = $addr_cc;
+            $this->addr_bcc = $addr_bcc;
+            $this->deliveryreceipt = $deliveryreceipt;
+            $this->trackid = $trackid;
+
+            $smtp_headers = $this->write_smtpheaders();
+            if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+
+            // Define mime_headers
+            $mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
+
+            if (! empty($this->html))
+            {
+                if (!empty($css))
+                {
+                    $this->css = $css;
+                    $this->buildCSS();    // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
+                }
+
+                $msg = $this->html;
+            }
+
+            // Define body in text_body
+            $text_body = $this->write_body($msg);
+
+            // Add attachments to text_encoded
+            if ($this->atleastonefile)
+            {
+                $files_encoded = $this->write_files($filename_list,$mimetype_list,$mimefilename_list);
+            }
+
+            // We now define $this->headers and $this->message
+            $this->headers = $smtp_headers . $mime_headers;
+            // On nettoie le header pour qu'il ne se termine pas par un retour chariot.
+            // Ceci evite aussi les lignes vides en fin qui peuvent etre interpretees
+            // comme des injections mail par les serveurs de messagerie.
+            $this->headers = preg_replace("/([\r\n]+)$/i","",$this->headers);
+
+            //$this->message = $this->eol.'This is a message with multiple parts in MIME format.'.$this->eol;
+            $this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
+            $this->message.= $text_body . $files_encoded;
+            $this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
+        }
+        else if ($this->sendmode == 'smtps')
+        {
+            // Use SMTPS library
+            // ------------------------------------------
+
+            require_once DOL_DOCUMENT_ROOT.'/core/class/smtps.class.php';
+            $smtps = new SMTPs();
+            $smtps->setCharSet($conf->file->character_set_client);
+
+            $smtps->setSubject($this->encodetorfc2822($subject));
+            $smtps->setTO($this->getValidAddress($to,0,1));
+            $smtps->setFrom($this->getValidAddress($from,0,1));
+            $smtps->setTrackId($trackid);
+            $smtps->setReplyTo($this->getValidAddress($replyto,0,1));
+
+            if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
+
+            if (! empty($this->html))
+            {
+                if (!empty($css))
+                {
+                    $this->css = $css;
+                    $this->buildCSS();
+                }
+                $msg = $this->html;
+                $msg = $this->checkIfHTML($msg);
+            }
+
+            if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
+            else $smtps->setBodyContent($msg,'plain');
+
+            if ($this->atleastoneimage)
+            {
+                foreach ($this->images_encoded as $img)
+                {
+                    $smtps->setImageInline($img['image_encoded'],$img['name'],$img['content_type'],$img['cid']);
+                }
+            }
+
+            if ($this->atleastonefile)
+            {
+                foreach ($filename_list as $i => $val)
+                {
+                    $content=file_get_contents($filename_list[$i]);
+                    $smtps->setAttachment($content,$mimefilename_list[$i],$mimetype_list[$i]);
+                }
+            }
+
+            $smtps->setCC($addr_cc);
+            $smtps->setBCC($addr_bcc);
+            $smtps->setErrorsTo($errors_to);
+            $smtps->setDeliveryReceipt($deliveryreceipt);
+
+            $this->smtps=$smtps;
+        }
+        else if ($this->sendmode == 'swiftmailer')
+        {
+            // Use Swift Mailer library
+            // ------------------------------------------
 
             $host = dol_getprefix('email');
 
@@ -361,419 +361,419 @@ 
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/InvalidEmail.php';
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDomainPart.php';
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/EmailValidation.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/EmailValidation.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php';
 
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/InputByteStream.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signer.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php';
-			//require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/SignedMessage.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
-			// Create the message
-			//$this->message = Swift_Message::newInstance();
-			$this->message = new Swift_Message();
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signer.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php';
+            //require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/SignedMessage.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+            // Create the message
+            //$this->message = Swift_Message::newInstance();
+            $this->message = new Swift_Message();
             //$this->message = new Swift_SignedMessage();
             // Adding a trackid header to a message
-			$headers = $this->message->getHeaders();
-			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid . '@' . $host);
-			$headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
-			$msgid = $headers->get('Message-ID');
-			$msgid->setId($headerID);
-			$headers->addIdHeader('References', $headerID);
-			// TODO if (! empty($moreinheader)) ...
-
-			// Give the message a subject
-			try {
-				$result = $this->message->setSubject($subject);
-			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
-			}
-
-			// Set the From address with an associative array
-			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));
-			if (! empty($from)) {
+            $headers = $this->message->getHeaders();
+            $headers->addTextHeader('X-Dolibarr-TRACKID', $trackid . '@' . $host);
+            $headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
+            $msgid = $headers->get('Message-ID');
+            $msgid->setId($headerID);
+            $headers->addIdHeader('References', $headerID);
+            // TODO if (! empty($moreinheader)) ...
+
+            // Give the message a subject
+            try {
+                $result = $this->message->setSubject($subject);
+            } catch (Exception $e) {
+                $this->errors[] =  $e->getMessage();
+            }
+
+            // Set the From address with an associative array
+            //$this->message->setFrom(array('john@doe.com' => 'John Doe'));
+            if (! empty($from)) {
                 try {
-                	$result = $this->message->setFrom($this->getArrayAddress($from));
+                    $result = $this->message->setFrom($this->getArrayAddress($from));
                 } catch (Exception $e) {
                     $this->errors[] = $e->getMessage();
                 }
             }
 
-			// Set the To addresses with an associative array
-			if (! empty($to)) {
+            // Set the To addresses with an associative array
+            if (! empty($to)) {
                 try {
-                	$result = $this->message->setTo($this->getArrayAddress($to));
+                    $result = $this->message->setTo($this->getArrayAddress($to));
                 } catch (Exception $e) {
                     $this->errors[] = $e->getMessage();
                 }
             }
 
-			if (! empty($replyto)) {
+            if (! empty($replyto)) {
                 try {
-                	$result = $this->message->SetReplyTo($this->getArrayAddress($replyto));
+                    $result = $this->message->SetReplyTo($this->getArrayAddress($replyto));
                 } catch (Exception $e) {
                     $this->errors[] = $e->getMessage();
                 }
             }
 
-			try {
-				$result = $this->message->setCharSet($conf->file->character_set_client);
-			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
-			}
-
-			if (! empty($this->html))
-			{
-				if (!empty($css))
-				{
-					$this->css = $css;
-					$this->buildCSS();
-				}
-				$msg = $this->html;
-				$msg = $this->checkIfHTML($msg);
-			}
-
-			if ($this->atleastoneimage)
-			{
-				foreach ($this->images_encoded as $img)
-				{
-					//$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
-					$attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
-					// embed image
-					$imgcid = $this->message->embed($attachment);
-					// replace cid by the one created by swiftmail in html message
-					$msg = str_replace("cid:".$img['cid'], $imgcid, $msg);
-				}
-			}
-
-			if ($this->msgishtml) {
-				$this->message->setBody($msg,'text/html');
-				// And optionally an alternative body
-				$this->message->addPart(html_entity_decode(strip_tags($msg)), 'text/plain');
-			} else {
-				$this->message->setBody($msg,'text/plain');
-				// And optionally an alternative body
-				$this->message->addPart($msg, 'text/html');
-			}
-
-			if ($this->atleastonefile)
-			{
-				foreach ($filename_list as $i => $val)
-				{
-					//$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
-					$attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
-					$this->message->attach($attachment);
-				}
-			}
-
-			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
-			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
-			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
-		}
-		else
-		{
-			// Send mail method not correctly defined
-			// --------------------------------------
-			$this->error = 'Bad value for sendmode';
-		}
-	}
-
-
-	/**
-	 * Send mail that was prepared by constructor.
-	 *
-	 * @return    boolean     True if mail sent, false otherwise
-	 */
-	function sendfile()
-	{
-		global $conf,$db,$langs;
-
-		$errorlevel=error_reporting();
-		//error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
-
-		$res=false;
-
-		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS) || !empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
-		{
-			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
-			$hookmanager = new HookManager($db);
-			$hookmanager->initHooks(array('mail'));
-
-			$parameters=array(); $action='';
-			$reshook = $hookmanager->executeHooks('sendMail', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0)
-			{
-				$this->error = "Error in hook maildao sendMail " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
-
-				return $reshook;
-			}
-			if ($reshook == 1)	// Hook replace standard code
-			{
-				return true;
-			}
-
-			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
-			$tmparray1 = explode(',', $this->addr_to);
-			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
-			{
-				$this->error = 'Too much recipients in to:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-				return false;
-			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
-			$tmparray2 = explode(',', $this->addr_cc);
-			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
-			{
-				$this->error = 'Too much recipients in cc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-				return false;
-			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
-			$tmparray3 = explode(',', $this->addr_bcc);
-			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
-			{
-				$this->error = 'Too much recipients in bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-				return false;
-			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
-			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
-			{
-				$this->error = 'Too much recipients in to:, cc:, bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-				return false;
-			}
-
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
-			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
-			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
-			}
-
-			if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
-			{
-				$this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO;
-				$this->addr_cc = '';
-				$this->addr_bcc = '';
-			}
-
-			// Action according to choosed sending method
-			if ($this->sendmode == 'mail')
-			{
-				// Use mail php function (default PHP method)
-				// ------------------------------------------
-				dol_syslog("CMailFile::sendfile addr_to=".$this->addr_to.", subject=".$this->subject, LOG_DEBUG);
-				dol_syslog("CMailFile::sendfile header=\n".$this->headers, LOG_DEBUG);
-				//dol_syslog("CMailFile::sendfile message=\n".$message);
-
-				// If Windows, sendmail_from must be defined
-				if (isset($_SERVER["WINDIR"]))
-				{
-					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
-					@ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
-				}
-
-				// Force parameters
-				if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
-				if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
-
-				$res=true;
-				if ($res && ! $this->subject)
-				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-				$dest=$this->getValidAddress($this->addr_to,2);
-				if ($res && ! $dest)
-				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-
-				if ($res)
-				{
-					$additionnalparam = '';	// By default
-					if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
-					{
-						// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
-						// Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
-						// Having this variable defined may create problems with some sendmail (option -f refused)
-						// Having this variable not defined may create problems with some other sendmail (option -f required)
-						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
-					}
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
-					{
-						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
-					}
-
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
-
-					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
-
-					$this->message=stripslashes($this->message);
-
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
-
-					if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
-					else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
-
-					if (! $res)
-					{
-						$langs->load("errors");
-						$this->error="Failed to send mail with php mail";
-						$linuxlike=1;
-						if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-						if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
-						if (! $linuxlike)
-						{
-							$this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
-						}
-						$this->error.=".<br>";
-						$this->error.=$langs->trans("ErrorPhpMailDelivery");
-						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					}
-					else
-					{
-						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-					}
-				}
-
-				if (isset($_SERVER["WINDIR"]))
-				{
-					@ini_restore('sendmail_from');
-				}
-
-				// Restore parameters
-				if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
-				if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
-			}
-			else if ($this->sendmode == 'smtps')
-			{
-				if (! is_object($this->smtps))
-				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					return false;
-				}
-
-				// Use SMTPS library
-				// ------------------------------------------
-				$this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
-
-				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
-
-				// If we use SSL/TLS
-				$server=$conf->global->$keyforsmtpserver;
-				$secure='';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
-				$server=($secure?$secure.'://':'').$server;
-
-				$port=$conf->global->$keyforsmtpport;
-
-				$this->smtps->setHost($server);
-				$this->smtps->setPort($port); // 25, 465...;
-
-				$loginid=''; $loginpass='';
-				if (! empty($conf->global->$keyforsmtpid))
-				{
-					$loginid = $conf->global->$keyforsmtpid;
-					$this->smtps->setID($loginid);
-				}
-				if (! empty($conf->global->$keyforsmtppw))
-				{
-					$loginpass = $conf->global->$keyforsmtppw;
-					$this->smtps->setPW($loginpass);
-				}
-
-				$res=true;
-				$from=$this->smtps->getFrom('org');
-				if ($res && ! $from)
-				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-				$dest=$this->smtps->getTo();
-				if ($res && ! $dest)
-				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-
-				if ($res)
-				{
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
-
-					$result=$this->smtps->sendMsg();
-					//print $result;
-
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
-
-					$result=$this->smtps->getErrors();
-					if (empty($this->error) && empty($result))
-					{
-						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-						$res=true;
-					}
-					else
-					{
-						if (empty($this->error)) $this->error=$result;
-						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-						$res=false;
-					}
-				}
-			}
-			else if ($this->sendmode == 'swiftmailer')
-			{
-				// Use Swift Mailer library
-				// ------------------------------------------
-				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
-
-				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
-
-				// If we use SSL/TLS
-				$server = $conf->global->$keyforsmtpserver;
-				$secure = '';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
-
-				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
-
-				if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
-				if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
-				//$smtps->_msgReplyTo  = 'reply@web.com';
-
-				// Create the Mailer using your created Transport
-				$this->mailer = new Swift_Mailer($this->transport);
+            try {
+                $result = $this->message->setCharSet($conf->file->character_set_client);
+            } catch (Exception $e) {
+                $this->errors[] =  $e->getMessage();
+            }
+
+            if (! empty($this->html))
+            {
+                if (!empty($css))
+                {
+                    $this->css = $css;
+                    $this->buildCSS();
+                }
+                $msg = $this->html;
+                $msg = $this->checkIfHTML($msg);
+            }
+
+            if ($this->atleastoneimage)
+            {
+                foreach ($this->images_encoded as $img)
+                {
+                    //$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
+                    $attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
+                    // embed image
+                    $imgcid = $this->message->embed($attachment);
+                    // replace cid by the one created by swiftmail in html message
+                    $msg = str_replace("cid:".$img['cid'], $imgcid, $msg);
+                }
+            }
+
+            if ($this->msgishtml) {
+                $this->message->setBody($msg,'text/html');
+                // And optionally an alternative body
+                $this->message->addPart(html_entity_decode(strip_tags($msg)), 'text/plain');
+            } else {
+                $this->message->setBody($msg,'text/plain');
+                // And optionally an alternative body
+                $this->message->addPart($msg, 'text/html');
+            }
+
+            if ($this->atleastonefile)
+            {
+                foreach ($filename_list as $i => $val)
+                {
+                    //$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
+                    $attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
+                    $this->message->attach($attachment);
+                }
+            }
+
+            if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
+            if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+            //if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
+            if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
+        }
+        else
+        {
+            // Send mail method not correctly defined
+            // --------------------------------------
+            $this->error = 'Bad value for sendmode';
+        }
+    }
+
+
+    /**
+     * Send mail that was prepared by constructor.
+     *
+     * @return    boolean     True if mail sent, false otherwise
+     */
+    function sendfile()
+    {
+        global $conf,$db,$langs;
+
+        $errorlevel=error_reporting();
+        //error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
+
+        $res=false;
+
+        if (empty($conf->global->MAIN_DISABLE_ALL_MAILS) || !empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
+        {
+            require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+            $hookmanager = new HookManager($db);
+            $hookmanager->initHooks(array('mail'));
+
+            $parameters=array(); $action='';
+            $reshook = $hookmanager->executeHooks('sendMail', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+            if ($reshook < 0)
+            {
+                $this->error = "Error in hook maildao sendMail " . $reshook;
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+
+                return $reshook;
+            }
+            if ($reshook == 1)	// Hook replace standard code
+            {
+                return true;
+            }
+
+            // Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
+            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+            $tmparray1 = explode(',', $this->addr_to);
+            if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
+            {
+                $this->error = 'Too much recipients in to:';
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+                return false;
+            }
+            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+            $tmparray2 = explode(',', $this->addr_cc);
+            if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
+            {
+                $this->error = 'Too much recipients in cc:';
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+                return false;
+            }
+            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+            $tmparray3 = explode(',', $this->addr_bcc);
+            if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
+            {
+                $this->error = 'Too much recipients in bcc:';
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+                return false;
+            }
+            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+            if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+            {
+                $this->error = 'Too much recipients in to:, cc:, bcc:';
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+                return false;
+            }
+
+            $keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
+            $keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
+            $keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
+            $keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
+            $keyfortls       ='MAIN_MAIL_EMAIL_TLS';
+            $keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+            if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
+            {
+                $keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
+                $keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
+                $keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
+                $keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
+                $keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
+                $keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+            }
+
+            if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
+            {
+                $this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO;
+                $this->addr_cc = '';
+                $this->addr_bcc = '';
+            }
+
+            // Action according to choosed sending method
+            if ($this->sendmode == 'mail')
+            {
+                // Use mail php function (default PHP method)
+                // ------------------------------------------
+                dol_syslog("CMailFile::sendfile addr_to=".$this->addr_to.", subject=".$this->subject, LOG_DEBUG);
+                dol_syslog("CMailFile::sendfile header=\n".$this->headers, LOG_DEBUG);
+                //dol_syslog("CMailFile::sendfile message=\n".$message);
+
+                // If Windows, sendmail_from must be defined
+                if (isset($_SERVER["WINDIR"]))
+                {
+                    if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
+                    @ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
+                }
+
+                // Force parameters
+                if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
+                if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
+
+                $res=true;
+                if ($res && ! $this->subject)
+                {
+                    $this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+                $dest=$this->getValidAddress($this->addr_to,2);
+                if ($res && ! $dest)
+                {
+                    $this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+
+                if ($res)
+                {
+                    $additionnalparam = '';	// By default
+                    if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
+                    {
+                        // le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
+                        // Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
+                        // Having this variable defined may create problems with some sendmail (option -f refused)
+                        // Having this variable not defined may create problems with some other sendmail (option -f required)
+                        $additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
+                    }
+                    if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+                    {
+                        $additionnalparam .= ($additionnalparam?' ':'').'-ba';
+                    }
+
+                    if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+
+                    dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
+
+                    $this->message=stripslashes($this->message);
+
+                    if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+
+                    if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
+                    else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
+
+                    if (! $res)
+                    {
+                        $langs->load("errors");
+                        $this->error="Failed to send mail with php mail";
+                        $linuxlike=1;
+                        if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
+                        if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+                        if (! $linuxlike)
+                        {
+                            $this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
+                        }
+                        $this->error.=".<br>";
+                        $this->error.=$langs->trans("ErrorPhpMailDelivery");
+                        dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    }
+                    else
+                    {
+                        dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
+                    }
+                }
+
+                if (isset($_SERVER["WINDIR"]))
+                {
+                    @ini_restore('sendmail_from');
+                }
+
+                // Restore parameters
+                if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
+                if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
+            }
+            else if ($this->sendmode == 'smtps')
+            {
+                if (! is_object($this->smtps))
+                {
+                    $this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    return false;
+                }
+
+                // Use SMTPS library
+                // ------------------------------------------
+                $this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
+
+                // Clean parameters
+                if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
+                if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+
+                // If we use SSL/TLS
+                $server=$conf->global->$keyforsmtpserver;
+                $secure='';
+                if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
+                if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+                $server=($secure?$secure.'://':'').$server;
+
+                $port=$conf->global->$keyforsmtpport;
+
+                $this->smtps->setHost($server);
+                $this->smtps->setPort($port); // 25, 465...;
+
+                $loginid=''; $loginpass='';
+                if (! empty($conf->global->$keyforsmtpid))
+                {
+                    $loginid = $conf->global->$keyforsmtpid;
+                    $this->smtps->setID($loginid);
+                }
+                if (! empty($conf->global->$keyforsmtppw))
+                {
+                    $loginpass = $conf->global->$keyforsmtppw;
+                    $this->smtps->setPW($loginpass);
+                }
+
+                $res=true;
+                $from=$this->smtps->getFrom('org');
+                if ($res && ! $from)
+                {
+                    $this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+                $dest=$this->smtps->getTo();
+                if ($res && ! $dest)
+                {
+                    $this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+
+                if ($res)
+                {
+                    if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+
+                    $result=$this->smtps->sendMsg();
+                    //print $result;
+
+                    if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+
+                    $result=$this->smtps->getErrors();
+                    if (empty($this->error) && empty($result))
+                    {
+                        dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
+                        $res=true;
+                    }
+                    else
+                    {
+                        if (empty($this->error)) $this->error=$result;
+                        dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                        $res=false;
+                    }
+                }
+            }
+            else if ($this->sendmode == 'swiftmailer')
+            {
+                // Use Swift Mailer library
+                // ------------------------------------------
+                require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+
+                // Clean parameters
+                if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
+                if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+
+                // If we use SSL/TLS
+                $server = $conf->global->$keyforsmtpserver;
+                $secure = '';
+                if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
+                if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+
+                $this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
+
+                if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
+                if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
+                //$smtps->_msgReplyTo  = 'reply@web.com';
+
+                // Create the Mailer using your created Transport
+                $this->mailer = new Swift_Mailer($this->transport);
 
                 // DKIM SIGN
                 if ($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED) {
@@ -785,770 +785,770 @@ 
                 }
 
                 if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
-					// To use the ArrayLogger
-					$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
-					// Or to use the Echo Logger
-					//$this->logger = new Swift_Plugins_Loggers_EchoLogger();
-					$this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
-				}
-				// send mail
-				try {
-					$result = $this->mailer->send($this->message);
-				} catch (Exception $e) {
-					$this->error =  $e->getMessage();
-				}
-				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
-
-				$res = true;
-				if (! empty($this->error) || ! $result) {
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-				else
-				{
-					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-				}
-			}
-			else
-			{
-				// Send mail method not correctly defined
-				// --------------------------------------
-
-				return 'Bad value for sendmode';
-			}
-
-			$parameters=array(); $action='';
-			$reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0)
-			{
-				$this->error = "Error in hook maildao sendMailAfter " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
-
-				return $reshook;
-			}
-		}
-		else
-		{
-			$this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
-		}
-
-		error_reporting($errorlevel);              // Reactive niveau erreur origine
-
-		return $res;
-	}
-
-	/**
-	 * Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word
-	 *
-	 * @param string $stringtoencode String to encode
-	 * @return string                string encoded
-	 */
-	static function encodetorfc2822($stringtoencode)
-	{
-		global $conf;
-		return '=?'.$conf->file->character_set_client.'?B?'.base64_encode($stringtoencode).'?=';
-	}
+                    // To use the ArrayLogger
+                    $this->logger = new Swift_Plugins_Loggers_ArrayLogger();
+                    // Or to use the Echo Logger
+                    //$this->logger = new Swift_Plugins_Loggers_EchoLogger();
+                    $this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
+                }
+                // send mail
+                try {
+                    $result = $this->mailer->send($this->message);
+                } catch (Exception $e) {
+                    $this->error =  $e->getMessage();
+                }
+                if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+
+                $res = true;
+                if (! empty($this->error) || ! $result) {
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+                else
+                {
+                    dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
+                }
+            }
+            else
+            {
+                // Send mail method not correctly defined
+                // --------------------------------------
+
+                return 'Bad value for sendmode';
+            }
+
+            $parameters=array(); $action='';
+            $reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+            if ($reshook < 0)
+            {
+                $this->error = "Error in hook maildao sendMailAfter " . $reshook;
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+
+                return $reshook;
+            }
+        }
+        else
+        {
+            $this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+            dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
+        }
+
+        error_reporting($errorlevel);              // Reactive niveau erreur origine
+
+        return $res;
+    }
+
+    /**
+     * Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word
+     *
+     * @param string $stringtoencode String to encode
+     * @return string                string encoded
+     */
+    static function encodetorfc2822($stringtoencode)
+    {
+        global $conf;
+        return '=?'.$conf->file->character_set_client.'?B?'.base64_encode($stringtoencode).'?=';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Read a file on disk and return encoded content for emails (mode = 'mail')
-	 *
-	 * @param	string	$sourcefile		Path to file to encode
-	 * @return 	int					    <0 if KO, encoded string if OK
-	 */
-	function _encode_file($sourcefile)
-	{
+    /**
+     * Read a file on disk and return encoded content for emails (mode = 'mail')
+     *
+     * @param	string	$sourcefile		Path to file to encode
+     * @return 	int					    <0 if KO, encoded string if OK
+     */
+    function _encode_file($sourcefile)
+    {
         // phpcs:enable
-		$newsourcefile=dol_osencode($sourcefile);
-
-		if (is_readable($newsourcefile))
-		{
-			$contents = file_get_contents($newsourcefile);	// Need PHP 4.3
-			$encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
-			return $encoded;
-		}
-		else
-		{
-			$this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
-			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
+        $newsourcefile=dol_osencode($sourcefile);
+
+        if (is_readable($newsourcefile))
+        {
+            $contents = file_get_contents($newsourcefile);	// Need PHP 4.3
+            $encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+            return $encoded;
+        }
+        else
+        {
+            $this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
+            dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Write content of a SMTP request into a dump file (mode = all)
-	 *  Used for debugging.
-	 *  Note that to see full SMTP protocol, you can use tcpdump -w /tmp/smtp -s 2000 port 25"
-	 *
-	 *  @return	void
-	 */
-	function dump_mail()
-	{
+    /**
+     *  Write content of a SMTP request into a dump file (mode = all)
+     *  Used for debugging.
+     *  Note that to see full SMTP protocol, you can use tcpdump -w /tmp/smtp -s 2000 port 25"
+     *
+     *  @return	void
+     */
+    function dump_mail()
+    {
         // phpcs:enable
-		global $conf,$dolibarr_main_data_root;
-
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
-		{
-			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
-			$fp = fopen($outputfile,"w");
-
-			if ($this->sendmode == 'mail')
-			{
-				fputs($fp, $this->headers);
-				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
-				fputs($fp, $this->message);
-			}
-			elseif ($this->sendmode == 'smtps')
-			{
-				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-			elseif ($this->sendmode == 'swiftmailer')
-			{
-				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-
-			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-		}
-	}
-
-
-	/**
-	 * Correct an uncomplete html string
-	 *
-	 * @param	string	$msg	String
-	 * @return	string			Completed string
-	 */
-	function checkIfHTML($msg)
-	{
-		if (!preg_match('/^[\s\t]*<html/i',$msg))
-		{
-			$out = "<html><head><title></title>";
-			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
-			$out.= "</head><body";
-			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
-			$out.= ">";
-			$out.= $msg;
-			$out.= "</body></html>";
-		}
-		else
-		{
-			$out = $msg;
-		}
-
-		return $out;
-	}
-
-	/**
-	 * Build a css style (mode = all) into this->styleCSS and this->bodyCSS
-	 *
-	 * @return string
-	 */
-	function buildCSS()
-	{
-		if (! empty($this->css))
-		{
-			// Style CSS
-			$this->styleCSS = '<style type="text/css">';
-			$this->styleCSS.= 'body {';
-
-			if ($this->css['bgcolor'])
-			{
-				$this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
-				$this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
-			}
-			if ($this->css['bgimage'])
-			{
-				// TODO recuperer cid
-				$this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
-			}
-			$this->styleCSS.= '}';
-			$this->styleCSS.= '</style>';
-		}
-	}
+        global $conf,$dolibarr_main_data_root;
+
+        if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
+        {
+            $outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
+            $fp = fopen($outputfile,"w");
+
+            if ($this->sendmode == 'mail')
+            {
+                fputs($fp, $this->headers);
+                fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
+                fputs($fp, $this->message);
+            }
+            elseif ($this->sendmode == 'smtps')
+            {
+                fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
+            }
+            elseif ($this->sendmode == 'swiftmailer')
+            {
+                fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
+            }
+
+            fclose($fp);
+            if (! empty($conf->global->MAIN_UMASK))
+                @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+        }
+    }
+
+
+    /**
+     * Correct an uncomplete html string
+     *
+     * @param	string	$msg	String
+     * @return	string			Completed string
+     */
+    function checkIfHTML($msg)
+    {
+        if (!preg_match('/^[\s\t]*<html/i',$msg))
+        {
+            $out = "<html><head><title></title>";
+            if (!empty($this->styleCSS)) $out.= $this->styleCSS;
+            $out.= "</head><body";
+            if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
+            $out.= ">";
+            $out.= $msg;
+            $out.= "</body></html>";
+        }
+        else
+        {
+            $out = $msg;
+        }
+
+        return $out;
+    }
+
+    /**
+     * Build a css style (mode = all) into this->styleCSS and this->bodyCSS
+     *
+     * @return string
+     */
+    function buildCSS()
+    {
+        if (! empty($this->css))
+        {
+            // Style CSS
+            $this->styleCSS = '<style type="text/css">';
+            $this->styleCSS.= 'body {';
+
+            if ($this->css['bgcolor'])
+            {
+                $this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
+                $this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
+            }
+            if ($this->css['bgimage'])
+            {
+                // TODO recuperer cid
+                $this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
+            }
+            $this->styleCSS.= '}';
+            $this->styleCSS.= '</style>';
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create SMTP headers (mode = 'mail')
-	 *
-	 * @return	string headers
-	 */
-	function write_smtpheaders()
-	{
+    /**
+     * Create SMTP headers (mode = 'mail')
+     *
+     * @return	string headers
+     */
+    function write_smtpheaders()
+    {
         // phpcs:enable
-		global $conf;
-		$out = "";
+        global $conf;
+        $out = "";
 
-		$host = dol_getprefix('email');
+        $host = dol_getprefix('email');
 
-		// Sender
-		//$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
-		$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
-		if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
-		{
-			$out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
-		}
-		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
-		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
-		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
-		if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+        // Sender
+        //$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
+        $out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
+        if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
+        {
+            $out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
+        }
+        // Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
+        $out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
+        if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
+        if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
 
-		// Receiver
-		if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
-		if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+        // Receiver
+        if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
+        if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
 
-		// Delivery receipt
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+        // Delivery receipt
+        if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
 
-		//$out.= "X-Priority: 3".$this->eol2;
+        //$out.= "X-Priority: 3".$this->eol2;
 
-		$out.= 'Date: ' . date("r") . $this->eol2;
+        $out.= 'Date: ' . date("r") . $this->eol2;
 
-		$trackid = $this->trackid;
-		if ($trackid)
-		{
-			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
-			$out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
-			$out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
-		}
-		else
-		{
-			$out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
-		}
+        $trackid = $this->trackid;
+        if ($trackid)
+        {
+            // References is kept in response and Message-ID is returned into In-Reply-To:
+            $out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
+            $out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
+            $out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
+        }
+        else
+        {
+            $out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
+        }
 
-		if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
-		$out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
-		$out.= "Mime-Version: 1.0".$this->eol2;
+        if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
+        $out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
+        $out.= "Mime-Version: 1.0".$this->eol2;
 
-		//$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol;
+        //$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol;
 
-		$out.= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
-		$out.= "Content-Transfer-Encoding: 8bit".$this->eol2;		// TODO Seems to be ignored. Header is 7bit once received.
+        $out.= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
+        $out.= "Content-Transfer-Encoding: 8bit".$this->eol2;		// TODO Seems to be ignored. Header is 7bit once received.
 
-		dol_syslog("CMailFile::write_smtpheaders smtp_header=\n".$out);
-		return $out;
-	}
+        dol_syslog("CMailFile::write_smtpheaders smtp_header=\n".$out);
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create header MIME (mode = 'mail')
-	 *
-	 * @param	array	$filename_list			Array of filenames
-	 * @param 	array	$mimefilename_list		Array of mime types
-	 * @return	string							mime headers
-	 */
-	function write_mimeheaders($filename_list, $mimefilename_list)
-	{
+    /**
+     * Create header MIME (mode = 'mail')
+     *
+     * @param	array	$filename_list			Array of filenames
+     * @param 	array	$mimefilename_list		Array of mime types
+     * @return	string							mime headers
+     */
+    function write_mimeheaders($filename_list, $mimefilename_list)
+    {
         // phpcs:enable
-		$mimedone=0;
-		$out = "";
-
-		if (is_array($filename_list))
-		{
-			$filename_list_size=count($filename_list);
-			for($i=0;$i < $filename_list_size;$i++)
-			{
-				if ($filename_list[$i])
-				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					$out.= "X-attachments: $filename_list[$i]".$this->eol2;
-				}
-			}
-		}
-
-		dol_syslog("CMailFile::write_mimeheaders mime_header=\n".$out, LOG_DEBUG);
-		return $out;
-	}
+        $mimedone=0;
+        $out = "";
+
+        if (is_array($filename_list))
+        {
+            $filename_list_size=count($filename_list);
+            for($i=0;$i < $filename_list_size;$i++)
+            {
+                if ($filename_list[$i])
+                {
+                    if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+                    $out.= "X-attachments: $filename_list[$i]".$this->eol2;
+                }
+            }
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return email content (mode = 'mail')
-	 *
-	 * @param	string		$msgtext		Message string
-	 * @return	string						String content
-	 */
-	function write_body($msgtext)
-	{
-        // phpcs:enable
-		global $conf;
-
-		$out='';
-
-		$out.= "--" . $this->mixed_boundary . $this->eol;
-
-		if ($this->atleastoneimage)
-		{
-			$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-			$out.= $this->eol;
-			$out.= "--" . $this->alternative_boundary . $this->eol;
-		}
-
-		// Make RFC821 Compliant, replace bare linefeeds
-		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext);	// PCRE modifier /s means new lines are common chars
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-		{
-			$strContent = preg_replace("/\r\n/si", "\n", $strContent);	// PCRE modifier /s means new lines are common chars
-		}
-
-		$strContentAltText = '';
-		if ($this->msgishtml)
-		{
-			// 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, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
-
-			// Check if html header already in message, if not complete the message
-			$strContent = $this->checkIfHTML($strContent);
-		}
-
-		// Make RFC2045 Compliant, split lines
-		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-		// TODO Encode main content into base64 and use the chunk_split, or quoted-printable
-		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));   // TODO Using this method creates unexpected line break on text/plain content.
-
-		if ($this->msgishtml)
-		{
-			if ($this->atleastoneimage)
-			{
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
-				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.($strContentAltText?$strContentAltText:strip_tags($strContent)).$this->eol; // Add plain text message
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->related_boundary . $this->eol;
-			}
-
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
-			{
-				$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
-				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.$strContentAltText.$this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-			}
-
-			$out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
-			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
-			$out.= $this->eol.$strContent.$this->eol;
-
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
-			{
-				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
-			}
-		}
-		else
-		{
-			$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
-			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-			$out.= $this->eol.$strContent.$this->eol;
-		}
-
-		$out.= $this->eol;
-
-		// Encode images
-		if ($this->atleastoneimage)
-		{
-			$out .= $this->write_images($this->images_encoded);
-			// always end related and end alternative after inline images
-			$out .= "--" . $this->related_boundary . "--" . $this->eol;
-			$out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
-			$out .= $this->eol;
-		}
-
-		return $out;
-	}
+        dol_syslog("CMailFile::write_mimeheaders mime_header=\n".$out, LOG_DEBUG);
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Attach file to email (mode = 'mail')
-	 *
-	 * @param	array	$filename_list		Tableau
-	 * @param	array	$mimetype_list		Tableau
-	 * @param 	array	$mimefilename_list	Tableau
-	 * @return	string						Chaine fichiers encodes
-	 */
-	function write_files($filename_list,$mimetype_list,$mimefilename_list)
-	{
+    /**
+     * Return email content (mode = 'mail')
+     *
+     * @param	string		$msgtext		Message string
+     * @return	string						String content
+     */
+    function write_body($msgtext)
+    {
         // phpcs:enable
-		$out = '';
-
-		$filename_list_size=count($filename_list);
-		for($i=0;$i < $filename_list_size;$i++)
-		{
-			if ($filename_list[$i])
-			{
-				dol_syslog("CMailFile::write_files: i=$i");
-				$encoded = $this->_encode_file($filename_list[$i]);
-				if ($encoded >= 0)
-				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					if (! $mimetype_list[$i]) {
-						$mimetype_list[$i] = "application/octet-stream";
-					}
-
-					$out.= "--" . $this->mixed_boundary . $this->eol;
-					$out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Transfer-Encoding: base64".$this->eol;
-					$out.= "Content-Description: ".$filename_list[$i].$this->eol;
-					$out.= $this->eol;
-					$out.= $encoded;
-					$out.= $this->eol;
-					//$out.= $this->eol;
-				}
-				else
-				{
-					return $encoded;
-				}
-			}
-		}
-
-		return $out;
-	}
+        global $conf;
+
+        $out='';
+
+        $out.= "--" . $this->mixed_boundary . $this->eol;
+
+        if ($this->atleastoneimage)
+        {
+            $out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+            $out.= $this->eol;
+            $out.= "--" . $this->alternative_boundary . $this->eol;
+        }
+
+        // Make RFC821 Compliant, replace bare linefeeds
+        $strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext);	// PCRE modifier /s means new lines are common chars
+        if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+        {
+            $strContent = preg_replace("/\r\n/si", "\n", $strContent);	// PCRE modifier /s means new lines are common chars
+        }
+
+        $strContentAltText = '';
+        if ($this->msgishtml)
+        {
+            // 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, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
+
+            // Check if html header already in message, if not complete the message
+            $strContent = $this->checkIfHTML($strContent);
+        }
+
+        // Make RFC2045 Compliant, split lines
+        //$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
+        // TODO Encode main content into base64 and use the chunk_split, or quoted-printable
+        $strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+
+        if ($this->msgishtml)
+        {
+            if ($this->atleastoneimage)
+            {
+                $out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+                //$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
+                $out.= $this->eol.($strContentAltText?$strContentAltText:strip_tags($strContent)).$this->eol; // Add plain text message
+                $out.= "--" . $this->alternative_boundary . $this->eol;
+                $out.= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
+                $out.= $this->eol;
+                $out.= "--" . $this->related_boundary . $this->eol;
+            }
+
+            if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
+            {
+                $out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+                $out.= $this->eol;
+                $out.= "--" . $this->alternative_boundary . $this->eol;
+                $out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+                //$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
+                $out.= $this->eol.$strContentAltText.$this->eol;
+                $out.= "--" . $this->alternative_boundary . $this->eol;
+            }
+
+            $out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
+            //$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
+            $out.= $this->eol.$strContent.$this->eol;
 
+            if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
+            {
+                $out.= "--" . $this->alternative_boundary . "--". $this->eol;
+            }
+        }
+        else
+        {
+            $out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+            //$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
+            $out.= $this->eol.$strContent.$this->eol;
+        }
+
+        $out.= $this->eol;
+
+        // Encode images
+        if ($this->atleastoneimage)
+        {
+            $out .= $this->write_images($this->images_encoded);
+            // always end related and end alternative after inline images
+            $out .= "--" . $this->related_boundary . "--" . $this->eol;
+            $out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
+            $out .= $this->eol;
+        }
+
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Attach an image to email (mode = 'mail')
-	 *
-	 * @param	array	$images_list	Array of array image
-	 * @return	string					Chaine images encodees
-	 */
-	function write_images($images_list)
-	{
+    /**
+     * Attach file to email (mode = 'mail')
+     *
+     * @param	array	$filename_list		Tableau
+     * @param	array	$mimetype_list		Tableau
+     * @param 	array	$mimefilename_list	Tableau
+     * @return	string						Chaine fichiers encodes
+     */
+    function write_files($filename_list,$mimetype_list,$mimefilename_list)
+    {
         // phpcs:enable
-		$out = '';
+        $out = '';
+
+        $filename_list_size=count($filename_list);
+        for($i=0;$i < $filename_list_size;$i++)
+        {
+            if ($filename_list[$i])
+            {
+                dol_syslog("CMailFile::write_files: i=$i");
+                $encoded = $this->_encode_file($filename_list[$i]);
+                if ($encoded >= 0)
+                {
+                    if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+                    if (! $mimetype_list[$i]) {
+                        $mimetype_list[$i] = "application/octet-stream";
+                    }
+
+                    $out.= "--" . $this->mixed_boundary . $this->eol;
+                    $out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
+                    $out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
+                    $out.= "Content-Transfer-Encoding: base64".$this->eol;
+                    $out.= "Content-Description: ".$filename_list[$i].$this->eol;
+                    $out.= $this->eol;
+                    $out.= $encoded;
+                    $out.= $this->eol;
+                    //$out.= $this->eol;
+                }
+                else
+                {
+                    return $encoded;
+                }
+            }
+        }
 
-		if (is_array($images_list))
-		{
-			foreach ($images_list as $img)
-			{
-				dol_syslog("CMailFile::write_images: ".$img["name"]);
+        return $out;
+    }
 
-				$out.= "--" . $this->related_boundary . $this->eol; // always related for an inline image
-				$out.= "Content-Type: " . $img["content_type"] . "; name=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-Transfer-Encoding: base64".$this->eol;
-				$out.= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-ID: <".$img["cid"].">".$this->eol;
-				$out.= $this->eol;
-				$out.= $img["image_encoded"];
-				$out.= $this->eol;
-			}
-		}
 
-		return $out;
-	}
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     * Attach an image to email (mode = 'mail')
+     *
+     * @param	array	$images_list	Array of array image
+     * @return	string					Chaine images encodees
+     */
+    function write_images($images_list)
+    {
+        // phpcs:enable
+        $out = '';
+
+        if (is_array($images_list))
+        {
+            foreach ($images_list as $img)
+            {
+                dol_syslog("CMailFile::write_images: ".$img["name"]);
+
+                $out.= "--" . $this->related_boundary . $this->eol; // always related for an inline image
+                $out.= "Content-Type: " . $img["content_type"] . "; name=\"".$img["name"]."\"".$this->eol;
+                $out.= "Content-Transfer-Encoding: base64".$this->eol;
+                $out.= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
+                $out.= "Content-ID: <".$img["cid"].">".$this->eol;
+                $out.= $this->eol;
+                $out.= $img["image_encoded"];
+                $out.= $this->eol;
+            }
+        }
+
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Try to create a socket connection
-	 *
-	 * @param 	string		$host		Add ssl:// for SSL/TLS.
-	 * @param 	int			$port		Example: 25, 465
-	 * @return	int						Socket id if ok, 0 if KO
-	 */
-	function check_server_port($host,$port)
-	{
+    /**
+     * Try to create a socket connection
+     *
+     * @param 	string		$host		Add ssl:// for SSL/TLS.
+     * @param 	int			$port		Example: 25, 465
+     * @return	int						Socket id if ok, 0 if KO
+     */
+    function check_server_port($host,$port)
+    {
         // phpcs:enable
-		global $conf;
-
-		$_retVal=0;
-		$timeout=5;	// Timeout in seconds
-
-		if (function_exists('fsockopen'))
-		{
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
-			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
-			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
-			}
-
-			// If we use SSL/TLS
-			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
-			// tls smtp start with no encryption
-			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
-
-			dol_syslog("Try socket connection to host=".$host." port=".$port);
-			//See if we can connect to the SMTP server
-			if ($socket = @fsockopen(
-					$host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
-					$port,       // which Port number to use
-					$errno,      // actual system level error
-					$errstr,     // and any text that goes with the error
-					$timeout
-			))  // timeout for reading/writing data over the socket
-			{
-				// Windows still does not have support for this timeout function
-				if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
-
-				dol_syslog("Now we wait for answer 220");
-
-				// Check response from Server
-				if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
-			}
-			else
-			{
-				$this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
-			}
-		}
-		return $_retVal;
-	}
+        global $conf;
+
+        $_retVal=0;
+        $timeout=5;	// Timeout in seconds
+
+        if (function_exists('fsockopen'))
+        {
+            $keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
+            $keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
+            $keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
+            $keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
+            $keyfortls       ='MAIN_MAIL_EMAIL_TLS';
+            $keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+            if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
+            {
+                $keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
+                $keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
+                $keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
+                $keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
+                $keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
+                $keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+            }
+
+            // If we use SSL/TLS
+            if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
+            // tls smtp start with no encryption
+            //if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
+
+            dol_syslog("Try socket connection to host=".$host." port=".$port);
+            //See if we can connect to the SMTP server
+            if ($socket = @fsockopen(
+                    $host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
+                    $port,       // which Port number to use
+                    $errno,      // actual system level error
+                    $errstr,     // and any text that goes with the error
+                    $timeout
+            ))  // timeout for reading/writing data over the socket
+            {
+                // Windows still does not have support for this timeout function
+                if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
+
+                dol_syslog("Now we wait for answer 220");
+
+                // Check response from Server
+                if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
+            }
+            else
+            {
+                $this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
+            }
+        }
+        return $_retVal;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * This function has been modified as provided by SirSir to allow multiline responses when
-	 * using SMTP Extensions.
-	 *
-	 * @param	Socket	$socket			Socket
-	 * @param   string	$response		Response string
-	 * @return  boolean					true if success
-	 */
-	function server_parse($socket, $response)
-	{
+    /**
+     * This function has been modified as provided by SirSir to allow multiline responses when
+     * using SMTP Extensions.
+     *
+     * @param	Socket	$socket			Socket
+     * @param   string	$response		Response string
+     * @return  boolean					true if success
+     */
+    function server_parse($socket, $response)
+    {
         // phpcs:enable
-		$_retVal = true;	// Indicates if Object was created or not
-		$server_response = '';
-
-		while (substr($server_response,3,1) != ' ')
-		{
-			if (! ($server_response = fgets($socket, 256)) )
-			{
-				$this->error="Couldn't get mail server response codes";
-				return false;
-			}
-		}
-
-		if( !( substr($server_response, 0, 3) == $response ) )
-		{
-			$this->error="Ran into problems sending Mail.\r\nResponse: $server_response";
-			$_retVal = false;
-		}
-
-		return $_retVal;
-	}
-
-	/**
-	 * Seearch images into html message and init array this->images_encoded if found
-	 *
-	 * @param	string	$images_dir		Location of physical images files
-	 * @return	int 		        	>0 if OK, <0 if KO
-	 */
-	function findHtmlImages($images_dir)
-	{
-		// Build the list of image extensions
-		$extensions = array_keys($this->image_types);
-
-		$matches = array();
-		preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches);  // If "xxx.ext" or 'xxx.ext' found
-
-		if (! empty($matches))
-		{
-			$i=0;
-			foreach ($matches[1] as $full)
-			{
-
-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
-				{
-					$img = $regs[1];
-
-					if (file_exists($images_dir.'/'.$img))
-					{
-						// Image path in src
-						$src = preg_quote($full,'/');
-
-						// Image full path
-						$this->html_images[$i]["fullpath"] = $images_dir.'/'.$img;
-
-						// Image name
-						$this->html_images[$i]["name"] = $img;
-
-						// Content type
-						if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg))
-						{
-							$ext=strtolower($reg[1]);
-							$this->html_images[$i]["content_type"] = $this->image_types[$ext];
-						}
-
-						// cid
-						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3);	// Force md5 hash (does not contains special chars)
-						$this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
-					}
-					$i++;
-				}
-			}
-
-			if (!empty($this->html_images))
-			{
-				$inline = array();
-
-				$i=0;
-
-				foreach ($this->html_images as $img)
-				{
-					$fullpath = $images_dir.'/'.$img["name"];
-
-					// If duplicate images are embedded, they may show up as attachments, so remove them.
-					if (!in_array($fullpath,$inline))
-					{
-						// Read image file
-						if ($image = file_get_contents($fullpath))
-						{
-							// On garde que le nom de l'image
-							preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i',$img["name"],$regs);
-							$imgName = $regs[1];
-
-							$this->images_encoded[$i]['name'] = $imgName;
-							$this->images_encoded[$i]['fullpath'] = $fullpath;
-							$this->images_encoded[$i]['content_type'] = $img["content_type"];
-							$this->images_encoded[$i]['cid'] = $img["cid"];
-							// Encodage de l'image
-							$this->images_encoded[$i]["image_encoded"] = chunk_split(base64_encode($image), 68, $this->eol);
-							$inline[] = $fullpath;
-						}
-					}
-					$i++;
-				}
-			}
-			else
-			{
-				return -1;
-			}
-
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-	/**
-	 * Return a formatted address string for SMTP protocol
-	 *
-	 * @param	string		$address		     Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
-	 * @param	int			$format			     0=auto, 1=emails with <>, 2=emails without <>, 3=auto + label between "
-	 * @param	int			$encode			     0=No encode name, 1=Encode name to RFC2822
-	 * @param   int         $maxnumberofemail    0=No limit. Otherwise, maximum number of emails returned ($address may contains several email separated with ','). Add '...' if there is more.
-	 * @return	string						     If format 0: '<john@doe.com>' or 'John Doe <john@doe.com>' or '=?UTF-8?B?Sm9obiBEb2U=?= <john@doe.com>'
-	 * 										     If format 1: '<john@doe.com>'
-	 *										     If format 2: 'john@doe.com'
-	 *										     If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
-	 *                                           If format 4: 'John Doe' or 'john@doe.com' if no label exists
-	 */
-	static function getValidAddress($address,$format,$encode=0,$maxnumberofemail=0)
-	{
-		global $conf;
-
-		$ret='';
-
-		$arrayaddress=explode(',',$address);
-
-		// Boucle sur chaque composant de l'adresse
-		$i=0;
-		foreach($arrayaddress as $val)
-		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
-			{
-				$name  = trim($regs[1]);
-				$email = trim($regs[2]);
-			}
-			else
-			{
-				$name  = '';
-				$email = trim($val);
-			}
-
-			if ($email)
-			{
-				$i++;
-
-				$newemail='';
-				if ($format == 4)
-				{
-					$newemail = $name?$name:$email;
-				}
-				if ($format == 2)
-				{
-					$newemail=$email;
-				}
-				if ($format == 1 || $format == 3)
-				{
-					$newemail='<'.$email.'>';
-				}
-				if ($format == 0 || $format == 3)
-				{
-					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
-					elseif (! $name) $newemail='<'.$email.'>';
-					else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
-				}
-
-				$ret=($ret ? $ret.',' : '').$newemail;
-
-				// Stop if we have too much records
-				if ($maxnumberofemail && $i >= $maxnumberofemail)
-				{
-					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
-					break;
-				}
-			}
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Return a formatted array of address string for SMTP protocol
-	 *
-	 * @param   string      $address        Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
-	 * @return  array                       array of email => name
-	 */
-	function getArrayAddress($address)
-	{
-		global $conf;
-
-		$ret=array();
-
-		$arrayaddress=explode(',',$address);
-
-		// Boucle sur chaque composant de l'adresse
-		foreach($arrayaddress as $val)
-		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
-			{
-				$name  = trim($regs[1]);
-				$email = trim($regs[2]);
-			}
-			else
-			{
-				$name  = null;
-				$email = trim($val);
-			}
-
-			$ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
-		}
-
-		return $ret;
-	}
+        $_retVal = true;	// Indicates if Object was created or not
+        $server_response = '';
+
+        while (substr($server_response,3,1) != ' ')
+        {
+            if (! ($server_response = fgets($socket, 256)) )
+            {
+                $this->error="Couldn't get mail server response codes";
+                return false;
+            }
+        }
+
+        if( !( substr($server_response, 0, 3) == $response ) )
+        {
+            $this->error="Ran into problems sending Mail.\r\nResponse: $server_response";
+            $_retVal = false;
+        }
+
+        return $_retVal;
+    }
+
+    /**
+     * Seearch images into html message and init array this->images_encoded if found
+     *
+     * @param	string	$images_dir		Location of physical images files
+     * @return	int 		        	>0 if OK, <0 if KO
+     */
+    function findHtmlImages($images_dir)
+    {
+        // Build the list of image extensions
+        $extensions = array_keys($this->image_types);
+
+        $matches = array();
+        preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches);  // If "xxx.ext" or 'xxx.ext' found
+
+        if (! empty($matches))
+        {
+            $i=0;
+            foreach ($matches[1] as $full)
+            {
+
+                if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+                {
+                    $img = $regs[1];
+
+                    if (file_exists($images_dir.'/'.$img))
+                    {
+                        // Image path in src
+                        $src = preg_quote($full,'/');
+
+                        // Image full path
+                        $this->html_images[$i]["fullpath"] = $images_dir.'/'.$img;
+
+                        // Image name
+                        $this->html_images[$i]["name"] = $img;
+
+                        // Content type
+                        if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg))
+                        {
+                            $ext=strtolower($reg[1]);
+                            $this->html_images[$i]["content_type"] = $this->image_types[$ext];
+                        }
+
+                        // cid
+                        $this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3);	// Force md5 hash (does not contains special chars)
+                        $this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
+                    }
+                    $i++;
+                }
+            }
+
+            if (!empty($this->html_images))
+            {
+                $inline = array();
+
+                $i=0;
+
+                foreach ($this->html_images as $img)
+                {
+                    $fullpath = $images_dir.'/'.$img["name"];
+
+                    // If duplicate images are embedded, they may show up as attachments, so remove them.
+                    if (!in_array($fullpath,$inline))
+                    {
+                        // Read image file
+                        if ($image = file_get_contents($fullpath))
+                        {
+                            // On garde que le nom de l'image
+                            preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i',$img["name"],$regs);
+                            $imgName = $regs[1];
+
+                            $this->images_encoded[$i]['name'] = $imgName;
+                            $this->images_encoded[$i]['fullpath'] = $fullpath;
+                            $this->images_encoded[$i]['content_type'] = $img["content_type"];
+                            $this->images_encoded[$i]['cid'] = $img["cid"];
+                            // Encodage de l'image
+                            $this->images_encoded[$i]["image_encoded"] = chunk_split(base64_encode($image), 68, $this->eol);
+                            $inline[] = $fullpath;
+                        }
+                    }
+                    $i++;
+                }
+            }
+            else
+            {
+                return -1;
+            }
+
+            return 1;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    /**
+     * Return a formatted address string for SMTP protocol
+     *
+     * @param	string		$address		     Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
+     * @param	int			$format			     0=auto, 1=emails with <>, 2=emails without <>, 3=auto + label between "
+     * @param	int			$encode			     0=No encode name, 1=Encode name to RFC2822
+     * @param   int         $maxnumberofemail    0=No limit. Otherwise, maximum number of emails returned ($address may contains several email separated with ','). Add '...' if there is more.
+     * @return	string						     If format 0: '<john@doe.com>' or 'John Doe <john@doe.com>' or '=?UTF-8?B?Sm9obiBEb2U=?= <john@doe.com>'
+     * 										     If format 1: '<john@doe.com>'
+     *										     If format 2: 'john@doe.com'
+     *										     If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
+     *                                           If format 4: 'John Doe' or 'john@doe.com' if no label exists
+     */
+    static function getValidAddress($address,$format,$encode=0,$maxnumberofemail=0)
+    {
+        global $conf;
+
+        $ret='';
+
+        $arrayaddress=explode(',',$address);
+
+        // Boucle sur chaque composant de l'adresse
+        $i=0;
+        foreach($arrayaddress as $val)
+        {
+            if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+            {
+                $name  = trim($regs[1]);
+                $email = trim($regs[2]);
+            }
+            else
+            {
+                $name  = '';
+                $email = trim($val);
+            }
+
+            if ($email)
+            {
+                $i++;
+
+                $newemail='';
+                if ($format == 4)
+                {
+                    $newemail = $name?$name:$email;
+                }
+                if ($format == 2)
+                {
+                    $newemail=$email;
+                }
+                if ($format == 1 || $format == 3)
+                {
+                    $newemail='<'.$email.'>';
+                }
+                if ($format == 0 || $format == 3)
+                {
+                    if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
+                    elseif (! $name) $newemail='<'.$email.'>';
+                    else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+                }
+
+                $ret=($ret ? $ret.',' : '').$newemail;
+
+                // Stop if we have too much records
+                if ($maxnumberofemail && $i >= $maxnumberofemail)
+                {
+                    if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+                    break;
+                }
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Return a formatted array of address string for SMTP protocol
+     *
+     * @param   string      $address        Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
+     * @return  array                       array of email => name
+     */
+    function getArrayAddress($address)
+    {
+        global $conf;
+
+        $ret=array();
+
+        $arrayaddress=explode(',',$address);
+
+        // Boucle sur chaque composant de l'adresse
+        foreach($arrayaddress as $val)
+        {
+            if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+            {
+                $name  = trim($regs[1]);
+                $email = trim($regs[2]);
+            }
+            else
+            {
+                $name  = null;
+                $email = trim($val);
+            }
+
+            $ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
+        }
+
+        return $ret;
+    }
 }

Spacing +329 added lines, -329 removed lines

@@ -40,13 +40,13 @@ 
 	public $sendmode;
 	public $sendsetup;
 
-	var $subject;      	// Topic:       Subject of email
-	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
+	var $subject; // Topic:       Subject of email
+	var $addr_from; // From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
 	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
 	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
 	// Return-Path: Email where to send bounds.
-	var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
-	var $errors_to;		// Errors-To:	Email where to send errors.
+	var $reply_to; // Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
+	var $errors_to; // Errors-To:	Email where to send errors.
 	var $addr_to;
 	var $addr_cc;
 	var $addr_bcc;
@@ -63,10 +63,10 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-	var $smtps;			// Contains SMTPs object (if this method is used)
-	var $phpmailer;		// Contains PHPMailer object (if this method is used)
+	var $smtps; // Contains SMTPs object (if this method is used)
+	var $phpmailer; // Contains PHPMailer object (if this method is used)
 
 	/**
 	 * @var string CSS
@@ -83,9 +83,9 @@ 
 	// Image
 	var $html;
 	var $image_boundary;
-	var $atleastoneimage=0;    // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
-	var $html_images=array();
-	var $images_encoded=array();
+	var $atleastoneimage = 0; // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
+	var $html_images = array();
+	var $images_encoded = array();
 	var $image_types = array(
         'gif'  => 'image/gif',
 		'jpg'  => 'image/jpeg',
@@ -119,13 +119,13 @@ 
 	 *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define with sending mode and parameters to use)
 	 *  @param	string	$replyto			 Reply-to email (will be set to same value than From by default if not provided)
 	 */
-	function __construct($subject, $to, $from, $msg, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=0, $errors_to='', $css='', $trackid='', $moreinheader='', $sendcontext='standard', $replyto='')
+	function __construct($subject, $to, $from, $msg, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = 0, $errors_to = '', $css = '', $trackid = '', $moreinheader = '', $sendcontext = 'standard', $replyto = '')
 	{
 		global $conf, $dolibarr_main_data_root;
 
 		$this->sendcontext = $sendcontext;
 
-		if (empty($replyto)) $replyto=$from;
+		if (empty($replyto)) $replyto = $from;
 
 		// Define this->sendmode
 		$this->sendmode = '';
@@ -133,28 +133,28 @@ 
 		{
 			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
 		}
-		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
-		if (empty($this->sendmode)) $this->sendmode='mail';
+		if (empty($this->sendmode)) $this->sendmode = $conf->global->MAIN_MAIL_SENDMODE;
+		if (empty($this->sendmode)) $this->sendmode = 'mail';
 
 		// We define end of line (RFC 821).
-		$this->eol="\r\n";
+		$this->eol = "\r\n";
 		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
-		$this->eol2="\r\n";
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+		$this->eol2 = "\r\n";
+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
 		{
-			$this->eol="\n";
-			$this->eol2="\n";
-			$moreinheader = str_replace("\r\n","\n",$moreinheader);
+			$this->eol = "\n";
+			$this->eol2 = "\n";
+			$moreinheader = str_replace("\r\n", "\n", $moreinheader);
 		}
 
 		// On defini mixed_boundary
-		$this->mixed_boundary = "multipart_x." . time() . ".x_boundary";
+		$this->mixed_boundary = "multipart_x.".time().".x_boundary";
 
 		// On defini related_boundary
-		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);	// Force md5 hash (does not contains special chars)
+		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3); // Force md5 hash (does not contains special chars)
 
 		// On defini alternative_boundary
-		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
+		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contains special chars)
 
 		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
 		dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
@@ -162,13 +162,13 @@ 
 		if (empty($subject))
 		{
 			dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
-			$this->error='ErrorSubjectIsRequired';
+			$this->error = 'ErrorSubjectIsRequired';
 			return;
 		}
 		if (empty($msg))
 		{
 		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
-		    $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
+		    $msg = '.'; // Avoid empty message (with empty message conten show a multipart structure)
 		}
 
 		// Detect if message is HTML (use fast method)
@@ -185,21 +185,21 @@ 
 		global $dolibarr_main_url_root;
 
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 		// Replace relative /viewimage to absolute path
-		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
+		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
 
-		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
+		if (!empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml = 1; // To force to send everything with content type html.
 
 		// Detect images
 		if ($this->msgishtml)
 		{
 			$this->html = $msg;
 
-			if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
+			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
 			{
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
 			}
@@ -211,7 +211,7 @@ 
 				{
 					if ($this->html_images[$i])
 					{
-						$this->atleastoneimage=1;
+						$this->atleastoneimage = 1;
 						dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
 					}
 				}
@@ -225,14 +225,14 @@ 
 			{
 				if ($filename_list[$i])
 				{
-					$this->atleastonefile=1;
+					$this->atleastonefile = 1;
 					dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i], LOG_DEBUG);
 				}
 			}
 		}
 
 		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 
 		// Action according to choosed sending method
 		if ($this->sendmode == 'mail')
@@ -257,17 +257,17 @@ 
 			$this->trackid = $trackid;
 
 			$smtp_headers = $this->write_smtpheaders();
-			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+			if (!empty($moreinheader)) $smtp_headers .= $moreinheader; // $moreinheader contains the \r\n
 
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
 
-			if (! empty($this->html))
+			if (!empty($this->html))
 			{
 				if (!empty($css))
 				{
 					$this->css = $css;
-					$this->buildCSS();    // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
+					$this->buildCSS(); // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
 				}
 
 				$msg = $this->html;
@@ -279,20 +279,20 @@ 
 			// Add attachments to text_encoded
 			if ($this->atleastonefile)
 			{
-				$files_encoded = $this->write_files($filename_list,$mimetype_list,$mimefilename_list);
+				$files_encoded = $this->write_files($filename_list, $mimetype_list, $mimefilename_list);
 			}
 
 			// We now define $this->headers and $this->message
-			$this->headers = $smtp_headers . $mime_headers;
+			$this->headers = $smtp_headers.$mime_headers;
 			// On nettoie le header pour qu'il ne se termine pas par un retour chariot.
 			// Ceci evite aussi les lignes vides en fin qui peuvent etre interpretees
 			// comme des injections mail par les serveurs de messagerie.
-			$this->headers = preg_replace("/([\r\n]+)$/i","",$this->headers);
+			$this->headers = preg_replace("/([\r\n]+)$/i", "", $this->headers);
 
 			//$this->message = $this->eol.'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
-			$this->message.= $text_body . $files_encoded;
-			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
+			$this->message .= $text_body.$files_encoded;
+			$this->message .= "--".$this->mixed_boundary."--".$this->eol;
 		}
 		else if ($this->sendmode == 'smtps')
 		{
@@ -304,14 +304,14 @@ 
 			$smtps->setCharSet($conf->file->character_set_client);
 
 			$smtps->setSubject($this->encodetorfc2822($subject));
-			$smtps->setTO($this->getValidAddress($to,0,1));
-			$smtps->setFrom($this->getValidAddress($from,0,1));
+			$smtps->setTO($this->getValidAddress($to, 0, 1));
+			$smtps->setFrom($this->getValidAddress($from, 0, 1));
 			$smtps->setTrackId($trackid);
-			$smtps->setReplyTo($this->getValidAddress($replyto,0,1));
+			$smtps->setReplyTo($this->getValidAddress($replyto, 0, 1));
 
-			if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
+			if (!empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
 
-			if (! empty($this->html))
+			if (!empty($this->html))
 			{
 				if (!empty($css))
 				{
@@ -322,14 +322,14 @@ 
 				$msg = $this->checkIfHTML($msg);
 			}
 
-			if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
-			else $smtps->setBodyContent($msg,'plain');
+			if ($this->msgishtml) $smtps->setBodyContent($msg, 'html');
+			else $smtps->setBodyContent($msg, 'plain');
 
 			if ($this->atleastoneimage)
 			{
 				foreach ($this->images_encoded as $img)
 				{
-					$smtps->setImageInline($img['image_encoded'],$img['name'],$img['content_type'],$img['cid']);
+					$smtps->setImageInline($img['image_encoded'], $img['name'], $img['content_type'], $img['cid']);
 				}
 			}
 
@@ -337,8 +337,8 @@ 
 			{
 				foreach ($filename_list as $i => $val)
 				{
-					$content=file_get_contents($filename_list[$i]);
-					$smtps->setAttachment($content,$mimefilename_list[$i],$mimetype_list[$i]);
+					$content = file_get_contents($filename_list[$i]);
+					$smtps->setAttachment($content, $mimefilename_list[$i], $mimetype_list[$i]);
 				}
 			}
 
@@ -347,7 +347,7 @@ 
 			$smtps->setErrorsTo($errors_to);
 			$smtps->setDeliveryReceipt($deliveryreceipt);
 
-			$this->smtps=$smtps;
+			$this->smtps = $smtps;
 		}
 		else if ($this->sendmode == 'swiftmailer')
 		{
@@ -383,8 +383,8 @@ 
             //$this->message = new Swift_SignedMessage();
             // Adding a trackid header to a message
 			$headers = $this->message->getHeaders();
-			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid . '@' . $host);
-			$headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
+			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid.'@'.$host);
+			$headerID = time().'.swiftmailer-dolibarr-'.$trackid.'@'.$host;
 			$msgid = $headers->get('Message-ID');
 			$msgid->setId($headerID);
 			$headers->addIdHeader('References', $headerID);
@@ -394,12 +394,12 @@ 
 			try {
 				$result = $this->message->setSubject($subject);
 			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
+				$this->errors[] = $e->getMessage();
 			}
 
 			// Set the From address with an associative array
 			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));
-			if (! empty($from)) {
+			if (!empty($from)) {
                 try {
                 	$result = $this->message->setFrom($this->getArrayAddress($from));
                 } catch (Exception $e) {
@@ -408,7 +408,7 @@ 
             }
 
 			// Set the To addresses with an associative array
-			if (! empty($to)) {
+			if (!empty($to)) {
                 try {
                 	$result = $this->message->setTo($this->getArrayAddress($to));
                 } catch (Exception $e) {
@@ -416,7 +416,7 @@ 
                 }
             }
 
-			if (! empty($replyto)) {
+			if (!empty($replyto)) {
                 try {
                 	$result = $this->message->SetReplyTo($this->getArrayAddress($replyto));
                 } catch (Exception $e) {
@@ -427,10 +427,10 @@ 
 			try {
 				$result = $this->message->setCharSet($conf->file->character_set_client);
 			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
+				$this->errors[] = $e->getMessage();
 			}
 
-			if (! empty($this->html))
+			if (!empty($this->html))
 			{
 				if (!empty($css))
 				{
@@ -455,11 +455,11 @@ 
 			}
 
 			if ($this->msgishtml) {
-				$this->message->setBody($msg,'text/html');
+				$this->message->setBody($msg, 'text/html');
 				// And optionally an alternative body
 				$this->message->addPart(html_entity_decode(strip_tags($msg)), 'text/plain');
 			} else {
-				$this->message->setBody($msg,'text/plain');
+				$this->message->setBody($msg, 'text/plain');
 				// And optionally an alternative body
 				$this->message->addPart($msg, 'text/html');
 			}
@@ -469,13 +469,13 @@ 
 				foreach ($filename_list as $i => $val)
 				{
 					//$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
-					$attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
+					$attachment = Swift_Attachment::fromPath($filename_list[$i], $mimetype_list[$i]);
 					$this->message->attach($attachment);
 				}
 			}
 
-			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			if (!empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
+			if (!empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
 			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
 			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
 		}
@@ -495,25 +495,25 @@ 
 	 */
 	function sendfile()
 	{
-		global $conf,$db,$langs;
+		global $conf, $db, $langs;
 
-		$errorlevel=error_reporting();
+		$errorlevel = error_reporting();
 		//error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
 
-		$res=false;
+		$res = false;
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS) || !empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
 		{
-			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
 			$hookmanager->initHooks(array('mail'));
 
-			$parameters=array(); $action='';
+			$parameters = array(); $action = '';
 			$reshook = $hookmanager->executeHooks('sendMail', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0)
 			{
-				$this->error = "Error in hook maildao sendMail " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+				$this->error = "Error in hook maildao sendMail ".$reshook;
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
 				return $reshook;
 			}
@@ -523,52 +523,52 @@ 
 			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL = 10;
 			$tmparray1 = explode(',', $this->addr_to);
 			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in to:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL = 10;
 			$tmparray2 = explode(',', $this->addr_cc);
 			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in cc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL = 10;
 			$tmparray3 = explode(',', $this->addr_bcc);
 			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
-			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL = 10;
+			if ((count($tmparray1) + count($tmparray2) + count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in to:, cc:, bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
 
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+			$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER';
+			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
+			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
+			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
+			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
+			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
 			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
 			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';
+				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';
+				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';
+				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';
+				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';
+				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
 			}
 
 			if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
@@ -591,68 +591,68 @@ 
 				if (isset($_SERVER["WINDIR"]))
 				{
 					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
-					@ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
+					@ini_set('sendmail_from', $this->getValidAddress($this->addr_from, 2));
 				}
 
 				// Force parameters
-				if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
-				if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
+				if (!empty($conf->global->$keyforsmtpserver)) ini_set('SMTP', $conf->global->$keyforsmtpserver);
+				if (!empty($conf->global->$keyforsmtpport))   ini_set('smtp_port', $conf->global->$keyforsmtpport);
 
-				$res=true;
-				if ($res && ! $this->subject)
+				$res = true;
+				if ($res && !$this->subject)
 				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
+					$this->error = "Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
-				$dest=$this->getValidAddress($this->addr_to,2);
-				if ($res && ! $dest)
+				$dest = $this->getValidAddress($this->addr_to, 2);
+				if ($res && !$dest)
 				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
+					$this->error = "Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
 
 				if ($res)
 				{
-					$additionnalparam = '';	// By default
-					if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
+					$additionnalparam = ''; // By default
+					if (!empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
 					{
 						// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
 						// Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
 						// Having this variable defined may create problems with some sendmail (option -f refused)
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
-						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
+						$additionnalparam .= ($additionnalparam ? ' ' : '').(!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f'.$this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO, 2) : ($this->addr_from != '' ? '-f'.$this->getValidAddress($this->addr_from, 2) : ''));
 					}
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
 					{
-						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
+						$additionnalparam .= ($additionnalparam ? ' ' : '').'-ba';
 					}
 
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params
 
 					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
-					$this->message=stripslashes($this->message);
+					$this->message = stripslashes($this->message);
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
-					if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
+					if (!empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
 					else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
 
-					if (! $res)
+					if (!$res)
 					{
 						$langs->load("errors");
-						$this->error="Failed to send mail with php mail";
-						$linuxlike=1;
-						if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-						if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
-						if (! $linuxlike)
+						$this->error = "Failed to send mail with php mail";
+						$linuxlike = 1;
+						if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
+						if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+						if (!$linuxlike)
 						{
-							$this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
+							$this->error .= " to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'); // This values are value used only for non linuxlike systems
 						}
-						$this->error.=".<br>";
-						$this->error.=$langs->trans("ErrorPhpMailDelivery");
+						$this->error .= ".<br>";
+						$this->error .= $langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					}
 					else
@@ -667,86 +667,86 @@ 
 				}
 
 				// Restore parameters
-				if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
-				if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
+				if (!empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
+				if (!empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
 			}
 			else if ($this->sendmode == 'smtps')
 			{
-				if (! is_object($this->smtps))
+				if (!is_object($this->smtps))
 				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					return false;
 				}
 
 				// Use SMTPS library
 				// ------------------------------------------
-				$this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
+				$this->smtps->setTransportType(0); // Only this method is coded in SMTPs library
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');
+				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');
 
 				// If we use SSL/TLS
-				$server=$conf->global->$keyforsmtpserver;
-				$secure='';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
-				$server=($secure?$secure.'://':'').$server;
+				$server = $conf->global->$keyforsmtpserver;
+				$secure = '';
+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';
+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';
+				$server = ($secure ? $secure.'://' : '').$server;
 
-				$port=$conf->global->$keyforsmtpport;
+				$port = $conf->global->$keyforsmtpport;
 
 				$this->smtps->setHost($server);
 				$this->smtps->setPort($port); // 25, 465...;
 
-				$loginid=''; $loginpass='';
-				if (! empty($conf->global->$keyforsmtpid))
+				$loginid = ''; $loginpass = '';
+				if (!empty($conf->global->$keyforsmtpid))
 				{
 					$loginid = $conf->global->$keyforsmtpid;
 					$this->smtps->setID($loginid);
 				}
-				if (! empty($conf->global->$keyforsmtppw))
+				if (!empty($conf->global->$keyforsmtppw))
 				{
 					$loginpass = $conf->global->$keyforsmtppw;
 					$this->smtps->setPW($loginpass);
 				}
 
-				$res=true;
-				$from=$this->smtps->getFrom('org');
-				if ($res && ! $from)
+				$res = true;
+				$from = $this->smtps->getFrom('org');
+				if ($res && !$from)
 				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
-				$dest=$this->smtps->getTo();
-				if ($res && ! $dest)
+				$dest = $this->smtps->getTo();
+				if ($res && !$dest)
 				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
 
 				if ($res)
 				{
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
 
-					$result=$this->smtps->sendMsg();
+					$result = $this->smtps->sendMsg();
 					//print $result;
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
-					$result=$this->smtps->getErrors();
+					$result = $this->smtps->getErrors();
 					if (empty($this->error) && empty($result))
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-						$res=true;
+						$res = true;
 					}
 					else
 					{
-						if (empty($this->error)) $this->error=$result;
+						if (empty($this->error)) $this->error = $result;
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-						$res=false;
+						$res = false;
 					}
 				}
 			}
@@ -757,19 +757,19 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');
+				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');
 
 				// If we use SSL/TLS
 				$server = $conf->global->$keyforsmtpserver;
 				$secure = '';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';
+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';
 
 				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
 
-				if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
-				if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
+				if (!empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
+				if (!empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Create the Mailer using your created Transport
@@ -784,7 +784,7 @@ 
                     $this->message->attachSigner($signer->ignoreHeader('Return-Path'));
                 }
 
-                if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+                if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
 					// To use the ArrayLogger
 					$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
 					// Or to use the Echo Logger
@@ -795,14 +795,14 @@ 
 				try {
 					$result = $this->mailer->send($this->message);
 				} catch (Exception $e) {
-					$this->error =  $e->getMessage();
+					$this->error = $e->getMessage();
 				}
-				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+				if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
 				$res = true;
-				if (! empty($this->error) || ! $result) {
+				if (!empty($this->error) || !$result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
 				else
 				{
@@ -817,23 +817,23 @@ 
 				return 'Bad value for sendmode';
 			}
 
-			$parameters=array(); $action='';
+			$parameters = array(); $action = '';
 			$reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0)
 			{
-				$this->error = "Error in hook maildao sendMailAfter " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+				$this->error = "Error in hook maildao sendMailAfter ".$reshook;
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
 				return $reshook;
 			}
 		}
 		else
 		{
-			$this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+			$this->error = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
 		}
 
-		error_reporting($errorlevel);              // Reactive niveau erreur origine
+		error_reporting($errorlevel); // Reactive niveau erreur origine
 
 		return $res;
 	}
@@ -860,17 +860,17 @@ 
 	function _encode_file($sourcefile)
 	{
         // phpcs:enable
-		$newsourcefile=dol_osencode($sourcefile);
+		$newsourcefile = dol_osencode($sourcefile);
 
 		if (is_readable($newsourcefile))
 		{
-			$contents = file_get_contents($newsourcefile);	// Need PHP 4.3
-			$encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+			$contents = file_get_contents($newsourcefile); // Need PHP 4.3
+			$encoded = chunk_split(base64_encode($contents), 76, $this->eol); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
 		}
 		else
 		{
-			$this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
+			$this->error = "Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -888,30 +888,30 @@ 
 	function dump_mail()
 	{
         // phpcs:enable
-		global $conf,$dolibarr_main_data_root;
+		global $conf, $dolibarr_main_data_root;
 
 		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
 		{
-			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
-			$fp = fopen($outputfile,"w");
+			$outputfile = $dolibarr_main_data_root."/dolibarr_mail.log";
+			$fp = fopen($outputfile, "w");
 
 			if ($this->sendmode == 'mail')
 			{
 				fputs($fp, $this->headers);
-				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
+				fputs($fp, $this->eol); // This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
 			}
 			elseif ($this->sendmode == 'smtps')
 			{
-				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
+				fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 			elseif ($this->sendmode == 'swiftmailer')
 			{
-				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
+				fputs($fp, $this->logger->dump()); // this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK))
 				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 	}
@@ -925,15 +925,15 @@ 
 	 */
 	function checkIfHTML($msg)
 	{
-		if (!preg_match('/^[\s\t]*<html/i',$msg))
+		if (!preg_match('/^[\s\t]*<html/i', $msg))
 		{
 			$out = "<html><head><title></title>";
-			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
-			$out.= "</head><body";
-			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
-			$out.= ">";
-			$out.= $msg;
-			$out.= "</body></html>";
+			if (!empty($this->styleCSS)) $out .= $this->styleCSS;
+			$out .= "</head><body";
+			if (!empty($this->bodyCSS)) $out .= $this->bodyCSS;
+			$out .= ">";
+			$out .= $msg;
+			$out .= "</body></html>";
 		}
 		else
 		{
@@ -950,24 +950,24 @@ 
 	 */
 	function buildCSS()
 	{
-		if (! empty($this->css))
+		if (!empty($this->css))
 		{
 			// Style CSS
 			$this->styleCSS = '<style type="text/css">';
-			$this->styleCSS.= 'body {';
+			$this->styleCSS .= 'body {';
 
 			if ($this->css['bgcolor'])
 			{
-				$this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
-				$this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
+				$this->styleCSS .= '  background-color: '.$this->css['bgcolor'].';';
+				$this->bodyCSS .= ' bgcolor="'.$this->css['bgcolor'].'"';
 			}
 			if ($this->css['bgimage'])
 			{
 				// TODO recuperer cid
-				$this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
+				$this->styleCSS .= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
 			}
-			$this->styleCSS.= '}';
-			$this->styleCSS.= '</style>';
+			$this->styleCSS .= '}';
+			$this->styleCSS .= '</style>';
 		}
 	}
 
@@ -988,48 +988,48 @@ 
 
 		// Sender
 		//$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
-		$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
-		if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
+		$out .= "From: ".$this->getValidAddress($this->addr_from, 3, 1).$this->eol2;
+		if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
 		{
-			$out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
+			$out .= "To: ".$this->getValidAddress($this->addr_to, 0, 1).$this->eol2;
 		}
 		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
-		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
-		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
-		if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+		$out .= "Return-Path: ".$this->getValidAddress($this->addr_from, 0, 1).$this->eol2;
+		if (isset($this->reply_to) && $this->reply_to)  $out .= "Reply-To: ".$this->getValidAddress($this->reply_to, 2).$this->eol2;
+		if (isset($this->errors_to) && $this->errors_to) $out .= "Errors-To: ".$this->getValidAddress($this->errors_to, 2).$this->eol2;
 
 		// Receiver
-		if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
-		if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+		if (isset($this->addr_cc) && $this->addr_cc)   $out .= "Cc: ".$this->getValidAddress($this->addr_cc, 2).$this->eol2;
+		if (isset($this->addr_bcc) && $this->addr_bcc)  $out .= "Bcc: ".$this->getValidAddress($this->addr_bcc, 2).$this->eol2; // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
 
 		// Delivery receipt
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out .= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from, 2).$this->eol2;
 
 		//$out.= "X-Priority: 3".$this->eol2;
 
-		$out.= 'Date: ' . date("r") . $this->eol2;
+		$out .= 'Date: '.date("r").$this->eol2;
 
 		$trackid = $this->trackid;
 		if ($trackid)
 		{
 			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
-			$out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
-			$out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
+			$out .= 'Message-ID: <'.time().'.phpmail-dolibarr-'.$trackid.'@'.$host.">".$this->eol2; // Uppercase seems replaced by phpmail
+			$out .= 'References: <'.time().'.phpmail-dolibarr-'.$trackid.'@'.$host.">".$this->eol2;
+			$out .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host.$this->eol2;
 		}
 		else
 		{
-			$out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
+			$out .= 'Message-ID: <'.time().'.phpmail@'.$host.">".$this->eol2;
 		}
 
-		if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
-		$out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
-		$out.= "Mime-Version: 1.0".$this->eol2;
+		if (!empty($_SERVER['REMOTE_ADDR'])) $out .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR'].$this->eol2;
+		$out .= "X-Mailer: Dolibarr version ".DOL_VERSION." (using php mail)".$this->eol2;
+		$out .= "Mime-Version: 1.0".$this->eol2;
 
 		//$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol;
 
-		$out.= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
-		$out.= "Content-Transfer-Encoding: 8bit".$this->eol2;		// TODO Seems to be ignored. Header is 7bit once received.
+		$out .= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
+		$out .= "Content-Transfer-Encoding: 8bit".$this->eol2; // TODO Seems to be ignored. Header is 7bit once received.
 
 		dol_syslog("CMailFile::write_smtpheaders smtp_header=\n".$out);
 		return $out;
@@ -1047,18 +1047,18 @@ 
 	function write_mimeheaders($filename_list, $mimefilename_list)
 	{
         // phpcs:enable
-		$mimedone=0;
+		$mimedone = 0;
 		$out = "";
 
 		if (is_array($filename_list))
 		{
-			$filename_list_size=count($filename_list);
-			for($i=0;$i < $filename_list_size;$i++)
+			$filename_list_size = count($filename_list);
+			for ($i = 0; $i < $filename_list_size; $i++)
 			{
 				if ($filename_list[$i])
 				{
 					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					$out.= "X-attachments: $filename_list[$i]".$this->eol2;
+					$out .= "X-attachments: $filename_list[$i]".$this->eol2;
 				}
 			}
 		}
@@ -1079,31 +1079,31 @@ 
         // phpcs:enable
 		global $conf;
 
-		$out='';
+		$out = '';
 
-		$out.= "--" . $this->mixed_boundary . $this->eol;
+		$out .= "--".$this->mixed_boundary.$this->eol;
 
 		if ($this->atleastoneimage)
 		{
-			$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-			$out.= $this->eol;
-			$out.= "--" . $this->alternative_boundary . $this->eol;
+			$out .= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+			$out .= $this->eol;
+			$out .= "--".$this->alternative_boundary.$this->eol;
 		}
 
 		// Make RFC821 Compliant, replace bare linefeeds
-		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext);	// PCRE modifier /s means new lines are common chars
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext); // PCRE modifier /s means new lines are common chars
+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
 		{
-			$strContent = preg_replace("/\r\n/si", "\n", $strContent);	// PCRE modifier /s means new lines are common chars
+			$strContent = preg_replace("/\r\n/si", "\n", $strContent); // PCRE modifier /s means new lines are common chars
 		}
 
 		$strContentAltText = '';
 		if ($this->msgishtml)
 		{
 			// 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, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
+			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n"));
 
 			// Check if html header already in message, if not complete the message
 			$strContent = $this->checkIfHTML($strContent);
@@ -1112,57 +1112,57 @@ 
 		// Make RFC2045 Compliant, split lines
 		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
 		// TODO Encode main content into base64 and use the chunk_split, or quoted-printable
-		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n")); // TODO Using this method creates unexpected line break on text/plain content.
 
 		if ($this->msgishtml)
 		{
 			if ($this->atleastoneimage)
 			{
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+				$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.($strContentAltText?$strContentAltText:strip_tags($strContent)).$this->eol; // Add plain text message
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->related_boundary . $this->eol;
+				$out .= $this->eol.($strContentAltText ? $strContentAltText : strip_tags($strContent)).$this->eol; // Add plain text message
+				$out .= "--".$this->alternative_boundary.$this->eol;
+				$out .= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
+				$out .= $this->eol;
+				$out .= "--".$this->related_boundary.$this->eol;
 			}
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
 			{
-				$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+				$out .= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+				$out .= $this->eol;
+				$out .= "--".$this->alternative_boundary.$this->eol;
+				$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.$strContentAltText.$this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
+				$out .= $this->eol.$strContentAltText.$this->eol;
+				$out .= "--".$this->alternative_boundary.$this->eol;
 			}
 
-			$out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
+			$out .= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
-			$out.= $this->eol.$strContent.$this->eol;
+			$out .= $this->eol.$strContent.$this->eol;
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
 			{
-				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
+				$out .= "--".$this->alternative_boundary."--".$this->eol;
 			}
 		}
 		else
 		{
-			$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+			$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-			$out.= $this->eol.$strContent.$this->eol;
+			$out .= $this->eol.$strContent.$this->eol;
 		}
 
-		$out.= $this->eol;
+		$out .= $this->eol;
 
 		// Encode images
 		if ($this->atleastoneimage)
 		{
 			$out .= $this->write_images($this->images_encoded);
 			// always end related and end alternative after inline images
-			$out .= "--" . $this->related_boundary . "--" . $this->eol;
-			$out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
+			$out .= "--".$this->related_boundary."--".$this->eol;
+			$out .= $this->eol."--".$this->alternative_boundary."--".$this->eol;
 			$out .= $this->eol;
 		}
 
@@ -1178,13 +1178,13 @@ 
 	 * @param 	array	$mimefilename_list	Tableau
 	 * @return	string						Chaine fichiers encodes
 	 */
-	function write_files($filename_list,$mimetype_list,$mimefilename_list)
+	function write_files($filename_list, $mimetype_list, $mimefilename_list)
 	{
         // phpcs:enable
 		$out = '';
 
-		$filename_list_size=count($filename_list);
-		for($i=0;$i < $filename_list_size;$i++)
+		$filename_list_size = count($filename_list);
+		for ($i = 0; $i < $filename_list_size; $i++)
 		{
 			if ($filename_list[$i])
 			{
@@ -1193,18 +1193,18 @@ 
 				if ($encoded >= 0)
 				{
 					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					if (! $mimetype_list[$i]) {
+					if (!$mimetype_list[$i]) {
 						$mimetype_list[$i] = "application/octet-stream";
 					}
 
-					$out.= "--" . $this->mixed_boundary . $this->eol;
-					$out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Transfer-Encoding: base64".$this->eol;
-					$out.= "Content-Description: ".$filename_list[$i].$this->eol;
-					$out.= $this->eol;
-					$out.= $encoded;
-					$out.= $this->eol;
+					$out .= "--".$this->mixed_boundary.$this->eol;
+					$out .= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
+					$out .= "Content-Type: ".$mimetype_list[$i]."; name=\"".$filename_list[$i]."\"".$this->eol;
+					$out .= "Content-Transfer-Encoding: base64".$this->eol;
+					$out .= "Content-Description: ".$filename_list[$i].$this->eol;
+					$out .= $this->eol;
+					$out .= $encoded;
+					$out .= $this->eol;
 					//$out.= $this->eol;
 				}
 				else
@@ -1236,14 +1236,14 @@ 
 			{
 				dol_syslog("CMailFile::write_images: ".$img["name"]);
 
-				$out.= "--" . $this->related_boundary . $this->eol; // always related for an inline image
-				$out.= "Content-Type: " . $img["content_type"] . "; name=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-Transfer-Encoding: base64".$this->eol;
-				$out.= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-ID: <".$img["cid"].">".$this->eol;
-				$out.= $this->eol;
-				$out.= $img["image_encoded"];
-				$out.= $this->eol;
+				$out .= "--".$this->related_boundary.$this->eol; // always related for an inline image
+				$out .= "Content-Type: ".$img["content_type"]."; name=\"".$img["name"]."\"".$this->eol;
+				$out .= "Content-Transfer-Encoding: base64".$this->eol;
+				$out .= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
+				$out .= "Content-ID: <".$img["cid"].">".$this->eol;
+				$out .= $this->eol;
+				$out .= $img["image_encoded"];
+				$out .= $this->eol;
 			}
 		}
 
@@ -1259,44 +1259,44 @@ 
 	 * @param 	int			$port		Example: 25, 465
 	 * @return	int						Socket id if ok, 0 if KO
 	 */
-	function check_server_port($host,$port)
+	function check_server_port($host, $port)
 	{
         // phpcs:enable
 		global $conf;
 
-		$_retVal=0;
-		$timeout=5;	// Timeout in seconds
+		$_retVal = 0;
+		$timeout = 5; // Timeout in seconds
 
 		if (function_exists('fsockopen'))
 		{
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+			$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER';
+			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
+			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
+			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
+			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
+			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
 			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
 			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';
+				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';
+				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';
+				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';
+				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';
+				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
 			}
 
 			// If we use SSL/TLS
-			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
+			if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host = 'ssl://'.$host;
 			// tls smtp start with no encryption
 			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
 			dol_syslog("Try socket connection to host=".$host." port=".$port);
 			//See if we can connect to the SMTP server
 			if ($socket = @fsockopen(
-					$host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
-					$port,       // which Port number to use
-					$errno,      // actual system level error
-					$errstr,     // and any text that goes with the error
+					$host, // Host to test, IP or domain. Add ssl:// for SSL/TLS.
+					$port, // which Port number to use
+					$errno, // actual system level error
+					$errstr, // and any text that goes with the error
 					$timeout
 			))  // timeout for reading/writing data over the socket
 			{
@@ -1306,11 +1306,11 @@ 
 				dol_syslog("Now we wait for answer 220");
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
+				if ($_retVal = $this->server_parse($socket, "220")) $_retVal = $socket;
 			}
 			else
 			{
-				$this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
+				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);
 			}
 		}
 		return $_retVal;
@@ -1328,21 +1328,21 @@ 
 	function server_parse($socket, $response)
 	{
         // phpcs:enable
-		$_retVal = true;	// Indicates if Object was created or not
+		$_retVal = true; // Indicates if Object was created or not
 		$server_response = '';
 
-		while (substr($server_response,3,1) != ' ')
+		while (substr($server_response, 3, 1) != ' ')
 		{
-			if (! ($server_response = fgets($socket, 256)) )
+			if (!($server_response = fgets($socket, 256)))
 			{
-				$this->error="Couldn't get mail server response codes";
+				$this->error = "Couldn't get mail server response codes";
 				return false;
 			}
 		}
 
-		if( !( substr($server_response, 0, 3) == $response ) )
+		if (!(substr($server_response, 0, 3) == $response))
 		{
-			$this->error="Ran into problems sending Mail.\r\nResponse: $server_response";
+			$this->error = "Ran into problems sending Mail.\r\nResponse: $server_response";
 			$_retVal = false;
 		}
 
@@ -1361,22 +1361,22 @@ 
 		$extensions = array_keys($this->image_types);
 
 		$matches = array();
-		preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches);  // If "xxx.ext" or 'xxx.ext' found
+		preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches); // If "xxx.ext" or 'xxx.ext' found
 
-		if (! empty($matches))
+		if (!empty($matches))
 		{
-			$i=0;
+			$i = 0;
 			foreach ($matches[1] as $full)
 			{
 
-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i', $full, $regs))   // If xxx is 'file=aaa'
 				{
 					$img = $regs[1];
 
 					if (file_exists($images_dir.'/'.$img))
 					{
 						// Image path in src
-						$src = preg_quote($full,'/');
+						$src = preg_quote($full, '/');
 
 						// Image full path
 						$this->html_images[$i]["fullpath"] = $images_dir.'/'.$img;
@@ -1387,12 +1387,12 @@ 
 						// Content type
 						if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg))
 						{
-							$ext=strtolower($reg[1]);
+							$ext = strtolower($reg[1]);
 							$this->html_images[$i]["content_type"] = $this->image_types[$ext];
 						}
 
 						// cid
-						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3);	// Force md5 hash (does not contains special chars)
+						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3); // Force md5 hash (does not contains special chars)
 						$this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
 					}
 					$i++;
@@ -1403,20 +1403,20 @@ 
 			{
 				$inline = array();
 
-				$i=0;
+				$i = 0;
 
 				foreach ($this->html_images as $img)
 				{
 					$fullpath = $images_dir.'/'.$img["name"];
 
 					// If duplicate images are embedded, they may show up as attachments, so remove them.
-					if (!in_array($fullpath,$inline))
+					if (!in_array($fullpath, $inline))
 					{
 						// Read image file
 						if ($image = file_get_contents($fullpath))
 						{
 							// On garde que le nom de l'image
-							preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i',$img["name"],$regs);
+							preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i', $img["name"], $regs);
 							$imgName = $regs[1];
 
 							$this->images_encoded[$i]['name'] = $imgName;
@@ -1457,19 +1457,19 @@ 
 	 *										     If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
 	 *                                           If format 4: 'John Doe' or 'john@doe.com' if no label exists
 	 */
-	static function getValidAddress($address,$format,$encode=0,$maxnumberofemail=0)
+	static function getValidAddress($address, $format, $encode = 0, $maxnumberofemail = 0)
 	{
 		global $conf;
 
-		$ret='';
+		$ret = '';
 
-		$arrayaddress=explode(',',$address);
+		$arrayaddress = explode(',', $address);
 
 		// Boucle sur chaque composant de l'adresse
-		$i=0;
-		foreach($arrayaddress as $val)
+		$i = 0;
+		foreach ($arrayaddress as $val)
 		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
@@ -1484,32 +1484,32 @@ 
 			{
 				$i++;
 
-				$newemail='';
+				$newemail = '';
 				if ($format == 4)
 				{
-					$newemail = $name?$name:$email;
+					$newemail = $name ? $name : $email;
 				}
 				if ($format == 2)
 				{
-					$newemail=$email;
+					$newemail = $email;
 				}
 				if ($format == 1 || $format == 3)
 				{
-					$newemail='<'.$email.'>';
+					$newemail = '<'.$email.'>';
 				}
 				if ($format == 0 || $format == 3)
 				{
-					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
-					elseif (! $name) $newemail='<'.$email.'>';
-					else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+					if (!empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail = '<'.$email.'>';
+					elseif (!$name) $newemail = '<'.$email.'>';
+					else $newemail = ($format == 3 ? '"' : '').($encode ?self::encodetorfc2822($name) : $name).($format == 3 ? '"' : '').' <'.$email.'>';
 				}
 
-				$ret=($ret ? $ret.',' : '').$newemail;
+				$ret = ($ret ? $ret.',' : '').$newemail;
 
 				// Stop if we have too much records
 				if ($maxnumberofemail && $i >= $maxnumberofemail)
 				{
-					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+					if (count($arrayaddress) > $maxnumberofemail) $ret .= '...';
 					break;
 				}
 			}
@@ -1528,14 +1528,14 @@ 
 	{
 		global $conf;
 
-		$ret=array();
+		$ret = array();
 
-		$arrayaddress=explode(',',$address);
+		$arrayaddress = explode(',', $address);
 
 		// Boucle sur chaque composant de l'adresse
-		foreach($arrayaddress as $val)
+		foreach ($arrayaddress as $val)
 		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
@@ -1546,7 +1546,7 @@ 
 				$email = trim($val);
 			}
 
-			$ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
+			$ret[$email] = empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL) ? $name : null;
 		}
 
 		return $ret;

Braces +221 added lines, -113 removed lines

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

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

Spacing +31 added lines, -31 removed lines

@@ -37,7 +37,7 @@ 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
 
     /**
@@ -60,7 +60,7 @@ 
      *  @param  int		$idForm			Id du formulaire
      * 	@return	string					HTML select string
      */
-    function setBarcodeEncoder($selected,$barcodelist,$code_id,$idForm='formbarcode')
+    function setBarcodeEncoder($selected, $barcodelist, $code_id, $idForm = 'formbarcode')
     {
         global $conf, $langs;
 
@@ -81,8 +81,8 @@ 
         }
 
         // We check if barcode is already selected by default
-        if (((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
-        (! empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
+        if (((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
+        (!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
         {
             $disable = 'disabled';
         }
@@ -90,24 +90,24 @@ 
         if (!empty($conf->use_javascript_ajax))
         {
             $select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';
-            $select_encoder.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            $select_encoder.= '<input type="hidden" name="action" value="update">';
-            $select_encoder.= '<input type="hidden" name="code_id" value="'.$code_id.'">';
+            $select_encoder .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            $select_encoder .= '<input type="hidden" name="action" value="update">';
+            $select_encoder .= '<input type="hidden" name="code_id" value="'.$code_id.'">';
         }
         
-        $selectname=(!empty($conf->use_javascript_ajax)?'coder':'coder'.$code_id);
-        $select_encoder.= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
-        $select_encoder.= '<option value="0"'.($selected==0?' selected':'').' '.$disable.'>'.$langs->trans('Disable').'</option>';
-        $select_encoder.= '<option value="-1" disabled>--------------------</option>';
-        foreach($barcodelist as $key => $value)
+        $selectname = (!empty($conf->use_javascript_ajax) ? 'coder' : 'coder'.$code_id);
+        $select_encoder .= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
+        $select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';
+        $select_encoder .= '<option value="-1" disabled>--------------------</option>';
+        foreach ($barcodelist as $key => $value)
         {
-            $select_encoder.= '<option value="'.$key.'"'.($selected==$key?' selected':'').'>'.$value.'</option>';
+            $select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';
         }
-        $select_encoder.= '</select>';
+        $select_encoder .= '</select>';
         
         if (!empty($conf->use_javascript_ajax))
         {
-            $select_encoder.= '</form>';
+            $select_encoder .= '</form>';
         }
 
         return $select_encoder;
@@ -123,7 +123,7 @@ 
      *  @return void
      *  @deprecated
      */
-    function select_barcode_type($selected='', $htmlname='barcodetype_id', $useempty=0)
+    function select_barcode_type($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
     {
         // phpcs:enable
         print $this->selectBarcodeType($selected, $htmlname, $useempty);
@@ -137,17 +137,17 @@ 
      *  @param  int     $useempty          Display empty value in select
      *  @return string
      */
-    function selectBarcodeType($selected='', $htmlname='barcodetype_id', $useempty=0)
+    function selectBarcodeType($selected = '', $htmlname = 'barcodetype_id', $useempty = 0)
     {
         global $langs, $conf;
 
         $out = '';
 
         $sql = "SELECT rowid, code, libelle";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-        $sql.= " WHERE coder <> '0'";
-        $sql.= " AND entity = ".$conf->entity;
-        $sql.= " ORDER BY code";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+        $sql .= " WHERE coder <> '0'";
+        $sql .= " AND entity = ".$conf->entity;
+        $sql .= " ORDER BY code";
 
         $result = $this->db->query($sql);
         if ($result) {
@@ -155,20 +155,20 @@ 
             $i = 0;
 
             if ($useempty && $num > 0) {
-                $out .= '<select class="flat minwidth75imp" name="' . $htmlname . '" id="select_' . $htmlname . '">';
+                $out .= '<select class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
                 $out .= '<option value="0">&nbsp;</option>';
             } else {
                 $langs->load("errors");
-                $out .= '<select disabled class="flat minwidth75imp" name="' . $htmlname . '" id="select_' . $htmlname . '">';
-                $out .= '<option value="0" selected>' . $langs->trans('ErrorNoActivatedBarcode') . '</option>';
+                $out .= '<select disabled class="flat minwidth75imp" name="'.$htmlname.'" id="select_'.$htmlname.'">';
+                $out .= '<option value="0" selected>'.$langs->trans('ErrorNoActivatedBarcode').'</option>';
             }
 
             while ($i < $num) {
                 $obj = $this->db->fetch_object($result);
                 if ($selected == $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.'">';
                 }
                 $out .= $obj->libelle;
                 $out .= '</option>';
@@ -193,7 +193,7 @@ 
      *  @return	void
      *  @deprecated
      */
-    function form_barcode_type($page, $selected='', $htmlname='barcodetype_id')
+    function form_barcode_type($page, $selected = '', $htmlname = 'barcodetype_id')
     {
         // phpcs:enable
         print $this->formBarcodeType($page, $selected, $htmlname);
@@ -207,19 +207,19 @@ 
      *  @param  string      $htmlname       Nom du formulaire select
      *  @return string
      */
-    function formBarcodeType($page, $selected='', $htmlname='barcodetype_id')
+    function formBarcodeType($page, $selected = '', $htmlname = 'barcodetype_id')
     {
         global $langs, $conf;
         $out = '';
         if ($htmlname != "none") {
-            $out .= '<form method="post" action="' . $page . '">';
-            $out .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+            $out .= '<form method="post" action="'.$page.'">';
+            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             $out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
             $out .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
             $out .= '<tr><td>';
             $out .= $this->selectBarcodeType($selected, $htmlname, 1);
             $out .= '</td>';
-            $out .= '<td align="left"><input type="submit" class="button" value="' . $langs->trans("Modify") . '">';
+            $out .= '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
             $out .= '</td></tr></table></form>';
         }
         return $out;

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
             }
             $out .= "</select>";
             $out .= ajax_combobox("select_".$htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
         return $out;

dolibarr/htdocs/core/class/CSMSFile.class.php

Indentation +162 added lines, -162 removed lines

@@ -35,73 +35,73 @@ 
 class CSMSFile
 {
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	public $addr_from;
-	public $addr_to;
-	public $deferred;
-	public $priority;
-	public $class;
-	public $message;
-	public $nostop;
-
-
-	/**
-	 *	CSMSFile
-	 *
-	 *	@param	string	$to                 Recipients SMS
-	 *	@param 	string	$from               Sender SMS
-	 *	@param 	string	$msg                Message
-	 *	@param 	int		$deliveryreceipt	Not used
-	 *	@param 	int		$deferred			Deferred or not
-	 *	@param 	int		$priority			Priority
-	 *	@param 	int		$class				Class
-	 */
-	function __construct($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
-	{
-		global $conf;
-
-		// On definit fin de ligne
-		$this->eol="\n";
-		if (preg_match('/^win/i',PHP_OS)) $this->eol="\r\n";
-		if (preg_match('/^mac/i',PHP_OS)) $this->eol="\r";
-
-		// If ending method not defined
-		if (empty($conf->global->MAIN_SMS_SENDMODE))
-		{
-		    $this->error='No SMS Engine defined';
-		    return -1;
-		}
-
-		dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".$conf->global->MAIN_SMS_SENDMODE." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".count($msg), LOG_DEBUG);
-		dol_syslog("CSMSFile::CSMSFile: deferred=".$deferred." priority=".$priority." class=".$class, LOG_DEBUG);
-
-		// Action according to choosed sending method
-	    $this->addr_from=$from;
-	    $this->addr_to=$to;
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    public $addr_from;
+    public $addr_to;
+    public $deferred;
+    public $priority;
+    public $class;
+    public $message;
+    public $nostop;
+
+
+    /**
+     *	CSMSFile
+     *
+     *	@param	string	$to                 Recipients SMS
+     *	@param 	string	$from               Sender SMS
+     *	@param 	string	$msg                Message
+     *	@param 	int		$deliveryreceipt	Not used
+     *	@param 	int		$deferred			Deferred or not
+     *	@param 	int		$priority			Priority
+     *	@param 	int		$class				Class
+     */
+    function __construct($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
+    {
+        global $conf;
+
+        // On definit fin de ligne
+        $this->eol="\n";
+        if (preg_match('/^win/i',PHP_OS)) $this->eol="\r\n";
+        if (preg_match('/^mac/i',PHP_OS)) $this->eol="\r";
+
+        // If ending method not defined
+        if (empty($conf->global->MAIN_SMS_SENDMODE))
+        {
+            $this->error='No SMS Engine defined';
+            return -1;
+        }
+
+        dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".$conf->global->MAIN_SMS_SENDMODE." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".count($msg), LOG_DEBUG);
+        dol_syslog("CSMSFile::CSMSFile: deferred=".$deferred." priority=".$priority." class=".$class, LOG_DEBUG);
+
+        // Action according to choosed sending method
+        $this->addr_from=$from;
+        $this->addr_to=$to;
         $this->deferred=$deferred;
         $this->priority=$priority;
         $this->class=$class;
         $this->message=$msg;
         $this->nostop=false;
-	}
+    }
 
 
-	/**
-	 * Send sms that was prepared by constructor
-	 *
-	 * @return    boolean     True if sms sent, false otherwise
-	 */
-	function sendfile()
-	{
-		global $conf;
+    /**
+     * Send sms that was prepared by constructor
+     *
+     * @return    boolean     True if sms sent, false otherwise
+     */
+    function sendfile()
+    {
+        global $conf;
 
-		$errorlevel=error_reporting();
-		error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
+        $errorlevel=error_reporting();
+        error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
 
-		$res=false;
+        $res=false;
 
         dol_syslog("CSMSFile::sendfile addr_to=".$this->addr_to, LOG_DEBUG);
         dol_syslog("CSMSFile::sendfile message=\n".$this->message);
@@ -110,121 +110,121 @@ 
 
         if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
 
-		if (empty($conf->global->MAIN_DISABLE_ALL_SMS))
-		{
-
-		    // Action according to choosed sending method
-		    if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
-			{
-				dol_include_once('/ovh/class/ovhsms.class.php');
-				$sms=new OvhSms($this->db);
-				$sms->expe=$this->addr_from;
-				$sms->dest=$this->addr_to;
-				$sms->message=$this->message;
-				$sms->deferred=$this->deferred;
-				$sms->priority=$this->priority;
+        if (empty($conf->global->MAIN_DISABLE_ALL_SMS))
+        {
+
+            // Action according to choosed sending method
+            if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
+            {
+                dol_include_once('/ovh/class/ovhsms.class.php');
+                $sms=new OvhSms($this->db);
+                $sms->expe=$this->addr_from;
+                $sms->dest=$this->addr_to;
+                $sms->message=$this->message;
+                $sms->deferred=$this->deferred;
+                $sms->priority=$this->priority;
                 $sms->class=$this->class;
                 $sms->nostop=$this->nostop;
 
                 $res=$sms->SmsSend();
-				if ($res <= 0)
-				{
-					$this->error=$sms->error;
-					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-				}
-				else
-				{
-					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
-					//var_dump($res);        // 1973128
-					if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
-				}
-			}
-		    else if (! empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
-		    {
-		        $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
-		        $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
-		        dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
-		        try
-		        {
-		            $classname=ucfirst($classfile);
-		            $sms = new $classname($this->db);
-		            $sms->expe=$this->addr_from;
-		            $sms->dest=$this->addr_to;
-		            $sms->deferred=$this->deferred;
-		            $sms->priority=$this->priority;
-		            $sms->class=$this->class;
-		            $sms->message=$this->message;
-		            $sms->nostop=$this->nostop;
+                if ($res <= 0)
+                {
+                    $this->error=$sms->error;
+                    dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
+                }
+                else
+                {
+                    dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
+                    //var_dump($res);        // 1973128
+                    if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+                }
+            }
+            else if (! empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+            {
+                $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
+                $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
+                dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
+                try
+                {
+                    $classname=ucfirst($classfile);
+                    $sms = new $classname($this->db);
+                    $sms->expe=$this->addr_from;
+                    $sms->dest=$this->addr_to;
+                    $sms->deferred=$this->deferred;
+                    $sms->priority=$this->priority;
+                    $sms->class=$this->class;
+                    $sms->message=$this->message;
+                    $sms->nostop=$this->nostop;
 
                     $res=$sms->SmsSend();
                     $this->error = $sms->error;
                     $this->errors = $sms->errors;
-    				if ($res <= 0)
-    				{
-    					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-    				}
-    				else
-    				{
-    					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
-    					//var_dump($res);        // 1973128
-    					if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
-    				}
-		        }
-		        catch(Exception $e)
-		        {
-		            dol_print_error('','Error to get list of senders: '.$e->getMessage());
-		        }
-		    }
-			else
-			{
-				// Send sms method not correctly defined
-				// --------------------------------------
-
-				return 'Bad value for MAIN_SMS_SENDMODE constant';
-			}
-		}
-		else
-		{
-			$this->error='No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
-			dol_syslog("CSMSFile::sendfile: ".$this->error, LOG_WARNING);
-		}
-
-		error_reporting($errorlevel);              // Reactive niveau erreur origine
-
-		return $res;
-	}
+                    if ($res <= 0)
+                    {
+                        dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
+                    }
+                    else
+                    {
+                        dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
+                        //var_dump($res);        // 1973128
+                        if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+                    }
+                }
+                catch(Exception $e)
+                {
+                    dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                }
+            }
+            else
+            {
+                // Send sms method not correctly defined
+                // --------------------------------------
+
+                return 'Bad value for MAIN_SMS_SENDMODE constant';
+            }
+        }
+        else
+        {
+            $this->error='No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
+            dol_syslog("CSMSFile::sendfile: ".$this->error, LOG_WARNING);
+        }
+
+        error_reporting($errorlevel);              // Reactive niveau erreur origine
+
+        return $res;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Write content of a SendSms request into a dump file (mode = all)
-	 *  Used for debugging.
-	 *
-	 *  @return	void
-	 */
-	function dump_sms()
-	{
+    /**
+     *  Write content of a SendSms request into a dump file (mode = all)
+     *  Used for debugging.
+     *
+     *  @return	void
+     */
+    function dump_sms()
+    {
         // phpcs:enable
-		global $conf,$dolibarr_main_data_root;
-
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
-		{
-			$outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
-			$fp = fopen($outputfile,"w");
-
-			fputs($fp, "From: ".$this->addr_from."\n");
-			fputs($fp, "To: ".$this->addr_to."\n");
-			fputs($fp, "Priority: ".$this->priority."\n");
-			fputs($fp, "Class: ".$this->class."\n");
-			fputs($fp, "Deferred: ".$this->deferred."\n");
-			fputs($fp, "DisableStop: ".$this->nostop."\n");
-			fputs($fp, "Message:\n".$this->message);
-
-			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-		}
-	}
+        global $conf,$dolibarr_main_data_root;
+
+        if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
+        {
+            $outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
+            $fp = fopen($outputfile,"w");
+
+            fputs($fp, "From: ".$this->addr_from."\n");
+            fputs($fp, "To: ".$this->addr_to."\n");
+            fputs($fp, "Priority: ".$this->priority."\n");
+            fputs($fp, "Class: ".$this->class."\n");
+            fputs($fp, "Deferred: ".$this->deferred."\n");
+            fputs($fp, "DisableStop: ".$this->nostop."\n");
+            fputs($fp, "Message:\n".$this->message);
+
+            fclose($fp);
+            if (! empty($conf->global->MAIN_UMASK))
+            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -241,7 +241,7 @@ 
 
         if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir
         {
-        	$outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
+            $outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
             $fp = fopen($outputfile,"a+");
 
             fputs($fp, "\nResult id=".$result);

Spacing +56 added lines, -56 removed lines

@@ -37,7 +37,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	public $addr_from;
 	public $addr_to;
@@ -59,19 +59,19 @@ 
 	 *	@param 	int		$priority			Priority
 	 *	@param 	int		$class				Class
 	 */
-	function __construct($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
+	function __construct($to, $from, $msg, $deliveryreceipt = 0, $deferred = 0, $priority = 3, $class = 1)
 	{
 		global $conf;
 
 		// On definit fin de ligne
-		$this->eol="\n";
-		if (preg_match('/^win/i',PHP_OS)) $this->eol="\r\n";
-		if (preg_match('/^mac/i',PHP_OS)) $this->eol="\r";
+		$this->eol = "\n";
+		if (preg_match('/^win/i', PHP_OS)) $this->eol = "\r\n";
+		if (preg_match('/^mac/i', PHP_OS)) $this->eol = "\r";
 
 		// If ending method not defined
 		if (empty($conf->global->MAIN_SMS_SENDMODE))
 		{
-		    $this->error='No SMS Engine defined';
+		    $this->error = 'No SMS Engine defined';
 		    return -1;
 		}
 
@@ -79,13 +79,13 @@ 
 		dol_syslog("CSMSFile::CSMSFile: deferred=".$deferred." priority=".$priority." class=".$class, LOG_DEBUG);
 
 		// Action according to choosed sending method
-	    $this->addr_from=$from;
-	    $this->addr_to=$to;
-        $this->deferred=$deferred;
-        $this->priority=$priority;
-        $this->class=$class;
-        $this->message=$msg;
-        $this->nostop=false;
+	    $this->addr_from = $from;
+	    $this->addr_to = $to;
+        $this->deferred = $deferred;
+        $this->priority = $priority;
+        $this->class = $class;
+        $this->message = $msg;
+        $this->nostop = false;
 	}
 
 
@@ -98,17 +98,17 @@ 
 	{
 		global $conf;
 
-		$errorlevel=error_reporting();
-		error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
+		$errorlevel = error_reporting();
+		error_reporting($errorlevel ^ E_WARNING); // Desactive warnings
 
-		$res=false;
+		$res = false;
 
         dol_syslog("CSMSFile::sendfile addr_to=".$this->addr_to, LOG_DEBUG);
         dol_syslog("CSMSFile::sendfile message=\n".$this->message);
 
-        $this->message=stripslashes($this->message);
+        $this->message = stripslashes($this->message);
 
-        if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
+        if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_SMS))
 		{
@@ -117,46 +117,46 @@ 
 		    if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
 			{
 				dol_include_once('/ovh/class/ovhsms.class.php');
-				$sms=new OvhSms($this->db);
-				$sms->expe=$this->addr_from;
-				$sms->dest=$this->addr_to;
-				$sms->message=$this->message;
-				$sms->deferred=$this->deferred;
-				$sms->priority=$this->priority;
-                $sms->class=$this->class;
-                $sms->nostop=$this->nostop;
-
-                $res=$sms->SmsSend();
+				$sms = new OvhSms($this->db);
+				$sms->expe = $this->addr_from;
+				$sms->dest = $this->addr_to;
+				$sms->message = $this->message;
+				$sms->deferred = $this->deferred;
+				$sms->priority = $this->priority;
+                $sms->class = $this->class;
+                $sms->nostop = $this->nostop;
+
+                $res = $sms->SmsSend();
 				if ($res <= 0)
 				{
-					$this->error=$sms->error;
+					$this->error = $sms->error;
 					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
 				}
 				else
 				{
 					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
 					//var_dump($res);        // 1973128
-					if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
 				}
 			}
-		    else if (! empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+		    else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
 		    {
-		        $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
-		        $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
+		        $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
+		        $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
 		        dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
 		        try
 		        {
-		            $classname=ucfirst($classfile);
+		            $classname = ucfirst($classfile);
 		            $sms = new $classname($this->db);
-		            $sms->expe=$this->addr_from;
-		            $sms->dest=$this->addr_to;
-		            $sms->deferred=$this->deferred;
-		            $sms->priority=$this->priority;
-		            $sms->class=$this->class;
-		            $sms->message=$this->message;
-		            $sms->nostop=$this->nostop;
-
-                    $res=$sms->SmsSend();
+		            $sms->expe = $this->addr_from;
+		            $sms->dest = $this->addr_to;
+		            $sms->deferred = $this->deferred;
+		            $sms->priority = $this->priority;
+		            $sms->class = $this->class;
+		            $sms->message = $this->message;
+		            $sms->nostop = $this->nostop;
+
+                    $res = $sms->SmsSend();
                     $this->error = $sms->error;
                     $this->errors = $sms->errors;
     				if ($res <= 0)
@@ -167,12 +167,12 @@ 
     				{
     					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
     					//var_dump($res);        // 1973128
-    					if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+    					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
     				}
 		        }
-		        catch(Exception $e)
+		        catch (Exception $e)
 		        {
-		            dol_print_error('','Error to get list of senders: '.$e->getMessage());
+		            dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
 		        }
 		    }
 			else
@@ -185,11 +185,11 @@ 
 		}
 		else
 		{
-			$this->error='No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
+			$this->error = 'No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
 			dol_syslog("CSMSFile::sendfile: ".$this->error, LOG_WARNING);
 		}
 
-		error_reporting($errorlevel);              // Reactive niveau erreur origine
+		error_reporting($errorlevel); // Reactive niveau erreur origine
 
 		return $res;
 	}
@@ -205,12 +205,12 @@ 
 	function dump_sms()
 	{
         // phpcs:enable
-		global $conf,$dolibarr_main_data_root;
+		global $conf, $dolibarr_main_data_root;
 
 		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
 		{
-			$outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
-			$fp = fopen($outputfile,"w");
+			$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";
+			$fp = fopen($outputfile, "w");
 
 			fputs($fp, "From: ".$this->addr_from."\n");
 			fputs($fp, "To: ".$this->addr_to."\n");
@@ -221,7 +221,7 @@ 
 			fputs($fp, "Message:\n".$this->message);
 
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 	}
@@ -237,17 +237,17 @@ 
     function dump_sms_result($result)
     {
         // phpcs:enable
-        global $conf,$dolibarr_main_data_root;
+        global $conf, $dolibarr_main_data_root;
 
         if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir
         {
-        	$outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
-            $fp = fopen($outputfile,"a+");
+        	$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";
+            $fp = fopen($outputfile, "a+");
 
             fputs($fp, "\nResult id=".$result);
 
             fclose($fp);
-            if (! empty($conf->global->MAIN_UMASK))
+            if (!empty($conf->global->MAIN_UMASK))
             @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
         }
     }

Braces +38 added lines, -24 removed lines

@@ -65,8 +65,12 @@ 
 
 		// On definit fin de ligne
 		$this->eol="\n";
-		if (preg_match('/^win/i',PHP_OS)) $this->eol="\r\n";
-		if (preg_match('/^mac/i',PHP_OS)) $this->eol="\r";
+		if (preg_match('/^win/i',PHP_OS)) {
+		    $this->eol="\r\n";
+		}
+		if (preg_match('/^mac/i',PHP_OS)) {
+		    $this->eol="\r";
+		}
 
 		// If ending method not defined
 		if (empty($conf->global->MAIN_SMS_SENDMODE))
@@ -108,15 +112,19 @@ 
 
         $this->message=stripslashes($this->message);
 
-        if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
+        if (! empty($conf->global->MAIN_SMS_DEBUG)) {
+            $this->dump_sms();
+        }
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_SMS))
 		{
 
 		    // Action according to choosed sending method
-		    if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
+		    if ($conf->global->MAIN_SMS_SENDMODE == 'ovh') {
+		        // Backward compatibility    @deprecated
 			{
 				dol_include_once('/ovh/class/ovhsms.class.php');
+		    }
 				$sms=new OvhSms($this->db);
 				$sms->expe=$this->addr_from;
 				$sms->dest=$this->addr_to;
@@ -131,17 +139,19 @@ 
 				{
 					$this->error=$sms->error;
 					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-				}
-				else
+				} else
 				{
 					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
 					//var_dump($res);        // 1973128
-					if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+					if (! empty($conf->global->MAIN_SMS_DEBUG)) {
+					    $this->dump_sms_result($res);
+					}
 				}
-			}
-		    else if (! empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+			} else if (! empty($conf->global->MAIN_SMS_SENDMODE)) {
+		        // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
 		    {
 		        $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
+		    }
 		        $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
 		        dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
 		        try
@@ -162,28 +172,26 @@ 
     				if ($res <= 0)
     				{
     					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-    				}
-    				else
+    				} else
     				{
     					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
     					//var_dump($res);        // 1973128
-    					if (! empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+    					if (! empty($conf->global->MAIN_SMS_DEBUG)) {
+    					    $this->dump_sms_result($res);
+    					}
     				}
-		        }
-		        catch(Exception $e)
+		        } catch(Exception $e)
 		        {
 		            dol_print_error('','Error to get list of senders: '.$e->getMessage());
 		        }
-		    }
-			else
+		    } else
 			{
 				// Send sms method not correctly defined
 				// --------------------------------------
 
 				return 'Bad value for MAIN_SMS_SENDMODE constant';
 			}
-		}
-		else
+		} else
 		{
 			$this->error='No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
 			dol_syslog("CSMSFile::sendfile: ".$this->error, LOG_WARNING);
@@ -207,9 +215,11 @@ 
         // phpcs:enable
 		global $conf,$dolibarr_main_data_root;
 
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
+		if (@is_writeable($dolibarr_main_data_root)) {
+		    // Avoid fatal error on fopen with open_basedir
 		{
 			$outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
+		}
 			$fp = fopen($outputfile,"w");
 
 			fputs($fp, "From: ".$this->addr_from."\n");
@@ -221,8 +231,9 @@ 
 			fputs($fp, "Message:\n".$this->message);
 
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+						@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 	}
 
@@ -239,16 +250,19 @@ 
         // phpcs:enable
         global $conf,$dolibarr_main_data_root;
 
-        if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir
+        if (@is_writeable($dolibarr_main_data_root)) {
+            // Avoid fatal error on fopen with open_basedir
         {
         	$outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
+        }
             $fp = fopen($outputfile,"a+");
 
             fputs($fp, "\nResult id=".$result);
 
             fclose($fp);
-            if (! empty($conf->global->MAIN_UMASK))
-            @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+            if (! empty($conf->global->MAIN_UMASK)) {
+                        @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+            }
         }
     }
 }