alxarafe / alixar

dolibarr/htdocs/comm/mailing/class/mailing.class.php

Indentation +659 added lines, -659 removed lines

@@ -31,694 +31,694 @@
  */
 class Mailing extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='mailing';
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='mailing';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='mailing';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='mailing';
 
-	/**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
-	public $picto='email';
+    /**
+     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+     */
+    public $picto='email';
 
-	public $titre;
-	public $sujet;
-	public $body;
-	public $nbemail;
-	public $bgcolor;
-	public $bgimage;
+    public $titre;
+    public $sujet;
+    public $body;
+    public $nbemail;
+    public $bgcolor;
+    public $bgimage;
 
-	public $statut;       // Status 0=Draft, 1=Validated, 2=Sent partially, 3=Sent completely
+    public $statut;       // Status 0=Draft, 1=Validated, 2=Sent partially, 3=Sent completely
 
-	public $email_from;
-	public $email_replyto;
-	public $email_errorsto;
+    public $email_from;
+    public $email_replyto;
+    public $email_errorsto;
 
-	public $joined_file1;
-	public $joined_file2;
-	public $joined_file3;
-	public $joined_file4;
+    public $joined_file1;
+    public $joined_file2;
+    public $joined_file3;
+    public $joined_file4;
 
-	public $user_creat;
-	public $user_valid;
+    public $user_creat;
+    public $user_valid;
 
-	public $date_creat;
-	public $date_valid;
+    public $date_creat;
+    public $date_valid;
 
-	public $extraparams=array();
+    public $extraparams=array();
 
-	public $statut_dest=array();
-	public $statuts=array();
+    public $statut_dest=array();
+    public $statuts=array();
 
 
     /**
      *  Constructor
      *
      *  @param      DoliDb      $db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-
-		// List of language codes for status
-		$this->statuts[0] = 'MailingStatusDraft';
-		$this->statuts[1] = 'MailingStatusValidated';
-		$this->statuts[2] = 'MailingStatusSentPartialy';
-		$this->statuts[3] = 'MailingStatusSentCompletely';
-
-		$this->statut_dest[-1] = 'MailingStatusError';
-		$this->statut_dest[0] = 'MailingStatusNotSent';
-		$this->statut_dest[1] = 'MailingStatusSent';
-		$this->statut_dest[2] = 'MailingStatusRead';
-		$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe';    // Read but ask to not be contacted anymore
-	}
-
-	/**
-	 *  Create an EMailing
-	 *
-	 *  @param	User	$user 		Object of user making creation
-	 *  @return int	   				-1 if error, Id of created object if OK
-	 */
-	function create($user)
-	{
-		global $conf, $langs;
-
-		$this->db->begin();
-
-		$this->titre=trim($this->titre);
-		$this->email_from=trim($this->email_from);
-
-		if (! $this->email_from)
-		{
-			$this->error = $langs->trans("ErrorMailFromRequired");
-			return -1;
-		}
-
-		$now=dol_now();
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing";
-		$sql .= " (date_creat, fk_user_creat, entity)";
-		$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", ".$conf->entity.")";
-
-		if (! $this->titre)
-		{
-			$this->titre = $langs->trans("NoTitle");
-		}
-
-		dol_syslog("Mailing::Create", LOG_DEBUG);
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."mailing");
-
-			if ($this->update($user) > 0)
-			{
-				$this->db->commit();
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				$this->db->rollback();
-				return -1;
-			}
-
-			return $this->id;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Update emailing record
-	 *
-	 *  @param	User	$user 		Object of user making change
-	 *  @return int				    < 0 if KO, > 0 if OK
-	 */
-	function update($user)
-	{
-		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
-		$sql .= " SET titre = '".$this->db->escape($this->titre)."'";
-		$sql .= ", sujet = '".$this->db->escape($this->sujet)."'";
-		$sql .= ", body = '".$this->db->escape($this->body)."'";
-		$sql .= ", email_from = '".$this->db->escape($this->email_from)."'";
-		$sql .= ", email_replyto = '".$this->db->escape($this->email_replyto)."'";
-		$sql .= ", email_errorsto = '".$this->db->escape($this->email_errorsto)."'";
-		$sql .= ", bgcolor = '".($this->bgcolor?$this->db->escape($this->bgcolor):null)."'";
-		$sql .= ", bgimage = '".($this->bgimage?$this->db->escape($this->bgimage):null)."'";
-		$sql .= " WHERE rowid = ".$this->id;
-
-		dol_syslog("Mailing::Update", LOG_DEBUG);
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 *	Get object from database
-	 *
-	 *	@param	int		$rowid      Id of emailing
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function fetch($rowid)
-	{
-		global $conf;
-
-		$sql = "SELECT m.rowid, m.titre, m.sujet, m.body, m.bgcolor, m.bgimage";
-		$sql.= ", m.email_from, m.email_replyto, m.email_errorsto";
-		$sql.= ", m.statut, m.nbemail";
-		$sql.= ", m.fk_user_creat, m.fk_user_valid";
-		$sql.= ", m.date_creat";
-		$sql.= ", m.date_valid";
-		$sql.= ", m.date_envoi";
-		$sql.= ", m.extraparams";
-		$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
-		$sql.= " WHERE m.rowid = ".(int) $rowid;
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-
-				$this->id				= $obj->rowid;
-				$this->ref				= $obj->rowid;
-				$this->statut			= $obj->statut;
-				$this->nbemail			= $obj->nbemail;
-				$this->titre			= $obj->titre;
-
-				$this->sujet			= $obj->sujet;
-				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401))) {
-					$this->body				= dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401);
-				}else {
-					$this->body				= $obj->body;
-				}
-
-				$this->bgcolor			= $obj->bgcolor;
-				$this->bgimage			= $obj->bgimage;
-
-				$this->email_from		= $obj->email_from;
-				$this->email_replyto	= $obj->email_replyto;
-				$this->email_errorsto	= $obj->email_errorsto;
-
-				$this->user_creat		= $obj->fk_user_creat;
-				$this->user_valid		= $obj->fk_user_valid;
-
-				$this->date_creat		= $this->db->jdate($obj->date_creat);
-				$this->date_valid		= $this->db->jdate($obj->date_valid);
-				$this->date_envoi		= $this->db->jdate($obj->date_envoi);
-
-				$this->extraparams		= (array) json_decode($obj->extraparams, true);
-
-				return 1;
-			}
-			else
-			{
-				dol_syslog(get_class($this)."::fetch Erreur -1");
-				return -1;
-			}
-		}
-		else
-		{
-			dol_syslog(get_class($this)."::fetch Erreur -2");
-			return -2;
-		}
-	}
-
-
-	/**
-	 *	Load an object from its id and create a new one in database
-	 *
-	 *	@param  int		$fromid     	Id of object to clone
-	 *	@param	int		$option1		1=Copy content, 0=Forget content
-	 *	@param	int		$option2		Not used
-	 *	@return	int						New id of clone
-	 */
-	function createFromClone($fromid,$option1,$option2)
-	{
-		global $user,$langs;
-
-		$error=0;
-
-		$object=new Mailing($this->db);
-
-		$object->context['createfromclone']='createfromclone';
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		$object->id=0;
-		$object->statut=0;
-
-		// Clear fields
-		$object->titre=$langs->trans("CopyOf").' '.$object->titre.' '.dol_print_date(dol_now());
-
-		// If no option copy content
-		if (empty($option1))
-		{
-			// Clear values
-			$object->nbemail            = 0;
-			$object->sujet              = '';
-			$object->body               = '';
-			$object->bgcolor            = '';
-			$object->bgimage            = '';
-
-			$object->email_from         = '';
-			$object->email_replyto      = '';
-			$object->email_errorsto     = '';
-
-			$object->user_creat         = $user->id;
-			$object->user_valid         = '';
-
-			$object->date_creat         = '';
-			$object->date_valid         = '';
-			$object->date_envoi         = '';
-		}
-
-		// Create clone
-		$result=$object->create($user);
-
-		// Other options
-		if ($result < 0)
-		{
-			$this->error=$object->error;
-			$error++;
-		}
-
-		if (! $error)
-		{
-			//Clone target
-			if (!empty($option2)) {
-
-				require_once DOL_DOCUMENT_ROOT .'/core/modules/mailings/modules_mailings.php';
-
-				$mailing_target = new MailingTargets($this->db);
-
-				$target_array=array();
-
-				$sql = "SELECT fk_contact, ";
-				$sql.=" lastname,   ";
-				$sql.=" firstname,";
-				$sql.=" email,";
-				$sql.=" other,";
-				$sql.=" source_url,";
-				$sql.=" source_id ,";
-				$sql.=" source_type ";
-				$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles ";
-				$sql.= " WHERE fk_mailing = ".$fromid;
-
-				dol_syslog(get_class($this)."::createFromClone", LOG_DEBUG);
-				$result=$this->db->query($sql);
-				if ($result)
-				{
-					if ($this->db->num_rows($result))
-					{
-						while ($obj = $this->db->fetch_object($result)) {
-
-							$target_array[]=array('fk_contact'=>$obj->fk_contact,
-							'lastname'=>$obj->lastname,
-							'firstname'=>$obj->firstname,
-							'email'=>$obj->email,
-							'other'=>$obj->other,
-							'source_url'=>$obj->source_url,
-							'source_id'=>$obj->source_id,
-							'source_type'=>$obj->source_type);
-						}
-					}
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					return -1;
-				}
-
-				$mailing_target->add_to_target($object->id, $target_array);
-			}
-		}
-
-		unset($object->context['createfromclone']);
-
-		// End
-		if (! $error)
-		{
-			$this->db->commit();
-			return $object->id;
-		}
-		else
-		{
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Validate emailing
-	 *
-	 *  @param	User	$user      	Objet user qui valide
-	 * 	@return	int					<0 if KO, >0 if OK
-	 */
-	function valid($user)
-	{
-		$now=dol_now();
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
-		$sql .= " SET statut = 1, date_valid = '".$this->db->idate($now)."', fk_user_valid=".$user->id;
-		$sql .= " WHERE rowid = ".$this->id;
-
-		dol_syslog("Mailing::valid", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Delete emailing
-	 *
-	 *  @param	int		$rowid      id du mailing a supprimer
-	 *  @return int         		1 en cas de succes
-	 */
-	function delete($rowid)
-	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing";
-		$sql.= " WHERE rowid = ".$rowid;
-
-		dol_syslog("Mailing::delete", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			return $this->delete_targets();
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+
+        // List of language codes for status
+        $this->statuts[0] = 'MailingStatusDraft';
+        $this->statuts[1] = 'MailingStatusValidated';
+        $this->statuts[2] = 'MailingStatusSentPartialy';
+        $this->statuts[3] = 'MailingStatusSentCompletely';
+
+        $this->statut_dest[-1] = 'MailingStatusError';
+        $this->statut_dest[0] = 'MailingStatusNotSent';
+        $this->statut_dest[1] = 'MailingStatusSent';
+        $this->statut_dest[2] = 'MailingStatusRead';
+        $this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe';    // Read but ask to not be contacted anymore
+    }
+
+    /**
+     *  Create an EMailing
+     *
+     *  @param	User	$user 		Object of user making creation
+     *  @return int	   				-1 if error, Id of created object if OK
+     */
+    function create($user)
+    {
+        global $conf, $langs;
+
+        $this->db->begin();
+
+        $this->titre=trim($this->titre);
+        $this->email_from=trim($this->email_from);
+
+        if (! $this->email_from)
+        {
+            $this->error = $langs->trans("ErrorMailFromRequired");
+            return -1;
+        }
+
+        $now=dol_now();
+
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing";
+        $sql .= " (date_creat, fk_user_creat, entity)";
+        $sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", ".$conf->entity.")";
+
+        if (! $this->titre)
+        {
+            $this->titre = $langs->trans("NoTitle");
+        }
+
+        dol_syslog("Mailing::Create", LOG_DEBUG);
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."mailing");
+
+            if ($this->update($user) > 0)
+            {
+                $this->db->commit();
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                $this->db->rollback();
+                return -1;
+            }
+
+            return $this->id;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     *  Update emailing record
+     *
+     *  @param	User	$user 		Object of user making change
+     *  @return int				    < 0 if KO, > 0 if OK
+     */
+    function update($user)
+    {
+        $sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
+        $sql .= " SET titre = '".$this->db->escape($this->titre)."'";
+        $sql .= ", sujet = '".$this->db->escape($this->sujet)."'";
+        $sql .= ", body = '".$this->db->escape($this->body)."'";
+        $sql .= ", email_from = '".$this->db->escape($this->email_from)."'";
+        $sql .= ", email_replyto = '".$this->db->escape($this->email_replyto)."'";
+        $sql .= ", email_errorsto = '".$this->db->escape($this->email_errorsto)."'";
+        $sql .= ", bgcolor = '".($this->bgcolor?$this->db->escape($this->bgcolor):null)."'";
+        $sql .= ", bgimage = '".($this->bgimage?$this->db->escape($this->bgimage):null)."'";
+        $sql .= " WHERE rowid = ".$this->id;
+
+        dol_syslog("Mailing::Update", LOG_DEBUG);
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    /**
+     *	Get object from database
+     *
+     *	@param	int		$rowid      Id of emailing
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function fetch($rowid)
+    {
+        global $conf;
+
+        $sql = "SELECT m.rowid, m.titre, m.sujet, m.body, m.bgcolor, m.bgimage";
+        $sql.= ", m.email_from, m.email_replyto, m.email_errorsto";
+        $sql.= ", m.statut, m.nbemail";
+        $sql.= ", m.fk_user_creat, m.fk_user_valid";
+        $sql.= ", m.date_creat";
+        $sql.= ", m.date_valid";
+        $sql.= ", m.date_envoi";
+        $sql.= ", m.extraparams";
+        $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
+        $sql.= " WHERE m.rowid = ".(int) $rowid;
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+
+                $this->id				= $obj->rowid;
+                $this->ref				= $obj->rowid;
+                $this->statut			= $obj->statut;
+                $this->nbemail			= $obj->nbemail;
+                $this->titre			= $obj->titre;
+
+                $this->sujet			= $obj->sujet;
+                if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401))) {
+                    $this->body				= dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401);
+                }else {
+                    $this->body				= $obj->body;
+                }
+
+                $this->bgcolor			= $obj->bgcolor;
+                $this->bgimage			= $obj->bgimage;
+
+                $this->email_from		= $obj->email_from;
+                $this->email_replyto	= $obj->email_replyto;
+                $this->email_errorsto	= $obj->email_errorsto;
+
+                $this->user_creat		= $obj->fk_user_creat;
+                $this->user_valid		= $obj->fk_user_valid;
+
+                $this->date_creat		= $this->db->jdate($obj->date_creat);
+                $this->date_valid		= $this->db->jdate($obj->date_valid);
+                $this->date_envoi		= $this->db->jdate($obj->date_envoi);
+
+                $this->extraparams		= (array) json_decode($obj->extraparams, true);
+
+                return 1;
+            }
+            else
+            {
+                dol_syslog(get_class($this)."::fetch Erreur -1");
+                return -1;
+            }
+        }
+        else
+        {
+            dol_syslog(get_class($this)."::fetch Erreur -2");
+            return -2;
+        }
+    }
+
+
+    /**
+     *	Load an object from its id and create a new one in database
+     *
+     *	@param  int		$fromid     	Id of object to clone
+     *	@param	int		$option1		1=Copy content, 0=Forget content
+     *	@param	int		$option2		Not used
+     *	@return	int						New id of clone
+     */
+    function createFromClone($fromid,$option1,$option2)
+    {
+        global $user,$langs;
+
+        $error=0;
+
+        $object=new Mailing($this->db);
+
+        $object->context['createfromclone']='createfromclone';
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetch($fromid);
+        $object->id=0;
+        $object->statut=0;
+
+        // Clear fields
+        $object->titre=$langs->trans("CopyOf").' '.$object->titre.' '.dol_print_date(dol_now());
+
+        // If no option copy content
+        if (empty($option1))
+        {
+            // Clear values
+            $object->nbemail            = 0;
+            $object->sujet              = '';
+            $object->body               = '';
+            $object->bgcolor            = '';
+            $object->bgimage            = '';
+
+            $object->email_from         = '';
+            $object->email_replyto      = '';
+            $object->email_errorsto     = '';
+
+            $object->user_creat         = $user->id;
+            $object->user_valid         = '';
+
+            $object->date_creat         = '';
+            $object->date_valid         = '';
+            $object->date_envoi         = '';
+        }
+
+        // Create clone
+        $result=$object->create($user);
+
+        // Other options
+        if ($result < 0)
+        {
+            $this->error=$object->error;
+            $error++;
+        }
+
+        if (! $error)
+        {
+            //Clone target
+            if (!empty($option2)) {
+
+                require_once DOL_DOCUMENT_ROOT .'/core/modules/mailings/modules_mailings.php';
+
+                $mailing_target = new MailingTargets($this->db);
+
+                $target_array=array();
+
+                $sql = "SELECT fk_contact, ";
+                $sql.=" lastname,   ";
+                $sql.=" firstname,";
+                $sql.=" email,";
+                $sql.=" other,";
+                $sql.=" source_url,";
+                $sql.=" source_id ,";
+                $sql.=" source_type ";
+                $sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles ";
+                $sql.= " WHERE fk_mailing = ".$fromid;
+
+                dol_syslog(get_class($this)."::createFromClone", LOG_DEBUG);
+                $result=$this->db->query($sql);
+                if ($result)
+                {
+                    if ($this->db->num_rows($result))
+                    {
+                        while ($obj = $this->db->fetch_object($result)) {
+
+                            $target_array[]=array('fk_contact'=>$obj->fk_contact,
+                            'lastname'=>$obj->lastname,
+                            'firstname'=>$obj->firstname,
+                            'email'=>$obj->email,
+                            'other'=>$obj->other,
+                            'source_url'=>$obj->source_url,
+                            'source_id'=>$obj->source_id,
+                            'source_type'=>$obj->source_type);
+                        }
+                    }
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    return -1;
+                }
+
+                $mailing_target->add_to_target($object->id, $target_array);
+            }
+        }
+
+        unset($object->context['createfromclone']);
+
+        // End
+        if (! $error)
+        {
+            $this->db->commit();
+            return $object->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     *  Validate emailing
+     *
+     *  @param	User	$user      	Objet user qui valide
+     * 	@return	int					<0 if KO, >0 if OK
+     */
+    function valid($user)
+    {
+        $now=dol_now();
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
+        $sql .= " SET statut = 1, date_valid = '".$this->db->idate($now)."', fk_user_valid=".$user->id;
+        $sql .= " WHERE rowid = ".$this->id;
+
+        dol_syslog("Mailing::valid", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Delete emailing
+     *
+     *  @param	int		$rowid      id du mailing a supprimer
+     *  @return int         		1 en cas de succes
+     */
+    function delete($rowid)
+    {
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing";
+        $sql.= " WHERE rowid = ".$rowid;
+
+        dol_syslog("Mailing::delete", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            return $this->delete_targets();
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Delete targets emailing
-	 *
-	 *  @return int       1 if OK, 0 if error
-	 */
-	function delete_targets()
-	{
+    /**
+     *  Delete targets emailing
+     *
+     *  @return int       1 if OK, 0 if error
+     */
+    function delete_targets()
+    {
         // phpcs:enable
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
-		$sql.= " WHERE fk_mailing = ".$this->id;
-
-		dol_syslog("Mailing::delete_targets", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return 0;
-		}
-	}
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
+        $sql.= " WHERE fk_mailing = ".$this->id;
+
+        dol_syslog("Mailing::delete_targets", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return 0;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Change status of each recipient
-	 *
-	 *	@param	User	$user      	Objet user qui valide
-	 *  @return int         		<0 if KO, >0 if OK
-	 */
-	function reset_targets_status($user)
-	{
+    /**
+     *  Change status of each recipient
+     *
+     *	@param	User	$user      	Objet user qui valide
+     *  @return int         		<0 if KO, >0 if OK
+     */
+    function reset_targets_status($user)
+    {
         // phpcs:enable
-		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-		$sql.= " SET statut = 0";
-		$sql.= " WHERE fk_mailing = ".$this->id;
-
-		dol_syslog("Mailing::reset_targets_status", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Count number of target with status
-	 *
-	 *  @param  string	$mode   Mode ('alreadysent' = Sent success or error, 'alreadysentok' = Sent success, 'alreadysentko' = Sent error)
-	 *  @return int        		Nb of target with status
-	 */
-	function countNbOfTargets($mode)
-	{
-	    $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
-	    $sql.= " WHERE fk_mailing = ".$this->id;
-	    if ($mode == 'alreadysent') $sql.= " AND statut <> 0";
-	    elseif ($mode == 'alreadysentok') $sql.= " AND statut > 0";
-	    elseif ($mode == 'alreadysentko') $sql.= " AND statut = -1";
-	    else
-	    {
-	        $this->error='BadValueForParameterMode';
-	        return -2;
-	    }
-
-	    $resql=$this->db->query($sql);
-	    if ($resql)
-	    {
-	        $obj = $this->db->fetch_object($resql);
-	        if ($obj) return $obj->nb;
-	    }
-	    else
-	    {
-	        $this->error=$this->db->lasterror();
-	        return -1;
-	    }
-	    return 0;
-	}
-
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option						On what the link point to ('nolink', ...)
-	 *  @param	int  	$notooltip					1=Disable tooltip
-	 *  @param  string  $morecss            		Add more css on link
-	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *	@return	string								String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
-	{
-		global $db, $conf, $langs, $hookmanager;
-		global $dolibarr_main_authentication, $dolibarr_main_demo;
-		global $menumanager;
-
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
-
-		$result = '';
-		$companylink = '';
-
-		$label = '<u>' . $langs->trans("ShowEmailing") . '</u>';
-		$label.= '<br>';
-		$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-
-		$url = DOL_URL_ROOT.'/comm/mailing/card.php?id='.$this->id;
-
-		if ($option != 'nolink')
-		{
-			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-		}
-
-		$linkclose='';
-		if (empty($notooltip))
-		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
-				$label=$langs->trans("ShowEmailing");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-			}
-			$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
-
-			/*
+        $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+        $sql.= " SET statut = 0";
+        $sql.= " WHERE fk_mailing = ".$this->id;
+
+        dol_syslog("Mailing::reset_targets_status", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            return 1;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Count number of target with status
+     *
+     *  @param  string	$mode   Mode ('alreadysent' = Sent success or error, 'alreadysentok' = Sent success, 'alreadysentko' = Sent error)
+     *  @return int        		Nb of target with status
+     */
+    function countNbOfTargets($mode)
+    {
+        $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+        $sql.= " WHERE fk_mailing = ".$this->id;
+        if ($mode == 'alreadysent') $sql.= " AND statut <> 0";
+        elseif ($mode == 'alreadysentok') $sql.= " AND statut > 0";
+        elseif ($mode == 'alreadysentko') $sql.= " AND statut = -1";
+        else
+        {
+            $this->error='BadValueForParameterMode';
+            return -2;
+        }
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            if ($obj) return $obj->nb;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+        return 0;
+    }
+
+
+    /**
+     *  Return a link to the object card (with optionaly the picto)
+     *
+     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+     *	@param	string	$option						On what the link point to ('nolink', ...)
+     *  @param	int  	$notooltip					1=Disable tooltip
+     *  @param  string  $morecss            		Add more css on link
+     *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *	@return	string								String with URL
+     */
+    function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+    {
+        global $db, $conf, $langs, $hookmanager;
+        global $dolibarr_main_authentication, $dolibarr_main_demo;
+        global $menumanager;
+
+        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+
+        $result = '';
+        $companylink = '';
+
+        $label = '<u>' . $langs->trans("ShowEmailing") . '</u>';
+        $label.= '<br>';
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+        $url = DOL_URL_ROOT.'/comm/mailing/card.php?id='.$this->id;
+
+        if ($option != 'nolink')
+        {
+            // Add param to save lastsearch_values or not
+            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+            if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        }
+
+        $linkclose='';
+        if (empty($notooltip))
+        {
+            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            {
+                $label=$langs->trans("ShowEmailing");
+                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+            }
+            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+
+            /*
 			 $hookmanager->initHooks(array('myobjectdao'));
 			 $parameters=array('id'=>$this->id);
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		}
-		else $linkclose = ($morecss?' class="'.$morecss.'"':'');
-
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
-
-		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
-		$result .= $linkend;
-		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
-
-		global $action;
-		$hookmanager->initHooks(array('emailingdao'));
-		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
-
-		return $result;
-	}
-
-	/**
-	 *  Return label of status of emailing (draft, validated, ...)
-	 *
-	 *  @param	int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
-	 *  @return string        			Label
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->statut,$mode);
-	}
+        }
+        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
+        $linkend='</a>';
+
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= $this->ref;
+        $result .= $linkend;
+        //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+        global $action;
+        $hookmanager->initHooks(array('emailingdao'));
+        $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
+        $reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+        if ($reshook > 0) $result = $hookmanager->resPrint;
+        else $result .= $hookmanager->resPrint;
+
+        return $result;
+    }
+
+    /**
+     *  Return label of status of emailing (draft, validated, ...)
+     *
+     *  @param	int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+     *  @return string        			Label
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->statut,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Renvoi le libelle d'un statut donne
-	 *
-	 *  @param	int		$statut        	Id statut
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return string        			Label
-	 */
-	function LibStatut($statut,$mode=0)
-	{
+    /**
+     *  Renvoi le libelle d'un statut donne
+     *
+     *  @param	int		$statut        	Id statut
+     *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return string        			Label
+     */
+    function LibStatut($statut,$mode=0)
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load('mails');
-
-		if ($mode == 0 || $mode == 1)
-		{
-			return $langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut == 0)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut == 1)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
-			if ($statut == 2)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-			if ($statut == 3)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
-		}
-	}
-
-
-	/**
-	 *  Renvoi le libelle d'un statut donne
-	 *  TODO Add class mailin_target.class.php
-	 *
-	 *  @param	int		$statut        	Id statut
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @param	strin	$desc			Desc error
-	 *  @return string        			Label
-	 */
-	public static function libStatutDest($statut,$mode=0,$desc='')
-	{
-		global $langs;
-		$langs->load('mails');
-
-		if ($mode == 0)
-		{
-			return $langs->trans('MailingStatusError');
-		}
-		elseif ($mode == 1)
-		{
-			return $langs->trans('MailingStatusSent');
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
-		}
-		elseif ($mode == 5)
-		{
-		    if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-		    if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-		    if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-		    if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
-		}
-		elseif ($mode == 6)
-		{
-		    if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-		    if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-		    if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-		    if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
-		}
-	}
+        global $langs;
+        $langs->load('mails');
+
+        if ($mode == 0 || $mode == 1)
+        {
+            return $langs->trans($this->statuts[$statut]);
+        }
+        elseif ($mode == 2)
+        {
+            if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+            if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
+            if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+            if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+        }
+        elseif ($mode == 3)
+        {
+            if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+            if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
+            if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+            if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
+        }
+        elseif ($mode == 4)
+        {
+            if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+            if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
+            if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+            if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+        }
+        elseif ($mode == 5)
+        {
+            if ($statut == 0)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+            if ($statut == 1)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
+            if ($statut == 2)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+            if ($statut == 3)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+        }
+    }
+
+
+    /**
+     *  Renvoi le libelle d'un statut donne
+     *  TODO Add class mailin_target.class.php
+     *
+     *  @param	int		$statut        	Id statut
+     *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @param	strin	$desc			Desc error
+     *  @return string        			Label
+     */
+    public static function libStatutDest($statut,$mode=0,$desc='')
+    {
+        global $langs;
+        $langs->load('mails');
+
+        if ($mode == 0)
+        {
+            return $langs->trans('MailingStatusError');
+        }
+        elseif ($mode == 1)
+        {
+            return $langs->trans('MailingStatusSent');
+        }
+        elseif ($mode == 2)
+        {
+            if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+            if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+            if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+            if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+        }
+        elseif ($mode == 3)
+        {
+            if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+            if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+            if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+            if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+        }
+        elseif ($mode == 4)
+        {
+            if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+            if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+            if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+            if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+        }
+        elseif ($mode == 5)
+        {
+            if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+            if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+            if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+            if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+        }
+        elseif ($mode == 6)
+        {
+            if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+            if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+            if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+            if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+        }
+    }
 }

Spacing +146 added lines, -146 removed lines

@@ -23,7 +23,7 @@ 
  *	\brief      File of class to manage emailings module
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -34,17 +34,17 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='mailing';
+	public $element = 'mailing';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='mailing';
+	public $table_element = 'mailing';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
-	public $picto='email';
+	public $picto = 'email';
 
 	public $titre;
 	public $sujet;
@@ -53,7 +53,7 @@ 
 	public $bgcolor;
 	public $bgimage;
 
-	public $statut;       // Status 0=Draft, 1=Validated, 2=Sent partially, 3=Sent completely
+	public $statut; // Status 0=Draft, 1=Validated, 2=Sent partially, 3=Sent completely
 
 	public $email_from;
 	public $email_replyto;
@@ -70,10 +70,10 @@ 
 	public $date_creat;
 	public $date_valid;
 
-	public $extraparams=array();
+	public $extraparams = array();
 
-	public $statut_dest=array();
-	public $statuts=array();
+	public $statut_dest = array();
+	public $statuts = array();
 
 
     /**
@@ -95,7 +95,7 @@ 
 		$this->statut_dest[0] = 'MailingStatusNotSent';
 		$this->statut_dest[1] = 'MailingStatusSent';
 		$this->statut_dest[2] = 'MailingStatusRead';
-		$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe';    // Read but ask to not be contacted anymore
+		$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore
 	}
 
 	/**
@@ -110,28 +110,28 @@ 
 
 		$this->db->begin();
 
-		$this->titre=trim($this->titre);
-		$this->email_from=trim($this->email_from);
+		$this->titre = trim($this->titre);
+		$this->email_from = trim($this->email_from);
 
-		if (! $this->email_from)
+		if (!$this->email_from)
 		{
 			$this->error = $langs->trans("ErrorMailFromRequired");
 			return -1;
 		}
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing";
 		$sql .= " (date_creat, fk_user_creat, entity)";
 		$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", ".$conf->entity.")";
 
-		if (! $this->titre)
+		if (!$this->titre)
 		{
 			$this->titre = $langs->trans("NoTitle");
 		}
 
 		dol_syslog("Mailing::Create", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."mailing");
@@ -142,7 +142,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
@@ -151,7 +151,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -172,19 +172,19 @@ 
 		$sql .= ", email_from = '".$this->db->escape($this->email_from)."'";
 		$sql .= ", email_replyto = '".$this->db->escape($this->email_replyto)."'";
 		$sql .= ", email_errorsto = '".$this->db->escape($this->email_errorsto)."'";
-		$sql .= ", bgcolor = '".($this->bgcolor?$this->db->escape($this->bgcolor):null)."'";
-		$sql .= ", bgimage = '".($this->bgimage?$this->db->escape($this->bgimage):null)."'";
+		$sql .= ", bgcolor = '".($this->bgcolor ? $this->db->escape($this->bgcolor) : null)."'";
+		$sql .= ", bgimage = '".($this->bgimage ? $this->db->escape($this->bgimage) : null)."'";
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog("Mailing::Update", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -200,43 +200,43 @@ 
 		global $conf;
 
 		$sql = "SELECT m.rowid, m.titre, m.sujet, m.body, m.bgcolor, m.bgimage";
-		$sql.= ", m.email_from, m.email_replyto, m.email_errorsto";
-		$sql.= ", m.statut, m.nbemail";
-		$sql.= ", m.fk_user_creat, m.fk_user_valid";
-		$sql.= ", m.date_creat";
-		$sql.= ", m.date_valid";
-		$sql.= ", m.date_envoi";
-		$sql.= ", m.extraparams";
-		$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
-		$sql.= " WHERE m.rowid = ".(int) $rowid;
+		$sql .= ", m.email_from, m.email_replyto, m.email_errorsto";
+		$sql .= ", m.statut, m.nbemail";
+		$sql .= ", m.fk_user_creat, m.fk_user_valid";
+		$sql .= ", m.date_creat";
+		$sql .= ", m.date_valid";
+		$sql .= ", m.date_envoi";
+		$sql .= ", m.extraparams";
+		$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
+		$sql .= " WHERE m.rowid = ".(int) $rowid;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
 			{
 				$obj = $this->db->fetch_object($result);
 
-				$this->id				= $obj->rowid;
-				$this->ref				= $obj->rowid;
-				$this->statut			= $obj->statut;
-				$this->nbemail			= $obj->nbemail;
+				$this->id = $obj->rowid;
+				$this->ref = $obj->rowid;
+				$this->statut = $obj->statut;
+				$this->nbemail = $obj->nbemail;
 				$this->titre			= $obj->titre;
 
 				$this->sujet			= $obj->sujet;
 				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401))) {
 					$this->body				= dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401);
-				}else {
+				} else {
 					$this->body				= $obj->body;
 				}
 
 				$this->bgcolor			= $obj->bgcolor;
 				$this->bgimage			= $obj->bgimage;
 
-				$this->email_from		= $obj->email_from;
-				$this->email_replyto	= $obj->email_replyto;
-				$this->email_errorsto	= $obj->email_errorsto;
+				$this->email_from = $obj->email_from;
+				$this->email_replyto = $obj->email_replyto;
+				$this->email_errorsto = $obj->email_errorsto;
 
 				$this->user_creat		= $obj->fk_user_creat;
 				$this->user_valid		= $obj->fk_user_valid;
@@ -245,7 +245,7 @@ 
 				$this->date_valid		= $this->db->jdate($obj->date_valid);
 				$this->date_envoi		= $this->db->jdate($obj->date_envoi);
 
-				$this->extraparams		= (array) json_decode($obj->extraparams, true);
+				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
 				return 1;
 			}
@@ -271,25 +271,25 @@ 
 	 *	@param	int		$option2		Not used
 	 *	@return	int						New id of clone
 	 */
-	function createFromClone($fromid,$option1,$option2)
+	function createFromClone($fromid, $option1, $option2)
 	{
-		global $user,$langs;
+		global $user, $langs;
 
-		$error=0;
+		$error = 0;
 
-		$object=new Mailing($this->db);
+		$object = new Mailing($this->db);
 
-		$object->context['createfromclone']='createfromclone';
+		$object->context['createfromclone'] = 'createfromclone';
 
 		$this->db->begin();
 
 		// Load source object
 		$object->fetch($fromid);
-		$object->id=0;
-		$object->statut=0;
+		$object->id = 0;
+		$object->statut = 0;
 
 		// Clear fields
-		$object->titre=$langs->trans("CopyOf").' '.$object->titre.' '.dol_print_date(dol_now());
+		$object->titre = $langs->trans("CopyOf").' '.$object->titre.' '.dol_print_date(dol_now());
 
 		// If no option copy content
 		if (empty($option1))
@@ -314,46 +314,46 @@ 
 		}
 
 		// Create clone
-		$result=$object->create($user);
+		$result = $object->create($user);
 
 		// Other options
 		if ($result < 0)
 		{
-			$this->error=$object->error;
+			$this->error = $object->error;
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			//Clone target
 			if (!empty($option2)) {
 
-				require_once DOL_DOCUMENT_ROOT .'/core/modules/mailings/modules_mailings.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
 
 				$mailing_target = new MailingTargets($this->db);
 
-				$target_array=array();
+				$target_array = array();
 
 				$sql = "SELECT fk_contact, ";
-				$sql.=" lastname,   ";
-				$sql.=" firstname,";
-				$sql.=" email,";
-				$sql.=" other,";
-				$sql.=" source_url,";
-				$sql.=" source_id ,";
-				$sql.=" source_type ";
-				$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles ";
-				$sql.= " WHERE fk_mailing = ".$fromid;
+				$sql .= " lastname,   ";
+				$sql .= " firstname,";
+				$sql .= " email,";
+				$sql .= " other,";
+				$sql .= " source_url,";
+				$sql .= " source_id ,";
+				$sql .= " source_type ";
+				$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles ";
+				$sql .= " WHERE fk_mailing = ".$fromid;
 
 				dol_syslog(get_class($this)."::createFromClone", LOG_DEBUG);
-				$result=$this->db->query($sql);
+				$result = $this->db->query($sql);
 				if ($result)
 				{
 					if ($this->db->num_rows($result))
 					{
 						while ($obj = $this->db->fetch_object($result)) {
 
-							$target_array[]=array('fk_contact'=>$obj->fk_contact,
+							$target_array[] = array('fk_contact'=>$obj->fk_contact,
 							'lastname'=>$obj->lastname,
 							'firstname'=>$obj->firstname,
 							'email'=>$obj->email,
@@ -366,7 +366,7 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					return -1;
 				}
 
@@ -377,7 +377,7 @@ 
 		unset($object->context['createfromclone']);
 
 		// End
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return $object->id;
@@ -397,7 +397,7 @@ 
 	 */
 	function valid($user)
 	{
-		$now=dol_now();
+		$now = dol_now();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
 		$sql .= " SET statut = 1, date_valid = '".$this->db->idate($now)."', fk_user_valid=".$user->id;
@@ -410,7 +410,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -425,17 +425,17 @@ 
 	function delete($rowid)
 	{
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing";
-		$sql.= " WHERE rowid = ".$rowid;
+		$sql .= " WHERE rowid = ".$rowid;
 
 		dol_syslog("Mailing::delete", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return $this->delete_targets();
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -450,17 +450,17 @@ 
 	{
         // phpcs:enable
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
-		$sql.= " WHERE fk_mailing = ".$this->id;
+		$sql .= " WHERE fk_mailing = ".$this->id;
 
 		dol_syslog("Mailing::delete_targets", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return 0;
 		}
 	}
@@ -477,18 +477,18 @@ 
 	{
         // phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-		$sql.= " SET statut = 0";
-		$sql.= " WHERE fk_mailing = ".$this->id;
+		$sql .= " SET statut = 0";
+		$sql .= " WHERE fk_mailing = ".$this->id;
 
 		dol_syslog("Mailing::reset_targets_status", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -503,17 +503,17 @@ 
 	function countNbOfTargets($mode)
 	{
 	    $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
-	    $sql.= " WHERE fk_mailing = ".$this->id;
-	    if ($mode == 'alreadysent') $sql.= " AND statut <> 0";
-	    elseif ($mode == 'alreadysentok') $sql.= " AND statut > 0";
-	    elseif ($mode == 'alreadysentko') $sql.= " AND statut = -1";
+	    $sql .= " WHERE fk_mailing = ".$this->id;
+	    if ($mode == 'alreadysent') $sql .= " AND statut <> 0";
+	    elseif ($mode == 'alreadysentok') $sql .= " AND statut > 0";
+	    elseif ($mode == 'alreadysentko') $sql .= " AND statut = -1";
 	    else
 	    {
-	        $this->error='BadValueForParameterMode';
+	        $this->error = 'BadValueForParameterMode';
 	        return -2;
 	    }
 
-	    $resql=$this->db->query($sql);
+	    $resql = $this->db->query($sql);
 	    if ($resql)
 	    {
 	        $obj = $this->db->fetch_object($resql);
@@ -521,7 +521,7 @@ 
 	    }
 	    else
 	    {
-	        $this->error=$this->db->lasterror();
+	        $this->error = $this->db->lasterror();
 	        return -1;
 	    }
 	    return 0;
@@ -538,41 +538,41 @@ 
 	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $db, $conf, $langs, $hookmanager;
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
 		$companylink = '';
 
-		$label = '<u>' . $langs->trans("ShowEmailing") . '</u>';
-		$label.= '<br>';
-		$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		$label = '<u>'.$langs->trans("ShowEmailing").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		$url = DOL_URL_ROOT.'/comm/mailing/card.php?id='.$this->id;
 
 		if ($option != 'nolink')
 		{
 			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		}
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label=$langs->trans("ShowEmailing");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowEmailing");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
 			 $hookmanager->initHooks(array('myobjectdao'));
@@ -581,22 +581,22 @@ 
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
 		}
-		else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
 		global $action;
 		$hookmanager->initHooks(array('emailingdao'));
-		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) $result = $hookmanager->resPrint;
 		else $result .= $hookmanager->resPrint;
 
@@ -609,9 +609,9 @@ 
 	 *  @param	int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
 	 *  @return string        			Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -622,7 +622,7 @@ 
 	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string        			Label
 	 */
-	function LibStatut($statut,$mode=0)
+	function LibStatut($statut, $mode = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -634,31 +634,31 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1');
+			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3');
+			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]), 'statut6');
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]);
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut == 0)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut == 1)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
-			if ($statut == 2)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-			if ($statut == 3)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut == 0)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+			if ($statut == 1)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut1');
+			if ($statut == 2)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut3');
+			if ($statut == 3)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]), 'statut6');
 		}
 	}
 
@@ -672,7 +672,7 @@ 
 	 *  @param	strin	$desc			Desc error
 	 *  @return string        			Label
 	 */
-	public static function libStatutDest($statut,$mode=0,$desc='')
+	public static function libStatutDest($statut, $mode = 0, $desc = '')
 	{
 		global $langs;
 		$langs->load('mails');
@@ -687,38 +687,38 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+			if ($statut == -1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+			if ($statut == 1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
+			if ($statut == 2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
+			if ($statut == 3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+			if ($statut == -1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+			if ($statut == 1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
+			if ($statut == 2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
+			if ($statut == 3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+			if ($statut == -1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+			if ($statut == 1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
+			if ($statut == 2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
+			if ($statut == 3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
 		}
 		elseif ($mode == 5)
 		{
-		    if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-		    if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-		    if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-		    if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+		    if ($statut == -1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+		    if ($statut == 1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
+		    if ($statut == 2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
+		    if ($statut == 3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
 		}
 		elseif ($mode == 6)
 		{
-		    if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-		    if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-		    if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-		    if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+		    if ($statut == -1) return $langs->trans("MailingStatusError").' '.img_error($desc);
+		    if ($statut == 1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"), 'statut6');
+		    if ($statut == 2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"), 'statut4');
+		    if ($statut == 3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"), 'statut3');
 		}
 	}
 }

Braces +166 added lines, -96 removed lines

@@ -139,8 +139,7 @@ 
 			if ($this->update($user) > 0)
 			{
 				$this->db->commit();
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->db->rollback();
@@ -148,8 +147,7 @@ 
 			}
 
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -181,8 +179,7 @@ 
 		if ($result)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -227,7 +224,7 @@ 
 				$this->sujet			= $obj->sujet;
 				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401))) {
 					$this->body				= dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401);
-				}else {
+				} else {
 					$this->body				= $obj->body;
 				}
 
@@ -248,14 +245,12 @@ 
 				$this->extraparams		= (array) json_decode($obj->extraparams, true);
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this)."::fetch Erreur -1");
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::fetch Erreur -2");
 			return -2;
@@ -363,8 +358,7 @@ 
 							'source_type'=>$obj->source_type);
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					return -1;
@@ -381,8 +375,7 @@ 
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -407,8 +400,7 @@ 
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -432,8 +424,7 @@ 
 		if ($resql)
 		{
 			return $this->delete_targets();
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -457,8 +448,7 @@ 
 		if ($resql)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return 0;
@@ -485,8 +475,7 @@ 
 		if ($resql)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			return -1;
@@ -504,10 +493,13 @@ 
 	{
 	    $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
 	    $sql.= " WHERE fk_mailing = ".$this->id;
-	    if ($mode == 'alreadysent') $sql.= " AND statut <> 0";
-	    elseif ($mode == 'alreadysentok') $sql.= " AND statut > 0";
-	    elseif ($mode == 'alreadysentko') $sql.= " AND statut = -1";
-	    else
+	    if ($mode == 'alreadysent') {
+	        $sql.= " AND statut <> 0";
+	    } elseif ($mode == 'alreadysentok') {
+	        $sql.= " AND statut > 0";
+	    } elseif ($mode == 'alreadysentko') {
+	        $sql.= " AND statut = -1";
+	    } else
 	    {
 	        $this->error='BadValueForParameterMode';
 	        return -2;
@@ -517,9 +509,10 @@ 
 	    if ($resql)
 	    {
 	        $obj = $this->db->fetch_object($resql);
-	        if ($obj) return $obj->nb;
-	    }
-	    else
+	        if ($obj) {
+	            return $obj->nb;
+	        }
+	    } else
 	    {
 	        $this->error=$this->db->lasterror();
 	        return -1;
@@ -544,7 +537,10 @@ 
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (! empty($conf->dol_no_mouse_hover)) {
+		    $notooltip=1;
+		}
+		// Force disable tooltips
 
 		$result = '';
 		$companylink = '';
@@ -559,8 +555,12 @@ 
 		{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+			    $add_save_lastsearch_values=1;
+			}
+			if ($add_save_lastsearch_values) {
+			    $url.='&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose='';
@@ -580,16 +580,21 @@ 
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
+		} else {
+		    $linkclose = ($morecss?' class="'.$morecss.'"':'');
 		}
-		else $linkclose = ($morecss?' class="'.$morecss.'"':'');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) {
+		    $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		}
+		if ($withpicto != 2) {
+		    $result.= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -597,8 +602,11 @@ 
 		$hookmanager->initHooks(array('emailingdao'));
 		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook=$hookmanager->executeHooks('getNomUrl',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+		    $result = $hookmanager->resPrint;
+		} else {
+		    $result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -631,34 +639,62 @@ 
 		if ($mode == 0 || $mode == 1)
 		{
 			return $langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 3)
+			if ($statut == 0) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut == 1) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut == 2) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut == 3) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+			}
+		} elseif ($mode == 3)
 		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1');
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3');
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6');
-		}
-		elseif ($mode == 4)
+			if ($statut == 0) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			}
+			if ($statut == 1) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut1');
+			}
+			if ($statut == 2) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			}
+			if ($statut == 3) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 2) return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut == 3) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
-		}
-		elseif ($mode == 5)
+			if ($statut == 0) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut == 1) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut == 2) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut3').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut == 3) {
+			    return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
+			}
+		} elseif ($mode == 5)
 		{
-			if ($statut == 0)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut == 1)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
-			if ($statut == 2)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
-			if ($statut == 3)  return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			if ($statut == 0) {
+			    return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			}
+			if ($statut == 1) {
+			    return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1');
+			}
+			if ($statut == 2) {
+			    return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut3');
+			}
+			if ($statut == 3) {
+			    return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6');
+			}
 		}
 	}
 
@@ -680,45 +716,79 @@ 
 		if ($mode == 0)
 		{
 			return $langs->trans('MailingStatusError');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans('MailingStatusSent');
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 2)
 		{
-			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
-		}
-		elseif ($mode == 5)
+			if ($statut==-1) {
+			    return $langs->trans("MailingStatusError").' '.img_error($desc);
+			}
+			if ($statut==1) {
+			    return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+			}
+			if ($statut==2) {
+			    return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+			}
+			if ($statut==3) {
+			    return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+			}
+		} elseif ($mode == 3)
 		{
-		    if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-		    if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-		    if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-		    if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
-		}
-		elseif ($mode == 6)
+			if ($statut==-1) {
+			    return $langs->trans("MailingStatusError").' '.img_error($desc);
+			}
+			if ($statut==1) {
+			    return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+			}
+			if ($statut==2) {
+			    return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+			}
+			if ($statut==3) {
+			    return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+			}
+		} elseif ($mode == 4)
 		{
-		    if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error($desc);
-		    if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-		    if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
-		    if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+			if ($statut==-1) {
+			    return $langs->trans("MailingStatusError").' '.img_error($desc);
+			}
+			if ($statut==1) {
+			    return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+			}
+			if ($statut==2) {
+			    return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+			}
+			if ($statut==3) {
+			    return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+			}
+		} elseif ($mode == 5)
+		{
+		    if ($statut==-1) {
+		        return $langs->trans("MailingStatusError").' '.img_error($desc);
+		    }
+		    if ($statut==1) {
+		        return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+		    }
+		    if ($statut==2) {
+		        return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+		    }
+		    if ($statut==3) {
+		        return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+		    }
+		} elseif ($mode == 6)
+		{
+		    if ($statut==-1) {
+		        return $langs->trans("MailingStatusError").' '.img_error($desc);
+		    }
+		    if ($statut==1) {
+		        return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+		    }
+		    if ($statut==2) {
+		        return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut4');
+		    }
+		    if ($statut==3) {
+		        return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
+		    }
 		}
 	}
 }

dolibarr/htdocs/comm/mailing/card.php

Indentation +1149 added lines, -1149 removed lines

@@ -88,621 +88,621 @@ 
 
 if (empty($reshook))
 {
-	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes')
-	{
-		if (empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
-		{
-			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
-			$result=$object->createFromClone($object->id,$_REQUEST["clone_content"],$_REQUEST["clone_receivers"]);
-			if ($result > 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
-				exit;
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-		}
-	    $action='';
-	}
-
-	// Action send emailing for everybody
-	if ($action == 'sendallconfirmed' && $confirm == 'yes')
-	{
-		if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
-		{
-			// As security measure, we don't allow send from the GUI
-			setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
-			setEventMessages('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
-			setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
-			$action='';
-		}
-		else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
-		{
-			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
-			$action='';
-		}
-		else
-		{
-			$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
-
-			if ($object->statut == 0)
-			{
-				dol_print_error('','ErrorMailIsNotValidated');
-				exit;
-			}
-
-			$id       = $object->id;
-			$subject  = $object->sujet;
-			$message  = $object->body;
-			$from     = $object->email_from;
-			$replyto  = $object->email_replyto;
-			$errorsto = $object->email_errorsto;
-			// Le message est-il en html
-			$msgishtml=-1;	// Unknown by default
-			if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
-
-			// Warning, we must not use begin-commit transaction here
-			// because we want to save update for each mail sent.
-
-			$nbok=0; $nbko=0;
-
-			// On choisit les mails non deja envoyes pour ce mailing (statut=0)
-			// ou envoyes en erreur (statut=-1)
-			$sql = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
-			$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-			$sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id;
-			$sql .= " ORDER BY mc.statut DESC";		// first status 0, then status -1
-
-			dol_syslog("card.php: select targets", LOG_DEBUG);
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$num = $db->num_rows($resql);	// nb of possible recipients
-
-				if ($num)
-				{
-					dol_syslog("comm/mailing/card.php: nb of targets = ".$num, LOG_DEBUG);
-
-					$now=dol_now();
-
-					// Positionne date debut envoi
-					$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
-					$resql2=$db->query($sql);
-					if (! $resql2)
-					{
-						dol_print_error($db);
-					}
-
-					// Loop on each email and send it
-					$i = 0;
-
-					while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB)
-					{
-						// Here code is common with same loop ino mailing-send.php
-						$res=1;
-						$now=dol_now();
-
-						$obj = $db->fetch_object($resql);
-
-						// sendto en RFC2822
-						$sendto = str_replace(',',' ',dolGetFirstLastname($obj->firstname, $obj->lastname))." <".$obj->email.">";
-
-						// Make substitutions on topic and body. From (AA=YY;BB=CC;...) we keep YY, CC, ...
-						$other=explode(';',$obj->other);
-						$tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-
-	                    $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
-
-	                    $targetobject = null;		// Not defined with mass emailing
-	                    $parameters=array('mode'=>'emailing');
-	                    $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount'), $targetobject);			// Note: On mass emailing, this is null because be don't know object
-
-	                    // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
-						$substitutionarray['__ID__'] = $obj->source_id;
-						$substitutionarray['__EMAIL__'] = $obj->email;
-						$substitutionarray['__LASTNAME__'] = $obj->lastname;
-						$substitutionarray['__FIRSTNAME__'] = $obj->firstname;
-						$substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>';
-						$substitutionarray['__OTHER1__'] = $other1;
-						$substitutionarray['__OTHER2__'] = $other2;
-						$substitutionarray['__OTHER3__'] = $other3;
-						$substitutionarray['__OTHER4__'] = $other4;
-						$substitutionarray['__OTHER5__'] = $other5;
-						$substitutionarray['__USER_SIGNATURE__'] = $signature;	// Signature is empty when ran from command line or taken from user in parameter)
-						$substitutionarray['__SIGNATURE__'] = $signature;	// For backward compatibility
-						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
-
-						$onlinepaymentenabled = 0;
-						if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
-						if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-						{
-							$substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-							{
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							}
-							else
-							{
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
-							}
-						}
-						/* For backward compatibility, deprecated */
-						if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-						{
-							$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+    // Action clone object
+    if ($action == 'confirm_clone' && $confirm == 'yes')
+    {
+        if (empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
+        {
+            setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+        }
+        else
+        {
+            $result=$object->createFromClone($object->id,$_REQUEST["clone_content"],$_REQUEST["clone_receivers"]);
+            if ($result > 0)
+            {
+                header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+                exit;
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+        }
+        $action='';
+    }
+
+    // Action send emailing for everybody
+    if ($action == 'sendallconfirmed' && $confirm == 'yes')
+    {
+        if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
+        {
+            // As security measure, we don't allow send from the GUI
+            setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
+            setEventMessages('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
+            setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
+            $action='';
+        }
+        else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+        {
+            setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
+            $action='';
+        }
+        else
+        {
+            $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+
+            if ($object->statut == 0)
+            {
+                dol_print_error('','ErrorMailIsNotValidated');
+                exit;
+            }
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+            $id       = $object->id;
+            $subject  = $object->sujet;
+            $message  = $object->body;
+            $from     = $object->email_from;
+            $replyto  = $object->email_replyto;
+            $errorsto = $object->email_errorsto;
+            // Le message est-il en html
+            $msgishtml=-1;	// Unknown by default
+            if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
+
+            // Warning, we must not use begin-commit transaction here
+            // because we want to save update for each mail sent.
+
+            $nbok=0; $nbko=0;
+
+            // On choisit les mails non deja envoyes pour ce mailing (statut=0)
+            // ou envoyes en erreur (statut=-1)
+            $sql = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
+            $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+            $sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id;
+            $sql .= " ORDER BY mc.statut DESC";		// first status 0, then status -1
+
+            dol_syslog("card.php: select targets", LOG_DEBUG);
+            $resql=$db->query($sql);
+            if ($resql)
+            {
+                $num = $db->num_rows($resql);	// nb of possible recipients
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+                if ($num)
+                {
+                    dol_syslog("comm/mailing/card.php: nb of targets = ".$num, LOG_DEBUG);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
-						}
-						//$substitutionisok=true;
+                    $now=dol_now();
 
-	                    complete_substitutions_array($substitutionarray, $langs);
-						$newsubject=make_substitutions($subject,$substitutionarray);
-						$newmessage=make_substitutions($message,$substitutionarray);
+                    // Positionne date debut envoi
+                    $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
+                    $resql2=$db->query($sql);
+                    if (! $resql2)
+                    {
+                        dol_print_error($db);
+                    }
 
-						$arr_file = array();
-						$arr_mime = array();
-						$arr_name = array();
-						$arr_css  = array();
+                    // Loop on each email and send it
+                    $i = 0;
 
-						$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
-						if (count($listofpaths))
-						{
-							foreach($listofpaths as $key => $val)
-							{
-								$arr_file[]=$listofpaths[$key]['fullname'];
-								$arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
-								$arr_name[]=$listofpaths[$key]['name'];
-							}
-						}
-
-						// Fabrication du mail
-						$trackid='emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
-						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
-
-						if ($mail->error)
-						{
-							$res=0;
-						}
-						/*if (! $substitutionisok)
+                    while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB)
+                    {
+                        // Here code is common with same loop ino mailing-send.php
+                        $res=1;
+                        $now=dol_now();
+
+                        $obj = $db->fetch_object($resql);
+
+                        // sendto en RFC2822
+                        $sendto = str_replace(',',' ',dolGetFirstLastname($obj->firstname, $obj->lastname))." <".$obj->email.">";
+
+                        // Make substitutions on topic and body. From (AA=YY;BB=CC;...) we keep YY, CC, ...
+                        $other=explode(';',$obj->other);
+                        $tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                        $tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                        $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                        $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                        $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+
+                        $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
+
+                        $targetobject = null;		// Not defined with mass emailing
+                        $parameters=array('mode'=>'emailing');
+                        $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount'), $targetobject);			// Note: On mass emailing, this is null because be don't know object
+
+                        // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
+                        $substitutionarray['__ID__'] = $obj->source_id;
+                        $substitutionarray['__EMAIL__'] = $obj->email;
+                        $substitutionarray['__LASTNAME__'] = $obj->lastname;
+                        $substitutionarray['__FIRSTNAME__'] = $obj->firstname;
+                        $substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>';
+                        $substitutionarray['__OTHER1__'] = $other1;
+                        $substitutionarray['__OTHER2__'] = $other2;
+                        $substitutionarray['__OTHER3__'] = $other3;
+                        $substitutionarray['__OTHER4__'] = $other4;
+                        $substitutionarray['__OTHER5__'] = $other5;
+                        $substitutionarray['__USER_SIGNATURE__'] = $signature;	// Signature is empty when ran from command line or taken from user in parameter)
+                        $substitutionarray['__SIGNATURE__'] = $signature;	// For backward compatibility
+                        $substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+                        $substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+
+                        $onlinepaymentenabled = 0;
+                        if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
+                        if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
+                        if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+                        if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+                        {
+                            $substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+                            {
+                                $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+                            }
+                            else
+                            {
+                                $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+                                $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+                            }
+                        }
+                        /* For backward compatibility, deprecated */
+                        if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+                        {
+                            $substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+
+                            if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+                            else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+
+                            if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+                            else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+
+                            if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+                            else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+
+                            if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+                            else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+                        }
+                        //$substitutionisok=true;
+
+                        complete_substitutions_array($substitutionarray, $langs);
+                        $newsubject=make_substitutions($subject,$substitutionarray);
+                        $newmessage=make_substitutions($message,$substitutionarray);
+
+                        $arr_file = array();
+                        $arr_mime = array();
+                        $arr_name = array();
+                        $arr_css  = array();
+
+                        $listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+                        if (count($listofpaths))
+                        {
+                            foreach($listofpaths as $key => $val)
+                            {
+                                $arr_file[]=$listofpaths[$key]['fullname'];
+                                $arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
+                                $arr_name[]=$listofpaths[$key]['name'];
+                            }
+                        }
+
+                        // Fabrication du mail
+                        $trackid='emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
+                        $mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
+
+                        if ($mail->error)
+                        {
+                            $res=0;
+                        }
+                        /*if (! $substitutionisok)
 						{
 							$mail->error='Some substitution failed';
 							$res=0;
 						}*/
 
-						// Send mail
-						if ($res)
-						{
-							$res=$mail->sendfile();
-						}
+                        // Send mail
+                        if ($res)
+                        {
+                            $res=$mail->sendfile();
+                        }
+
+                        if ($res)
+                        {
+                            // Mail successful
+                            $nbok++;
+
+                            dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+
+                            $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+                            $sql.=" SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+                            $resql2=$db->query($sql);
+                            if (! $resql2)
+                            {
+                                dol_print_error($db);
+                            }
+                            else
+                            {
+                                //if cheack read is use then update prospect contact status
+                                if (strpos($message, '__CHECK_READ__') !== false)
+                                {
+                                    //Update status communication of thirdparty prospect
+                                    $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
+                                    dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
+                                    $resql2=$db->query($sql);
+                                    if (! $resql2)
+                                    {
+                                        dol_print_error($db);
+                                    }
+
+                                    //Update status communication of contact prospect
+                                    $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
+                                    dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
+
+                                    $resql2=$db->query($sql);
+                                    if (! $resql2)
+                                    {
+                                        dol_print_error($db);
+                                    }
+                                }
+                            }
+
+                            if (!empty($conf->global->MAILING_DELAY))
+                            {
+                                sleep($conf->global->MAILING_DELAY);
+                            }
+
+                            //test if CHECK READ change statut prospect contact
+                        }
+                        else
+                        {
+                            // Mail failed
+                            $nbko++;
+
+                            dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING);
+
+                            $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+                            $sql.=" SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+                            $resql2=$db->query($sql);
+                            if (! $resql2)
+                            {
+                                dol_print_error($db);
+                            }
+                        }
+
+                        $i++;
+                    }
+                }
+                else
+                {
+                    setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs');
+                }
+
+                // Loop finished, set global statut of mail
+                if ($nbko > 0)
+                {
+                    $statut=2;	// Status 'sent partially' (because at least one error)
+                    if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+                    else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+                }
+                else
+                {
+                    if ($nbok >= $num)
+                    {
+                        $statut=3;	// Send to everybody
+                        setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+                    }
+                    else
+                    {
+                        $statut=2;	// Status 'sent partially' (because not send to everybody)
+                        setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+                    }
+                }
+
+                $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
+                dol_syslog("comm/mailing/card.php: update global status", LOG_DEBUG);
+                $resql2=$db->query($sql);
+                if (! $resql2)
+                {
+                    dol_print_error($db);
+                }
+            }
+            else
+            {
+                dol_syslog($db->error());
+                dol_print_error($db);
+            }
 
-						if ($res)
-						{
-							// Mail successful
-							$nbok++;
-
-							dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
-
-							$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sql.=" SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
-							$resql2=$db->query($sql);
-							if (! $resql2)
-							{
-								dol_print_error($db);
-							}
-							else
-							{
-								//if cheack read is use then update prospect contact status
-								if (strpos($message, '__CHECK_READ__') !== false)
-								{
-									//Update status communication of thirdparty prospect
-									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
-									dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
-									$resql2=$db->query($sql);
-									if (! $resql2)
-									{
-										dol_print_error($db);
-									}
-
-								    //Update status communication of contact prospect
-									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
-									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
-
-									$resql2=$db->query($sql);
-									if (! $resql2)
-									{
-										dol_print_error($db);
-									}
-								}
-							}
-
-						    if (!empty($conf->global->MAILING_DELAY))
-						    {
-                            	sleep($conf->global->MAILING_DELAY);
-                        	}
-
-                        	//test if CHECK READ change statut prospect contact
-						}
-						else
-						{
-							// Mail failed
-							$nbko++;
-
-							dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING);
-
-							$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sql.=" SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
-							$resql2=$db->query($sql);
-							if (! $resql2)
-							{
-								dol_print_error($db);
-							}
-						}
-
-						$i++;
-					}
-				}
-				else
-				{
-					setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs');
-				}
-
-				// Loop finished, set global statut of mail
-				if ($nbko > 0)
-				{
-					$statut=2;	// Status 'sent partially' (because at least one error)
-					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
-					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
-				}
-				else
-				{
-					if ($nbok >= $num)
-					{
-						$statut=3;	// Send to everybody
-						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
-					}
-					else
-					{
-						$statut=2;	// Status 'sent partially' (because not send to everybody)
-						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
-					}
-				}
-
-				$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
-				dol_syslog("comm/mailing/card.php: update global status", LOG_DEBUG);
-				$resql2=$db->query($sql);
-				if (! $resql2)
-				{
-					dol_print_error($db);
-				}
-			}
-			else
-			{
-				dol_syslog($db->error());
-				dol_print_error($db);
-			}
-
-			$action = '';
-		}
-	}
-
-	// Action send test emailing
-	if ($action == 'send' && empty($_POST["cancel"]))
-	{
-		$error=0;
-
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
-
-		$object->sendto = $_POST["sendto"];
-		if (! $object->sendto)
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("MailTo")), null, 'errors');
-			$error++;
-		}
-
-		if (! $error)
-		{
-			// Le message est-il en html
-			$msgishtml=-1;	// Inconnu par defaut
-			if (preg_match('/[\s\t]*<html>/i',$object->body)) $msgishtml=1;
-
-			// other are set at begin of page
-			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
-			$object->substitutionarrayfortest['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
-
-			// Pratique les substitutions sur le sujet et message
-	        complete_substitutions_array($object->substitutionarrayfortest, $langs);
-			$tmpsujet=make_substitutions($object->sujet,$object->substitutionarrayfortest);
-			$tmpbody=make_substitutions($object->body,$object->substitutionarrayfortest);
-
-			$arr_file = array();
-			$arr_mime = array();
-			$arr_name = array();
-			$arr_css  = array();
-
-	        // Ajout CSS
-	        if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor;
-	        if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
-
-	        // Attached files
-			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
-			if (count($listofpaths))
-			{
-				foreach($listofpaths as $key => $val)
-				{
-					$arr_file[]=$listofpaths[$key]['fullname'];
-					$arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
-					$arr_name[]=$listofpaths[$key]['name'];
-				}
-			}
-
-			$trackid='emailingtest';
-			$mailfile = new CMailFile($tmpsujet, $object->sendto, $object->email_from, $tmpbody, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $object->email_errorsto, $arr_css, $trackid, '', 'emailing');
-
-			$result=$mailfile->sendfile();
-			if ($result)
-			{
-				setEventMessages($langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)), null, 'mesgs');
-			}
-			else
-			{
-				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
-			}
-
-			$action='';
-		}
-	}
-
-	// Action add emailing
-	if ($action == 'add')
-	{
-		$mesgs = array();
-
-		$object->email_from     = trim($_POST["from"]);
-		$object->email_replyto  = trim($_POST["replyto"]);
-		$object->email_errorsto = trim($_POST["errorsto"]);
-		$object->titre          = trim($_POST["titre"]);
-		$object->sujet          = trim($_POST["sujet"]);
-		$object->body           = trim($_POST["bodyemail"]);
-		$object->bgcolor        = trim($_POST["bgcolor"]);
-		$object->bgimage        = trim($_POST["bgimage"]);
-
-		if (! $object->titre) {
-			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
-		}
-		if (! $object->sujet) {
-			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
-		}
-		if (! $object->body)  {
-			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
-		}
-
-		if (!count($mesgs))
-		{
-			if ($object->create($user) >= 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-				exit;
-			}
-			$mesgs[] = $object->error;
-		}
-
-		setEventMessages($mesg, $mesgs, 'errors');
-		$action="create";
-	}
-
-	// Action update description of emailing
-	if ($action == 'settitre' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
-	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
-
-		if ($action == 'settitre')					$object->titre          = trim(GETPOST('titre','alpha'));
-		else if ($action == 'setemail_from')		$object->email_from     = trim(GETPOST('email_from','alpha'));
-		else if ($action == 'setemail_replyto')		$object->email_replyto  = trim(GETPOST('email_replyto','alpha'));
-		else if ($action == 'setemail_errorsto')	$object->email_errorsto = trim(GETPOST('email_errorsto','alpha'));
-		else if ($action == 'settitre' && empty($object->titre)) {
-			$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
-		}
-		else if ($action == 'setfrom' && empty($object->email_from)) {
-			$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));
-		}
-
-		if (! $mesg)
-		{
-			if ($object->update($user) >= 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-				exit;
-			}
-			$mesg = $object->error;
-		}
-
-		setEventMessages($mesg, $mesgs, 'errors');
-		$action="";
-	}
-
-	/*
+            $action = '';
+        }
+    }
+
+    // Action send test emailing
+    if ($action == 'send' && empty($_POST["cancel"]))
+    {
+        $error=0;
+
+        $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+
+        $object->sendto = $_POST["sendto"];
+        if (! $object->sendto)
+        {
+            setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("MailTo")), null, 'errors');
+            $error++;
+        }
+
+        if (! $error)
+        {
+            // Le message est-il en html
+            $msgishtml=-1;	// Inconnu par defaut
+            if (preg_match('/[\s\t]*<html>/i',$object->body)) $msgishtml=1;
+
+            // other are set at begin of page
+            $object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
+            $object->substitutionarrayfortest['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
+
+            // Pratique les substitutions sur le sujet et message
+            complete_substitutions_array($object->substitutionarrayfortest, $langs);
+            $tmpsujet=make_substitutions($object->sujet,$object->substitutionarrayfortest);
+            $tmpbody=make_substitutions($object->body,$object->substitutionarrayfortest);
+
+            $arr_file = array();
+            $arr_mime = array();
+            $arr_name = array();
+            $arr_css  = array();
+
+            // Ajout CSS
+            if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor;
+            if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
+
+            // Attached files
+            $listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+            if (count($listofpaths))
+            {
+                foreach($listofpaths as $key => $val)
+                {
+                    $arr_file[]=$listofpaths[$key]['fullname'];
+                    $arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
+                    $arr_name[]=$listofpaths[$key]['name'];
+                }
+            }
+
+            $trackid='emailingtest';
+            $mailfile = new CMailFile($tmpsujet, $object->sendto, $object->email_from, $tmpbody, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $object->email_errorsto, $arr_css, $trackid, '', 'emailing');
+
+            $result=$mailfile->sendfile();
+            if ($result)
+            {
+                setEventMessages($langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)), null, 'mesgs');
+            }
+            else
+            {
+                setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
+            }
+
+            $action='';
+        }
+    }
+
+    // Action add emailing
+    if ($action == 'add')
+    {
+        $mesgs = array();
+
+        $object->email_from     = trim($_POST["from"]);
+        $object->email_replyto  = trim($_POST["replyto"]);
+        $object->email_errorsto = trim($_POST["errorsto"]);
+        $object->titre          = trim($_POST["titre"]);
+        $object->sujet          = trim($_POST["sujet"]);
+        $object->body           = trim($_POST["bodyemail"]);
+        $object->bgcolor        = trim($_POST["bgcolor"]);
+        $object->bgimage        = trim($_POST["bgimage"]);
+
+        if (! $object->titre) {
+            $mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
+        }
+        if (! $object->sujet) {
+            $mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
+        }
+        if (! $object->body)  {
+            $mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+        }
+
+        if (!count($mesgs))
+        {
+            if ($object->create($user) >= 0)
+            {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+            $mesgs[] = $object->error;
+        }
+
+        setEventMessages($mesg, $mesgs, 'errors');
+        $action="create";
+    }
+
+    // Action update description of emailing
+    if ($action == 'settitre' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
+    {
+        $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+
+        if ($action == 'settitre')					$object->titre          = trim(GETPOST('titre','alpha'));
+        else if ($action == 'setemail_from')		$object->email_from     = trim(GETPOST('email_from','alpha'));
+        else if ($action == 'setemail_replyto')		$object->email_replyto  = trim(GETPOST('email_replyto','alpha'));
+        else if ($action == 'setemail_errorsto')	$object->email_errorsto = trim(GETPOST('email_errorsto','alpha'));
+        else if ($action == 'settitre' && empty($object->titre)) {
+            $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
+        }
+        else if ($action == 'setfrom' && empty($object->email_from)) {
+            $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));
+        }
+
+        if (! $mesg)
+        {
+            if ($object->update($user) >= 0)
+            {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+            $mesg = $object->error;
+        }
+
+        setEventMessages($mesg, $mesgs, 'errors');
+        $action="";
+    }
+
+    /*
 	 * Add file in email form
 	 */
-	if (! empty($_POST['addfile']))
-	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	    // Set tmp user directory
-	    dol_add_file_process($upload_dir,0,0);
-
-		$action="edit";
-	}
-
-	// Action remove file
-	if (! empty($_POST["removedfile"]))
-	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	    dol_remove_file_process($_POST['removedfile'],0,0);    // We really delete file linked to mailing
-
-		$action="edit";
-	}
-
-	// Action update emailing
-	if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$isupload=0;
-
-		if (! $isupload)
-		{
-			$mesgs = array();
-
-			$object->sujet          = trim($_POST["sujet"]);
-			$object->body           = trim($_POST["bodyemail"]);
-			$object->bgcolor        = trim($_POST["bgcolor"]);
-			$object->bgimage        = trim($_POST["bgimage"]);
-
-			if (! $object->sujet) {
-				$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
-			}
-			if (! $object->body) {
-				$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
-			}
-
-			if (!count($mesgs))
-			{
-				if ($object->update($user) >= 0)
-				{
-					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-					exit;
-				}
-				$mesgs[] =$object->error;
-			}
-
-			setEventMessages($mesg, $mesgs, 'errors');
-			$action="edit";
-		}
-		else
-		{
-			$action="edit";
-		}
-	}
-
-	// Action confirmation validation
-	if ($action == 'confirm_valid' && $confirm == 'yes')
-	{
-		if ($object->id > 0)
-		{
-			$object->valid($user);
-			setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	// Action confirmation validation
-	if ($action == 'confirm_settodraft' && $confirm == 'yes')
-	{
-		if ($object->id > 0)
-		{
-			$result = $object->setStatut(0);
+    if (! empty($_POST['addfile']))
+    {
+        $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        // Set tmp user directory
+        dol_add_file_process($upload_dir,0,0);
+
+        $action="edit";
+    }
+
+    // Action remove file
+    if (! empty($_POST["removedfile"]))
+    {
+        $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        dol_remove_file_process($_POST['removedfile'],0,0);    // We really delete file linked to mailing
+
+        $action="edit";
+    }
+
+    // Action update emailing
+    if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        $isupload=0;
+
+        if (! $isupload)
+        {
+            $mesgs = array();
+
+            $object->sujet          = trim($_POST["sujet"]);
+            $object->body           = trim($_POST["bodyemail"]);
+            $object->bgcolor        = trim($_POST["bgcolor"]);
+            $object->bgimage        = trim($_POST["bgimage"]);
+
+            if (! $object->sujet) {
+                $mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
+            }
+            if (! $object->body) {
+                $mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+            }
+
+            if (!count($mesgs))
+            {
+                if ($object->update($user) >= 0)
+                {
+                    header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                    exit;
+                }
+                $mesgs[] =$object->error;
+            }
+
+            setEventMessages($mesg, $mesgs, 'errors');
+            $action="edit";
+        }
+        else
+        {
+            $action="edit";
+        }
+    }
+
+    // Action confirmation validation
+    if ($action == 'confirm_valid' && $confirm == 'yes')
+    {
+        if ($object->id > 0)
+        {
+            $object->valid($user);
+            setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
+            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+            exit;
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
+
+    // Action confirmation validation
+    if ($action == 'confirm_settodraft' && $confirm == 'yes')
+    {
+        if ($object->id > 0)
+        {
+            $result = $object->setStatut(0);
+            if ($result > 0)
+            {
+                //setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
+
+    // Resend
+    if ($action == 'confirm_reset' && $confirm == 'yes')
+    {
+        if ($object->id > 0)
+        {
+            $db->begin();
+
+            $result=$object->valid($user);
             if ($result > 0)
             {
-    			//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
-    			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-    			exit;
+                $result=$object->reset_targets_status($user);
+            }
+
+            if ($result > 0)
+            {
+                $db->commit();
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
             }
             else
             {
                 setEventMessages($object->error, $object->errors, 'errors');
+                $db->rollback();
             }
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	// Resend
-	if ($action == 'confirm_reset' && $confirm == 'yes')
-	{
-		if ($object->id > 0)
-		{
-			$db->begin();
-
-			$result=$object->valid($user);
-			if ($result > 0)
-			{
-				$result=$object->reset_targets_status($user);
-			}
-
-			if ($result > 0)
-			{
-				$db->commit();
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-				exit;
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$db->rollback();
-			}
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	// Action confirmation suppression
-	if ($action == 'confirm_delete' && $confirm == 'yes')
-	{
-		if ($object->delete($object->id))
-		{
-			$url= (! empty($urlfrom) ? $urlfrom : 'list.php');
-			header("Location: ".$url);
-			exit;
-		}
-	}
-
-	if (! empty($_POST["cancel"]))
-	{
-		$action = '';
-	}
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
+
+    // Action confirmation suppression
+    if ($action == 'confirm_delete' && $confirm == 'yes')
+    {
+        if ($object->delete($object->id))
+        {
+            $url= (! empty($urlfrom) ? $urlfrom : 'list.php');
+            header("Location: ".$url);
+            exit;
+        }
+    }
+
+    if (! empty($_POST["cancel"]))
+    {
+        $action = '';
+    }
 }
 
 
@@ -715,646 +715,646 @@ 
 
 $help_url='EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
 llxHeader('', $langs->trans("Mailing"), $help_url, '', 0, 0,
-	array(
-	'/includes/ace/ace.js',
-	'/includes/ace/ext-statusbar.js',
-	'/includes/ace/ext-language_tools.js',
-	//'/includes/ace/ext-chromevox.js'
-	), array());
+    array(
+    '/includes/ace/ace.js',
+    '/includes/ace/ext-statusbar.js',
+    '/includes/ace/ext-language_tools.js',
+    //'/includes/ace/ext-chromevox.js'
+    ), array());
 
 if ($action == 'create')
 {
-	// EMailing in creation mode
-	print '<form name="new_mailing" action="'.$_SERVER['PHP_SELF'].'" method="POST">'."\n";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
+    // EMailing in creation mode
+    print '<form name="new_mailing" action="'.$_SERVER['PHP_SELF'].'" method="POST">'."\n";
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
 
-	$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-	foreach($object->substitutionarray as $key => $val)
-	{
-		$htmltext.=$key.' = '.$langs->trans($val).'<br>';
-	}
-	$htmltext.='</i>';
+    $htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
+    foreach($object->substitutionarray as $key => $val)
+    {
+        $htmltext.=$key.' = '.$langs->trans($val).'<br>';
+    }
+    $htmltext.='</i>';
 
 
-	$availablelink=$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
-	//print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+    $availablelink=$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
+    //print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
 
 
-	// Print mail form
-	print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'title_generic');
+    // Print mail form
+    print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'title_generic');
 
-	dol_fiche_head();
+    dol_fiche_head();
 
-	print '<table class="border" width="100%">';
-	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTitle").'</td><td><input class="flat minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST('titre')).'" autofocus="autofocus"></td></tr>';
-	print '<tr><td class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
-	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO)?$conf->global->MAILING_EMAIL_ERRORSTO:$conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
+    print '<table class="border" width="100%">';
+    print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTitle").'</td><td><input class="flat minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST('titre')).'" autofocus="autofocus"></td></tr>';
+    print '<tr><td class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
+    print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO)?$conf->global->MAILING_EMAIL_ERRORSTO:$conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
 
-	// Other attributes
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    // Other attributes
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
-		print $object->showOptionals($extrafields,'edit');
-	}
+    if (empty($reshook))
+    {
+        print $object->showOptionals($extrafields,'edit');
+    }
 
-	print '</table>';
-	print '</br><br>';
+    print '</table>';
+    print '</br><br>';
 
-	print '<table class="border" width="100%">';
-	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTopic").'</td><td><input class="flat minwidth200 quatrevingtpercent" name="sujet" value="'.dol_escape_htmltag(GETPOST('sujet')).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
-	print $htmlother->selectColor($_POST['bgcolor'],'bgcolor','',0);
-	print '</td></tr>';
+    print '<table class="border" width="100%">';
+    print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTopic").'</td><td><input class="flat minwidth200 quatrevingtpercent" name="sujet" value="'.dol_escape_htmltag(GETPOST('sujet')).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
+    print $htmlother->selectColor($_POST['bgcolor'],'bgcolor','',0);
+    print '</td></tr>';
 
-	print '</table>';
+    print '</table>';
 
-	print '<div style="padding-top: 10px">';
-	// Editeur wysiwyg
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('bodyemail',GETPOST('bodyemail','none'),'',600,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,'90%');
-	$doleditor->Create();
-	print '</div>';
+    print '<div style="padding-top: 10px">';
+    // Editeur wysiwyg
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('bodyemail',GETPOST('bodyemail','none'),'',600,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,'90%');
+    $doleditor->Create();
+    print '</div>';
 
-	dol_fiche_end();
+    dol_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
+    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
 
-	print '</form>';
+    print '</form>';
 }
 else
 {
-	if ($object->id > 0)
-	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
-
-		$head = emailing_prepare_head($object);
-
-		// Confirmation back to draft
-		if ($action == 'settodraft')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("SetToDraft"),$langs->trans("ConfirmUnvalidateEmailing"),"confirm_settodraft",'','',1);
-		}
-		// Confirmation validation of mailing
-		if ($action == 'valid')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ValidMailing"),$langs->trans("ConfirmValidMailing"),"confirm_valid",'','',1);
-		}
-		// Confirm reset
-		else if ($action == 'reset')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ResetMailing"),$langs->trans("ConfirmResetMailing",$object->ref),"confirm_reset",'','',2);
-		}
-		// Confirm delete
-		else if ($action == 'delete')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(! empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''),$langs->trans("DeleteAMailing"),$langs->trans("ConfirmDeleteMailing"),"confirm_delete",'','',1);
-		}
-
-
-		if ($action != 'edit' && $action != 'edithtml')
-		{
-			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
-
-			/*
+    if ($object->id > 0)
+    {
+        $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+
+        $head = emailing_prepare_head($object);
+
+        // Confirmation back to draft
+        if ($action == 'settodraft')
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("SetToDraft"),$langs->trans("ConfirmUnvalidateEmailing"),"confirm_settodraft",'','',1);
+        }
+        // Confirmation validation of mailing
+        if ($action == 'valid')
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ValidMailing"),$langs->trans("ConfirmValidMailing"),"confirm_valid",'','',1);
+        }
+        // Confirm reset
+        else if ($action == 'reset')
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ResetMailing"),$langs->trans("ConfirmResetMailing",$object->ref),"confirm_reset",'','',2);
+        }
+        // Confirm delete
+        else if ($action == 'delete')
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(! empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''),$langs->trans("DeleteAMailing"),$langs->trans("ConfirmDeleteMailing"),"confirm_delete",'','',1);
+        }
+
+
+        if ($action != 'edit' && $action != 'edithtml')
+        {
+            dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
+
+            /*
 			 * Mailing en mode visu
 			 */
-			if ($action == 'sendall')
-			{
+            if ($action == 'sendall')
+            {
                 // Define message to recommand from command line
-				$sendingmode=$conf->global->EMAILING_MAIL_SENDMODE;
-				if (empty($sendingmode)) $sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
-				if (empty($sendingmode)) $sendingmode='mail';	// If not defined, we use php mail function
-
-				// MAILING_NO_USING_PHPMAIL may be defined or not.
-				// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
-				// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0 or undefined=no limit).
-				if (! empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
-				{
-					// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
-					// You ensure that every user is using its own SMTP server when using the mass emailing module.
-					$linktoadminemailbefore='<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
-					$linktoadminemailend='</a>';
-					setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
-					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
-					if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
-					$_GET["action"]='';
-				}
-				else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
-				{
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
-
-					// The feature is forbidden from GUI, we show just message to use from command line.
-				    setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
-					setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
-					if ($conf->file->mailing_limit_sendbyweb != '-1')  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
-					{
-					   setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');  // You can send online with constant...
-					}
-					$_GET["action"]='';
-				}
-				else
-				{
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
-
-				    $text='';
-				    if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
+                $sendingmode=$conf->global->EMAILING_MAIL_SENDMODE;
+                if (empty($sendingmode)) $sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
+                if (empty($sendingmode)) $sendingmode='mail';	// If not defined, we use php mail function
+
+                // MAILING_NO_USING_PHPMAIL may be defined or not.
+                // MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
+                // MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0 or undefined=no limit).
+                if (! empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
+                {
+                    // EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
+                    // You ensure that every user is using its own SMTP server when using the mass emailing module.
+                    $linktoadminemailbefore='<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
+                    $linktoadminemailend='</a>';
+                    setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
+                    setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
+                    if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+                    $_GET["action"]='';
+                }
+                else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+                {
+                    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+                    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+
+                    // The feature is forbidden from GUI, we show just message to use from command line.
+                    setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
+                    setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
+                    if ($conf->file->mailing_limit_sendbyweb != '-1')  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
+                    {
+                        setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');  // You can send online with constant...
+                    }
+                    $_GET["action"]='';
+                }
+                else
+                {
+                    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+                    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+
+                    $text='';
+                    if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
                     {
-                    	$text.=$langs->trans("MailingNeedCommand");
-                    	$text.='<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
-                    	$text.='<br><br>';
+                        $text.=$langs->trans("MailingNeedCommand");
+                        $text.='<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
+                        $text.='<br><br>';
                     }
-				    $text.=$langs->trans('ConfirmSendingEmailing').'<br>';
-					$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('SendMailing'),$text,'sendallconfirmed',$formquestion,'',1,300);
-				}
-			}
+                    $text.=$langs->trans('ConfirmSendingEmailing').'<br>';
+                    $text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+                    print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('SendMailing'),$text,'sendallconfirmed',$formquestion,'',1,300);
+                }
+            }
 
-			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+            $linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-			$morehtmlright='';
-			$nbtry = $nbok = 0;
-			if ($object->statut == 2 || $object->statut == 3)
-			{
-				$nbtry = $object->countNbOfTargets('alreadysent');
-				$nbko  = $object->countNbOfTargets('alreadysentko');
+            $morehtmlright='';
+            $nbtry = $nbok = 0;
+            if ($object->statut == 2 || $object->statut == 3)
+            {
+                $nbtry = $object->countNbOfTargets('alreadysent');
+                $nbko  = $object->countNbOfTargets('alreadysentko');
 
-				$morehtmlright.=' ('.$nbtry.'/'.$object->nbemail;
-				if ($nbko) $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
-				$morehtmlright.=') &nbsp; ';
-			}
+                $morehtmlright.=' ('.$nbtry.'/'.$object->nbemail;
+                if ($nbko) $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
+                $morehtmlright.=') &nbsp; ';
+            }
 
-			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
+            dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 
-			print '<div class="fichecenter">';
-			print '<div class="underbanner clearboth"></div>';
+            print '<div class="fichecenter">';
+            print '<div class="underbanner clearboth"></div>';
 
-			print '<table class="border" width="100%">';
+            print '<table class="border" width="100%">';
 
-			// Description
-			print '<tr><td class="titlefield">'.$form->editfieldkey("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
-			print $form->editfieldval("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
-			print '</td></tr>';
+            // Description
+            print '<tr><td class="titlefield">'.$form->editfieldkey("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
+            print $form->editfieldval("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
+            print '</td></tr>';
 
-			// From
-			print '<tr><td>'.$form->editfieldkey("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
-			print $form->editfieldval("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
-			print '</td></tr>';
+            // From
+            print '<tr><td>'.$form->editfieldkey("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
+            print $form->editfieldval("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
+            print '</td></tr>';
 
-			// Errors to
-			print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
-			print $form->editfieldval("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
-			print '</td></tr>';
+            // Errors to
+            print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
+            print $form->editfieldval("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
+            print '</td></tr>';
 
-			// Nb of distinct emails
-			print '<tr><td>';
-			print $langs->trans("TotalNbOfDistinctRecipients");
-			print '</td><td colspan="3">';
-			$nbemail = ($object->nbemail?$object->nbemail:0);
-			if (is_numeric($nbemail))
-			{
-			    $text='';
-			    if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
-			    {
-    				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
-    				{
-    					$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-    				}
-    				else
-    				{
-    					$text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
-    				}
-			    }
-			    if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
-				if ($text)
-    			{
-    			    print $form->textwithpicto($nbemail,$text,1,'warning');
-    			}
-    			else
-    			{
-    				print $nbemail;
-    			}
-			}
-			print '</td></tr>';
+            // Nb of distinct emails
+            print '<tr><td>';
+            print $langs->trans("TotalNbOfDistinctRecipients");
+            print '</td><td colspan="3">';
+            $nbemail = ($object->nbemail?$object->nbemail:0);
+            if (is_numeric($nbemail))
+            {
+                $text='';
+                if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
+                {
+                    if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
+                    {
+                        $text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+                    }
+                    else
+                    {
+                        $text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+                    }
+                }
+                if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+                if ($text)
+                {
+                    print $form->textwithpicto($nbemail,$text,1,'warning');
+                }
+                else
+                {
+                    print $nbemail;
+                }
+            }
+            print '</td></tr>';
 
-			// Other attributes
-			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+            // Other attributes
+            include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-			print '</table>';
+            print '</table>';
 
-			print "</div>";
+            print "</div>";
 
-			dol_fiche_end();
+            dol_fiche_end();
 
 
-			// Clone confirmation
-			if ($action == 'clone')
-			{
-				// Create an array for form
-				$formquestion=array(
-					'text' => $langs->trans("ConfirmClone"),
-				array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneContent"),   'value' => 1),
-				array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
-				);
-				// Paiement incomplet. On demande si motif = escompte ou autre
-				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$object->ref),'confirm_clone',$formquestion,'yes',2,240);
-			}
+            // Clone confirmation
+            if ($action == 'clone')
+            {
+                // Create an array for form
+                $formquestion=array(
+                    'text' => $langs->trans("ConfirmClone"),
+                array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneContent"),   'value' => 1),
+                array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
+                );
+                // Paiement incomplet. On demande si motif = escompte ou autre
+                print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$object->ref),'confirm_clone',$formquestion,'yes',2,240);
+            }
 
-			/*
+            /*
 			 * Boutons d'action
 			 */
 
-			if (GETPOST('cancel','alpha') || $confirm=='no' || $action == '' || in_array($action,array('settodraft','valid','delete','sendall','clone','test')))
-			{
-				print "\n\n<div class=\"tabsAction\">\n";
-
-				if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id))
-				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=settodraft&amp;id='.$object->id.'">'.$langs->trans("SetToDraft").'</a>';
-				}
-
-				if (($object->statut == 0 || $object->statut == 1) && $user->rights->mailing->creer)
-				{
-					if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_MAILING))
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
-					}
-					else
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
-					}
-
-					if (! empty($conf->use_javascript_ajax)) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&amp;id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
-				}
-
-				//print '<a class="butAction" href="card.php?action=test&amp;id='.$object->id.'">'.$langs->trans("PreviewMailing").'</a>';
-
-				if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
-				{
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
-				}
-				else
-				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
-				}
-
-				if ($object->statut == 0)
-				{
-					if ($object->nbemail <= 0)
-					{
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoTargetYet")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					else if (empty($user->rights->mailing->valider))
-					{
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					else
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
-					}
-				}
-
-				if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider)
-				{
-					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
-					{
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SendingFromWebInterfaceIsNotAllowed")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					else if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
-					{
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					else
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
-					}
-				}
-
-				if ($user->rights->mailing->creer)
-				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=clone&amp;object=emailing&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
-				}
-
-				if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider)
-				{
-					if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
-					{
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
-					}
-					else
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
-					}
-				}
-
-				if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer)
-				{
-					if ($object->statut > 0 && (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->delete))
-					{
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
-					}
-					else
-					{
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(! empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
-					}
-				}
-
-				print '</div>';
-			}
-
-			// Affichage formulaire de TEST
-			if ($action == 'test')
-			{
-			    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-			    print load_fiche_titre($langs->trans("TestMailing"));
-
-			    dol_fiche_head(null, '', '', -1);
-
-			    // Create l'objet formulaire mail
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-				$formmail = new FormMail($db);
-				$formmail->fromname = $object->email_from;
-				$formmail->frommail = $object->email_from;
-				$formmail->withsubstit=1;
-				$formmail->withfrom=0;
-				$formmail->withto=$user->email?$user->email:1;
-				$formmail->withtocc=0;
-				$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-				$formmail->withtopic=0;
-				$formmail->withtopicreadonly=1;
-				$formmail->withfile=0;
-				$formmail->withbody=0;
-				$formmail->withbodyreadonly=1;
-				$formmail->withcancel=1;
-				$formmail->withdeliveryreceipt=0;
-				// Tableau des substitutions
-				$formmail->substit=$object->substitutionarrayfortest;
-				// Tableau des parametres complementaires du post
-				$formmail->param["action"]="send";
-				$formmail->param["models"]='none';
-				$formmail->param["mailid"]=$object->id;
-				$formmail->param["returnurl"]=$_SERVER['PHP_SELF']."?id=".$object->id;
-
-				print $formmail->get_form();
-
-				print '<br>';
-
-				dol_fiche_end();
-
-				print dol_set_focus('#sendto');
-			}
-
-
-			$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-			foreach($object->substitutionarray as $key => $val)
-			{
-				$htmltext.=$key.' = '.$langs->trans($val).'<br>';
-			}
-			$htmltext.='</i>';
-
-			// Print mail content
-			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto('<span class="hideonsmartphone">'.$langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
-
-			dol_fiche_head('', '', '', -1);
-
-			print '<table class="bordernooddeven" width="100%">';
-
-			// Subject
-			print '<tr><td class="titlefield">'.$langs->trans("MailTopic").'</td><td colspan="3">'.$object->sujet.'</td></tr>';
-
-			// Joined files
-			print '<tr><td>'.$langs->trans("MailFile").'</td><td colspan="3">';
-			// List of files
-			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
-			if (count($listofpaths))
-			{
-				foreach($listofpaths as $key => $val)
-				{
-					print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
-					print '<br>';
-				}
-			}
-			else
-			{
-				print '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
-			}
-			print '</td></tr>';
+            if (GETPOST('cancel','alpha') || $confirm=='no' || $action == '' || in_array($action,array('settodraft','valid','delete','sendall','clone','test')))
+            {
+                print "\n\n<div class=\"tabsAction\">\n";
+
+                if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id))
+                {
+                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=settodraft&amp;id='.$object->id.'">'.$langs->trans("SetToDraft").'</a>';
+                }
+
+                if (($object->statut == 0 || $object->statut == 1) && $user->rights->mailing->creer)
+                {
+                    if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_MAILING))
+                    {
+                        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
+                    }
+                    else
+                    {
+                        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
+                    }
+
+                    if (! empty($conf->use_javascript_ajax)) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&amp;id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
+                }
+
+                //print '<a class="butAction" href="card.php?action=test&amp;id='.$object->id.'">'.$langs->trans("PreviewMailing").'</a>';
+
+                if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+                {
+                    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
+                }
+                else
+                {
+                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
+                }
+
+                if ($object->statut == 0)
+                {
+                    if ($object->nbemail <= 0)
+                    {
+                        print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoTargetYet")).'">'.$langs->trans("ValidMailing").'</a>';
+                    }
+                    else if (empty($user->rights->mailing->valider))
+                    {
+                        print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
+                    }
+                    else
+                    {
+                        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
+                    }
+                }
+
+                if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider)
+                {
+                    if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+                    {
+                        print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SendingFromWebInterfaceIsNotAllowed")).'">'.$langs->trans("SendMailing").'</a>';
+                    }
+                    else if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+                    {
+                        print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
+                    }
+                    else
+                    {
+                        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
+                    }
+                }
+
+                if ($user->rights->mailing->creer)
+                {
+                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=clone&amp;object=emailing&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
+                }
+
+                if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider)
+                {
+                    if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+                    {
+                        print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
+                    }
+                    else
+                    {
+                        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
+                    }
+                }
+
+                if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer)
+                {
+                    if ($object->statut > 0 && (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->delete))
+                    {
+                        print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
+                    }
+                    else
+                    {
+                        print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(! empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
+                    }
+                }
+
+                print '</div>';
+            }
+
+            // Affichage formulaire de TEST
+            if ($action == 'test')
+            {
+                print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+                print load_fiche_titre($langs->trans("TestMailing"));
+
+                dol_fiche_head(null, '', '', -1);
+
+                // Create l'objet formulaire mail
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                $formmail = new FormMail($db);
+                $formmail->fromname = $object->email_from;
+                $formmail->frommail = $object->email_from;
+                $formmail->withsubstit=1;
+                $formmail->withfrom=0;
+                $formmail->withto=$user->email?$user->email:1;
+                $formmail->withtocc=0;
+                $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+                $formmail->withtopic=0;
+                $formmail->withtopicreadonly=1;
+                $formmail->withfile=0;
+                $formmail->withbody=0;
+                $formmail->withbodyreadonly=1;
+                $formmail->withcancel=1;
+                $formmail->withdeliveryreceipt=0;
+                // Tableau des substitutions
+                $formmail->substit=$object->substitutionarrayfortest;
+                // Tableau des parametres complementaires du post
+                $formmail->param["action"]="send";
+                $formmail->param["models"]='none';
+                $formmail->param["mailid"]=$object->id;
+                $formmail->param["returnurl"]=$_SERVER['PHP_SELF']."?id=".$object->id;
+
+                print $formmail->get_form();
+
+                print '<br>';
+
+                dol_fiche_end();
+
+                print dol_set_focus('#sendto');
+            }
+
+
+            $htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
+            foreach($object->substitutionarray as $key => $val)
+            {
+                $htmltext.=$key.' = '.$langs->trans($val).'<br>';
+            }
+            $htmltext.='</i>';
+
+            // Print mail content
+            print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto('<span class="hideonsmartphone">'.$langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
+
+            dol_fiche_head('', '', '', -1);
+
+            print '<table class="bordernooddeven" width="100%">';
+
+            // Subject
+            print '<tr><td class="titlefield">'.$langs->trans("MailTopic").'</td><td colspan="3">'.$object->sujet.'</td></tr>';
+
+            // Joined files
+            print '<tr><td>'.$langs->trans("MailFile").'</td><td colspan="3">';
+            // List of files
+            $listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+            if (count($listofpaths))
+            {
+                foreach($listofpaths as $key => $val)
+                {
+                    print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
+                    print '<br>';
+                }
+            }
+            else
+            {
+                print '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
+            }
+            print '</td></tr>';
 
             // Background color
             /*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
             print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
             print '</td></tr>';*/
 
-			print '</table>';
-
-		    // Message
-			print '<div style="padding-top: 10px; background: '.($object->bgcolor?(preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor:'white').'">';
-			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')	// CKEditor does not apply the color of the div into its content area
-			{
-				$readonly=1;
-				// Editeur wysiwyg
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',false,true,empty($conf->global->FCKEDITOR_ENABLE_MAILING)?0:1,20,'90%',$readonly);
-				$doleditor->Create();
-			}
-			else print dol_htmlentitiesbr($object->body);
-			print '</div>';
-
-			dol_fiche_end();
-		}
-		else
-		{
-			/*
+            print '</table>';
+
+            // Message
+            print '<div style="padding-top: 10px; background: '.($object->bgcolor?(preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor:'white').'">';
+            if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')	// CKEditor does not apply the color of the div into its content area
+            {
+                $readonly=1;
+                // Editeur wysiwyg
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',false,true,empty($conf->global->FCKEDITOR_ENABLE_MAILING)?0:1,20,'90%',$readonly);
+                $doleditor->Create();
+            }
+            else print dol_htmlentitiesbr($object->body);
+            print '</div>';
+
+            dol_fiche_end();
+        }
+        else
+        {
+            /*
 			 * Mailing en mode edition (CKeditor or HTML source)
 			 */
 
-			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
+            dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
 
-			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
+            $linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
-			$morehtmlright='';
-			if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+            $morehtmlright='';
+            if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
 
-			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
+            dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 
-			print '<div class="fichecenter">';
-			print '<div class="underbanner clearboth"></div>';
+            print '<div class="fichecenter">';
+            print '<div class="underbanner clearboth"></div>';
 
-			print '<table class="border" width="100%">';
+            print '<table class="border" width="100%">';
 
-			/*
+            /*
 			print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>';
 			print '<td colspan="3">';
 			print $form->showrefnav($object,'id', $linkback);
 			print '</td></tr>';
 			*/
 
-			// Topic
-			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
-			// From
-			print '<tr><td class="titlefield">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
-			// To
-			print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1).'</td></tr>';
-
-			// Nb of distinct emails
-			print '<tr><td>';
-			print $langs->trans("TotalNbOfDistinctRecipients");
-			print '</td><td colspan="3">';
-			$nbemail = ($object->nbemail?$object->nbemail:0);
-			if (is_numeric($nbemail))
-			{
-				$text='';
-				if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
-				{
-					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
-					{
-						$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-					}
-					else
-					{
-						$text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
-					}
-				}
-				if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
-				if ($text)
-				{
-					print $form->textwithpicto($nbemail,$text,1,'warning');
-				}
-				else
-				{
-					print $nbemail;
-				}
-			}
-			print '</td></tr>';
+            // Topic
+            print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+            // From
+            print '<tr><td class="titlefield">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
+            // To
+            print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1).'</td></tr>';
+
+            // Nb of distinct emails
+            print '<tr><td>';
+            print $langs->trans("TotalNbOfDistinctRecipients");
+            print '</td><td colspan="3">';
+            $nbemail = ($object->nbemail?$object->nbemail:0);
+            if (is_numeric($nbemail))
+            {
+                $text='';
+                if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
+                {
+                    if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
+                    {
+                        $text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+                    }
+                    else
+                    {
+                        $text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+                    }
+                }
+                if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+                if ($text)
+                {
+                    print $form->textwithpicto($nbemail,$text,1,'warning');
+                }
+                else
+                {
+                    print $nbemail;
+                }
+            }
+            print '</td></tr>';
 
-			// Other attributes
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            // Other attributes
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
-			if (empty($reshook))
-			{
-				print $object->showOptionals($extrafields,'edit');
-			}
+            if (empty($reshook))
+            {
+                print $object->showOptionals($extrafields,'edit');
+            }
+
+            print '</table>';
+            print '</div>';
 
-			print '</table>';
-			print '</div>';
+            dol_fiche_end();
 
-			dol_fiche_end();
 
 
+            print "<br>\n";
 
-			print "<br>\n";
+            print '<form name="edit_mailing" action="card.php" method="post" enctype="multipart/form-data">'."\n";
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="update">';
+            print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-			print '<form name="edit_mailing" action="card.php" method="post" enctype="multipart/form-data">'."\n";
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="update">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
+            $htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
+            foreach($object->substitutionarray as $key => $val)
+            {
+                $htmltext.=$key.' = '.$langs->trans($val).'<br>';
+            }
+            $htmltext.='</i>';
+
+            // Print mail content
+            print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
+
+            dol_fiche_head(null, '', '', -1);
+
+            print '<table class="bordernooddeven" width="100%">';
+
+            // Subject
+            print '<tr><td class="fieldrequired titlefield">'.$langs->trans("MailTopic").'</td><td colspan="3"><input class="flat quatrevingtpercent" type="text" name="sujet" value="'.$object->sujet.'"></td></tr>';
+
+            $trackid=''; // TODO To avoid conflicts with 2 mass emailing, we should set a trackid here, even if we use another one into email header.
+            dol_init_file_process($upload_dir, $trackid);
+
+            // Joined files
+            $addfileaction='addfile';
+            print '<tr><td>'.$langs->trans("MailFile").'</td>';
+            print '<td colspan="3">';
+            // List of files
+            $listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+
+            // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+            $out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
+            $out.= '<script type="text/javascript" language="javascript">';
+            $out.= 'jQuery(document).ready(function () {';
+            $out.= '    jQuery(".removedfile").click(function() {';
+            $out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
+            $out.= '    });';
+            $out.= '})';
+            $out.= '</script>'."\n";
+            if (count($listofpaths))
+            {
+                foreach($listofpaths as $key => $val)
+                {
+                    $out.= '<div id="attachfile_'.$key.'">';
+                    $out.= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
+                    $out.= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"),'delete.png','','',1).'" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+                    $out.= '<br></div>';
+                }
+            }
+            else
+            {
+                $out.= $langs->trans("NoAttachedFiles").'<br>';
+            }
+            // Add link to add file
+            $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+            $out.= ' ';
+            $out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+            print $out;
+            print '</td></tr>';
 
-			$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-			foreach($object->substitutionarray as $key => $val)
-			{
-				$htmltext.=$key.' = '.$langs->trans($val).'<br>';
-			}
-			$htmltext.='</i>';
+            // Background color
+            print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
+            print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
+            print '</td></tr>';
 
-			// Print mail content
-			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
+            print '</table>';
 
-			dol_fiche_head(null, '', '', -1);
+            // Message
+            print '<div style="padding-top: 10px">';
 
-			print '<table class="bordernooddeven" width="100%">';
+            if ($action == 'edit')
+            {
+                // Editeur wysiwyg
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,'90%');
+                $doleditor->Create();
+            }
+            if ($action == 'edithtml')
+            {
+                // Editor HTML source
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',true,true,'ace',20,'90%');
+                $doleditor->Create(0, '', false, 'HTML Source', 'php');
+            }
 
-			// Subject
-			print '<tr><td class="fieldrequired titlefield">'.$langs->trans("MailTopic").'</td><td colspan="3"><input class="flat quatrevingtpercent" type="text" name="sujet" value="'.$object->sujet.'"></td></tr>';
+            print '</div>';
 
-			$trackid=''; // TODO To avoid conflicts with 2 mass emailing, we should set a trackid here, even if we use another one into email header.
-			dol_init_file_process($upload_dir, $trackid);
 
-			// Joined files
-			$addfileaction='addfile';
-			print '<tr><td>'.$langs->trans("MailFile").'</td>';
-			print '<td colspan="3">';
-			// List of files
-			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
-
-			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
-			$out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-			$out.= '<script type="text/javascript" language="javascript">';
-			$out.= 'jQuery(document).ready(function () {';
-			$out.= '    jQuery(".removedfile").click(function() {';
-			$out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
-			$out.= '    });';
-			$out.= '})';
-			$out.= '</script>'."\n";
-			if (count($listofpaths))
-			{
-				foreach($listofpaths as $key => $val)
-				{
-					$out.= '<div id="attachfile_'.$key.'">';
-					$out.= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
-					$out.= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"),'delete.png','','',1).'" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
-					$out.= '<br></div>';
-				}
-			}
-			else
-			{
-				$out.= $langs->trans("NoAttachedFiles").'<br>';
-			}
-			// Add link to add file
-			$out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-			$out.= ' ';
-			$out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
-			print $out;
-			print '</td></tr>';
+            dol_fiche_end();
 
-		    // Background color
-			print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
-			print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
-			print '</td></tr>';
+            print '<div class="center">';
+            print '<input type="submit" class="button buttonforacesave" value="'.$langs->trans("Save").'" name="save">';
+            print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+            print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
+            print '</div>';
 
-			print '</table>';
-
-			// Message
-			print '<div style="padding-top: 10px">';
-
-			if ($action == 'edit')
-			{
-				// Editeur wysiwyg
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,'90%');
-				$doleditor->Create();
-			}
-			if ($action == 'edithtml')
-			{
-				// Editor HTML source
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',true,true,'ace',20,'90%');
-				$doleditor->Create(0, '', false, 'HTML Source', 'php');
-			}
-
-			print '</div>';
-
-
-			dol_fiche_end();
-
-			print '<div class="center">';
-			print '<input type="submit" class="button buttonforacesave" value="'.$langs->trans("Save").'" name="save">';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
-			print '</div>';
-
-			print '</form>';
-			print '<br>';
-		}
-	}
-	else
-	{
-		dol_print_error($db,$object->error);
-	}
+            print '</form>';
+            print '<br>';
+        }
+    }
+    else
+    {
+        dol_print_error($db,$object->error);
+    }
 }
 
 // End of page

Braces +149 added lines, -117 removed lines

@@ -23,7 +23,9 @@ 
  *       \brief      Fiche mailing, onglet general
  */
 
-if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK','1');
+if (! defined('NOSTYLECHECK')) {
+    define('NOSTYLECHECK','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -41,7 +43,9 @@ 
 // Load translation files required by the page
 $langs->load("mails");
 
-if (! $user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->societe_id > 0)) accessforbidden();
+if (! $user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->societe_id > 0)) {
+    accessforbidden();
+}
 
 $id=(GETPOST('mailid','int') ? GETPOST('mailid','int') : GETPOST('id','int'));
 $action=GETPOST('action','alpha');
@@ -87,7 +91,9 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -97,16 +103,14 @@ 
 		if (empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
+		} else
 		{
 			$result=$object->createFromClone($object->id,$_REQUEST["clone_content"],$_REQUEST["clone_receivers"]);
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 				exit;
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -124,13 +128,11 @@ 
 			setEventMessages('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
 			setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
 			$action='';
-		}
-		else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+		} else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 		{
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
 			$action='';
-		}
-		else
+		} else
 		{
 			$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
 
@@ -148,7 +150,9 @@ 
 			$errorsto = $object->email_errorsto;
 			// Le message est-il en html
 			$msgishtml=-1;	// Unknown by default
-			if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
+			if (preg_match('/[\s\t]*<html>/i',$message)) {
+			    $msgishtml=1;
+			}
 
 			// Warning, we must not use begin-commit transaction here
 			// because we want to save update for each mail sent.
@@ -227,9 +231,15 @@ 
 						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
 
 						$onlinepaymentenabled = 0;
-						if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+						if (! empty($conf->paypal->enabled)) {
+						    $onlinepaymentenabled++;
+						}
+						if (! empty($conf->paybox->enabled)) {
+						    $onlinepaymentenabled++;
+						}
+						if (! empty($conf->stripe->enabled)) {
+						    $onlinepaymentenabled++;
+						}
 						if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
 						{
 							$substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
@@ -239,8 +249,7 @@ 
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							}
-							else
+							} else
 							{
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
@@ -253,17 +262,29 @@ 
 						{
 							$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+							    $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+							    $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+							}
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+							    $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+							    $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+							}
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+							    $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+							    $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+							}
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+							    $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							} else {
+							    $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							}
 						}
 						//$substitutionisok=true;
 
@@ -320,8 +341,7 @@ 
 							if (! $resql2)
 							{
 								dol_print_error($db);
-							}
-							else
+							} else
 							{
 								//if cheack read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false)
@@ -353,8 +373,7 @@ 
                         	}
 
                         	//test if CHECK READ change statut prospect contact
-						}
-						else
+						} else
 						{
 							// Mail failed
 							$nbko++;
@@ -372,8 +391,7 @@ 
 
 						$i++;
 					}
-				}
-				else
+				} else
 				{
 					setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs');
 				}
@@ -382,17 +400,18 @@ 
 				if ($nbko > 0)
 				{
 					$statut=2;	// Status 'sent partially' (because at least one error)
-					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
-					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
-				}
-				else
+					if ($nbok > 0) {
+					    setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+					} else {
+					    setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+					}
+				} else
 				{
 					if ($nbok >= $num)
 					{
 						$statut=3;	// Send to everybody
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
-					}
-					else
+					} else
 					{
 						$statut=2;	// Status 'sent partially' (because not send to everybody)
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
@@ -406,8 +425,7 @@ 
 				{
 					dol_print_error($db);
 				}
-			}
-			else
+			} else
 			{
 				dol_syslog($db->error());
 				dol_print_error($db);
@@ -435,7 +453,9 @@ 
 		{
 			// Le message est-il en html
 			$msgishtml=-1;	// Inconnu par defaut
-			if (preg_match('/[\s\t]*<html>/i',$object->body)) $msgishtml=1;
+			if (preg_match('/[\s\t]*<html>/i',$object->body)) {
+			    $msgishtml=1;
+			}
 
 			// other are set at begin of page
 			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
@@ -452,8 +472,12 @@ 
 			$arr_css  = array();
 
 	        // Ajout CSS
-	        if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor;
-	        if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
+	        if (!empty($object->bgcolor)) {
+	            $arr_css['bgcolor'] = (preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor;
+	        }
+	        if (!empty($object->bgimage)) {
+	            $arr_css['bgimage'] = $object->bgimage;
+	        }
 
 	        // Attached files
 			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
@@ -474,8 +498,7 @@ 
 			if ($result)
 			{
 				setEventMessages($langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)), null, 'mesgs');
-			}
-			else
+			} else
 			{
 				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
 			}
@@ -527,14 +550,17 @@ 
 	{
 		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
 
-		if ($action == 'settitre')					$object->titre          = trim(GETPOST('titre','alpha'));
-		else if ($action == 'setemail_from')		$object->email_from     = trim(GETPOST('email_from','alpha'));
-		else if ($action == 'setemail_replyto')		$object->email_replyto  = trim(GETPOST('email_replyto','alpha'));
-		else if ($action == 'setemail_errorsto')	$object->email_errorsto = trim(GETPOST('email_errorsto','alpha'));
-		else if ($action == 'settitre' && empty($object->titre)) {
+		if ($action == 'settitre') {
+		    $object->titre          = trim(GETPOST('titre','alpha'));
+		} else if ($action == 'setemail_from') {
+		    $object->email_from     = trim(GETPOST('email_from','alpha'));
+		} else if ($action == 'setemail_replyto') {
+		    $object->email_replyto  = trim(GETPOST('email_replyto','alpha'));
+		} else if ($action == 'setemail_errorsto') {
+		    $object->email_errorsto = trim(GETPOST('email_errorsto','alpha'));
+		} else if ($action == 'settitre' && empty($object->titre)) {
 			$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
-		}
-		else if ($action == 'setfrom' && empty($object->email_from)) {
+		} else if ($action == 'setfrom' && empty($object->email_from)) {
 			$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));
 		}
 
@@ -614,8 +640,7 @@ 
 
 			setEventMessages($mesg, $mesgs, 'errors');
 			$action="edit";
-		}
-		else
+		} else
 		{
 			$action="edit";
 		}
@@ -630,8 +655,7 @@ 
 			setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 		}
@@ -648,13 +672,11 @@ 
     			//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
     			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
     			exit;
-            }
-            else
+            } else
             {
                 setEventMessages($object->error, $object->errors, 'errors');
             }
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 		}
@@ -678,14 +700,12 @@ 
 				$db->commit();
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 		}
@@ -786,8 +806,7 @@ 
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
 
 	print '</form>';
-}
-else
+} else
 {
 	if ($object->id > 0)
 	{
@@ -828,8 +847,13 @@ 
 			{
                 // Define message to recommand from command line
 				$sendingmode=$conf->global->EMAILING_MAIL_SENDMODE;
-				if (empty($sendingmode)) $sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
-				if (empty($sendingmode)) $sendingmode='mail';	// If not defined, we use php mail function
+				if (empty($sendingmode)) {
+				    $sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
+				}
+				if (empty($sendingmode)) {
+				    $sendingmode='mail';
+				}
+				// If not defined, we use php mail function
 
 				// MAILING_NO_USING_PHPMAIL may be defined or not.
 				// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
@@ -842,27 +866,38 @@ 
 					$linktoadminemailend='</a>';
 					setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
 					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
-					if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+					if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) {
+					    setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+					}
 					$_GET["action"]='';
-				}
-				else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+				} else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 				{
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+				        setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+				    }
+				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') {
+				        setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+				    }
 
 					// The feature is forbidden from GUI, we show just message to use from command line.
 				    setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 					setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
-					if ($conf->file->mailing_limit_sendbyweb != '-1')  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
+					if ($conf->file->mailing_limit_sendbyweb != '-1') {
+					    // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
 					{
-					   setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');  // You can send online with constant...
+					   setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
+					}
+					// You can send online with constant...
 					}
 					$_GET["action"]='';
-				}
-				else
+				} else
 				{
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+				        setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+				    }
+				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') {
+				        setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+				    }
 
 				    $text='';
 				    if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
@@ -887,7 +922,9 @@ 
 				$nbko  = $object->countNbOfTargets('alreadysentko');
 
 				$morehtmlright.=' ('.$nbtry.'/'.$object->nbemail;
-				if ($nbko) $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
+				if ($nbko) {
+				    $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
+				}
 				$morehtmlright.=') &nbsp; ';
 			}
 
@@ -926,18 +963,18 @@ 
     				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
     				{
     					$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-    				}
-    				else
+    				} else
     				{
     					$text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
     				}
 			    }
-			    if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+			    if (empty($nbemail)) {
+			        $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+			    }
 				if ($text)
     			{
     			    print $form->textwithpicto($nbemail,$text,1,'warning');
-    			}
-    			else
+    			} else
     			{
     				print $nbemail;
     			}
@@ -985,13 +1022,14 @@ 
 					if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_MAILING))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
-					}
-					else
+					} else
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
 					}
 
-					if (! empty($conf->use_javascript_ajax)) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&amp;id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
+					if (! empty($conf->use_javascript_ajax)) {
+					    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&amp;id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
+					}
 				}
 
 				//print '<a class="butAction" href="card.php?action=test&amp;id='.$object->id.'">'.$langs->trans("PreviewMailing").'</a>';
@@ -999,8 +1037,7 @@ 
 				if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
-				}
-				else
+				} else
 				{
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
 				}
@@ -1010,12 +1047,10 @@ 
 					if ($object->nbemail <= 0)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoTargetYet")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					else if (empty($user->rights->mailing->valider))
+					} else if (empty($user->rights->mailing->valider))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					else
+					} else
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
 					}
@@ -1026,12 +1061,10 @@ 
 					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SendingFromWebInterfaceIsNotAllowed")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					else if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+					} else if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					else
+					} else
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
 					}
@@ -1047,8 +1080,7 @@ 
 					if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
-					}
-					else
+					} else
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
 					}
@@ -1059,8 +1091,7 @@ 
 					if ($object->statut > 0 && (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->delete))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
-					}
-					else
+					} else
 					{
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(! empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
 					}
@@ -1140,8 +1171,7 @@ 
 					print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
 					print '<br>';
 				}
-			}
-			else
+			} else
 			{
 				print '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 			}
@@ -1156,20 +1186,22 @@ 
 
 		    // Message
 			print '<div style="padding-top: 10px; background: '.($object->bgcolor?(preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor:'white').'">';
-			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')	// CKEditor does not apply the color of the div into its content area
+			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff') {
+			    // CKEditor does not apply the color of the div into its content area
 			{
 				$readonly=1;
+			}
 				// Editeur wysiwyg
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',false,true,empty($conf->global->FCKEDITOR_ENABLE_MAILING)?0:1,20,'90%',$readonly);
 				$doleditor->Create();
+			} else {
+			    print dol_htmlentitiesbr($object->body);
 			}
-			else print dol_htmlentitiesbr($object->body);
 			print '</div>';
 
 			dol_fiche_end();
-		}
-		else
+		} else
 		{
 			/*
 			 * Mailing en mode edition (CKeditor or HTML source)
@@ -1180,7 +1212,9 @@ 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
 			$morehtmlright='';
-			if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+			if ($object->statut == 2) {
+			    $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+			}
 
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 
@@ -1216,18 +1250,18 @@ 
 					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 					{
 						$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-					}
-					else
+					} else
 					{
 						$text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
 				}
-				if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+				if (empty($nbemail)) {
+				    $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+				}
 				if ($text)
 				{
 					print $form->textwithpicto($nbemail,$text,1,'warning');
-				}
-				else
+				} else
 				{
 					print $nbemail;
 				}
@@ -1302,8 +1336,7 @@ 
 					$out.= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"),'delete.png','','',1).'" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
 					$out.= '<br></div>';
 				}
-			}
-			else
+			} else
 			{
 				$out.= $langs->trans("NoAttachedFiles").'<br>';
 			}
@@ -1353,8 +1386,7 @@ 
 			print '</form>';
 			print '<br>';
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db,$object->error);
 	}

Spacing +296 added lines, -296 removed lines

@@ -23,12 +23,12 @@ 
  *       \brief      Fiche mailing, onglet general
  */
 
-if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK','1');
+if (!defined('NOSTYLECHECK')) define('NOSTYLECHECK', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -41,43 +41,43 @@ 
 // Load translation files required by the page
 $langs->load("mails");
 
-if (! $user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->societe_id > 0)) accessforbidden();
+if (!$user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->societe_id > 0)) accessforbidden();
 
-$id=(GETPOST('mailid','int') ? GETPOST('mailid','int') : GETPOST('id','int'));
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$urlfrom=GETPOST('urlfrom');
+$id = (GETPOST('mailid', 'int') ? GETPOST('mailid', 'int') : GETPOST('id', 'int'));
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$urlfrom = GETPOST('urlfrom');
 
-$object=new Mailing($db);
-$result=$object->fetch($id);
+$object = new Mailing($db);
+$result = $object->fetch($id);
 
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('mailingcard','globalcard'));
+$hookmanager->initHooks(array('mailingcard', 'globalcard'));
 
 // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
-$object->substitutionarray=FormMail::getAvailableSubstitKey('emailing');
+$object->substitutionarray = FormMail::getAvailableSubstitKey('emailing');
 
 
 // Set $object->substitutionarrayfortest
-$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
+$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
 
-$targetobject = null;		// Not defined with mass emailing
+$targetobject = null; // Not defined with mass emailing
 
-$parameters=array('mode'=>'emailing');
-$substitutionarray=FormMail::getAvailableSubstitKey('emailing', $targetobject);
+$parameters = array('mode'=>'emailing');
+$substitutionarray = FormMail::getAvailableSubstitKey('emailing', $targetobject);
 
 $object->substitutionarrayfortest = $substitutionarray;
 
 // List of sending methods
-$listofmethods=array();
-$listofmethods['mail']='PHP mail function';
+$listofmethods = array();
+$listofmethods['mail'] = 'PHP mail function';
 //$listofmethods['simplemail']='Simplemail class';
-$listofmethods['smtps']='SMTP/SMTPS socket library';
+$listofmethods['smtps'] = 'SMTP/SMTPS socket library';
 
 
 
@@ -85,8 +85,8 @@ 
  * Actions
  */
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
@@ -100,7 +100,7 @@ 
 		}
 		else
 		{
-			$result=$object->createFromClone($object->id,$_REQUEST["clone_content"],$_REQUEST["clone_receivers"]);
+			$result = $object->createFromClone($object->id, $_REQUEST["clone_content"], $_REQUEST["clone_receivers"]);
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
@@ -111,7 +111,7 @@ 
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	    $action='';
+	    $action = '';
 	}
 
 	// Action send emailing for everybody
@@ -123,20 +123,20 @@ 
 			setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 			setEventMessages('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
 			setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
-			$action='';
+			$action = '';
 		}
 		else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 		{
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
-			$action='';
+			$action = '';
 		}
 		else
 		{
-			$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+			$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 			if ($object->statut == 0)
 			{
-				dol_print_error('','ErrorMailIsNotValidated');
+				dol_print_error('', 'ErrorMailIsNotValidated');
 				exit;
 			}
 
@@ -147,37 +147,37 @@ 
 			$replyto  = $object->email_replyto;
 			$errorsto = $object->email_errorsto;
 			// Le message est-il en html
-			$msgishtml=-1;	// Unknown by default
-			if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
+			$msgishtml = -1; // Unknown by default
+			if (preg_match('/[\s\t]*<html>/i', $message)) $msgishtml = 1;
 
 			// Warning, we must not use begin-commit transaction here
 			// because we want to save update for each mail sent.
 
-			$nbok=0; $nbko=0;
+			$nbok = 0; $nbko = 0;
 
 			// On choisit les mails non deja envoyes pour ce mailing (statut=0)
 			// ou envoyes en erreur (statut=-1)
 			$sql = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
 			$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 			$sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id;
-			$sql .= " ORDER BY mc.statut DESC";		// first status 0, then status -1
+			$sql .= " ORDER BY mc.statut DESC"; // first status 0, then status -1
 
 			dol_syslog("card.php: select targets", LOG_DEBUG);
-			$resql=$db->query($sql);
+			$resql = $db->query($sql);
 			if ($resql)
 			{
-				$num = $db->num_rows($resql);	// nb of possible recipients
+				$num = $db->num_rows($resql); // nb of possible recipients
 
 				if ($num)
 				{
 					dol_syslog("comm/mailing/card.php: nb of targets = ".$num, LOG_DEBUG);
 
-					$now=dol_now();
+					$now = dol_now();
 
 					// Positionne date debut envoi
-					$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
-					$resql2=$db->query($sql);
-					if (! $resql2)
+					$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
+					$resql2 = $db->query($sql);
+					if (!$resql2)
 					{
 						dol_print_error($db);
 					}
@@ -188,27 +188,27 @@ 
 					while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB)
 					{
 						// Here code is common with same loop ino mailing-send.php
-						$res=1;
-						$now=dol_now();
+						$res = 1;
+						$now = dol_now();
 
 						$obj = $db->fetch_object($resql);
 
 						// sendto en RFC2822
-						$sendto = str_replace(',',' ',dolGetFirstLastname($obj->firstname, $obj->lastname))." <".$obj->email.">";
+						$sendto = str_replace(',', ' ', dolGetFirstLastname($obj->firstname, $obj->lastname))." <".$obj->email.">";
 
 						// Make substitutions on topic and body. From (AA=YY;BB=CC;...) we keep YY, CC, ...
-						$other=explode(';',$obj->other);
-						$tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-	                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+						$other = explode(';', $obj->other);
+						$tmpfield = explode('=', $other[0], 2); $other1 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+	                    $tmpfield = explode('=', $other[1], 2); $other2 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+	                    $tmpfield = explode('=', $other[2], 2); $other3 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+	                    $tmpfield = explode('=', $other[3], 2); $other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+	                    $tmpfield = explode('=', $other[4], 2); $other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
 
-	                    $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
+	                    $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
 
-	                    $targetobject = null;		// Not defined with mass emailing
-	                    $parameters=array('mode'=>'emailing');
-	                    $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount'), $targetobject);			// Note: On mass emailing, this is null because be don't know object
+	                    $targetobject = null; // Not defined with mass emailing
+	                    $parameters = array('mode'=>'emailing');
+	                    $substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
 
 	                    // Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
 						$substitutionarray['__ID__'] = $obj->source_id;
@@ -221,79 +221,79 @@ 
 						$substitutionarray['__OTHER3__'] = $other3;
 						$substitutionarray['__OTHER4__'] = $other4;
 						$substitutionarray['__OTHER5__'] = $other5;
-						$substitutionarray['__USER_SIGNATURE__'] = $signature;	// Signature is empty when ran from command line or taken from user in parameter)
-						$substitutionarray['__SIGNATURE__'] = $signature;	// For backward compatibility
+						$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
+						$substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
 						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
 
 						$onlinepaymentenabled = 0;
-						if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-						if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
-						if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+						if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;
+						if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;
+						if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN))
 						{
-							$substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 							{
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							}
 							else
 							{
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
 							}
 						}
 						/* For backward compatibility, deprecated */
-						if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN))
 						{
-							$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							$substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
 						}
 						//$substitutionisok=true;
 
 	                    complete_substitutions_array($substitutionarray, $langs);
-						$newsubject=make_substitutions($subject,$substitutionarray);
-						$newmessage=make_substitutions($message,$substitutionarray);
+						$newsubject = make_substitutions($subject, $substitutionarray);
+						$newmessage = make_substitutions($message, $substitutionarray);
 
 						$arr_file = array();
 						$arr_mime = array();
 						$arr_name = array();
 						$arr_css  = array();
 
-						$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+						$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
 						if (count($listofpaths))
 						{
-							foreach($listofpaths as $key => $val)
+							foreach ($listofpaths as $key => $val)
 							{
-								$arr_file[]=$listofpaths[$key]['fullname'];
-								$arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
-								$arr_name[]=$listofpaths[$key]['name'];
+								$arr_file[] = $listofpaths[$key]['fullname'];
+								$arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
+								$arr_name[] = $listofpaths[$key]['name'];
 							}
 						}
 
 						// Fabrication du mail
-						$trackid='emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
+						$trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
 						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
 
 						if ($mail->error)
 						{
-							$res=0;
+							$res = 0;
 						}
 						/*if (! $substitutionisok)
 						{
@@ -304,7 +304,7 @@ 
 						// Send mail
 						if ($res)
 						{
-							$res=$mail->sendfile();
+							$res = $mail->sendfile();
 						}
 
 						if ($res)
@@ -312,12 +312,12 @@ 
 							// Mail successful
 							$nbok++;
 
-							dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+							dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_DEBUG);
 
-							$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sql.=" SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
-							$resql2=$db->query($sql);
-							if (! $resql2)
+							$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+							$sql .= " SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+							$resql2 = $db->query($sql);
+							if (!$resql2)
 							{
 								dol_print_error($db);
 							}
@@ -329,8 +329,8 @@ 
 									//Update status communication of thirdparty prospect
 									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
 									dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
-									$resql2=$db->query($sql);
-									if (! $resql2)
+									$resql2 = $db->query($sql);
+									if (!$resql2)
 									{
 										dol_print_error($db);
 									}
@@ -339,8 +339,8 @@ 
 									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
 
-									$resql2=$db->query($sql);
-									if (! $resql2)
+									$resql2 = $db->query($sql);
+									if (!$resql2)
 									{
 										dol_print_error($db);
 									}
@@ -359,12 +359,12 @@ 
 							// Mail failed
 							$nbko++;
 
-							dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING);
+							dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_WARNING);
 
-							$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-							$sql.=" SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
-							$resql2=$db->query($sql);
-							if (! $resql2)
+							$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+							$sql .= " SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+							$resql2 = $db->query($sql);
+							if (!$resql2)
 							{
 								dol_print_error($db);
 							}
@@ -381,28 +381,28 @@ 
 				// Loop finished, set global statut of mail
 				if ($nbko > 0)
 				{
-					$statut=2;	// Status 'sent partially' (because at least one error)
-					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
-					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+					$statut = 2; // Status 'sent partially' (because at least one error)
+					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 				}
 				else
 				{
 					if ($nbok >= $num)
 					{
-						$statut=3;	// Send to everybody
-						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+						$statut = 3; // Send to everybody
+						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					}
 					else
 					{
-						$statut=2;	// Status 'sent partially' (because not send to everybody)
-						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+						$statut = 2; // Status 'sent partially' (because not send to everybody)
+						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					}
 				}
 
-				$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
 				dol_syslog("comm/mailing/card.php: update global status", LOG_DEBUG);
-				$resql2=$db->query($sql);
-				if (! $resql2)
+				$resql2 = $db->query($sql);
+				if (!$resql2)
 				{
 					dol_print_error($db);
 				}
@@ -420,22 +420,22 @@ 
 	// Action send test emailing
 	if ($action == 'send' && empty($_POST["cancel"]))
 	{
-		$error=0;
+		$error = 0;
 
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		$object->sendto = $_POST["sendto"];
-		if (! $object->sendto)
+		if (!$object->sendto)
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("MailTo")), null, 'errors');
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			// Le message est-il en html
-			$msgishtml=-1;	// Inconnu par defaut
-			if (preg_match('/[\s\t]*<html>/i',$object->body)) $msgishtml=1;
+			$msgishtml = -1; // Inconnu par defaut
+			if (preg_match('/[\s\t]*<html>/i', $object->body)) $msgishtml = 1;
 
 			// other are set at begin of page
 			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
@@ -443,8 +443,8 @@ 
 
 			// Pratique les substitutions sur le sujet et message
 	        complete_substitutions_array($object->substitutionarrayfortest, $langs);
-			$tmpsujet=make_substitutions($object->sujet,$object->substitutionarrayfortest);
-			$tmpbody=make_substitutions($object->body,$object->substitutionarrayfortest);
+			$tmpsujet = make_substitutions($object->sujet, $object->substitutionarrayfortest);
+			$tmpbody = make_substitutions($object->body, $object->substitutionarrayfortest);
 
 			$arr_file = array();
 			$arr_mime = array();
@@ -452,35 +452,35 @@ 
 			$arr_css  = array();
 
 	        // Ajout CSS
-	        if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor;
+	        if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
 	        if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
 
 	        // Attached files
-			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+			$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
 			if (count($listofpaths))
 			{
-				foreach($listofpaths as $key => $val)
+				foreach ($listofpaths as $key => $val)
 				{
-					$arr_file[]=$listofpaths[$key]['fullname'];
-					$arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
-					$arr_name[]=$listofpaths[$key]['name'];
+					$arr_file[] = $listofpaths[$key]['fullname'];
+					$arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
+					$arr_name[] = $listofpaths[$key]['name'];
 				}
 			}
 
-			$trackid='emailingtest';
+			$trackid = 'emailingtest';
 			$mailfile = new CMailFile($tmpsujet, $object->sendto, $object->email_from, $tmpbody, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $object->email_errorsto, $arr_css, $trackid, '', 'emailing');
 
-			$result=$mailfile->sendfile();
+			$result = $mailfile->sendfile();
 			if ($result)
 			{
-				setEventMessages($langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)), null, 'mesgs');
+				setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
 			}
 			else
 			{
 				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
 			}
 
-			$action='';
+			$action = '';
 		}
 	}
 
@@ -498,14 +498,14 @@ 
 		$object->bgcolor        = trim($_POST["bgcolor"]);
 		$object->bgimage        = trim($_POST["bgimage"]);
 
-		if (! $object->titre) {
-			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
+		if (!$object->titre) {
+			$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		}
-		if (! $object->sujet) {
-			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
+		if (!$object->sujet) {
+			$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTopic"));
 		}
-		if (! $object->body)  {
-			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+		if (!$object->body) {
+			$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
 		}
 
 		if (!count($mesgs))
@@ -519,26 +519,26 @@ 
 		}
 
 		setEventMessages($mesg, $mesgs, 'errors');
-		$action="create";
+		$action = "create";
 	}
 
 	// Action update description of emailing
 	if ($action == 'settitre' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
 	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
-		if ($action == 'settitre')					$object->titre          = trim(GETPOST('titre','alpha'));
-		else if ($action == 'setemail_from')		$object->email_from     = trim(GETPOST('email_from','alpha'));
-		else if ($action == 'setemail_replyto')		$object->email_replyto  = trim(GETPOST('email_replyto','alpha'));
-		else if ($action == 'setemail_errorsto')	$object->email_errorsto = trim(GETPOST('email_errorsto','alpha'));
+		if ($action == 'settitre')					$object->titre = trim(GETPOST('titre', 'alpha'));
+		else if ($action == 'setemail_from')		$object->email_from = trim(GETPOST('email_from', 'alpha'));
+		else if ($action == 'setemail_replyto')		$object->email_replyto  = trim(GETPOST('email_replyto', 'alpha'));
+		else if ($action == 'setemail_errorsto')	$object->email_errorsto = trim(GETPOST('email_errorsto', 'alpha'));
 		else if ($action == 'settitre' && empty($object->titre)) {
-			$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
+			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		}
 		else if ($action == 'setfrom' && empty($object->email_from)) {
-			$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));
+			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailFrom"));
 		}
 
-		if (! $mesg)
+		if (!$mesg)
 		{
 			if ($object->update($user) >= 0)
 			{
@@ -549,34 +549,34 @@ 
 		}
 
 		setEventMessages($mesg, $mesgs, 'errors');
-		$action="";
+		$action = "";
 	}
 
 	/*
 	 * Add file in email form
 	 */
-	if (! empty($_POST['addfile']))
+	if (!empty($_POST['addfile']))
 	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	    // Set tmp user directory
-	    dol_add_file_process($upload_dir,0,0);
+	    dol_add_file_process($upload_dir, 0, 0);
 
-		$action="edit";
+		$action = "edit";
 	}
 
 	// Action remove file
-	if (! empty($_POST["removedfile"]))
+	if (!empty($_POST["removedfile"]))
 	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    dol_remove_file_process($_POST['removedfile'],0,0);    // We really delete file linked to mailing
+	    dol_remove_file_process($_POST['removedfile'], 0, 0); // We really delete file linked to mailing
 
-		$action="edit";
+		$action = "edit";
 	}
 
 	// Action update emailing
@@ -584,9 +584,9 @@ 
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$isupload=0;
+		$isupload = 0;
 
-		if (! $isupload)
+		if (!$isupload)
 		{
 			$mesgs = array();
 
@@ -595,11 +595,11 @@ 
 			$object->bgcolor        = trim($_POST["bgcolor"]);
 			$object->bgimage        = trim($_POST["bgimage"]);
 
-			if (! $object->sujet) {
-				$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
+			if (!$object->sujet) {
+				$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTopic"));
 			}
-			if (! $object->body) {
-				$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+			if (!$object->body) {
+				$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
 			}
 
 			if (!count($mesgs))
@@ -609,15 +609,15 @@ 
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
 				}
-				$mesgs[] =$object->error;
+				$mesgs[] = $object->error;
 			}
 
 			setEventMessages($mesg, $mesgs, 'errors');
-			$action="edit";
+			$action = "edit";
 		}
 		else
 		{
-			$action="edit";
+			$action = "edit";
 		}
 	}
 
@@ -667,10 +667,10 @@ 
 		{
 			$db->begin();
 
-			$result=$object->valid($user);
+			$result = $object->valid($user);
 			if ($result > 0)
 			{
-				$result=$object->reset_targets_status($user);
+				$result = $object->reset_targets_status($user);
 			}
 
 			if ($result > 0)
@@ -696,13 +696,13 @@ 
 	{
 		if ($object->delete($object->id))
 		{
-			$url= (! empty($urlfrom) ? $urlfrom : 'list.php');
+			$url = (!empty($urlfrom) ? $urlfrom : 'list.php');
 			header("Location: ".$url);
 			exit;
 		}
 	}
 
-	if (! empty($_POST["cancel"]))
+	if (!empty($_POST["cancel"]))
 	{
 		$action = '';
 	}
@@ -716,7 +716,7 @@ 
 $form = new Form($db);
 $htmlother = new FormOther($db);
 
-$help_url='EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
+$help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
 llxHeader('', $langs->trans("Mailing"), $help_url, '', 0, 0,
 	array(
 	'/includes/ace/ace.js',
@@ -733,14 +733,14 @@ 
 	print '<input type="hidden" name="action" value="add">';
 
 	$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-	foreach($object->substitutionarray as $key => $val)
+	foreach ($object->substitutionarray as $key => $val)
 	{
-		$htmltext.=$key.' = '.$langs->trans($val).'<br>';
+		$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 	}
-	$htmltext.='</i>';
+	$htmltext .= '</i>';
 
 
-	$availablelink=$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
+	$availablelink = $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
 	//print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
 
 
@@ -752,15 +752,15 @@ 
 	print '<table class="border" width="100%">';
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTitle").'</td><td><input class="flat minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST('titre')).'" autofocus="autofocus"></td></tr>';
 	print '<tr><td class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
-	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO)?$conf->global->MAILING_EMAIL_ERRORSTO:$conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
+	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO) ? $conf->global->MAILING_EMAIL_ERRORSTO : $conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
 
 	// Other attributes
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
-		print $object->showOptionals($extrafields,'edit');
+		print $object->showOptionals($extrafields, 'edit');
 	}
 
 	print '</table>';
@@ -769,7 +769,7 @@ 
 	print '<table class="border" width="100%">';
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTopic").'</td><td><input class="flat minwidth200 quatrevingtpercent" name="sujet" value="'.dol_escape_htmltag(GETPOST('sujet')).'"></td></tr>';
 	print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
-	print $htmlother->selectColor($_POST['bgcolor'],'bgcolor','',0);
+	print $htmlother->selectColor($_POST['bgcolor'], 'bgcolor', '', 0);
 	print '</td></tr>';
 
 	print '</table>';
@@ -777,7 +777,7 @@ 
 	print '<div style="padding-top: 10px">';
 	// Editeur wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('bodyemail',GETPOST('bodyemail','none'),'',600,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,'90%');
+	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'none'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
 	$doleditor->Create();
 	print '</div>';
 
@@ -791,29 +791,29 @@ 
 {
 	if ($object->id > 0)
 	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1,$object,'mailing');
+		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		$head = emailing_prepare_head($object);
 
 		// Confirmation back to draft
 		if ($action == 'settodraft')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("SetToDraft"),$langs->trans("ConfirmUnvalidateEmailing"),"confirm_settodraft",'','',1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("SetToDraft"), $langs->trans("ConfirmUnvalidateEmailing"), "confirm_settodraft", '', '', 1);
 		}
 		// Confirmation validation of mailing
 		if ($action == 'valid')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ValidMailing"),$langs->trans("ConfirmValidMailing"),"confirm_valid",'','',1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1);
 		}
 		// Confirm reset
 		else if ($action == 'reset')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ResetMailing"),$langs->trans("ConfirmResetMailing",$object->ref),"confirm_reset",'','',2);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ResetMailing"), $langs->trans("ConfirmResetMailing", $object->ref), "confirm_reset", '', '', 2);
 		}
 		// Confirm delete
 		else if ($action == 'delete')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(! empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''),$langs->trans("DeleteAMailing"),$langs->trans("ConfirmDeleteMailing"),"confirm_delete",'','',1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
 		}
 
 
@@ -827,68 +827,68 @@ 
 			if ($action == 'sendall')
 			{
                 // Define message to recommand from command line
-				$sendingmode=$conf->global->EMAILING_MAIL_SENDMODE;
-				if (empty($sendingmode)) $sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
-				if (empty($sendingmode)) $sendingmode='mail';	// If not defined, we use php mail function
+				$sendingmode = $conf->global->EMAILING_MAIL_SENDMODE;
+				if (empty($sendingmode)) $sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
+				if (empty($sendingmode)) $sendingmode = 'mail'; // If not defined, we use php mail function
 
 				// MAILING_NO_USING_PHPMAIL may be defined or not.
 				// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
 				// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0 or undefined=no limit).
-				if (! empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
+				if (!empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
 				{
 					// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
 					// You ensure that every user is using its own SMTP server when using the mass emailing module.
-					$linktoadminemailbefore='<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
-					$linktoadminemailend='</a>';
+					$linktoadminemailbefore = '<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
+					$linktoadminemailend = '</a>';
 					setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
 					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
-					if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
-					$_GET["action"]='';
+					if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+					$_GET["action"] = '';
 				}
 				else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 				{
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
 					// The feature is forbidden from GUI, we show just message to use from command line.
 				    setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 					setEventMessages('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
 					if ($conf->file->mailing_limit_sendbyweb != '-1')  // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
 					{
-					   setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');  // You can send online with constant...
+					   setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
 					}
-					$_GET["action"]='';
+					$_GET["action"] = '';
 				}
 				else
 				{
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
-				    if (! empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
-				    $text='';
+				    $text = '';
 				    if ($conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
                     {
-                    	$text.=$langs->trans("MailingNeedCommand");
-                    	$text.='<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
-                    	$text.='<br><br>';
+                    	$text .= $langs->trans("MailingNeedCommand");
+                    	$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
+                    	$text .= '<br><br>';
                     }
-				    $text.=$langs->trans('ConfirmSendingEmailing').'<br>';
-					$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('SendMailing'),$text,'sendallconfirmed',$formquestion,'',1,300);
+				    $text .= $langs->trans('ConfirmSendingEmailing').'<br>';
+					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', $formquestion, '', 1, 300);
 				}
 			}
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-			$morehtmlright='';
+			$morehtmlright = '';
 			$nbtry = $nbok = 0;
 			if ($object->statut == 2 || $object->statut == 3)
 			{
 				$nbtry = $object->countNbOfTargets('alreadysent');
 				$nbko  = $object->countNbOfTargets('alreadysentko');
 
-				$morehtmlright.=' ('.$nbtry.'/'.$object->nbemail;
-				if ($nbko) $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
-				$morehtmlright.=') &nbsp; ';
+				$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
+				if ($nbko) $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+				$morehtmlright .= ') &nbsp; ';
 			}
 
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
@@ -899,43 +899,43 @@ 
 			print '<table class="border" width="100%">';
 
 			// Description
-			print '<tr><td class="titlefield">'.$form->editfieldkey("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
-			print $form->editfieldval("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
+			print '<tr><td class="titlefield">'.$form->editfieldkey("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').'</td><td colspan="3">';
+			print $form->editfieldval("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
 			print '</td></tr>';
 
 			// From
-			print '<tr><td>'.$form->editfieldkey("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
-			print $form->editfieldval("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
+			print '<tr><td>'.$form->editfieldkey("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').'</td><td colspan="3">';
+			print $form->editfieldval("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
 			print '</td></tr>';
 
 			// Errors to
-			print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
-			print $form->editfieldval("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
+			print '<tr><td>'.$form->editfieldkey("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').'</td><td colspan="3">';
+			print $form->editfieldval("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
 			print '</td></tr>';
 
 			// Nb of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
 			print '</td><td colspan="3">';
-			$nbemail = ($object->nbemail?$object->nbemail:0);
+			$nbemail = ($object->nbemail ? $object->nbemail : 0);
 			if (is_numeric($nbemail))
 			{
-			    $text='';
-			    if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
+			    $text = '';
+			    if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
 			    {
     				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
     				{
-    					$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+    					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
     				}
     				else
     				{
-    					$text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+    					$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
     				}
 			    }
-			    if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+			    if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
 				if ($text)
     			{
-    			    print $form->textwithpicto($nbemail,$text,1,'warning');
+    			    print $form->textwithpicto($nbemail, $text, 1, 'warning');
     			}
     			else
     			{
@@ -945,7 +945,7 @@ 
 			print '</td></tr>';
 
 			// Other attributes
-			include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			print '</table>';
 
@@ -958,20 +958,20 @@ 
 			if ($action == 'clone')
 			{
 				// Create an array for form
-				$formquestion=array(
+				$formquestion = array(
 					'text' => $langs->trans("ConfirmClone"),
-				array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneContent"),   'value' => 1),
+				array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContent"), 'value' => 1),
 				array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
 				);
 				// Paiement incomplet. On demande si motif = escompte ou autre
-				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$object->ref),'confirm_clone',$formquestion,'yes',2,240);
+				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloneEMailing'), $langs->trans('ConfirmCloneEMailing', $object->ref), 'confirm_clone', $formquestion, 'yes', 2, 240);
 			}
 
 			/*
 			 * Boutons d'action
 			 */
 
-			if (GETPOST('cancel','alpha') || $confirm=='no' || $action == '' || in_array($action,array('settodraft','valid','delete','sendall','clone','test')))
+			if (GETPOST('cancel', 'alpha') || $confirm == 'no' || $action == '' || in_array($action, array('settodraft', 'valid', 'delete', 'sendall', 'clone', 'test')))
 			{
 				print "\n\n<div class=\"tabsAction\">\n";
 
@@ -982,7 +982,7 @@ 
 
 				if (($object->statut == 0 || $object->statut == 1) && $user->rights->mailing->creer)
 				{
-					if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_MAILING))
+					if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
 					}
@@ -991,12 +991,12 @@ 
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
 					}
 
-					if (! empty($conf->use_javascript_ajax)) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&amp;id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
+					if (!empty($conf->use_javascript_ajax)) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edithtml&amp;id='.$object->id.'">'.$langs->trans("EditHTMLSource").'</a>';
 				}
 
 				//print '<a class="butAction" href="card.php?action=test&amp;id='.$object->id.'">'.$langs->trans("PreviewMailing").'</a>';
 
-				if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+				if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
 				}
@@ -1027,7 +1027,7 @@ 
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SendingFromWebInterfaceIsNotAllowed")).'">'.$langs->trans("SendMailing").'</a>';
 					}
-					else if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+					else if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
 					}
@@ -1044,7 +1044,7 @@ 
 
 				if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider)
 				{
-					if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+					if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
 					}
@@ -1056,13 +1056,13 @@ 
 
 				if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer)
 				{
-					if ($object->statut > 0 && (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->delete))
+					if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
 					}
 					else
 					{
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(! empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
 					}
 				}
 
@@ -1082,25 +1082,25 @@ 
 				$formmail = new FormMail($db);
 				$formmail->fromname = $object->email_from;
 				$formmail->frommail = $object->email_from;
-				$formmail->withsubstit=1;
-				$formmail->withfrom=0;
-				$formmail->withto=$user->email?$user->email:1;
-				$formmail->withtocc=0;
-				$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-				$formmail->withtopic=0;
-				$formmail->withtopicreadonly=1;
-				$formmail->withfile=0;
-				$formmail->withbody=0;
-				$formmail->withbodyreadonly=1;
-				$formmail->withcancel=1;
-				$formmail->withdeliveryreceipt=0;
+				$formmail->withsubstit = 1;
+				$formmail->withfrom = 0;
+				$formmail->withto = $user->email ? $user->email : 1;
+				$formmail->withtocc = 0;
+				$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+				$formmail->withtopic = 0;
+				$formmail->withtopicreadonly = 1;
+				$formmail->withfile = 0;
+				$formmail->withbody = 0;
+				$formmail->withbodyreadonly = 1;
+				$formmail->withcancel = 1;
+				$formmail->withdeliveryreceipt = 0;
 				// Tableau des substitutions
-				$formmail->substit=$object->substitutionarrayfortest;
+				$formmail->substit = $object->substitutionarrayfortest;
 				// Tableau des parametres complementaires du post
-				$formmail->param["action"]="send";
-				$formmail->param["models"]='none';
-				$formmail->param["mailid"]=$object->id;
-				$formmail->param["returnurl"]=$_SERVER['PHP_SELF']."?id=".$object->id;
+				$formmail->param["action"] = "send";
+				$formmail->param["models"] = 'none';
+				$formmail->param["mailid"] = $object->id;
+				$formmail->param["returnurl"] = $_SERVER['PHP_SELF']."?id=".$object->id;
 
 				print $formmail->get_form();
 
@@ -1113,11 +1113,11 @@ 
 
 
 			$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-			foreach($object->substitutionarray as $key => $val)
+			foreach ($object->substitutionarray as $key => $val)
 			{
-				$htmltext.=$key.' = '.$langs->trans($val).'<br>';
+				$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 			}
-			$htmltext.='</i>';
+			$htmltext .= '</i>';
 
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto('<span class="hideonsmartphone">'.$langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
@@ -1132,10 +1132,10 @@ 
 			// Joined files
 			print '<tr><td>'.$langs->trans("MailFile").'</td><td colspan="3">';
 			// List of files
-			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+			$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
 			if (count($listofpaths))
 			{
-				foreach($listofpaths as $key => $val)
+				foreach ($listofpaths as $key => $val)
 				{
 					print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
 					print '<br>';
@@ -1155,13 +1155,13 @@ 
 			print '</table>';
 
 		    // Message
-			print '<div style="padding-top: 10px; background: '.($object->bgcolor?(preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor:'white').'">';
+			print '<div style="padding-top: 10px; background: '.($object->bgcolor ? (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor : 'white').'">';
 			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')	// CKEditor does not apply the color of the div into its content area
 			{
-				$readonly=1;
+				$readonly = 1;
 				// Editeur wysiwyg
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',false,true,empty($conf->global->FCKEDITOR_ENABLE_MAILING)?0:1,20,'90%',$readonly);
+				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
 				$doleditor->Create();
 			}
 			else print dol_htmlentitiesbr($object->body);
@@ -1179,8 +1179,8 @@ 
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
-			$morehtmlright='';
-			if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+			$morehtmlright = '';
+			if ($object->statut == 2) $morehtmlright .= ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
 
 			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 
@@ -1199,33 +1199,33 @@ 
 			// Topic
 			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
 			// From
-			print '<tr><td class="titlefield">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
 			// To
-			print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1).'</td></tr>';
+			print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1).'</td></tr>';
 
 			// Nb of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
 			print '</td><td colspan="3">';
-			$nbemail = ($object->nbemail?$object->nbemail:0);
+			$nbemail = ($object->nbemail ? $object->nbemail : 0);
 			if (is_numeric($nbemail))
 			{
-				$text='';
-				if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
+				$text = '';
+				if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
 				{
 					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 					{
-						$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
 					}
 					else
 					{
-						$text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
 				}
-				if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+				if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
 				if ($text)
 				{
-					print $form->textwithpicto($nbemail,$text,1,'warning');
+					print $form->textwithpicto($nbemail, $text, 1, 'warning');
 				}
 				else
 				{
@@ -1235,12 +1235,12 @@ 
 			print '</td></tr>';
 
 			// Other attributes
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 			if (empty($reshook))
 			{
-				print $object->showOptionals($extrafields,'edit');
+				print $object->showOptionals($extrafields, 'edit');
 			}
 
 			print '</table>';
@@ -1258,11 +1258,11 @@ 
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 			$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-			foreach($object->substitutionarray as $key => $val)
+			foreach ($object->substitutionarray as $key => $val)
 			{
-				$htmltext.=$key.' = '.$langs->trans($val).'<br>';
+				$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 			}
-			$htmltext.='</i>';
+			$htmltext .= '</i>';
 
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
@@ -1274,49 +1274,49 @@ 
 			// Subject
 			print '<tr><td class="fieldrequired titlefield">'.$langs->trans("MailTopic").'</td><td colspan="3"><input class="flat quatrevingtpercent" type="text" name="sujet" value="'.$object->sujet.'"></td></tr>';
 
-			$trackid=''; // TODO To avoid conflicts with 2 mass emailing, we should set a trackid here, even if we use another one into email header.
+			$trackid = ''; // TODO To avoid conflicts with 2 mass emailing, we should set a trackid here, even if we use another one into email header.
 			dol_init_file_process($upload_dir, $trackid);
 
 			// Joined files
-			$addfileaction='addfile';
+			$addfileaction = 'addfile';
 			print '<tr><td>'.$langs->trans("MailFile").'</td>';
 			print '<td colspan="3">';
 			// List of files
-			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+			$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
 
 			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
-			$out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-			$out.= '<script type="text/javascript" language="javascript">';
-			$out.= 'jQuery(document).ready(function () {';
-			$out.= '    jQuery(".removedfile").click(function() {';
-			$out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
-			$out.= '    });';
-			$out.= '})';
-			$out.= '</script>'."\n";
+			$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
+			$out .= '<script type="text/javascript" language="javascript">';
+			$out .= 'jQuery(document).ready(function () {';
+			$out .= '    jQuery(".removedfile").click(function() {';
+			$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
+			$out .= '    });';
+			$out .= '})';
+			$out .= '</script>'."\n";
 			if (count($listofpaths))
 			{
-				foreach($listofpaths as $key => $val)
+				foreach ($listofpaths as $key => $val)
 				{
-					$out.= '<div id="attachfile_'.$key.'">';
-					$out.= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
-					$out.= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"),'delete.png','','',1).'" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
-					$out.= '<br></div>';
+					$out .= '<div id="attachfile_'.$key.'">';
+					$out .= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
+					$out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"), 'delete.png', '', '', 1).'" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+					$out .= '<br></div>';
 				}
 			}
 			else
 			{
-				$out.= $langs->trans("NoAttachedFiles").'<br>';
+				$out .= $langs->trans("NoAttachedFiles").'<br>';
 			}
 			// Add link to add file
-			$out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-			$out.= ' ';
-			$out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+			$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+			$out .= ' ';
+			$out .= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 			print $out;
 			print '</td></tr>';
 
 		    // Background color
 			print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
-			print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
+			print $htmlother->selectColor($object->bgcolor, 'bgcolor', '', 0);
 			print '</td></tr>';
 
 			print '</table>';
@@ -1328,14 +1328,14 @@ 
 			{
 				// Editeur wysiwyg
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,'90%');
+				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
 				$doleditor->Create();
 			}
 			if ($action == 'edithtml')
 			{
 				// Editor HTML source
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('bodyemail',$object->body,'',600,'dolibarr_mailings','',true,true,'ace',20,'90%');
+				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, 'ace', 20, '90%');
 				$doleditor->Create(0, '', false, 'HTML Source', 'php');
 			}
 
@@ -1356,7 +1356,7 @@ 
 	}
 	else
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $object->error);
 	}
 }
 

dolibarr/htdocs/comm/mailing/info.php

Indentation +15 added lines, -15 removed lines

@@ -50,29 +50,29 @@
 
 if ($object->fetch($id) >= 0)
 {
-	$head = emailing_prepare_head($object);
+    $head = emailing_prepare_head($object);
 
-	dol_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
+    dol_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlright='';
-	if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+    $morehtmlright='';
+    if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
 	
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
+    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 	
-	print '<div class="underbanner clearboth"></div><br>';
+    print '<div class="underbanner clearboth"></div><br>';
 	
-	//print '<table width="100%"><tr><td>';
-	$object->user_creation=$object->user_creat;
-	$object->date_creation=$object->date_creat;
-	$object->user_validation=$object->user_valid;
-	$object->date_validation=$object->date_valid;
-	dol_print_object_info($object, 0);
-	//print '</td></tr></table>';
+    //print '<table width="100%"><tr><td>';
+    $object->user_creation=$object->user_creat;
+    $object->date_creation=$object->date_creat;
+    $object->user_validation=$object->user_valid;
+    $object->date_validation=$object->date_valid;
+    dol_print_object_info($object, 0);
+    //print '</td></tr></table>';
 	
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 
 // End of page

Braces +6 added lines, -3 removed lines

@@ -33,8 +33,9 @@ 
 $langs->load("mails");
 
 // Security check
-if (! $user->rights->mailing->lire || $user->societe_id > 0)
-accessforbidden();
+if (! $user->rights->mailing->lire || $user->societe_id > 0) {
+    accessforbidden();
+}
 
 
 
@@ -57,7 +58,9 @@ 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlright='';
-	if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+	if ($object->statut == 2) {
+	    $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+	}
 	
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 	

Spacing +11 added lines, -11 removed lines

@@ -25,18 +25,18 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT .'/comm/mailing/class/mailing.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
 
-$id=GETPOST('id');
+$id = GETPOST('id');
 
 // Load translation files required by the page
 $langs->load("mails");
 
 // Security check
-if (! $user->rights->mailing->lire || $user->societe_id > 0)
+if (!$user->rights->mailing->lire || $user->societe_id > 0)
 accessforbidden();
 
 
@@ -45,7 +45,7 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
+llxHeader('', $langs->trans("Mailing"), 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
 
 $form = new Form($db);
 
@@ -59,18 +59,18 @@ 
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlright='';
-	if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+	$morehtmlright = '';
+	if ($object->statut == 2) $morehtmlright .= ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
 	
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
 	
 	print '<div class="underbanner clearboth"></div><br>';
 	
 	//print '<table width="100%"><tr><td>';
-	$object->user_creation=$object->user_creat;
-	$object->date_creation=$object->date_creat;
-	$object->user_validation=$object->user_valid;
-	$object->date_validation=$object->date_valid;
+	$object->user_creation = $object->user_creat;
+	$object->date_creation = $object->date_creat;
+	$object->user_validation = $object->user_valid;
+	$object->date_validation = $object->date_valid;
 	dol_print_object_info($object, 0);
 	//print '</td></tr></table>';
 	

dolibarr/htdocs/comm/mailing/advtargetemailing.php

Indentation +326 added lines, -326 removed lines

@@ -37,12 +37,12 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('mails', 'companies'));
 if (! empty($conf->categorie->enabled)) {
-	$langs->load("categories");
+    $langs->load("categories");
 }
 
 // Security check
 if (! $user->rights->mailing->lire || $user->societe_id > 0)
-	accessforbidden();
+    accessforbidden();
 
 // Load variable for pagination
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
@@ -54,9 +54,9 @@ 
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder)
-	$sortorder = "ASC";
+    $sortorder = "ASC";
 if (! $sortfield)
-	$sortfield = "email";
+    $sortfield = "email";
 
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
@@ -68,31 +68,31 @@ 
 
 // Do we click on purge search criteria ?
 if (GETPOST('button_removefilter_x','alpha')) {
-	$search_nom = '';
-	$search_prenom = '';
-	$search_email = '';
+    $search_nom = '';
+    $search_prenom = '';
+    $search_email = '';
 }
 $array_query = array ();
 $object = new Mailing($db);
 $advTarget = new AdvanceTargetingMailing($db);
 
 if (empty($template_id)) {
-	$advTarget->fk_element = $id;
-	$advTarget->type_element = 'mailing';
-	$result = $advTarget->fetch_by_mailing();
+    $advTarget->fk_element = $id;
+    $advTarget->type_element = 'mailing';
+    $result = $advTarget->fetch_by_mailing();
 } else {
-	$result = $advTarget->fetch($template_id);
+    $result = $advTarget->fetch($template_id);
 }
 
 if ($result < 0)
 {
-	setEventMessages($advTarget->error, $advTarget->errors, 'errors');
+    setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 }
 else
 {
-	if (! empty($advTarget->id)) {
-		$array_query = json_decode($advTarget->filtervalue, true);
-	}
+    if (! empty($advTarget->id)) {
+        $array_query = json_decode($advTarget->filtervalue, true);
+    }
 }
 
 
@@ -101,308 +101,308 @@ 
  */
 
 if ($action == 'loadfilter') {
-	if (! empty($template_id)) {
-		$result = $advTarget->fetch($template_id);
-		if ($result < 0) {
-			setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-		} else {
-			if (! empty($advTarget->id)) {
-				$array_query = json_decode($advTarget->filtervalue, true);
-			}
-		}
-	}
+    if (! empty($template_id)) {
+        $result = $advTarget->fetch($template_id);
+        if ($result < 0) {
+            setEventMessages($advTarget->error, $advTarget->errors, 'errors');
+        } else {
+            if (! empty($advTarget->id)) {
+                $array_query = json_decode($advTarget->filtervalue, true);
+            }
+        }
+    }
 }
 
 if ($action == 'add') {
 
-	$user_contact_query = false;
-
-	$array_query = array ();
-
-	// Get extra fields
-
-	foreach ( $_POST as $key => $value ) {
-		// print '$key='.$key.' $value='.$value.'<BR>';
-		if (preg_match("/^options_.*(?<!_cnct)$/", $key)) {
-			// Special case for start date come with 3 inputs day, month, year
-			if (preg_match("/st_dt/", $key)) {
-				$dtarr = array ();
-				$dtarr = explode('_', $key);
-				if (! array_key_exists('options_' . $dtarr[1] . '_st_dt', $array_query)) {
-					$array_query['options_' . $dtarr[1] . '_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear', 'int'));
-				}
-			} elseif (preg_match("/end_dt/", $key)) {
-				// Special case for end date come with 3 inputs day, month, year
-				$dtarr = array ();
-				$dtarr = explode('_', $key);
-				if (! array_key_exists('options_' . $dtarr[1] . '_end_dt', $array_query)) {
-					$array_query['options_' . $dtarr[1] . '_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear', 'int'));
-				}
-			} else {
-				$array_query[$key] = GETPOST($key);
-			}
-		}
-		if (preg_match("/^options_.*_cnct/", $key)) {
-			$user_contact_query = true;
-			// Special case for start date come with 3 inputs day, month, year
-			if (preg_match("/st_dt/", $key)) {
-				$dtarr = array ();
-				$dtarr = explode('_', $key);
-				if (! array_key_exists('options_' . $dtarr[1] . '_st_dt' . '_cnct', $array_query)) {
-					$array_query['options_' . $dtarr[1] . '_st_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear' . '_cnct', 'int'));
-				}
-			} elseif (preg_match("/end_dt/", $key)) {
-				// Special case for end date come with 3 inputs day, month, year
-				$dtarr = array ();
-				$dtarr = explode('_', $key);
-				if (! array_key_exists('options_' . $dtarr[1] . '_end_dt' . '_cnct', $array_query)) {
-					$array_query['options_' . $dtarr[1] . '_end_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear' . '_cnct', 'int'));
-				}
-			} else {
-				$array_query[$key] = GETPOST($key);
-			}
-		}
-
-		if (preg_match("/^cust_/", $key)) {
-			$array_query[$key] = GETPOST($key);
-		}
-
-		if (preg_match("/^contact_/", $key)) {
-
-			$array_query[$key] = GETPOST($key);
-
-			$specials_date_key = array (
-					'contact_update_st_dt',
-					'contact_update_end_dt',
-					'contact_create_st_dt',
-					'contact_create_end_dt'
-			);
-			foreach ( $specials_date_key as $date_key ) {
-				if ($key == $date_key) {
-					$dt = GETPOST($date_key);
-					if (! empty($dt)) {
-						$array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key . 'month', 'int'), GETPOST($date_key . 'day', 'int'), GETPOST($date_key . 'year', 'int'));
-					} else {
-						$array_query[$key] = '';
-					}
-				}
-			}
-
-			if (! empty($array_query[$key])) {
-				$user_contact_query = true;
-			}
-		}
-
-		if ($array_query['type_of_target'] == 2 || $array_query['type_of_target'] == 4) {
-			$user_contact_query = true;
-		}
-
-		if (preg_match("/^type_of_target/", $key)) {
-			$array_query[$key] = GETPOST($key);
-		}
-	}
-
-	// if ($array_query ['type_of_target'] == 1 || $array_query ['type_of_target'] == 3) {
-	$result = $advTarget->query_thirdparty($array_query);
-	if ($result < 0) {
-		setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-	}
-	/*} else {
+    $user_contact_query = false;
+
+    $array_query = array ();
+
+    // Get extra fields
+
+    foreach ( $_POST as $key => $value ) {
+        // print '$key='.$key.' $value='.$value.'<BR>';
+        if (preg_match("/^options_.*(?<!_cnct)$/", $key)) {
+            // Special case for start date come with 3 inputs day, month, year
+            if (preg_match("/st_dt/", $key)) {
+                $dtarr = array ();
+                $dtarr = explode('_', $key);
+                if (! array_key_exists('options_' . $dtarr[1] . '_st_dt', $array_query)) {
+                    $array_query['options_' . $dtarr[1] . '_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear', 'int'));
+                }
+            } elseif (preg_match("/end_dt/", $key)) {
+                // Special case for end date come with 3 inputs day, month, year
+                $dtarr = array ();
+                $dtarr = explode('_', $key);
+                if (! array_key_exists('options_' . $dtarr[1] . '_end_dt', $array_query)) {
+                    $array_query['options_' . $dtarr[1] . '_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear', 'int'));
+                }
+            } else {
+                $array_query[$key] = GETPOST($key);
+            }
+        }
+        if (preg_match("/^options_.*_cnct/", $key)) {
+            $user_contact_query = true;
+            // Special case for start date come with 3 inputs day, month, year
+            if (preg_match("/st_dt/", $key)) {
+                $dtarr = array ();
+                $dtarr = explode('_', $key);
+                if (! array_key_exists('options_' . $dtarr[1] . '_st_dt' . '_cnct', $array_query)) {
+                    $array_query['options_' . $dtarr[1] . '_st_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear' . '_cnct', 'int'));
+                }
+            } elseif (preg_match("/end_dt/", $key)) {
+                // Special case for end date come with 3 inputs day, month, year
+                $dtarr = array ();
+                $dtarr = explode('_', $key);
+                if (! array_key_exists('options_' . $dtarr[1] . '_end_dt' . '_cnct', $array_query)) {
+                    $array_query['options_' . $dtarr[1] . '_end_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear' . '_cnct', 'int'));
+                }
+            } else {
+                $array_query[$key] = GETPOST($key);
+            }
+        }
+
+        if (preg_match("/^cust_/", $key)) {
+            $array_query[$key] = GETPOST($key);
+        }
+
+        if (preg_match("/^contact_/", $key)) {
+
+            $array_query[$key] = GETPOST($key);
+
+            $specials_date_key = array (
+                    'contact_update_st_dt',
+                    'contact_update_end_dt',
+                    'contact_create_st_dt',
+                    'contact_create_end_dt'
+            );
+            foreach ( $specials_date_key as $date_key ) {
+                if ($key == $date_key) {
+                    $dt = GETPOST($date_key);
+                    if (! empty($dt)) {
+                        $array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key . 'month', 'int'), GETPOST($date_key . 'day', 'int'), GETPOST($date_key . 'year', 'int'));
+                    } else {
+                        $array_query[$key] = '';
+                    }
+                }
+            }
+
+            if (! empty($array_query[$key])) {
+                $user_contact_query = true;
+            }
+        }
+
+        if ($array_query['type_of_target'] == 2 || $array_query['type_of_target'] == 4) {
+            $user_contact_query = true;
+        }
+
+        if (preg_match("/^type_of_target/", $key)) {
+            $array_query[$key] = GETPOST($key);
+        }
+    }
+
+    // if ($array_query ['type_of_target'] == 1 || $array_query ['type_of_target'] == 3) {
+    $result = $advTarget->query_thirdparty($array_query);
+    if ($result < 0) {
+        setEventMessages($advTarget->error, $advTarget->errors, 'errors');
+    }
+    /*} else {
 		$advTarget->thirdparty_lines = array ();
 	}*/
 
-	if ($user_contact_query && ($array_query['type_of_target'] == 1 || $array_query['type_of_target'] == 2 || $array_query['type_of_target'] == 4)) {
-		$result = $advTarget->query_contact($array_query, 1);
-		if ($result < 0) {
-			setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-		}
-		// If use contact but no result use artefact to so not use socid into add_to_target
-		if (count($advTarget->contact_lines) == 0) {
-			$advTarget->contact_lines = array (
-					0
-			);
-		}
-	} else {
-		$advTarget->contact_lines = array ();
-	}
-
-	if ((count($advTarget->thirdparty_lines) > 0) || (count($advTarget->contact_lines) > 0)) {
-		// Add targets into database
-		$obj = new mailing_advthirdparties($db);
-		$result = $obj->add_to_target_spec($id, $advTarget->thirdparty_lines, $array_query['type_of_target'], $advTarget->contact_lines);
-	} else {
-		$result = 0;
-	}
-
-	if ($result > 0) {
-		$query_temlate_id = '';
-		if (! empty($template_id)) {
-			$query_temlate_id = '&template_id=' . $template_id;
-		}
-		setEventMessages($langs->trans("XTargetsAdded",$result), null, 'mesgs');
-		header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id . $query_temlate_id);
-		exit();
-	}
-	if ($result == 0) {
-		setEventMessages($langs->trans("WarningNoEMailsAdded"), null, 'warnings');
-	}
-	if ($result < 0) {
-		setEventMessages($obj->error, $obj->errors, 'errors');
-	}
+    if ($user_contact_query && ($array_query['type_of_target'] == 1 || $array_query['type_of_target'] == 2 || $array_query['type_of_target'] == 4)) {
+        $result = $advTarget->query_contact($array_query, 1);
+        if ($result < 0) {
+            setEventMessages($advTarget->error, $advTarget->errors, 'errors');
+        }
+        // If use contact but no result use artefact to so not use socid into add_to_target
+        if (count($advTarget->contact_lines) == 0) {
+            $advTarget->contact_lines = array (
+                    0
+            );
+        }
+    } else {
+        $advTarget->contact_lines = array ();
+    }
+
+    if ((count($advTarget->thirdparty_lines) > 0) || (count($advTarget->contact_lines) > 0)) {
+        // Add targets into database
+        $obj = new mailing_advthirdparties($db);
+        $result = $obj->add_to_target_spec($id, $advTarget->thirdparty_lines, $array_query['type_of_target'], $advTarget->contact_lines);
+    } else {
+        $result = 0;
+    }
+
+    if ($result > 0) {
+        $query_temlate_id = '';
+        if (! empty($template_id)) {
+            $query_temlate_id = '&template_id=' . $template_id;
+        }
+        setEventMessages($langs->trans("XTargetsAdded",$result), null, 'mesgs');
+        header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id . $query_temlate_id);
+        exit();
+    }
+    if ($result == 0) {
+        setEventMessages($langs->trans("WarningNoEMailsAdded"), null, 'warnings');
+    }
+    if ($result < 0) {
+        setEventMessages($obj->error, $obj->errors, 'errors');
+    }
 }
 
 if ($action == 'clear') {
-	// Chargement de la classe
-	$classname = "MailingTargets";
-	$obj = new $classname($db);
-	$obj->clear_target($id);
+    // Chargement de la classe
+    $classname = "MailingTargets";
+    $obj = new $classname($db);
+    $obj->clear_target($id);
 
-	header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
-	exit();
+    header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+    exit();
 }
 
 if ($action == 'savefilter' || $action == 'createfilter') {
 
-	$template_name = GETPOST('template_name');
-	$error = 0;
-
-	if ($action == 'createfilter' && empty($template_name)) {
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), null, 'errors');
-		$error ++;
-	}
-
-	if (empty($error)) {
-
-		$array_query = array ();
-
-		// Get extra fields
-		foreach ( $_POST as $key => $value ) {
-			if (preg_match("/^options_.*(?<!_cnct)$/", $key)) {
-				// Special case for start date come with 3 inputs day, month, year
-				if (preg_match("/st_dt/", $key)) {
-					$dtarr = array ();
-					$dtarr = explode('_', $key);
-					if (! array_key_exists('options_' . $dtarr[1] . '_st_dt', $array_query)) {
-						$array_query['options_' . $dtarr[1] . '_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear', 'int'));
-					}
-				} elseif (preg_match("/end_dt/", $key)) {
-					// Special case for end date come with 3 inputs day, month, year
-					$dtarr = array ();
-					$dtarr = explode('_', $key);
-					if (! array_key_exists('options_' . $dtarr[1] . '_end_dt', $array_query)) {
-						$array_query['options_' . $dtarr[1] . '_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear', 'int'));
-						// print $array_query['options_'.$dtarr[1].'_end_dt'];
-						// 01/02/1013=1361228400
-					}
-				} else {
-					$array_query[$key] = GETPOST($key);
-				}
-			}
-			if (preg_match("/^options_.*_cnct/", $key)) {
-				// Special case for start date come with 3 inputs day, month, year
-				if (preg_match("/st_dt/", $key)) {
-					$dtarr = array ();
-					$dtarr = explode('_', $key);
-					if (! array_key_exists('options_' . $dtarr[1] . '_st_dt' . '_cnct', $array_query)) {
-						$array_query['options_' . $dtarr[1] . '_st_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear' . '_cnct', 'int'));
-					}
-				} elseif (preg_match("/end_dt/", $key)) {
-					// Special case for end date come with 3 inputs day, month, year
-					$dtarr = array ();
-					$dtarr = explode('_', $key);
-					if (! array_key_exists('options_' . $dtarr[1] . '_end_dt' . '_cnct', $array_query)) {
-						$array_query['options_' . $dtarr[1] . '_end_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear' . '_cnct', 'int'));
-						// print $array_query['cnct_options_'.$dtarr[1].'_end_dt'];
-						// 01/02/1013=1361228400
-					}
-				} else {
-					$array_query[$key] = GETPOST($key);
-				}
-			}
-
-			if (preg_match("/^cust_/", $key)) {
-				$array_query[$key] = GETPOST($key);
-			}
-
-			if (preg_match("/^contact_/", $key)) {
-
-				$array_query[$key] = GETPOST($key);
-
-				$specials_date_key = array (
-						'contact_update_st_dt',
-						'contact_update_end_dt',
-						'contact_create_st_dt',
-						'contact_create_end_dt'
-				);
-				foreach ( $specials_date_key as $date_key ) {
-					if ($key == $date_key) {
-						$dt = GETPOST($date_key);
-						if (! empty($dt)) {
-							$array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key . 'month', 'int'), GETPOST($date_key . 'day', 'int'), GETPOST($date_key . 'year', 'int'));
-						} else {
-							$array_query[$key] = '';
-						}
-					}
-				}
-			}
-
-			if (preg_match("/^type_of_target/", $key)) {
-				$array_query[$key] = GETPOST($key);
-			}
-		}
-		$advTarget->filtervalue = json_encode($array_query);
-
-		if ($action == 'createfilter') {
-			$advTarget->name = $template_name;
-			$result = $advTarget->create($user);
-			if ($result < 0) {
-				setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-			}
-		} elseif ($action == 'savefilter') {
-
-			$result = $advTarget->update($user);
-			if ($result < 0) {
-				setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-			}
-		}
-		$template_id = $advTarget->id;
-	}
+    $template_name = GETPOST('template_name');
+    $error = 0;
+
+    if ($action == 'createfilter' && empty($template_name)) {
+        setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), null, 'errors');
+        $error ++;
+    }
+
+    if (empty($error)) {
+
+        $array_query = array ();
+
+        // Get extra fields
+        foreach ( $_POST as $key => $value ) {
+            if (preg_match("/^options_.*(?<!_cnct)$/", $key)) {
+                // Special case for start date come with 3 inputs day, month, year
+                if (preg_match("/st_dt/", $key)) {
+                    $dtarr = array ();
+                    $dtarr = explode('_', $key);
+                    if (! array_key_exists('options_' . $dtarr[1] . '_st_dt', $array_query)) {
+                        $array_query['options_' . $dtarr[1] . '_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear', 'int'));
+                    }
+                } elseif (preg_match("/end_dt/", $key)) {
+                    // Special case for end date come with 3 inputs day, month, year
+                    $dtarr = array ();
+                    $dtarr = explode('_', $key);
+                    if (! array_key_exists('options_' . $dtarr[1] . '_end_dt', $array_query)) {
+                        $array_query['options_' . $dtarr[1] . '_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear', 'int'));
+                        // print $array_query['options_'.$dtarr[1].'_end_dt'];
+                        // 01/02/1013=1361228400
+                    }
+                } else {
+                    $array_query[$key] = GETPOST($key);
+                }
+            }
+            if (preg_match("/^options_.*_cnct/", $key)) {
+                // Special case for start date come with 3 inputs day, month, year
+                if (preg_match("/st_dt/", $key)) {
+                    $dtarr = array ();
+                    $dtarr = explode('_', $key);
+                    if (! array_key_exists('options_' . $dtarr[1] . '_st_dt' . '_cnct', $array_query)) {
+                        $array_query['options_' . $dtarr[1] . '_st_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear' . '_cnct', 'int'));
+                    }
+                } elseif (preg_match("/end_dt/", $key)) {
+                    // Special case for end date come with 3 inputs day, month, year
+                    $dtarr = array ();
+                    $dtarr = explode('_', $key);
+                    if (! array_key_exists('options_' . $dtarr[1] . '_end_dt' . '_cnct', $array_query)) {
+                        $array_query['options_' . $dtarr[1] . '_end_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear' . '_cnct', 'int'));
+                        // print $array_query['cnct_options_'.$dtarr[1].'_end_dt'];
+                        // 01/02/1013=1361228400
+                    }
+                } else {
+                    $array_query[$key] = GETPOST($key);
+                }
+            }
+
+            if (preg_match("/^cust_/", $key)) {
+                $array_query[$key] = GETPOST($key);
+            }
+
+            if (preg_match("/^contact_/", $key)) {
+
+                $array_query[$key] = GETPOST($key);
+
+                $specials_date_key = array (
+                        'contact_update_st_dt',
+                        'contact_update_end_dt',
+                        'contact_create_st_dt',
+                        'contact_create_end_dt'
+                );
+                foreach ( $specials_date_key as $date_key ) {
+                    if ($key == $date_key) {
+                        $dt = GETPOST($date_key);
+                        if (! empty($dt)) {
+                            $array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key . 'month', 'int'), GETPOST($date_key . 'day', 'int'), GETPOST($date_key . 'year', 'int'));
+                        } else {
+                            $array_query[$key] = '';
+                        }
+                    }
+                }
+            }
+
+            if (preg_match("/^type_of_target/", $key)) {
+                $array_query[$key] = GETPOST($key);
+            }
+        }
+        $advTarget->filtervalue = json_encode($array_query);
+
+        if ($action == 'createfilter') {
+            $advTarget->name = $template_name;
+            $result = $advTarget->create($user);
+            if ($result < 0) {
+                setEventMessages($advTarget->error, $advTarget->errors, 'errors');
+            }
+        } elseif ($action == 'savefilter') {
+
+            $result = $advTarget->update($user);
+            if ($result < 0) {
+                setEventMessages($advTarget->error, $advTarget->errors, 'errors');
+            }
+        }
+        $template_id = $advTarget->id;
+    }
 }
 
 if ($action == 'deletefilter') {
-	$result = $advTarget->delete($user);
-	if ($result < 0) {
-		setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-	}
-	header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
-	exit();
+    $result = $advTarget->delete($user);
+    if ($result < 0) {
+        setEventMessages($advTarget->error, $advTarget->errors, 'errors');
+    }
+    header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+    exit();
 }
 
 if ($action == 'delete') {
-	// Ici, rowid indique le destinataire et id le mailing
-	$sql = "DELETE FROM " . MAIN_DB_PREFIX . "mailing_cibles WHERE rowid=" . $rowid;
-	$resql = $db->query($sql);
-	if ($resql) {
-		if (! empty($id)) {
-			$classname = "MailingTargets";
-			$obj = new $classname($db);
-			$obj->update_nb($id);
-
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
-			exit();
-		} else {
-			header("Location: liste.php");
-			exit();
-		}
-	} else {
-		dol_print_error($db);
-	}
+    // Ici, rowid indique le destinataire et id le mailing
+    $sql = "DELETE FROM " . MAIN_DB_PREFIX . "mailing_cibles WHERE rowid=" . $rowid;
+    $resql = $db->query($sql);
+    if ($resql) {
+        if (! empty($id)) {
+            $classname = "MailingTargets";
+            $obj = new $classname($db);
+            $obj->update_nb($id);
+
+            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+            exit();
+        } else {
+            header("Location: liste.php");
+            exit();
+        }
+    } else {
+        dol_print_error($db);
+    }
 }
 
 if ($_POST["button_removefilter"]) {
-	$search_nom = '';
-	$search_prenom = '';
-	$search_email = '';
+    $search_nom = '';
+    $search_prenom = '';
+    $search_email = '';
 }
 
 
@@ -422,52 +422,52 @@ 
 
 if ($object->fetch($id) >= 0) {
 
-	$head = emailing_prepare_head($object);
+    $head = emailing_prepare_head($object);
 
-	dol_fiche_head($head, 'advtargets', $langs->trans("Mailing"), 0, 'email');
+    dol_fiche_head($head, 'advtargets', $langs->trans("Mailing"), 0, 'email');
 
-	print '<table class="border" width="100%">';
+    print '<table class="border" width="100%">';
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/mailing/liste.php">' . $langs->trans("BackToList") . '</a>';
+    $linkback = '<a href="' . DOL_URL_ROOT . '/comm/mailing/liste.php">' . $langs->trans("BackToList") . '</a>';
 
-	print '<tr><td width="25%">' . $langs->trans("Ref") . '</td>';
-	print '<td colspan="3">';
-	print $form->showrefnav($object, 'id', $linkback);
-	print '</td></tr>';
+    print '<tr><td width="25%">' . $langs->trans("Ref") . '</td>';
+    print '<td colspan="3">';
+    print $form->showrefnav($object, 'id', $linkback);
+    print '</td></tr>';
 
-	print '<tr><td width="25%">' . $langs->trans("MailTitle") . '</td><td colspan="3">' . $object->titre . '</td></tr>';
+    print '<tr><td width="25%">' . $langs->trans("MailTitle") . '</td><td colspan="3">' . $object->titre . '</td></tr>';
 
-	print '<tr><td width="25%">' . $langs->trans("MailFrom") . '</td><td colspan="3">' . dol_print_email($object->email_from, 0, 0, 0, 0, 1) . '</td></tr>';
+    print '<tr><td width="25%">' . $langs->trans("MailFrom") . '</td><td colspan="3">' . dol_print_email($object->email_from, 0, 0, 0, 0, 1) . '</td></tr>';
 
-	// Errors to
-	print '<tr><td width="25%">' . $langs->trans("MailErrorsTo") . '</td><td colspan="3">' . dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1);
-	print '</td></tr>';
+    // Errors to
+    print '<tr><td width="25%">' . $langs->trans("MailErrorsTo") . '</td><td colspan="3">' . dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1);
+    print '</td></tr>';
 
-	// Status
-	print '<tr><td width="25%">' . $langs->trans("Status") . '</td><td colspan="3">' . $object->getLibStatut(4) . '</td></tr>';
+    // Status
+    print '<tr><td width="25%">' . $langs->trans("Status") . '</td><td colspan="3">' . $object->getLibStatut(4) . '</td></tr>';
 
-	// Nb of distinct emails
-	print '<tr><td width="25%">';
-	print $langs->trans("TotalNbOfDistinctRecipients");
-	print '</td><td colspan="3">';
-	$nbemail = ($object->nbemail ? $object->nbemail : '0');
-	if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) {
-		$text = $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-		print $form->textwithpicto($nbemail, $text, 1, 'warning');
-	} else {
-		print $nbemail;
-	}
-	print '</td></tr>';
+    // Nb of distinct emails
+    print '<tr><td width="25%">';
+    print $langs->trans("TotalNbOfDistinctRecipients");
+    print '</td><td colspan="3">';
+    $nbemail = ($object->nbemail ? $object->nbemail : '0');
+    if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) {
+        $text = $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+        print $form->textwithpicto($nbemail, $text, 1, 'warning');
+    } else {
+        print $nbemail;
+    }
+    print '</td></tr>';
 
-	print '</table>';
+    print '</table>';
 
-	print "</div>";
+    print "</div>";
 
-	// Show email selectors
-	if ($object->statut == 0 && $user->rights->mailing->creer) {
+    // Show email selectors
+    if ($object->statut == 0 && $user->rights->mailing->creer) {
 
-		include DOL_DOCUMENT_ROOT . '/core/tpl/advtarget.tpl.php';
-	}
+        include DOL_DOCUMENT_ROOT . '/core/tpl/advtarget.tpl.php';
+    }
 }
 
 // End of page

Braces +10 added lines, -6 removed lines

@@ -22,7 +22,9 @@ 
  *       \brief      Page to define emailing targets
  */
 
-if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK','1');
+if (! defined('NOSTYLECHECK')) {
+    define('NOSTYLECHECK','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -43,8 +45,9 @@ 
 }
 
 // Security check
-if (! $user->rights->mailing->lire || $user->societe_id > 0)
+if (! $user->rights->mailing->lire || $user->societe_id > 0) {
 	accessforbidden();
+}
 
 // Load variable for pagination
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
@@ -55,10 +58,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder)
+if (! $sortorder) {
 	$sortorder = "ASC";
-if (! $sortfield)
+}
+if (! $sortfield) {
 	$sortfield = "email";
+}
 
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
@@ -89,8 +94,7 @@ 
 if ($result < 0)
 {
 	setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-}
-else
+} else
 {
 	if (! empty($advTarget->id)) {
 		$array_query = json_decode($advTarget->filtervalue, true);

Spacing +80 added lines, -80 removed lines

@@ -22,59 +22,59 @@ 
  *       \brief      Page to define emailing targets
  */
 
-if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK','1');
+if (!defined('NOSTYLECHECK')) define('NOSTYLECHECK', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/comm/mailing/class/mailing.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/emailing.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/comm/mailing/class/advtargetemailing.class.php';
-require_once DOL_DOCUMENT_ROOT . '/comm/mailing/class/html.formadvtargetemailing.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/modules/mailings/advthirdparties.modules.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/advtargetemailing.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/html.formadvtargetemailing.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/advthirdparties.modules.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('mails', 'companies'));
-if (! empty($conf->categorie->enabled)) {
+if (!empty($conf->categorie->enabled)) {
 	$langs->load("categories");
 }
 
 // Security check
-if (! $user->rights->mailing->lire || $user->societe_id > 0)
+if (!$user->rights->mailing->lire || $user->societe_id > 0)
 	accessforbidden();
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder)
+if (!$sortorder)
 	$sortorder = "ASC";
-if (! $sortfield)
+if (!$sortfield)
 	$sortfield = "email";
 
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 $search_nom = GETPOST("search_nom");
 $search_prenom = GETPOST("search_prenom");
 $search_email = GETPOST("search_email");
 $template_id = GETPOST('template_id', 'int');
 
 // Do we click on purge search criteria ?
-if (GETPOST('button_removefilter_x','alpha')) {
+if (GETPOST('button_removefilter_x', 'alpha')) {
 	$search_nom = '';
 	$search_prenom = '';
 	$search_email = '';
 }
-$array_query = array ();
+$array_query = array();
 $object = new Mailing($db);
 $advTarget = new AdvanceTargetingMailing($db);
 
@@ -92,7 +92,7 @@ 
 }
 else
 {
-	if (! empty($advTarget->id)) {
+	if (!empty($advTarget->id)) {
 		$array_query = json_decode($advTarget->filtervalue, true);
 	}
 }
@@ -103,12 +103,12 @@ 
  */
 
 if ($action == 'loadfilter') {
-	if (! empty($template_id)) {
+	if (!empty($template_id)) {
 		$result = $advTarget->fetch($template_id);
 		if ($result < 0) {
 			setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 		} else {
-			if (! empty($advTarget->id)) {
+			if (!empty($advTarget->id)) {
 				$array_query = json_decode($advTarget->filtervalue, true);
 			}
 		}
@@ -119,26 +119,26 @@ 
 
 	$user_contact_query = false;
 
-	$array_query = array ();
+	$array_query = array();
 
 	// Get extra fields
 
-	foreach ( $_POST as $key => $value ) {
+	foreach ($_POST as $key => $value) {
 		// print '$key='.$key.' $value='.$value.'<BR>';
 		if (preg_match("/^options_.*(?<!_cnct)$/", $key)) {
 			// Special case for start date come with 3 inputs day, month, year
 			if (preg_match("/st_dt/", $key)) {
-				$dtarr = array ();
+				$dtarr = array();
 				$dtarr = explode('_', $key);
-				if (! array_key_exists('options_' . $dtarr[1] . '_st_dt', $array_query)) {
-					$array_query['options_' . $dtarr[1] . '_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear', 'int'));
+				if (!array_key_exists('options_'.$dtarr[1].'_st_dt', $array_query)) {
+					$array_query['options_'.$dtarr[1].'_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_st_dtmonth', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtday', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtyear', 'int'));
 				}
 			} elseif (preg_match("/end_dt/", $key)) {
 				// Special case for end date come with 3 inputs day, month, year
-				$dtarr = array ();
+				$dtarr = array();
 				$dtarr = explode('_', $key);
-				if (! array_key_exists('options_' . $dtarr[1] . '_end_dt', $array_query)) {
-					$array_query['options_' . $dtarr[1] . '_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear', 'int'));
+				if (!array_key_exists('options_'.$dtarr[1].'_end_dt', $array_query)) {
+					$array_query['options_'.$dtarr[1].'_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_end_dtmonth', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtday', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtyear', 'int'));
 				}
 			} else {
 				$array_query[$key] = GETPOST($key);
@@ -148,17 +148,17 @@ 
 			$user_contact_query = true;
 			// Special case for start date come with 3 inputs day, month, year
 			if (preg_match("/st_dt/", $key)) {
-				$dtarr = array ();
+				$dtarr = array();
 				$dtarr = explode('_', $key);
-				if (! array_key_exists('options_' . $dtarr[1] . '_st_dt' . '_cnct', $array_query)) {
-					$array_query['options_' . $dtarr[1] . '_st_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear' . '_cnct', 'int'));
+				if (!array_key_exists('options_'.$dtarr[1].'_st_dt'.'_cnct', $array_query)) {
+					$array_query['options_'.$dtarr[1].'_st_dt'.'_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_st_dtmonth'.'_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtday'.'_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtyear'.'_cnct', 'int'));
 				}
 			} elseif (preg_match("/end_dt/", $key)) {
 				// Special case for end date come with 3 inputs day, month, year
-				$dtarr = array ();
+				$dtarr = array();
 				$dtarr = explode('_', $key);
-				if (! array_key_exists('options_' . $dtarr[1] . '_end_dt' . '_cnct', $array_query)) {
-					$array_query['options_' . $dtarr[1] . '_end_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear' . '_cnct', 'int'));
+				if (!array_key_exists('options_'.$dtarr[1].'_end_dt'.'_cnct', $array_query)) {
+					$array_query['options_'.$dtarr[1].'_end_dt'.'_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_end_dtmonth'.'_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtday'.'_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtyear'.'_cnct', 'int'));
 				}
 			} else {
 				$array_query[$key] = GETPOST($key);
@@ -173,24 +173,24 @@ 
 
 			$array_query[$key] = GETPOST($key);
 
-			$specials_date_key = array (
+			$specials_date_key = array(
 					'contact_update_st_dt',
 					'contact_update_end_dt',
 					'contact_create_st_dt',
 					'contact_create_end_dt'
 			);
-			foreach ( $specials_date_key as $date_key ) {
+			foreach ($specials_date_key as $date_key) {
 				if ($key == $date_key) {
 					$dt = GETPOST($date_key);
-					if (! empty($dt)) {
-						$array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key . 'month', 'int'), GETPOST($date_key . 'day', 'int'), GETPOST($date_key . 'year', 'int'));
+					if (!empty($dt)) {
+						$array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key.'month', 'int'), GETPOST($date_key.'day', 'int'), GETPOST($date_key.'year', 'int'));
 					} else {
 						$array_query[$key] = '';
 					}
 				}
 			}
 
-			if (! empty($array_query[$key])) {
+			if (!empty($array_query[$key])) {
 				$user_contact_query = true;
 			}
 		}
@@ -220,12 +220,12 @@ 
 		}
 		// If use contact but no result use artefact to so not use socid into add_to_target
 		if (count($advTarget->contact_lines) == 0) {
-			$advTarget->contact_lines = array (
+			$advTarget->contact_lines = array(
 					0
 			);
 		}
 	} else {
-		$advTarget->contact_lines = array ();
+		$advTarget->contact_lines = array();
 	}
 
 	if ((count($advTarget->thirdparty_lines) > 0) || (count($advTarget->contact_lines) > 0)) {
@@ -238,11 +238,11 @@ 
 
 	if ($result > 0) {
 		$query_temlate_id = '';
-		if (! empty($template_id)) {
-			$query_temlate_id = '&template_id=' . $template_id;
+		if (!empty($template_id)) {
+			$query_temlate_id = '&template_id='.$template_id;
 		}
-		setEventMessages($langs->trans("XTargetsAdded",$result), null, 'mesgs');
-		header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id . $query_temlate_id);
+		setEventMessages($langs->trans("XTargetsAdded", $result), null, 'mesgs');
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id.$query_temlate_id);
 		exit();
 	}
 	if ($result == 0) {
@@ -259,7 +259,7 @@ 
 	$obj = new $classname($db);
 	$obj->clear_target($id);
 
-	header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+	header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 	exit();
 }
 
@@ -270,29 +270,29 @@ 
 
 	if ($action == 'createfilter' && empty($template_name)) {
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), null, 'errors');
-		$error ++;
+		$error++;
 	}
 
 	if (empty($error)) {
 
-		$array_query = array ();
+		$array_query = array();
 
 		// Get extra fields
-		foreach ( $_POST as $key => $value ) {
+		foreach ($_POST as $key => $value) {
 			if (preg_match("/^options_.*(?<!_cnct)$/", $key)) {
 				// Special case for start date come with 3 inputs day, month, year
 				if (preg_match("/st_dt/", $key)) {
-					$dtarr = array ();
+					$dtarr = array();
 					$dtarr = explode('_', $key);
-					if (! array_key_exists('options_' . $dtarr[1] . '_st_dt', $array_query)) {
-						$array_query['options_' . $dtarr[1] . '_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear', 'int'));
+					if (!array_key_exists('options_'.$dtarr[1].'_st_dt', $array_query)) {
+						$array_query['options_'.$dtarr[1].'_st_dt'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_st_dtmonth', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtday', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtyear', 'int'));
 					}
 				} elseif (preg_match("/end_dt/", $key)) {
 					// Special case for end date come with 3 inputs day, month, year
-					$dtarr = array ();
+					$dtarr = array();
 					$dtarr = explode('_', $key);
-					if (! array_key_exists('options_' . $dtarr[1] . '_end_dt', $array_query)) {
-						$array_query['options_' . $dtarr[1] . '_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear', 'int'));
+					if (!array_key_exists('options_'.$dtarr[1].'_end_dt', $array_query)) {
+						$array_query['options_'.$dtarr[1].'_end_dt'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_end_dtmonth', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtday', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtyear', 'int'));
 						// print $array_query['options_'.$dtarr[1].'_end_dt'];
 						// 01/02/1013=1361228400
 					}
@@ -303,17 +303,17 @@ 
 			if (preg_match("/^options_.*_cnct/", $key)) {
 				// Special case for start date come with 3 inputs day, month, year
 				if (preg_match("/st_dt/", $key)) {
-					$dtarr = array ();
+					$dtarr = array();
 					$dtarr = explode('_', $key);
-					if (! array_key_exists('options_' . $dtarr[1] . '_st_dt' . '_cnct', $array_query)) {
-						$array_query['options_' . $dtarr[1] . '_st_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_st_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_st_dtyear' . '_cnct', 'int'));
+					if (!array_key_exists('options_'.$dtarr[1].'_st_dt'.'_cnct', $array_query)) {
+						$array_query['options_'.$dtarr[1].'_st_dt'.'_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_st_dtmonth'.'_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtday'.'_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_st_dtyear'.'_cnct', 'int'));
 					}
 				} elseif (preg_match("/end_dt/", $key)) {
 					// Special case for end date come with 3 inputs day, month, year
-					$dtarr = array ();
+					$dtarr = array();
 					$dtarr = explode('_', $key);
-					if (! array_key_exists('options_' . $dtarr[1] . '_end_dt' . '_cnct', $array_query)) {
-						$array_query['options_' . $dtarr[1] . '_end_dt' . '_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_' . $dtarr[1] . '_end_dtmonth' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtday' . '_cnct', 'int'), GETPOST('options_' . $dtarr[1] . '_end_dtyear' . '_cnct', 'int'));
+					if (!array_key_exists('options_'.$dtarr[1].'_end_dt'.'_cnct', $array_query)) {
+						$array_query['options_'.$dtarr[1].'_end_dt'.'_cnct'] = dol_mktime(0, 0, 0, GETPOST('options_'.$dtarr[1].'_end_dtmonth'.'_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtday'.'_cnct', 'int'), GETPOST('options_'.$dtarr[1].'_end_dtyear'.'_cnct', 'int'));
 						// print $array_query['cnct_options_'.$dtarr[1].'_end_dt'];
 						// 01/02/1013=1361228400
 					}
@@ -330,17 +330,17 @@ 
 
 				$array_query[$key] = GETPOST($key);
 
-				$specials_date_key = array (
+				$specials_date_key = array(
 						'contact_update_st_dt',
 						'contact_update_end_dt',
 						'contact_create_st_dt',
 						'contact_create_end_dt'
 				);
-				foreach ( $specials_date_key as $date_key ) {
+				foreach ($specials_date_key as $date_key) {
 					if ($key == $date_key) {
 						$dt = GETPOST($date_key);
-						if (! empty($dt)) {
-							$array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key . 'month', 'int'), GETPOST($date_key . 'day', 'int'), GETPOST($date_key . 'year', 'int'));
+						if (!empty($dt)) {
+							$array_query[$key] = dol_mktime(0, 0, 0, GETPOST($date_key.'month', 'int'), GETPOST($date_key.'day', 'int'), GETPOST($date_key.'year', 'int'));
 						} else {
 							$array_query[$key] = '';
 						}
@@ -376,21 +376,21 @@ 
 	if ($result < 0) {
 		setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 	}
-	header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+	header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 	exit();
 }
 
 if ($action == 'delete') {
 	// Ici, rowid indique le destinataire et id le mailing
-	$sql = "DELETE FROM " . MAIN_DB_PREFIX . "mailing_cibles WHERE rowid=" . $rowid;
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$rowid;
 	$resql = $db->query($sql);
 	if ($resql) {
-		if (! empty($id)) {
+		if (!empty($id)) {
 			$classname = "MailingTargets";
 			$obj = new $classname($db);
 			$obj->update_nb($id);
 
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit();
 		} else {
 			header("Location: liste.php");
@@ -430,30 +430,30 @@ 
 
 	print '<table class="border" width="100%">';
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/comm/mailing/liste.php">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/liste.php">'.$langs->trans("BackToList").'</a>';
 
-	print '<tr><td width="25%">' . $langs->trans("Ref") . '</td>';
+	print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
 	print '<td colspan="3">';
 	print $form->showrefnav($object, 'id', $linkback);
 	print '</td></tr>';
 
-	print '<tr><td width="25%">' . $langs->trans("MailTitle") . '</td><td colspan="3">' . $object->titre . '</td></tr>';
+	print '<tr><td width="25%">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
 
-	print '<tr><td width="25%">' . $langs->trans("MailFrom") . '</td><td colspan="3">' . dol_print_email($object->email_from, 0, 0, 0, 0, 1) . '</td></tr>';
+	print '<tr><td width="25%">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
 
 	// Errors to
-	print '<tr><td width="25%">' . $langs->trans("MailErrorsTo") . '</td><td colspan="3">' . dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1);
+	print '<tr><td width="25%">'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1);
 	print '</td></tr>';
 
 	// Status
-	print '<tr><td width="25%">' . $langs->trans("Status") . '</td><td colspan="3">' . $object->getLibStatut(4) . '</td></tr>';
+	print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
 
 	// Nb of distinct emails
 	print '<tr><td width="25%">';
 	print $langs->trans("TotalNbOfDistinctRecipients");
 	print '</td><td colspan="3">';
 	$nbemail = ($object->nbemail ? $object->nbemail : '0');
-	if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) {
+	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) {
 		$text = $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
 		print $form->textwithpicto($nbemail, $text, 1, 'warning');
 	} else {
@@ -468,7 +468,7 @@ 
 	// Show email selectors
 	if ($object->statut == 0 && $user->rights->mailing->creer) {
 
-		include DOL_DOCUMENT_ROOT . '/core/tpl/advtarget.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/advtarget.tpl.php';
 	}
 }
 

dolibarr/htdocs/comm/mailing/index.php

Indentation +39 added lines, -39 removed lines

@@ -82,7 +82,7 @@ 
             if (preg_match("/(.*)\.(.*)\.(.*)/i",$file,$reg))
             {
                 $modulename=$reg[1];
-       			if ($modulename == 'example') continue;
+                    if ($modulename == 'example') continue;
 
                 // Loading Class
                 $file = $dir."/".$modulename.".modules.php";
@@ -111,22 +111,22 @@ 
                         $result=$db->query($sql);
                         if ($result)
                         {
-                          $num = $db->num_rows($result);
+                            $num = $db->num_rows($result);
 
-                          $i = 0;
+                            $i = 0;
 
-                          while ($i < $num )
+                            while ($i < $num )
                             {
-                              $obj = $db->fetch_object($result);
-                              print '<td>'.img_object('',$mailmodule->picto).' '.$obj->label.'</td><td align="right">'.$obj->nb.'<td>';
-                              $i++;
+                                $obj = $db->fetch_object($result);
+                                print '<td>'.img_object('',$mailmodule->picto).' '.$obj->label.'</td><td align="right">'.$obj->nb.'<td>';
+                                $i++;
                             }
 
-                          $db->free($result);
+                            $db->free($result);
                         }
                         else
                         {
-                          dol_print_error($db);
+                            dol_print_error($db);
                         }
                         print '</tr>';
                     }
@@ -156,43 +156,43 @@ 
 $result=$db->query($sql);
 if ($result)
 {
-  print '<table class="noborder" width="100%">';
-  print '<tr class="liste_titre">';
-  print '<td colspan="2">'.$langs->trans("LastMailings",$limit).'</td>';
-  print '<td align="center">'.$langs->trans("DateCreation").'</td>';
-  print '<td align="center">'.$langs->trans("NbOfEMails").'</td>';
-  print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
-
-  $num = $db->num_rows($result);
-  if ($num > 0)
-  {
-      $i = 0;
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td colspan="2">'.$langs->trans("LastMailings",$limit).'</td>';
+    print '<td align="center">'.$langs->trans("DateCreation").'</td>';
+    print '<td align="center">'.$langs->trans("NbOfEMails").'</td>';
+    print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
+
+    $num = $db->num_rows($result);
+    if ($num > 0)
+    {
+        $i = 0;
 
     while ($i < $num )
-	{
-	  $obj = $db->fetch_object($result);
-
-	  print '<tr class="oddeven">';
-	  print '<td class="nowrap"><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>';
-	  print '<td>'.dol_trunc($obj->titre,38).'</td>';
-	  print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat),'day').'</td>';
-	  print '<td align="center">'.($obj->nbemail?$obj->nbemail:"0").'</td>';
-	  $mailstatic=new Mailing($db);
-	  print '<td align="right">'.$mailstatic->LibStatut($obj->statut,5).'</td>';
-      print '</tr>';
-	  $i++;
-	}
+    {
+        $obj = $db->fetch_object($result);
+
+        print '<tr class="oddeven">';
+        print '<td class="nowrap"><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>';
+        print '<td>'.dol_trunc($obj->titre,38).'</td>';
+        print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat),'day').'</td>';
+        print '<td align="center">'.($obj->nbemail?$obj->nbemail:"0").'</td>';
+        $mailstatic=new Mailing($db);
+        print '<td align="right">'.$mailstatic->LibStatut($obj->statut,5).'</td>';
+        print '</tr>';
+        $i++;
     }
-  else
+    }
+    else
     {
-     print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+        print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
-  print "</table><br>";
-  $db->free($result);
+    print "</table><br>";
+    $db->free($result);
 }
 else
 {
-  dol_print_error($db);
+    dol_print_error($db);
 }
 
 
@@ -207,7 +207,7 @@ 
     print '</div>';
 
     print '<br>';
- }
+    }
 
 // End of page
 llxFooter();

Braces +6 added lines, -7 removed lines

@@ -82,7 +82,9 @@ 
             if (preg_match("/(.*)\.(.*)\.(.*)/i",$file,$reg))
             {
                 $modulename=$reg[1];
-       			if ($modulename == 'example') continue;
+       			if ($modulename == 'example') {
+       			    continue;
+       			}
 
                 // Loading Class
                 $file = $dir."/".$modulename.".modules.php";
@@ -123,8 +125,7 @@ 
                             }
 
                           $db->free($result);
-                        }
-                        else
+                        } else
                         {
                           dol_print_error($db);
                         }
@@ -182,15 +183,13 @@ 
       print '</tr>';
 	  $i++;
 	}
-    }
-  else
+    } else
     {
      print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
   print "</table><br>";
   $db->free($result);
-}
-else
+} else
 {
   dol_print_error($db);
 }

Spacing +31 added lines, -31 removed lines

@@ -26,8 +26,8 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT .'/comm/mailing/class/mailing.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load translation files required by the page
@@ -35,15 +35,15 @@ 
 
 
 // Security check
-$result=restrictedArea($user,'mailing');
+$result = restrictedArea($user, 'mailing');
 
 
 /*
  *	View
  */
 
-$help_url='EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
-llxHeader('','EMailing',$help_url);
+$help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
+llxHeader('', 'EMailing', $help_url);
 
 print load_fiche_titre($langs->trans("MailingArea"));
 
@@ -73,18 +73,18 @@ 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("TargetsStatistics").'</td></tr>';
 
-$dir=DOL_DOCUMENT_ROOT."/core/modules/mailings";
-$handle=opendir($dir);
+$dir = DOL_DOCUMENT_ROOT."/core/modules/mailings";
+$handle = opendir($dir);
 
 if (is_resource($handle))
 {
-    while (($file = readdir($handle))!==false)
+    while (($file = readdir($handle)) !== false)
     {
         if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
         {
-            if (preg_match("/(.*)\.(.*)\.(.*)/i",$file,$reg))
+            if (preg_match("/(.*)\.(.*)\.(.*)/i", $file, $reg))
             {
-                $modulename=$reg[1];
+                $modulename = $reg[1];
        			if ($modulename == 'example') continue;
 
                 // Loading Class
@@ -93,12 +93,12 @@ 
                 require_once $file;
                 $mailmodule = new $classname($db);
 
-                $qualified=1;
+                $qualified = 1;
                 foreach ($mailmodule->require_module as $key)
                 {
-                    if (! $conf->$key->enabled || (! $user->admin && $mailmodule->require_admin))
+                    if (!$conf->$key->enabled || (!$user->admin && $mailmodule->require_admin))
                     {
-                        $qualified=0;
+                        $qualified = 0;
                         //print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif";
                         break;
                     }
@@ -111,17 +111,17 @@ 
                     {
                         print '<tr class="oddeven">';
 
-                        $result=$db->query($sql);
+                        $result = $db->query($sql);
                         if ($result)
                         {
                           $num = $db->num_rows($result);
 
                           $i = 0;
 
-                          while ($i < $num )
+                          while ($i < $num)
                             {
                               $obj = $db->fetch_object($result);
-                              print '<td>'.img_object('',$mailmodule->picto).' '.$obj->label.'</td><td align="right">'.$obj->nb.'<td>';
+                              print '<td>'.img_object('', $mailmodule->picto).' '.$obj->label.'</td><td align="right">'.$obj->nb.'<td>';
                               $i++;
                             }
 
@@ -151,17 +151,17 @@ 
 /*
  * List of last emailings
  */
-$limit=10;
+$limit = 10;
 $sql  = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat";
-$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
-$sql.= " ORDER BY m.date_creat DESC";
-$sql.= " LIMIT ".$limit;
-$result=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
+$sql .= " ORDER BY m.date_creat DESC";
+$sql .= " LIMIT ".$limit;
+$result = $db->query($sql);
 if ($result)
 {
   print '<table class="noborder" width="100%">';
   print '<tr class="liste_titre">';
-  print '<td colspan="2">'.$langs->trans("LastMailings",$limit).'</td>';
+  print '<td colspan="2">'.$langs->trans("LastMailings", $limit).'</td>';
   print '<td align="center">'.$langs->trans("DateCreation").'</td>';
   print '<td align="center">'.$langs->trans("NbOfEMails").'</td>';
   print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
@@ -171,17 +171,17 @@ 
   {
       $i = 0;
 
-    while ($i < $num )
+    while ($i < $num)
 	{
 	  $obj = $db->fetch_object($result);
 
 	  print '<tr class="oddeven">';
-	  print '<td class="nowrap"><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>';
-	  print '<td>'.dol_trunc($obj->titre,38).'</td>';
-	  print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat),'day').'</td>';
-	  print '<td align="center">'.($obj->nbemail?$obj->nbemail:"0").'</td>';
-	  $mailstatic=new Mailing($db);
-	  print '<td align="right">'.$mailstatic->LibStatut($obj->statut,5).'</td>';
+	  print '<td class="nowrap"><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"), "email").' '.$obj->rowid.'</a></td>';
+	  print '<td>'.dol_trunc($obj->titre, 38).'</td>';
+	  print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
+	  print '<td align="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
+	  $mailstatic = new Mailing($db);
+	  print '<td align="right">'.$mailstatic->LibStatut($obj->statut, 5).'</td>';
       print '</tr>';
 	  $i++;
 	}
@@ -203,10 +203,10 @@ 
 print '</div></div></div>';
 
 
-if ($langs->file_exists("html/spam.html",0)) {
+if ($langs->file_exists("html/spam.html", 0)) {
     print "<br><br><br><br>".$langs->trans("Note")."<br>";
     print '<div style="padding: 4px; background: #FAFAFA; border: 1px solid #BBBBBB;" >';
-    dol_print_file($langs,"html/spam.html",0);
+    dol_print_file($langs, "html/spam.html", 0);
     print '</div>';
 
     print '<br>';

dolibarr/htdocs/comm/mailing/cibles.php

Indentation +496 added lines, -496 removed lines

@@ -72,52 +72,52 @@ 
 
 if ($action == 'add')
 {
-	$module=GETPOST("module",'alpha');
-	$result=-1;
-
-	foreach ($modulesdir as $dir)
-	{
-	    // Load modules attributes in arrays (name, numero, orders) from dir directory
-	    //print $dir."\n<br>";
-	    dol_syslog("Scan directory ".$dir." for modules");
-
-	    // Loading Class
-	    $file = $dir."/".$module.".modules.php";
-	    $classname = "mailing_".$module;
-
-		if (file_exists($file))
-		{
-			require_once $file;
-
-			// Add targets into database
-			$obj = new $classname($db);
-			dol_syslog("Call add_to_target on class ".$classname);
-			$result=$obj->add_to_target($id);
-		}
-	}
-	if ($result > 0)
-	{
-		setEventMessages($langs->trans("XTargetsAdded",$result), null, 'mesgs');
-
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
-	}
-	if ($result == 0)
-	{
-		setEventMessages($langs->trans("WarningNoEMailsAdded"), null, 'warnings');
-	}
-	if ($result < 0)
-	{
-		setEventMessages($langs->trans("Error").($obj->error?' '.$obj->error:''), null, 'errors');
-	}
+    $module=GETPOST("module",'alpha');
+    $result=-1;
+
+    foreach ($modulesdir as $dir)
+    {
+        // Load modules attributes in arrays (name, numero, orders) from dir directory
+        //print $dir."\n<br>";
+        dol_syslog("Scan directory ".$dir." for modules");
+
+        // Loading Class
+        $file = $dir."/".$module.".modules.php";
+        $classname = "mailing_".$module;
+
+        if (file_exists($file))
+        {
+            require_once $file;
+
+            // Add targets into database
+            $obj = new $classname($db);
+            dol_syslog("Call add_to_target on class ".$classname);
+            $result=$obj->add_to_target($id);
+        }
+    }
+    if ($result > 0)
+    {
+        setEventMessages($langs->trans("XTargetsAdded",$result), null, 'mesgs');
+
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+        exit;
+    }
+    if ($result == 0)
+    {
+        setEventMessages($langs->trans("WarningNoEMailsAdded"), null, 'warnings');
+    }
+    if ($result < 0)
+    {
+        setEventMessages($langs->trans("Error").($obj->error?' '.$obj->error:''), null, 'errors');
+    }
 }
 
 if (GETPOST('clearlist'))
 {
-	// Loading Class
-	$obj = new MailingTargets($db);
-	$obj->clear_target($id);
-	/* Avoid this to allow reposition
+    // Loading Class
+    $obj = new MailingTargets($db);
+    $obj->clear_target($id);
+    /* Avoid this to allow reposition
 	header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 	exit;
 	*/
@@ -125,39 +125,39 @@ 
 
 if ($action == 'delete')
 {
-	// Ici, rowid indique le destinataire et id le mailing
-	$sql="DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$rowid;
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		if (!empty($id))
-		{
-			$obj = new MailingTargets($db);
-			$obj->update_nb($id);
-
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-			exit;
-		}
-		else
-		{
-			header("Location: list.php");
-			exit;
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    // Ici, rowid indique le destinataire et id le mailing
+    $sql="DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$rowid;
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        if (!empty($id))
+        {
+            $obj = new MailingTargets($db);
+            $obj->update_nb($id);
+
+            header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+            exit;
+        }
+        else
+        {
+            header("Location: list.php");
+            exit;
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 // Purge search criteria
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
-	$search_lastname='';
-	$search_firstname='';
-	$search_email='';
-	$search_other='';
-	$search_dest_status='';
+    $search_lastname='';
+    $search_firstname='';
+    $search_email='';
+    $search_other='';
+    $search_dest_status='';
 }
 
 
@@ -173,377 +173,377 @@ 
 
 if ($object->fetch($id) >= 0)
 {
-	$head = emailing_prepare_head($object);
-
-	dol_fiche_head($head, 'targets', $langs->trans("Mailing"), -1, 'email');
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
-
-	$morehtmlright='';
-	$nbtry = $nbok = 0;
-	if ($object->statut == 2 || $object->statut == 3)
-	{
-		$nbtry = $object->countNbOfTargets('alreadysent');
-		$nbko  = $object->countNbOfTargets('alreadysentko');
-
-		$morehtmlright.=' ('.$nbtry.'/'.$object->nbemail;
-		if ($nbko) $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
-		$morehtmlright.=') &nbsp; ';
-	}
-
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
-
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
-
-	print '<table class="border" width="100%">';
-
-	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
-
-	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
-
-	// Errors to
-	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1);
-	print '</td></tr>';
-
-	// Nb of distinct emails
-	print '<tr><td>';
-	print $langs->trans("TotalNbOfDistinctRecipients");
-	print '</td><td colspan="3">';
-	$nbemail = ($object->nbemail?$object->nbemail:0);
-	if (is_numeric($nbemail))
-	{
-		$text='';
-		if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
-		{
-			if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
-			{
-				$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-			}
-			else
-			{
-				$text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
-			}
-		}
-		if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
-		if ($text)
-		{
-			print $form->textwithpicto($nbemail,$text,1,'warning');
-		}
-		else
-		{
-			print $nbemail;
-		}
-	}
-	print '</td></tr>';
-
-	print '</table>';
-
-	print "</div>";
-
-	dol_fiche_end();
-
-	print '<br>';
-
-
-	$allowaddtarget=($object->statut == 0);
-
-	// Show email selectors
-	if ($allowaddtarget && $user->rights->mailing->creer)
-	{
-		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''), 'title_generic');
-
-		//print '<table class="noborder" width="100%">';
-		print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">';
-
-		//print '<tr class="liste_titre">';
-		print '<div class="tagtr liste_titre">';
-		//print '<td class="liste_titre">'.$langs->trans("RecipientSelectionModules").'</td>';
-		print '<div class="tagtd">'.$langs->trans("RecipientSelectionModules").'</div>';
-		//print '<td class="liste_titre" align="center">'.$langs->trans("NbOfUniqueEMails").'</td>';
-		print '<div class="tagtd" align="center">'.$langs->trans("NbOfUniqueEMails").'</div>';
-		//print '<td class="liste_titre" align="left">'.$langs->trans("Filter").'</td>';
-		print '<div class="tagtd" align="left">'.$langs->trans("Filter").'</div>';
-		//print '<td class="liste_titre" align="center">&nbsp;</td>';
-		print '<div class="tagtd">&nbsp;</div>';
-		//print "</tr>\n";
-		print '</div>';
-
-		clearstatcache();
-
-		foreach ($modulesdir as $dir)
-		{
-		    $modulenames=array();
-
-		    // Load modules attributes in arrays (name, numero, orders) from dir directory
-		    //print $dir."\n<br>";
-		    dol_syslog("Scan directory ".$dir." for modules");
-		    $handle=@opendir($dir);
-			if (is_resource($handle))
-			{
-				while (($file = readdir($handle))!==false)
-				{
-					if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-					{
-						if (preg_match("/(.*)\.modules\.php$/i",$file,$reg))
-						{
-							if ($reg[1] == 'example') continue;
-							$modulenames[]=$reg[1];
-						}
-					}
-				}
-				closedir($handle);
-			}
-
-			// Sort $modulenames
-			sort($modulenames);
-
-			$var = true;
-
-			// Loop on each submodule
-			foreach($modulenames as $modulename)
-			{
-				// Loading Class
-				$file = $dir.$modulename.".modules.php";
-				$classname = "mailing_".$modulename;
-				require_once $file;
-
-				$obj = new $classname($db);
-
-				// Check dependencies
-				$qualified=(isset($obj->enabled)?$obj->enabled:1);
-				foreach ($obj->require_module as $key)
-				{
-					if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin))
-					{
-						$qualified=0;
-						//print "Les prerequis d'activation du module mailing ne sont pas respectes. Il ne sera pas actif";
-						break;
-					}
-				}
-
-				// Si le module mailing est qualifie
-				if ($qualified)
-				{
-					$var = ! $var;
-
-					if ($allowaddtarget)
-					{
-						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
-						print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-					}
-					else
-					{
-					    print '<div '.$bctag[$var].'>';
-					}
-
-					print '<div class="tagtd">';
-					if (empty($obj->picto)) $obj->picto='generic';
-					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj),$obj->picto);
-					print ' ';
-					print $obj->getDesc();
-					print '</div>';
-
-					try {
-						$nbofrecipient=$obj->getNbOfRecipients('');
-					}
-					catch(Exception $e)
-					{
-						dol_syslog($e->getMessage(), LOG_ERR);
-					}
-
-					print '<div class="tagtd center">';
-					if ($nbofrecipient >= 0)
-					{
-						print $nbofrecipient;
-					}
-					else
-					{
-						print $langs->trans("Error").' '.img_error($obj->error);
-					}
-					print '</div>';
-
-					print '<div class="tagtd" align="left">';
-					if ($allowaddtarget)
-					{
-    					try {
-    						$filter=$obj->formFilter();
-    					}
-    					catch(Exception $e)
-    					{
-    						dol_syslog($e->getMessage(), LOG_ERR);
-    					}
-    					if ($filter) print $filter;
-    					else print $langs->trans("None");
-					}
-					print '</div>';
-
-					print '<div class="tagtd" align="right">';
-					if ($allowaddtarget)
-					{
-						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
-					}
-					else
-					{
-					    print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
-						//print $langs->trans("MailNoChangePossible");
-						print "&nbsp;";
-					}
-					print '</div>';
-
-					if ($allowaddtarget) print '</form>';
-					else print '</div>';
-				}
-			}
-		}	// End foreach dir
-
-		print '</div>';
-
-		print '<br><br>';
-	}
-
-	// List of selected targets
-	$sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.source_url, mc.source_id, mc.source_type, mc.error_text";
-	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-	$sql .= " WHERE mc.fk_mailing=".$object->id;
-	if ($search_lastname)  $sql.= natural_search("mc.lastname", $search_lastname);
-	if ($search_firstname) $sql.= natural_search("mc.firstname", $search_firstname);
-	if ($search_email)     $sql.= natural_search("mc.email", $search_email);
-	if ($search_other)     $sql.= natural_search("mc.other", $search_other);
-	if ($search_dest_status != '' && $search_dest_status >= -1) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
-	$sql .= $db->order($sortfield,$sortorder);
-
-	// Count total nb of records
-	$nbtotalofrecords = '';
-	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-	{
-	    $result = $db->query($sql);
-	    $nbtotalofrecords = $db->num_rows($result);
-	    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	    {
-	    	$page = 0;
-	    	$offset = 0;
-	    }
-	}
-
-	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
-	$sql .= $db->plimit($limit+1, $offset);
-
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-
-		$num = $db->num_rows($resql);
-
-		$param = "&amp;id=".$object->id;
-		//if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-		if ($search_lastname)  $param.= "&amp;search_lastname=".urlencode($search_lastname);
-		if ($search_firstname) $param.= "&amp;search_firstname=".urlencode($search_firstname);
-		if ($search_email)     $param.= "&amp;search_email=".urlencode($search_email);
-		if ($search_other)     $param.= "&amp;search_other=".urlencode($search_other);
-
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    $head = emailing_prepare_head($object);
+
+    dol_fiche_head($head, 'targets', $langs->trans("Mailing"), -1, 'email');
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
+
+    $morehtmlright='';
+    $nbtry = $nbok = 0;
+    if ($object->statut == 2 || $object->statut == 3)
+    {
+        $nbtry = $object->countNbOfTargets('alreadysent');
+        $nbko  = $object->countNbOfTargets('alreadysentko');
+
+        $morehtmlright.=' ('.$nbtry.'/'.$object->nbemail;
+        if ($nbko) $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
+        $morehtmlright.=') &nbsp; ';
+    }
+
+    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
+
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
+
+    print '<table class="border" width="100%">';
+
+    print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+
+    print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
+
+    // Errors to
+    print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1);
+    print '</td></tr>';
+
+    // Nb of distinct emails
+    print '<tr><td>';
+    print $langs->trans("TotalNbOfDistinctRecipients");
+    print '</td><td colspan="3">';
+    $nbemail = ($object->nbemail?$object->nbemail:0);
+    if (is_numeric($nbemail))
+    {
+        $text='';
+        if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
+        {
+            if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
+            {
+                $text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+            }
+            else
+            {
+                $text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+            }
+        }
+        if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+        if ($text)
+        {
+            print $form->textwithpicto($nbemail,$text,1,'warning');
+        }
+        else
+        {
+            print $nbemail;
+        }
+    }
+    print '</td></tr>';
+
+    print '</table>';
+
+    print "</div>";
+
+    dol_fiche_end();
+
+    print '<br>';
+
+
+    $allowaddtarget=($object->statut == 0);
+
+    // Show email selectors
+    if ($allowaddtarget && $user->rights->mailing->creer)
+    {
+        print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''), 'title_generic');
+
+        //print '<table class="noborder" width="100%">';
+        print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">';
+
+        //print '<tr class="liste_titre">';
+        print '<div class="tagtr liste_titre">';
+        //print '<td class="liste_titre">'.$langs->trans("RecipientSelectionModules").'</td>';
+        print '<div class="tagtd">'.$langs->trans("RecipientSelectionModules").'</div>';
+        //print '<td class="liste_titre" align="center">'.$langs->trans("NbOfUniqueEMails").'</td>';
+        print '<div class="tagtd" align="center">'.$langs->trans("NbOfUniqueEMails").'</div>';
+        //print '<td class="liste_titre" align="left">'.$langs->trans("Filter").'</td>';
+        print '<div class="tagtd" align="left">'.$langs->trans("Filter").'</div>';
+        //print '<td class="liste_titre" align="center">&nbsp;</td>';
+        print '<div class="tagtd">&nbsp;</div>';
+        //print "</tr>\n";
+        print '</div>';
+
+        clearstatcache();
+
+        foreach ($modulesdir as $dir)
+        {
+            $modulenames=array();
+
+            // Load modules attributes in arrays (name, numero, orders) from dir directory
+            //print $dir."\n<br>";
+            dol_syslog("Scan directory ".$dir." for modules");
+            $handle=@opendir($dir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+                    {
+                        if (preg_match("/(.*)\.modules\.php$/i",$file,$reg))
+                        {
+                            if ($reg[1] == 'example') continue;
+                            $modulenames[]=$reg[1];
+                        }
+                    }
+                }
+                closedir($handle);
+            }
+
+            // Sort $modulenames
+            sort($modulenames);
+
+            $var = true;
+
+            // Loop on each submodule
+            foreach($modulenames as $modulename)
+            {
+                // Loading Class
+                $file = $dir.$modulename.".modules.php";
+                $classname = "mailing_".$modulename;
+                require_once $file;
+
+                $obj = new $classname($db);
+
+                // Check dependencies
+                $qualified=(isset($obj->enabled)?$obj->enabled:1);
+                foreach ($obj->require_module as $key)
+                {
+                    if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin))
+                    {
+                        $qualified=0;
+                        //print "Les prerequis d'activation du module mailing ne sont pas respectes. Il ne sera pas actif";
+                        break;
+                    }
+                }
+
+                // Si le module mailing est qualifie
+                if ($qualified)
+                {
+                    $var = ! $var;
+
+                    if ($allowaddtarget)
+                    {
+                        print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
+                        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    }
+                    else
+                    {
+                        print '<div '.$bctag[$var].'>';
+                    }
+
+                    print '<div class="tagtd">';
+                    if (empty($obj->picto)) $obj->picto='generic';
+                    print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj),$obj->picto);
+                    print ' ';
+                    print $obj->getDesc();
+                    print '</div>';
+
+                    try {
+                        $nbofrecipient=$obj->getNbOfRecipients('');
+                    }
+                    catch(Exception $e)
+                    {
+                        dol_syslog($e->getMessage(), LOG_ERR);
+                    }
+
+                    print '<div class="tagtd center">';
+                    if ($nbofrecipient >= 0)
+                    {
+                        print $nbofrecipient;
+                    }
+                    else
+                    {
+                        print $langs->trans("Error").' '.img_error($obj->error);
+                    }
+                    print '</div>';
+
+                    print '<div class="tagtd" align="left">';
+                    if ($allowaddtarget)
+                    {
+                        try {
+                            $filter=$obj->formFilter();
+                        }
+                        catch(Exception $e)
+                        {
+                            dol_syslog($e->getMessage(), LOG_ERR);
+                        }
+                        if ($filter) print $filter;
+                        else print $langs->trans("None");
+                    }
+                    print '</div>';
+
+                    print '<div class="tagtd" align="right">';
+                    if ($allowaddtarget)
+                    {
+                        print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
+                    }
+                    else
+                    {
+                        print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
+                        //print $langs->trans("MailNoChangePossible");
+                        print "&nbsp;";
+                    }
+                    print '</div>';
+
+                    if ($allowaddtarget) print '</form>';
+                    else print '</div>';
+                }
+            }
+        }	// End foreach dir
+
+        print '</div>';
+
+        print '<br><br>';
+    }
+
+    // List of selected targets
+    $sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.source_url, mc.source_id, mc.source_type, mc.error_text";
+    $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+    $sql .= " WHERE mc.fk_mailing=".$object->id;
+    if ($search_lastname)  $sql.= natural_search("mc.lastname", $search_lastname);
+    if ($search_firstname) $sql.= natural_search("mc.firstname", $search_firstname);
+    if ($search_email)     $sql.= natural_search("mc.email", $search_email);
+    if ($search_other)     $sql.= natural_search("mc.other", $search_other);
+    if ($search_dest_status != '' && $search_dest_status >= -1) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
+    $sql .= $db->order($sortfield,$sortorder);
+
+    // Count total nb of records
+    $nbtotalofrecords = '';
+    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+    {
+        $result = $db->query($sql);
+        $nbtotalofrecords = $db->num_rows($result);
+        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+        {
+            $page = 0;
+            $offset = 0;
+        }
+    }
+
+    //$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
+    $sql .= $db->plimit($limit+1, $offset);
+
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+
+        $num = $db->num_rows($resql);
+
+        $param = "&amp;id=".$object->id;
+        //if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+        if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+        if ($search_lastname)  $param.= "&amp;search_lastname=".urlencode($search_lastname);
+        if ($search_firstname) $param.= "&amp;search_firstname=".urlencode($search_firstname);
+        if ($search_email)     $param.= "&amp;search_email=".urlencode($search_email);
+        if ($search_other)     $param.= "&amp;search_other=".urlencode($search_other);
+
+        print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+        print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
         print '<input type="hidden" name="page" value="'.$page.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
+        print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		$cleartext='';
-		if ($allowaddtarget) {
-		    $cleartext=$langs->trans("ToClearAllRecipientsClickHere").' '.'<a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition">'.$langs->trans("TargetsReset").'</a>';
-		}
-		print_barre_liste($langs->trans("MailSelectedRecipients"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$cleartext,$num,$nbtotalofrecords,'title_generic',0,'','', $limit);
+        $cleartext='';
+        if ($allowaddtarget) {
+            $cleartext=$langs->trans("ToClearAllRecipientsClickHere").' '.'<a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition">'.$langs->trans("TargetsReset").'</a>';
+        }
+        print_barre_liste($langs->trans("MailSelectedRecipients"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$cleartext,$num,$nbtotalofrecords,'title_generic',0,'','', $limit);
 
-		print '</form>';
+        print '</form>';
 
-		print "\n<!-- Liste destinataires selectionnes -->\n";
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+        print "\n<!-- Liste destinataires selectionnes -->\n";
+        print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+        print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
         print '<input type="hidden" name="page" value="'.$page.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="limit" value="'.$limit.'">';
-
-
-		if ($page)	$param.= "&amp;page=".$page;
-
-		print '<div class="div-table-responsive">';
-		print '<table class="noborder" width="100%">';
-
-		// Ligne des champs de filtres
-		print '<tr class="liste_titre_filter">';
-		// EMail
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth100" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
-		print '</td>';
-		// Name
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth100" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'">';
-		print '</td>';
-		// Firstname
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth100" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'">';
-		print '</td>';
-		// Other
-		print '<td class="liste_titre">';
-		print '<input class="flat maxwidth100" type="text" name="search_other" value="'.dol_escape_htmltag($search_other).'">';
-		print '</td>';
-		// Source
-		print '<td class="liste_titre">';
-		print '&nbsp';
-		print '</td>';
-
-		// Date sending
-		print '<td class="liste_titre">';
-		print '&nbsp';
-		print '</td>';
-		//Statut
-		print '<td class="liste_titre" align="right">';
-		print $formmailing->selectDestinariesStatus($search_dest_status,'search_dest_status',1);
-		print '</td>';
-		// Action column
-		print '<td class="liste_titre" align="right">';
-		$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-		print $searchpicto;
-		print '</td>';
-		print '</tr>';
-
-		print '<tr class="liste_titre">';
-		print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"mc.email",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre("Lastname",$_SERVER["PHP_SELF"],"mc.lastname",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre("Firstname",$_SERVER["PHP_SELF"],"mc.firstname",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre("OtherInformations",$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre("Source",$_SERVER["PHP_SELF"],"",$param,"",'align="center"',$sortfield,$sortorder);
-		// Date sending
-		if ($object->statut < 2)
-		{
-			print_liste_field_titre('');
-		}
-		else
-		{
-			print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder);
-		}
-		print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder);
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
-		print '</tr>';
-
-		$i = 0;
-
-		if ($num)
-		{
-			while ($i < min($num,$limit))
-			{
-				$obj = $db->fetch_object($resql);
-
-				print '<tr class="oddeven">';
-				print '<td>'.$obj->email.'</td>';
-				print '<td>'.$obj->lastname.'</td>';
-				print '<td>'.$obj->firstname.'</td>';
-				print '<td>'.$obj->other.'</td>';
-				print '<td align="center">';
+        print '<input type="hidden" name="id" value="'.$object->id.'">';
+        print '<input type="hidden" name="limit" value="'.$limit.'">';
+
+
+        if ($page)	$param.= "&amp;page=".$page;
+
+        print '<div class="div-table-responsive">';
+        print '<table class="noborder" width="100%">';
+
+        // Ligne des champs de filtres
+        print '<tr class="liste_titre_filter">';
+        // EMail
+        print '<td class="liste_titre">';
+        print '<input class="flat maxwidth100" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
+        print '</td>';
+        // Name
+        print '<td class="liste_titre">';
+        print '<input class="flat maxwidth100" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'">';
+        print '</td>';
+        // Firstname
+        print '<td class="liste_titre">';
+        print '<input class="flat maxwidth100" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'">';
+        print '</td>';
+        // Other
+        print '<td class="liste_titre">';
+        print '<input class="flat maxwidth100" type="text" name="search_other" value="'.dol_escape_htmltag($search_other).'">';
+        print '</td>';
+        // Source
+        print '<td class="liste_titre">';
+        print '&nbsp';
+        print '</td>';
+
+        // Date sending
+        print '<td class="liste_titre">';
+        print '&nbsp';
+        print '</td>';
+        //Statut
+        print '<td class="liste_titre" align="right">';
+        print $formmailing->selectDestinariesStatus($search_dest_status,'search_dest_status',1);
+        print '</td>';
+        // Action column
+        print '<td class="liste_titre" align="right">';
+        $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+        print $searchpicto;
+        print '</td>';
+        print '</tr>';
+
+        print '<tr class="liste_titre">';
+        print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"mc.email",$param,"","",$sortfield,$sortorder);
+        print_liste_field_titre("Lastname",$_SERVER["PHP_SELF"],"mc.lastname",$param,"","",$sortfield,$sortorder);
+        print_liste_field_titre("Firstname",$_SERVER["PHP_SELF"],"mc.firstname",$param,"","",$sortfield,$sortorder);
+        print_liste_field_titre("OtherInformations",$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
+        print_liste_field_titre("Source",$_SERVER["PHP_SELF"],"",$param,"",'align="center"',$sortfield,$sortorder);
+        // Date sending
+        if ($object->statut < 2)
+        {
+            print_liste_field_titre('');
+        }
+        else
+        {
+            print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder);
+        }
+        print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder);
+        print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+        print '</tr>';
+
+        $i = 0;
+
+        if ($num)
+        {
+            while ($i < min($num,$limit))
+            {
+                $obj = $db->fetch_object($resql);
+
+                print '<tr class="oddeven">';
+                print '<td>'.$obj->email.'</td>';
+                print '<td>'.$obj->lastname.'</td>';
+                print '<td>'.$obj->firstname.'</td>';
+                print '<td>'.$obj->other.'</td>';
+                print '<td align="center">';
                 if (empty($obj->source_id) || empty($obj->source_type))
                 {
                     print empty($obj->source_url)?'':$obj->source_url; // For backward compatibility
@@ -554,14 +554,14 @@ 
                     {
                         include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
                         $objectstatic=new Adherent($db);
-						$objectstatic->fetch($obj->source_id);
+                        $objectstatic->fetch($obj->source_id);
                         print $objectstatic->getNomUrl(1);
                     }
                     else if ($obj->source_type == 'user')
                     {
                         include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
                         $objectstatic=new User($db);
-						$objectstatic->fetch($obj->source_id);
+                        $objectstatic->fetch($obj->source_id);
                         $objectstatic->id=$obj->source_id;
                         print $objectstatic->getNomUrl(1);
                     }
@@ -569,78 +569,78 @@ 
                     {
                         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
                         $objectstatic=new Societe($db);
-						$objectstatic->fetch($obj->source_id);
+                        $objectstatic->fetch($obj->source_id);
                         print $objectstatic->getNomUrl(1);
                     }
                     else if ($obj->source_type == 'contact')
                     {
-                    	include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-                    	$objectstatic=new Contact($db);
-                    	$objectstatic->fetch($obj->source_id);
-                    	print $objectstatic->getNomUrl(1);
+                        include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+                        $objectstatic=new Contact($db);
+                        $objectstatic->fetch($obj->source_id);
+                        print $objectstatic->getNomUrl(1);
                     }
                     else
                     {
                         print $obj->source_url;
                     }
                 }
-				print '</td>';
+                print '</td>';
 
-				// Status of recipient sending email (Warning != status of emailing)
-				if ($obj->statut == 0)
-				{
-					print '<td align="center">&nbsp;</td>';
-					print '<td align="right" class="nowrap">'.$langs->trans("MailingStatusNotSent");
-					print '</td>';
-				}
-				else
-				{
-					print '<td align="center">'.$obj->date_envoi.'</td>';
-					print '<td align="right" class="nowrap">';
-					print $object::libStatutDest($obj->statut, 2, $obj->error_text);
-					print '</td>';
-				}
-
-				// Search Icon
-				print '<td align="right">';
-				if ($obj->statut == 0)	// Not sent yet
-				{
-					if ($user->rights->mailing->creer && $allowaddtarget) {
-						print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
-					}
-				}
-				/*if ($obj->statut == -1)	// Sent with error
+                // Status of recipient sending email (Warning != status of emailing)
+                if ($obj->statut == 0)
+                {
+                    print '<td align="center">&nbsp;</td>';
+                    print '<td align="right" class="nowrap">'.$langs->trans("MailingStatusNotSent");
+                    print '</td>';
+                }
+                else
+                {
+                    print '<td align="center">'.$obj->date_envoi.'</td>';
+                    print '<td align="right" class="nowrap">';
+                    print $object::libStatutDest($obj->statut, 2, $obj->error_text);
+                    print '</td>';
+                }
+
+                // Search Icon
+                print '<td align="right">';
+                if ($obj->statut == 0)	// Not sent yet
+                {
+                    if ($user->rights->mailing->creer && $allowaddtarget) {
+                        print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
+                    }
+                }
+                /*if ($obj->statut == -1)	// Sent with error
 				{
 					print '<a href="'.$_SERVER['PHP_SELF'].'?action=retry&rowid='.$obj->rowid.$param.'">'.$langs->trans("Retry").'</a>';
 				}*/
-				print '</td>';
-				print '</tr>';
-
-				$i++;
-			}
-		}
-		else
-		{
-			if ($object->statut < 2)
-			{
-			    print '<tr><td colspan="8" class="opacitymedium">';
-    			print $langs->trans("NoTargetYet");
-    			print '</td></tr>';
-			}
-		}
-		print "</table><br>";
-		print '</div>';
-
-		print '</form>';
-
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	print "\n<!-- Fin liste destinataires selectionnes -->\n";
+                print '</td>';
+                print '</tr>';
+
+                $i++;
+            }
+        }
+        else
+        {
+            if ($object->statut < 2)
+            {
+                print '<tr><td colspan="8" class="opacitymedium">';
+                print $langs->trans("NoTargetYet");
+                print '</td></tr>';
+            }
+        }
+        print "</table><br>";
+        print '</div>';
+
+        print '</form>';
+
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+    print "\n<!-- Fin liste destinataires selectionnes -->\n";
 }
 
 // End of page

Braces +91 added lines, -61 removed lines

@@ -36,7 +36,9 @@ 
 $langs->load("mails");
 
 // Security check
-if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
+if (! $user->rights->mailing->lire || $user->societe_id > 0) {
+    accessforbidden();
+}
 
 
 // Load variable for pagination
@@ -48,8 +50,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="email";
-if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) {
+    $sortfield="email";
+}
+if (! $sortorder) {
+    $sortorder="ASC";
+}
 
 $id=GETPOST('id','int');
 $rowid=GETPOST('rowid','int');
@@ -137,23 +143,23 @@ 
 
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
-		}
-		else
+		} else
 		{
 			header("Location: list.php");
 			exit;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
 }
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) {
+    // All tests are required to be compatible with all browsers
 {
 	$search_lastname='';
+}
 	$search_firstname='';
 	$search_email='';
 	$search_other='';
@@ -187,7 +193,9 @@ 
 		$nbko  = $object->countNbOfTargets('alreadysentko');
 
 		$morehtmlright.=' ('.$nbtry.'/'.$object->nbemail;
-		if ($nbko) $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
+		if ($nbko) {
+		    $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
+		}
 		$morehtmlright.=')   ';
 	}
 
@@ -219,18 +227,18 @@ 
 			if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 			{
 				$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-			}
-			else
+			} else
 			{
 				$text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
 			}
 		}
-		if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+		if (empty($nbemail)) {
+		    $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+		}
 		if ($text)
 		{
 			print $form->textwithpicto($nbemail,$text,1,'warning');
-		}
-		else
+		} else
 		{
 			print $nbemail;
 		}
@@ -287,7 +295,9 @@ 
 					{
 						if (preg_match("/(.*)\.modules\.php$/i",$file,$reg))
 						{
-							if ($reg[1] == 'example') continue;
+							if ($reg[1] == 'example') {
+							    continue;
+							}
 							$modulenames[]=$reg[1];
 						}
 					}
@@ -331,14 +341,15 @@ 
 					{
 						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-					}
-					else
+					} else
 					{
 					    print '<div '.$bctag[$var].'>';
 					}
 
 					print '<div class="tagtd">';
-					if (empty($obj->picto)) $obj->picto='generic';
+					if (empty($obj->picto)) {
+					    $obj->picto='generic';
+					}
 					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj),$obj->picto);
 					print ' ';
 					print $obj->getDesc();
@@ -346,8 +357,7 @@ 
 
 					try {
 						$nbofrecipient=$obj->getNbOfRecipients('');
-					}
-					catch(Exception $e)
+					} catch(Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
@@ -356,8 +366,7 @@ 
 					if ($nbofrecipient >= 0)
 					{
 						print $nbofrecipient;
-					}
-					else
+					} else
 					{
 						print $langs->trans("Error").' '.img_error($obj->error);
 					}
@@ -368,13 +377,15 @@ 
 					{
     					try {
     						$filter=$obj->formFilter();
-    					}
-    					catch(Exception $e)
+    					} catch(Exception $e)
     					{
     						dol_syslog($e->getMessage(), LOG_ERR);
     					}
-    					if ($filter) print $filter;
-    					else print $langs->trans("None");
+    					if ($filter) {
+    					    print $filter;
+    					} else {
+    					    print $langs->trans("None");
+    					}
 					}
 					print '</div>';
 
@@ -382,8 +393,7 @@ 
 					if ($allowaddtarget)
 					{
 						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
-					}
-					else
+					} else
 					{
 					    print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 						//print $langs->trans("MailNoChangePossible");
@@ -391,8 +401,11 @@ 
 					}
 					print '</div>';
 
-					if ($allowaddtarget) print '</form>';
-					else print '</div>';
+					if ($allowaddtarget) {
+					    print '</form>';
+					} else {
+					    print '</div>';
+					}
 				}
 			}
 		}	// End foreach dir
@@ -406,11 +419,21 @@ 
 	$sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.source_url, mc.source_id, mc.source_type, mc.error_text";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql .= " WHERE mc.fk_mailing=".$object->id;
-	if ($search_lastname)  $sql.= natural_search("mc.lastname", $search_lastname);
-	if ($search_firstname) $sql.= natural_search("mc.firstname", $search_firstname);
-	if ($search_email)     $sql.= natural_search("mc.email", $search_email);
-	if ($search_other)     $sql.= natural_search("mc.other", $search_other);
-	if ($search_dest_status != '' && $search_dest_status >= -1) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
+	if ($search_lastname) {
+	    $sql.= natural_search("mc.lastname", $search_lastname);
+	}
+	if ($search_firstname) {
+	    $sql.= natural_search("mc.firstname", $search_firstname);
+	}
+	if ($search_email) {
+	    $sql.= natural_search("mc.email", $search_email);
+	}
+	if ($search_other) {
+	    $sql.= natural_search("mc.other", $search_other);
+	}
+	if ($search_dest_status != '' && $search_dest_status >= -1) {
+	    $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
+	}
 	$sql .= $db->order($sortfield,$sortorder);
 
 	// Count total nb of records
@@ -419,9 +442,11 @@ 
 	{
 	    $result = $db->query($sql);
 	    $nbtotalofrecords = $db->num_rows($result);
-	    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	    if (($page * $limit) > $nbtotalofrecords) {
+	        // if total resultset is smaller then paging size (filtering), goto and load page 0
 	    {
 	    	$page = 0;
+	    }
 	    	$offset = 0;
 	    }
 	}
@@ -437,11 +462,21 @@ 
 
 		$param = "&amp;id=".$object->id;
 		//if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-		if ($search_lastname)  $param.= "&amp;search_lastname=".urlencode($search_lastname);
-		if ($search_firstname) $param.= "&amp;search_firstname=".urlencode($search_firstname);
-		if ($search_email)     $param.= "&amp;search_email=".urlencode($search_email);
-		if ($search_other)     $param.= "&amp;search_other=".urlencode($search_other);
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+		    $param.='&limit='.urlencode($limit);
+		}
+		if ($search_lastname) {
+		    $param.= "&amp;search_lastname=".urlencode($search_lastname);
+		}
+		if ($search_firstname) {
+		    $param.= "&amp;search_firstname=".urlencode($search_firstname);
+		}
+		if ($search_email) {
+		    $param.= "&amp;search_email=".urlencode($search_email);
+		}
+		if ($search_other) {
+		    $param.= "&amp;search_other=".urlencode($search_other);
+		}
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -468,7 +503,9 @@ 
 		print '<input type="hidden" name="limit" value="'.$limit.'">';
 
 
-		if ($page)	$param.= "&amp;page=".$page;
+		if ($page) {
+		    $param.= "&amp;page=".$page;
+		}
 
 		print '<div class="div-table-responsive">';
 		print '<table class="noborder" width="100%">';
@@ -521,8 +558,7 @@ 
 		if ($object->statut < 2)
 		{
 			print_liste_field_titre('');
-		}
-		else
+		} else
 		{
 			print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder);
 		}
@@ -547,8 +583,7 @@ 
                 if (empty($obj->source_id) || empty($obj->source_type))
                 {
                     print empty($obj->source_url)?'':$obj->source_url; // For backward compatibility
-                }
-                else
+                } else
                 {
                     if ($obj->source_type == 'member')
                     {
@@ -556,30 +591,26 @@ 
                         $objectstatic=new Adherent($db);
 						$objectstatic->fetch($obj->source_id);
                         print $objectstatic->getNomUrl(1);
-                    }
-                    else if ($obj->source_type == 'user')
+                    } else if ($obj->source_type == 'user')
                     {
                         include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
                         $objectstatic=new User($db);
 						$objectstatic->fetch($obj->source_id);
                         $objectstatic->id=$obj->source_id;
                         print $objectstatic->getNomUrl(1);
-                    }
-                    else if ($obj->source_type == 'thirdparty')
+                    } else if ($obj->source_type == 'thirdparty')
                     {
                         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
                         $objectstatic=new Societe($db);
 						$objectstatic->fetch($obj->source_id);
                         print $objectstatic->getNomUrl(1);
-                    }
-                    else if ($obj->source_type == 'contact')
+                    } else if ($obj->source_type == 'contact')
                     {
                     	include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
                     	$objectstatic=new Contact($db);
                     	$objectstatic->fetch($obj->source_id);
                     	print $objectstatic->getNomUrl(1);
-                    }
-                    else
+                    } else
                     {
                         print $obj->source_url;
                     }
@@ -592,8 +623,7 @@ 
 					print '<td align="center">&nbsp;</td>';
 					print '<td align="right" class="nowrap">'.$langs->trans("MailingStatusNotSent");
 					print '</td>';
-				}
-				else
+				} else
 				{
 					print '<td align="center">'.$obj->date_envoi.'</td>';
 					print '<td align="right" class="nowrap">';
@@ -603,10 +633,12 @@ 
 
 				// Search Icon
 				print '<td align="right">';
-				if ($obj->statut == 0)	// Not sent yet
+				if ($obj->statut == 0) {
+				    // Not sent yet
 				{
 					if ($user->rights->mailing->creer && $allowaddtarget) {
 						print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
+				}
 					}
 				}
 				/*if ($obj->statut == -1)	// Sent with error
@@ -618,8 +650,7 @@ 
 
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			if ($object->statut < 2)
 			{
@@ -634,8 +665,7 @@ 
 		print '</form>';
 
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}

Spacing +96 added lines, -96 removed lines

@@ -27,7 +27,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmailing.class.php';
@@ -39,29 +39,29 @@ 
 $langs->load("mails");
 
 // Security check
-if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
+if (!$user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
 
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="email";
-if (! $sortorder) $sortorder="ASC";
-
-$id=GETPOST('id','int');
-$rowid=GETPOST('rowid','int');
-$action=GETPOST('action','aZ09');
-$search_lastname=GETPOST("search_lastname");
-$search_firstname=GETPOST("search_firstname");
-$search_email=GETPOST("search_email");
-$search_other=GETPOST("search_other");
-$search_dest_status=GETPOST('search_dest_status');
+if (!$sortfield) $sortfield = "email";
+if (!$sortorder) $sortorder = "ASC";
+
+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'int');
+$action = GETPOST('action', 'aZ09');
+$search_lastname = GETPOST("search_lastname");
+$search_firstname = GETPOST("search_firstname");
+$search_email = GETPOST("search_email");
+$search_other = GETPOST("search_other");
+$search_dest_status = GETPOST('search_dest_status');
 
 // Search modules dirs
 $modulesdir = dolGetModulesDirs('/mailings');
@@ -75,8 +75,8 @@ 
 
 if ($action == 'add')
 {
-	$module=GETPOST("module",'alpha');
-	$result=-1;
+	$module = GETPOST("module", 'alpha');
+	$result = -1;
 
 	foreach ($modulesdir as $dir)
 	{
@@ -95,12 +95,12 @@ 
 			// Add targets into database
 			$obj = new $classname($db);
 			dol_syslog("Call add_to_target on class ".$classname);
-			$result=$obj->add_to_target($id);
+			$result = $obj->add_to_target($id);
 		}
 	}
 	if ($result > 0)
 	{
-		setEventMessages($langs->trans("XTargetsAdded",$result), null, 'mesgs');
+		setEventMessages($langs->trans("XTargetsAdded", $result), null, 'mesgs');
 
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
@@ -111,7 +111,7 @@ 
 	}
 	if ($result < 0)
 	{
-		setEventMessages($langs->trans("Error").($obj->error?' '.$obj->error:''), null, 'errors');
+		setEventMessages($langs->trans("Error").($obj->error ? ' '.$obj->error : ''), null, 'errors');
 	}
 }
 
@@ -129,8 +129,8 @@ 
 if ($action == 'delete')
 {
 	// Ici, rowid indique le destinataire et id le mailing
-	$sql="DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$rowid;
-	$resql=$db->query($sql);
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$rowid;
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		if (!empty($id))
@@ -154,13 +154,13 @@ 
 }
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-	$search_lastname='';
-	$search_firstname='';
-	$search_email='';
-	$search_other='';
-	$search_dest_status='';
+	$search_lastname = '';
+	$search_firstname = '';
+	$search_email = '';
+	$search_other = '';
+	$search_dest_status = '';
 }
 
 
@@ -169,7 +169,7 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
+llxHeader('', $langs->trans("Mailing"), 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
 
 $form = new Form($db);
 $formmailing = new FormMailing($db);
@@ -182,16 +182,16 @@ 
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlright='';
+	$morehtmlright = '';
 	$nbtry = $nbok = 0;
 	if ($object->statut == 2 || $object->statut == 3)
 	{
 		$nbtry = $object->countNbOfTargets('alreadysent');
 		$nbko  = $object->countNbOfTargets('alreadysentko');
 
-		$morehtmlright.=' ('.$nbtry.'/'.$object->nbemail;
-		if ($nbko) $morehtmlright.=' - '.$nbko.' '.$langs->trans("Error");
-		$morehtmlright.=') &nbsp; ';
+		$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
+		if ($nbko) $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+		$morehtmlright .= ') &nbsp; ';
 	}
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
@@ -203,35 +203,35 @@ 
 
 	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
 
-	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
+	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
 
 	// Errors to
-	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1);
+	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1);
 	print '</td></tr>';
 
 	// Nb of distinct emails
 	print '<tr><td>';
 	print $langs->trans("TotalNbOfDistinctRecipients");
 	print '</td><td colspan="3">';
-	$nbemail = ($object->nbemail?$object->nbemail:0);
+	$nbemail = ($object->nbemail ? $object->nbemail : 0);
 	if (is_numeric($nbemail))
 	{
-		$text='';
-		if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
+		$text = '';
+		if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
 		{
 			if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 			{
-				$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+				$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
 			}
 			else
 			{
-				$text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+				$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 			}
 		}
-		if (empty($nbemail)) $nbemail.=' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+		if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
 		if ($text)
 		{
-			print $form->textwithpicto($nbemail,$text,1,'warning');
+			print $form->textwithpicto($nbemail, $text, 1, 'warning');
 		}
 		else
 		{
@@ -249,12 +249,12 @@ 
 	print '<br>';
 
 
-	$allowaddtarget=($object->statut == 0);
+	$allowaddtarget = ($object->statut == 0);
 
 	// Show email selectors
 	if ($allowaddtarget && $user->rights->mailing->creer)
 	{
-		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''), 'title_generic');
+		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin ?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1) : ''), 'title_generic');
 
 		//print '<table class="noborder" width="100%">';
 		print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">';
@@ -276,22 +276,22 @@ 
 
 		foreach ($modulesdir as $dir)
 		{
-		    $modulenames=array();
+		    $modulenames = array();
 
 		    // Load modules attributes in arrays (name, numero, orders) from dir directory
 		    //print $dir."\n<br>";
 		    dol_syslog("Scan directory ".$dir." for modules");
-		    $handle=@opendir($dir);
+		    $handle = @opendir($dir);
 			if (is_resource($handle))
 			{
-				while (($file = readdir($handle))!==false)
+				while (($file = readdir($handle)) !== false)
 				{
 					if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
 					{
-						if (preg_match("/(.*)\.modules\.php$/i",$file,$reg))
+						if (preg_match("/(.*)\.modules\.php$/i", $file, $reg))
 						{
 							if ($reg[1] == 'example') continue;
-							$modulenames[]=$reg[1];
+							$modulenames[] = $reg[1];
 						}
 					}
 				}
@@ -304,7 +304,7 @@ 
 			$var = true;
 
 			// Loop on each submodule
-			foreach($modulenames as $modulename)
+			foreach ($modulenames as $modulename)
 			{
 				// Loading Class
 				$file = $dir.$modulename.".modules.php";
@@ -314,12 +314,12 @@ 
 				$obj = new $classname($db);
 
 				// Check dependencies
-				$qualified=(isset($obj->enabled)?$obj->enabled:1);
+				$qualified = (isset($obj->enabled) ? $obj->enabled : 1);
 				foreach ($obj->require_module as $key)
 				{
-					if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin))
+					if (!$conf->$key->enabled || (!$user->admin && $obj->require_admin))
 					{
-						$qualified=0;
+						$qualified = 0;
 						//print "Les prerequis d'activation du module mailing ne sont pas respectes. Il ne sera pas actif";
 						break;
 					}
@@ -328,7 +328,7 @@ 
 				// Si le module mailing est qualifie
 				if ($qualified)
 				{
-					$var = ! $var;
+					$var = !$var;
 
 					if ($allowaddtarget)
 					{
@@ -341,16 +341,16 @@ 
 					}
 
 					print '<div class="tagtd">';
-					if (empty($obj->picto)) $obj->picto='generic';
-					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj),$obj->picto);
+					if (empty($obj->picto)) $obj->picto = 'generic';
+					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto);
 					print ' ';
 					print $obj->getDesc();
 					print '</div>';
 
 					try {
-						$nbofrecipient=$obj->getNbOfRecipients('');
+						$nbofrecipient = $obj->getNbOfRecipients('');
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
@@ -370,9 +370,9 @@ 
 					if ($allowaddtarget)
 					{
     					try {
-    						$filter=$obj->formFilter();
+    						$filter = $obj->formFilter();
     					}
-    					catch(Exception $e)
+    					catch (Exception $e)
     					{
     						dol_syslog($e->getMessage(), LOG_ERR);
     					}
@@ -409,12 +409,12 @@ 
 	$sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.source_url, mc.source_id, mc.source_type, mc.error_text";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql .= " WHERE mc.fk_mailing=".$object->id;
-	if ($search_lastname)  $sql.= natural_search("mc.lastname", $search_lastname);
-	if ($search_firstname) $sql.= natural_search("mc.firstname", $search_firstname);
-	if ($search_email)     $sql.= natural_search("mc.email", $search_email);
-	if ($search_other)     $sql.= natural_search("mc.other", $search_other);
-	if ($search_dest_status != '' && $search_dest_status >= -1) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
-	$sql .= $db->order($sortfield,$sortorder);
+	if ($search_lastname)  $sql .= natural_search("mc.lastname", $search_lastname);
+	if ($search_firstname) $sql .= natural_search("mc.firstname", $search_firstname);
+	if ($search_email)     $sql .= natural_search("mc.email", $search_email);
+	if ($search_other)     $sql .= natural_search("mc.other", $search_other);
+	if ($search_dest_status != '' && $search_dest_status >= -1) $sql .= " AND mc.statut=".$db->escape($search_dest_status)." ";
+	$sql .= $db->order($sortfield, $sortorder);
 
 	// Count total nb of records
 	$nbtotalofrecords = '';
@@ -430,9 +430,9 @@ 
 	}
 
 	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
-	$sql .= $db->plimit($limit+1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 
@@ -440,11 +440,11 @@ 
 
 		$param = "&amp;id=".$object->id;
 		//if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-		if ($search_lastname)  $param.= "&amp;search_lastname=".urlencode($search_lastname);
-		if ($search_firstname) $param.= "&amp;search_firstname=".urlencode($search_firstname);
-		if ($search_email)     $param.= "&amp;search_email=".urlencode($search_email);
-		if ($search_other)     $param.= "&amp;search_other=".urlencode($search_other);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+		if ($search_lastname)  $param .= "&amp;search_lastname=".urlencode($search_lastname);
+		if ($search_firstname) $param .= "&amp;search_firstname=".urlencode($search_firstname);
+		if ($search_email)     $param .= "&amp;search_email=".urlencode($search_email);
+		if ($search_other)     $param .= "&amp;search_other=".urlencode($search_other);
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -453,11 +453,11 @@ 
         print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		$cleartext='';
+		$cleartext = '';
 		if ($allowaddtarget) {
-		    $cleartext=$langs->trans("ToClearAllRecipientsClickHere").' '.'<a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition">'.$langs->trans("TargetsReset").'</a>';
+		    $cleartext = $langs->trans("ToClearAllRecipientsClickHere").' '.'<a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition">'.$langs->trans("TargetsReset").'</a>';
 		}
-		print_barre_liste($langs->trans("MailSelectedRecipients"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$cleartext,$num,$nbtotalofrecords,'title_generic',0,'','', $limit);
+		print_barre_liste($langs->trans("MailSelectedRecipients"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $cleartext, $num, $nbtotalofrecords, 'title_generic', 0, '', '', $limit);
 
 		print '</form>';
 
@@ -471,7 +471,7 @@ 
 		print '<input type="hidden" name="limit" value="'.$limit.'">';
 
 
-		if ($page)	$param.= "&amp;page=".$page;
+		if ($page)	$param .= "&amp;page=".$page;
 
 		print '<div class="div-table-responsive">';
 		print '<table class="noborder" width="100%">';
@@ -505,21 +505,21 @@ 
 		print '</td>';
 		//Statut
 		print '<td class="liste_titre" align="right">';
-		print $formmailing->selectDestinariesStatus($search_dest_status,'search_dest_status',1);
+		print $formmailing->selectDestinariesStatus($search_dest_status, 'search_dest_status', 1);
 		print '</td>';
 		// Action column
 		print '<td class="liste_titre" align="right">';
-		$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+		$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
 		print $searchpicto;
 		print '</td>';
 		print '</tr>';
 
 		print '<tr class="liste_titre">';
-		print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"mc.email",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre("Lastname",$_SERVER["PHP_SELF"],"mc.lastname",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre("Firstname",$_SERVER["PHP_SELF"],"mc.firstname",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre("OtherInformations",$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
-		print_liste_field_titre("Source",$_SERVER["PHP_SELF"],"",$param,"",'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "mc.email", $param, "", "", $sortfield, $sortorder);
+		print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "mc.lastname", $param, "", "", $sortfield, $sortorder);
+		print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "mc.firstname", $param, "", "", $sortfield, $sortorder);
+		print_liste_field_titre("OtherInformations", $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+		print_liste_field_titre("Source", $_SERVER["PHP_SELF"], "", $param, "", 'align="center"', $sortfield, $sortorder);
 		// Date sending
 		if ($object->statut < 2)
 		{
@@ -527,17 +527,17 @@ 
 		}
 		else
 		{
-			print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,'','align="center"',$sortfield,$sortorder);
+			print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, '', 'align="center"', $sortfield, $sortorder);
 		}
-		print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder);
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "mc.statut", $param, '', 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
 		print '</tr>';
 
 		$i = 0;
 
 		if ($num)
 		{
-			while ($i < min($num,$limit))
+			while ($i < min($num, $limit))
 			{
 				$obj = $db->fetch_object($resql);
 
@@ -549,36 +549,36 @@ 
 				print '<td align="center">';
                 if (empty($obj->source_id) || empty($obj->source_type))
                 {
-                    print empty($obj->source_url)?'':$obj->source_url; // For backward compatibility
+                    print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
                 }
                 else
                 {
                     if ($obj->source_type == 'member')
                     {
                         include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-                        $objectstatic=new Adherent($db);
+                        $objectstatic = new Adherent($db);
 						$objectstatic->fetch($obj->source_id);
                         print $objectstatic->getNomUrl(1);
                     }
                     else if ($obj->source_type == 'user')
                     {
                         include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-                        $objectstatic=new User($db);
+                        $objectstatic = new User($db);
 						$objectstatic->fetch($obj->source_id);
-                        $objectstatic->id=$obj->source_id;
+                        $objectstatic->id = $obj->source_id;
                         print $objectstatic->getNomUrl(1);
                     }
                     else if ($obj->source_type == 'thirdparty')
                     {
                         include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-                        $objectstatic=new Societe($db);
+                        $objectstatic = new Societe($db);
 						$objectstatic->fetch($obj->source_id);
                         print $objectstatic->getNomUrl(1);
                     }
                     else if ($obj->source_type == 'contact')
                     {
                     	include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-                    	$objectstatic=new Contact($db);
+                    	$objectstatic = new Contact($db);
                     	$objectstatic->fetch($obj->source_id);
                     	print $objectstatic->getNomUrl(1);
                     }

dolibarr/htdocs/comm/mailing/list.php

Indentation +149 added lines, -149 removed lines

@@ -77,29 +77,29 @@ 
 
 if (empty($reshook))
 {
-	// Selection of new fields
-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	// Purge search criteria
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
-	{
-		/*foreach($object->fields as $key => $val)
+    // Purge search criteria
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+    {
+        /*foreach($object->fields as $key => $val)
 		{
 			$search[$key]='';
 		}*/
-		$search_ref = '';
-		$search_all = '';
-		$toselect='';
-		$search_array_options=array();
-	}
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-		|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
-	{
-		$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
-	}
-
-	// Mass actions
-	/*$objectclass='MyObject';
+        $search_ref = '';
+        $search_all = '';
+        $toselect='';
+        $search_array_options=array();
+    }
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
+        || GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+    {
+        $massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+    }
+
+    // Mass actions
+    /*$objectclass='MyObject';
 	$objectlabel='MyObject';
 	$permtoread = $user->rights->mymodule->read;
 	$permtodelete = $user->rights->mymodule->delete;
@@ -119,126 +119,126 @@ 
 
 if ($filteremail)
 {
-	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi,";
-	$sql.= " mc.statut as sendstatut";
-	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
-	$sql.= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
-	$sql.= " AND mc.email = '".$db->escape($filteremail)."'";
-	if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (! $sortorder) $sortorder="ASC";
-	if (! $sortfield) $sortfield="m.rowid";
-	$sql.= $db->order($sortfield,$sortorder);
-	$sql.= $db->plimit($conf->liste_limit +1, $offset);
+    $sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi,";
+    $sql.= " mc.statut as sendstatut";
+    $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
+    $sql.= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
+    $sql.= " AND mc.email = '".$db->escape($filteremail)."'";
+    if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
+    if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+    if (! $sortorder) $sortorder="ASC";
+    if (! $sortfield) $sortfield="m.rowid";
+    $sql.= $db->order($sortfield,$sortorder);
+    $sql.= $db->plimit($conf->liste_limit +1, $offset);
 }
 else
 {
-	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
-	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
-	$sql.= " WHERE m.entity = ".$conf->entity;
-	if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (! $sortorder) $sortorder="ASC";
-	if (! $sortfield) $sortfield="m.rowid";
-	$sql.= $db->order($sortfield,$sortorder);
-	$sql.= $db->plimit($conf->liste_limit +1, $offset);
+    $sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
+    $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
+    $sql.= " WHERE m.entity = ".$conf->entity;
+    if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
+    if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+    if (! $sortorder) $sortorder="ASC";
+    if (! $sortfield) $sortfield="m.rowid";
+    $sql.= $db->order($sortfield,$sortorder);
+    $sql.= $db->plimit($conf->liste_limit +1, $offset);
 }
 
 //print $sql;
 $result = $db->query($sql);
 if ($result)
 {
-	$num = $db->num_rows($result);
+    $num = $db->num_rows($result);
 
-	$title=$langs->trans("ListOfEMailings");
-	if ($filteremail) $title.=' ('.$langs->trans("SentTo",$filteremail).')';
+    $title=$langs->trans("ListOfEMailings");
+    if ($filteremail) $title.=' ('.$langs->trans("SentTo",$filteremail).')';
 
-	$newcardbutton='';
-	if ($user->rights->mailing->creer)
-	{
-		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/mailing/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewMailing').'</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
-	}
+    $newcardbutton='';
+    if ($user->rights->mailing->creer)
+    {
+        $newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/mailing/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewMailing').'</span>';
+        $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        $newcardbutton.= '</a>';
+    }
 
-	$i = 0;
+    $i = 0;
 
-	$param = "&search_all=".urlencode($search_all);
-	if ($filteremail) $param.='&filteremail='.urlencode($filteremail);
+    $param = "&search_all=".urlencode($search_all);
+    if ($filteremail) $param.='&filteremail='.urlencode($filteremail);
 
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
+    print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '',$num, '', 'title_generic.png', 0, $newcardbutton);
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '',$num, '', 'title_generic.png', 0, $newcardbutton);
 
-	$moreforfilter = '';
+    $moreforfilter = '';
 
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-	print '</td>';
-	// Title
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat maxwidth100 maxwidth50onsmartphone" name="search_all" value="'.dol_escape_htmltag($search_all).'">';
-	print '</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	if (! $filteremail) print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0);
-	print $searchpicto;
-	print '</td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre("Title",$_SERVER["PHP_SELF"],"m.titre",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre("DateCreation",$_SERVER["PHP_SELF"],"m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre("NbOfEMails",$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre("DateLastSend",$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
-	else print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
-
-
-	$email=new Mailing($db);
-
-	while ($i < min($num,$limit))
-	{
-		$obj = $db->fetch_object($result);
-
-		$email->id = $obj->rowid;
-		$email->ref = $obj->rowid;
-
-		print "<tr>";
-
-		print '<td>';
-		print $email->getNomUrl(1);
-		print '</td>';
-
-		print '<td>'.$obj->titre.'</td>';
-		// Date creation
-
-		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->datec),'day');
-		print '</td>';
-
-		// Nb of email
-		if (! $filteremail)
-		{
-			print '<td align="center">';
-			$nbemail = $obj->nbemail;
-			/*if ($obj->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
+    print '<tr class="liste_titre_filter">';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+    print '</td>';
+    // Title
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat maxwidth100 maxwidth50onsmartphone" name="search_all" value="'.dol_escape_htmltag($search_all).'">';
+    print '</td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    if (! $filteremail) print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre" align="right">';
+    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    print $searchpicto;
+    print '</td>';
+    print "</tr>\n";
+
+    print '<tr class="liste_titre">';
+    print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
+    print_liste_field_titre("Title",$_SERVER["PHP_SELF"],"m.titre",$param,"","",$sortfield,$sortorder);
+    print_liste_field_titre("DateCreation",$_SERVER["PHP_SELF"],"m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
+    if (! $filteremail) print_liste_field_titre("NbOfEMails",$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
+    if (! $filteremail) print_liste_field_titre("DateLastSend",$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
+    else print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
+
+
+    $email=new Mailing($db);
+
+    while ($i < min($num,$limit))
+    {
+        $obj = $db->fetch_object($result);
+
+        $email->id = $obj->rowid;
+        $email->ref = $obj->rowid;
+
+        print "<tr>";
+
+        print '<td>';
+        print $email->getNomUrl(1);
+        print '</td>';
+
+        print '<td>'.$obj->titre.'</td>';
+        // Date creation
+
+        print '<td align="center">';
+        print dol_print_date($db->jdate($obj->datec),'day');
+        print '</td>';
+
+        // Nb of email
+        if (! $filteremail)
+        {
+            print '<td align="center">';
+            $nbemail = $obj->nbemail;
+            /*if ($obj->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
 			{
 				$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
 				print $form->textwithpicto($nbemail,$text,1,'warning');
@@ -247,39 +247,39 @@ 
 			{
 				print $nbemail;
 			}*/
-			print $nbemail;
-			print '</td>';
-		}
-
-		// Last send
-		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->date_envoi),'day').'</td>';
-		print '</td>';
-
-		// Status
-		print '<td align="right" class="nowrap">';
-		if ($filteremail)
-		{
-			print $email::libStatutDest($obj->sendstatut,2);
-		}
-		else
-		{
-			print $email->LibStatut($obj->statut,5);
-		}
-		print '</td>';
-
-		print '<td></td>';
-
-		print "</tr>\n";
-		$i++;
-	}
-	print '</table>';
-	print '</div>';
-	print '</form>';
-	$db->free($result);
+            print $nbemail;
+            print '</td>';
+        }
+
+        // Last send
+        print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->date_envoi),'day').'</td>';
+        print '</td>';
+
+        // Status
+        print '<td align="right" class="nowrap">';
+        if ($filteremail)
+        {
+            print $email::libStatutDest($obj->sendstatut,2);
+        }
+        else
+        {
+            print $email->LibStatut($obj->statut,5);
+        }
+        print '</td>';
+
+        print '<td></td>';
+
+        print "</tr>\n";
+        $i++;
+    }
+    print '</table>';
+    print '</div>';
+    print '</form>';
+    $db->free($result);
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 // End of page

Braces +59 added lines, -25 removed lines

@@ -39,8 +39,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="m.date_creat";
+if (! $sortorder) {
+    $sortorder="DESC";
+}
+if (! $sortfield) {
+    $sortfield="m.date_creat";
+}
 
 $search_all=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
 $search_ref=GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
@@ -73,7 +77,9 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -81,13 +87,15 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) {
+	    // All tests are required to be compatible with all browsers
 	{
 		/*foreach($object->fields as $key => $val)
 		{
 			$search[$key]='';
 		}*/
 		$search_ref = '';
+	}
 		$search_all = '';
 		$toselect='';
 		$search_array_options=array();
@@ -124,22 +132,37 @@ 
 	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql.= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
 	$sql.= " AND mc.email = '".$db->escape($filteremail)."'";
-	if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (! $sortorder) $sortorder="ASC";
-	if (! $sortfield) $sortfield="m.rowid";
+	if ($search_ref) {
+	    $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
+	}
+	if ($search_all) {
+	    $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+	}
+	if (! $sortorder) {
+	    $sortorder="ASC";
+	}
+	if (! $sortfield) {
+	    $sortfield="m.rowid";
+	}
 	$sql.= $db->order($sortfield,$sortorder);
 	$sql.= $db->plimit($conf->liste_limit +1, $offset);
-}
-else
+} else
 {
 	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
 	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
 	$sql.= " WHERE m.entity = ".$conf->entity;
-	if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (! $sortorder) $sortorder="ASC";
-	if (! $sortfield) $sortfield="m.rowid";
+	if ($search_ref) {
+	    $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
+	}
+	if ($search_all) {
+	    $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+	}
+	if (! $sortorder) {
+	    $sortorder="ASC";
+	}
+	if (! $sortfield) {
+	    $sortfield="m.rowid";
+	}
 	$sql.= $db->order($sortfield,$sortorder);
 	$sql.= $db->plimit($conf->liste_limit +1, $offset);
 }
@@ -151,7 +174,9 @@ 
 	$num = $db->num_rows($result);
 
 	$title=$langs->trans("ListOfEMailings");
-	if ($filteremail) $title.=' ('.$langs->trans("SentTo",$filteremail).')';
+	if ($filteremail) {
+	    $title.=' ('.$langs->trans("SentTo",$filteremail).')';
+	}
 
 	$newcardbutton='';
 	if ($user->rights->mailing->creer)
@@ -164,10 +189,14 @@ 
 	$i = 0;
 
 	$param = "&search_all=".urlencode($search_all);
-	if ($filteremail) $param.='&filteremail='.urlencode($filteremail);
+	if ($filteremail) {
+	    $param.='&filteremail='.urlencode($filteremail);
+	}
 
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+	    print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -190,7 +219,9 @@ 
 	print '<input type="text" class="flat maxwidth100 maxwidth50onsmartphone" name="search_all" value="'.dol_escape_htmltag($search_all).'">';
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	if (! $filteremail) print '<td class="liste_titre">&nbsp;</td>';
+	if (! $filteremail) {
+	    print '<td class="liste_titre">&nbsp;</td>';
+	}
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="right">';
@@ -203,9 +234,14 @@ 
 	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre("Title",$_SERVER["PHP_SELF"],"m.titre",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre("DateCreation",$_SERVER["PHP_SELF"],"m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre("NbOfEMails",$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre("DateLastSend",$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
-	else print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
+	if (! $filteremail) {
+	    print_liste_field_titre("NbOfEMails",$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
+	}
+	if (! $filteremail) {
+	    print_liste_field_titre("DateLastSend",$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
+	} else {
+	    print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
+	}
 	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
@@ -260,8 +296,7 @@ 
 		if ($filteremail)
 		{
 			print $email::libStatutDest($obj->sendstatut,2);
-		}
-		else
+		} else
 		{
 			print $email->LibStatut($obj->statut,5);
 		}
@@ -276,8 +311,7 @@ 
 	print '</div>';
 	print '</form>';
 	$db->free($result);
-}
-else
+} else
 {
 	dol_print_error($db);
 }

Spacing +68 added lines, -68 removed lines

@@ -25,29 +25,29 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 
 // Load translation files required by the page
 $langs->load("mails");
 
 // Security check
-$result=restrictedArea($user,'mailing');
+$result = restrictedArea($user, 'mailing');
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$page = GETPOST("page",'int');
-if (empty($page) || $page == -1 || GETPOST('button_search','alpha') || GETPOST('button_removefilter','alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$page = GETPOST("page", 'int');
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="m.date_creat";
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "m.date_creat";
 
-$search_all=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
-$search_ref=GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
-$filteremail=GETPOST('filteremail','alpha');
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_ref = GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
+$filteremail = GETPOST('filteremail', 'alpha');
 
 $object = new Mailing($db);
 
@@ -57,7 +57,7 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('mailing');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -71,11 +71,11 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
@@ -84,7 +84,7 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
 		/*foreach($object->fields as $key => $val)
 		{
@@ -92,13 +92,13 @@ 
 		}*/
 		$search_ref = '';
 		$search_all = '';
-		$toselect='';
-		$search_array_options=array();
+		$toselect = '';
+		$search_array_options = array();
 	}
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-		|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
 	{
-		$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
 	// Mass actions
@@ -116,35 +116,35 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
+llxHeader('', $langs->trans("Mailing"), 'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
 
 $form = new Form($db);
 
 if ($filteremail)
 {
 	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi,";
-	$sql.= " mc.statut as sendstatut";
-	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
-	$sql.= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
-	$sql.= " AND mc.email = '".$db->escape($filteremail)."'";
-	if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (! $sortorder) $sortorder="ASC";
-	if (! $sortfield) $sortfield="m.rowid";
-	$sql.= $db->order($sortfield,$sortorder);
-	$sql.= $db->plimit($conf->liste_limit +1, $offset);
+	$sql .= " mc.statut as sendstatut";
+	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
+	$sql .= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
+	$sql .= " AND mc.email = '".$db->escape($filteremail)."'";
+	if ($search_ref) $sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
+	if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+	if (!$sortorder) $sortorder = "ASC";
+	if (!$sortfield) $sortfield = "m.rowid";
+	$sql .= $db->order($sortfield, $sortorder);
+	$sql .= $db->plimit($conf->liste_limit + 1, $offset);
 }
 else
 {
 	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
-	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
-	$sql.= " WHERE m.entity = ".$conf->entity;
-	if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (! $sortorder) $sortorder="ASC";
-	if (! $sortfield) $sortfield="m.rowid";
-	$sql.= $db->order($sortfield,$sortorder);
-	$sql.= $db->plimit($conf->liste_limit +1, $offset);
+	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
+	$sql .= " WHERE m.entity = ".$conf->entity;
+	if ($search_ref) $sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
+	if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+	if (!$sortorder) $sortorder = "ASC";
+	if (!$sortfield) $sortfield = "m.rowid";
+	$sql .= $db->order($sortfield, $sortorder);
+	$sql .= $db->plimit($conf->liste_limit + 1, $offset);
 }
 
 //print $sql;
@@ -153,21 +153,21 @@ 
 {
 	$num = $db->num_rows($result);
 
-	$title=$langs->trans("ListOfEMailings");
-	if ($filteremail) $title.=' ('.$langs->trans("SentTo",$filteremail).')';
+	$title = $langs->trans("ListOfEMailings");
+	if ($filteremail) $title .= ' ('.$langs->trans("SentTo", $filteremail).')';
 
-	$newcardbutton='';
+	$newcardbutton = '';
 	if ($user->rights->mailing->creer)
 	{
-		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/mailing/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewMailing').'</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
+		$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/mailing/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewMailing').'</span>';
+		$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+		$newcardbutton .= '</a>';
 	}
 
 	$i = 0;
 
 	$param = "&search_all=".urlencode($search_all);
-	if ($filteremail) $param.='&filteremail='.urlencode($filteremail);
+	if ($filteremail) $param .= '&filteremail='.urlencode($filteremail);
 
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -177,12 +177,12 @@ 
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '',$num, '', 'title_generic.png', 0, $newcardbutton);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, '', 'title_generic.png', 0, $newcardbutton);
 
 	$moreforfilter = '';
 
     print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre">';
@@ -193,30 +193,30 @@ 
 	print '<input type="text" class="flat maxwidth100 maxwidth50onsmartphone" name="search_all" value="'.dol_escape_htmltag($search_all).'">';
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	if (! $filteremail) print '<td class="liste_titre">&nbsp;</td>';
+	if (!$filteremail) print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="right">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
 	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre("Title",$_SERVER["PHP_SELF"],"m.titre",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre("DateCreation",$_SERVER["PHP_SELF"],"m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre("NbOfEMails",$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre("DateLastSend",$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
-	else print_liste_field_titre("DateSending",$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "m.rowid", $param, "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Title", $_SERVER["PHP_SELF"], "m.titre", $param, "", "", $sortfield, $sortorder);
+	print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "m.date_creat", $param, "", 'align="center"', $sortfield, $sortorder);
+	if (!$filteremail) print_liste_field_titre("NbOfEMails", $_SERVER["PHP_SELF"], "m.nbemail", $param, "", 'align="center"', $sortfield, $sortorder);
+	if (!$filteremail) print_liste_field_titre("DateLastSend", $_SERVER["PHP_SELF"], "m.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
+	else print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], ($filteremail ? "mc.statut" : "m.statut"), $param, "", 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
 
-	$email=new Mailing($db);
+	$email = new Mailing($db);
 
-	while ($i < min($num,$limit))
+	while ($i < min($num, $limit))
 	{
 		$obj = $db->fetch_object($result);
 
@@ -233,11 +233,11 @@ 
 		// Date creation
 
 		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->datec),'day');
+		print dol_print_date($db->jdate($obj->datec), 'day');
 		print '</td>';
 
 		// Nb of email
-		if (! $filteremail)
+		if (!$filteremail)
 		{
 			print '<td align="center">';
 			$nbemail = $obj->nbemail;
@@ -255,18 +255,18 @@ 
 		}
 
 		// Last send
-		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->date_envoi),'day').'</td>';
+		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->date_envoi), 'day').'</td>';
 		print '</td>';
 
 		// Status
 		print '<td align="right" class="nowrap">';
 		if ($filteremail)
 		{
-			print $email::libStatutDest($obj->sendstatut,2);
+			print $email::libStatutDest($obj->sendstatut, 2);
 		}
 		else
 		{
-			print $email->LibStatut($obj->statut,5);
+			print $email->LibStatut($obj->statut, 5);
 		}
 		print '</td>';
 

dolibarr/htdocs/comm/admin/propal_extrafields.php

Braces +6 added lines, -2 removed lines

@@ -37,13 +37,17 @@
 // List of supported format
 $tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+    $type2label[$key]=$langs->transnoentitiesnoconv($val);
+}
 
 $action=GETPOST('action', 'alpha');
 $attrname=GETPOST('attrname', 'alpha');
 $elementtype='propal'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 /*

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
@@ -38,13 +38,13 @@ 
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='propal'; //Must be the $table_element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'propal'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -61,12 +61,12 @@ 
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("Proposals");
+$textobject = $langs->transnoentitiesnoconv("Proposals");
 
-llxHeader('',$langs->trans("PropalSetup"));
+llxHeader('', $langs->trans("PropalSetup"));
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("PropalSetup"), $linkback, 'title_setup');
 
 
 $head = propal_admin_prepare_head();
@@ -106,7 +106,7 @@ 
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
     print "<br>";
     print load_fiche_titre($langs->trans("FieldEdition", $attrname));

dolibarr/htdocs/comm/admin/propaldet_extrafields.php

Indentation +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
 
 if (!$user->admin)
-	accessforbidden();
+    accessforbidden();
 
 // Load translation files required by the page
 $langs->loadlangs(array('admin', 'other', 'propal'));
@@ -99,7 +99,7 @@ 
 
 if ($action == 'create')
 {
-	print '<br><div id="newattrib"></div>';
+    print '<br><div id="newattrib"></div>';
     print load_fiche_titre($langs->trans('NewAttribute'));
 
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';

Braces +8 added lines, -3 removed lines

@@ -32,8 +32,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadlangs(array('admin', 'other', 'propal'));
@@ -44,14 +45,18 @@ 
 // List of supported format
 $tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+    $type2label[$key]=$langs->transnoentitiesnoconv($val);
+}
 
 $action=GETPOST('action', 'alpha');
 $attrname=GETPOST('attrname', 'alpha');
 
 $elementtype='propaldet'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 /*

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
@@ -45,14 +45,14 @@ 
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
 
-$elementtype='propaldet'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'propaldet'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -69,12 +69,12 @@ 
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("Proposals");
+$textobject = $langs->transnoentitiesnoconv("Proposals");
 
-llxHeader('',$langs->trans("PropalSetup"));
+llxHeader('', $langs->trans("PropalSetup"));
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("PropalSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("PropalSetup"), $linkback, 'title_setup');
 
 $head = propal_admin_prepare_head();
 
@@ -113,7 +113,7 @@ 
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
     print "<br>";
     print load_fiche_titre($langs->trans("FieldEdition", $attrname));