alxarafe / alixar

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

Indentation +162 added lines, -162 removed lines

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

Spacing +56 added lines, -56 removed lines

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

Braces +38 added lines, -24 removed lines

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

dolibarr/htdocs/core/class/fileupload.class.php

Indentation +516 added lines, -516 removed lines

@@ -30,143 +30,143 @@ 
  */
 class FileUpload
 {
-	protected $options;
-	protected $fk_element;
-	protected $element;
-
-	/**
-	 * Constructor
-	 *
-	 * @param array		$options		Options array
-	 * @param int		$fk_element		fk_element
-	 * @param string	$element		element
-	 */
-	function __construct($options=null,$fk_element=null,$element=null)
-	{
-		global $db, $conf;
-		global $object;
-
-		$this->fk_element=$fk_element;
-		$this->element=$element;
-
-		$pathname=$filename=$element;
-		if (preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
-		{
-			$pathname = $regs[1];
-			$filename = $regs[2];
-		}
-
-		$parentForeignKey = '';
-
-		// For compatibility
-		if ($element == 'propal') {
-			$pathname = 'comm/propal';
-			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'facture') {
-			$pathname = 'compta/facture';
-			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'project') {
-			$element = $pathname = 'projet';
-			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'project_task') {
-			$pathname = 'projet'; $filename='task';
-			$dir_output=$conf->projet->dir_output;
-			$parentForeignKey = 'fk_project';
-			$parentClass = 'Project';
-			$parentElement = 'projet';
-			$parentObject = 'project';
-		}
-		elseif ($element == 'fichinter') {
-			$element='ficheinter';
-			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'order_supplier') {
-			$pathname = 'fourn'; $filename='fournisseur.commande';
-			$dir_output=$conf->fournisseur->commande->dir_output;
-		}
-		elseif ($element == 'invoice_supplier') {
-			$pathname = 'fourn'; $filename='fournisseur.facture';
-			$dir_output=$conf->fournisseur->facture->dir_output;
-		}
-		elseif ($element == 'product') {
-			$dir_output = $conf->product->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'productbatch') {
-			$dir_output = $conf->productbatch->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'action') {
-			$pathname = 'comm/action'; $filename='actioncomm';
-			$dir_output=$conf->agenda->dir_output;
-		}
-		elseif ($element == 'chargesociales') {
-			$pathname = 'compta/sociales'; $filename='chargesociales';
-			$dir_output=$conf->tax->dir_output;
-		} else {
-			$dir_output=$conf->$element->dir_output;
-		}
-
-		dol_include_once('/'.$pathname.'/class/'.$filename.'.class.php');
-
-		$classname = ucfirst($filename);
-
-		if ($element == 'order_supplier') {
-			$classname = 'CommandeFournisseur';
-		} elseif ($element == 'invoice_supplier') {
-			$classname = 'FactureFournisseur';
-		}
-
-		$object = new $classname($db);
-
-		$object->fetch($fk_element);
-		if (!empty($parentForeignKey)) {
-			dol_include_once('/'.$parentElement.'/class/'.$parentObject.'.class.php');
-			$parent = new $parentClass($db);
-			$parent->fetch($object->$parentForeignKey);
-			if (!empty($parent->socid)) {
-				$parent->fetch_thirdparty();
-			}
-			$object->$parentObject = clone $parent;
-		} else {
-			$object->fetch_thirdparty();
-		}
-
-		$object_ref = dol_sanitizeFileName($object->ref);
-		if ($element == 'invoice_supplier') {
-			$object_ref = get_exdir($object->id,2,0,0,$object,'invoice_supplier') . $object_ref;
-		} else if ($element == 'project_task') {
-			$object_ref = $object->project->ref . '/' . $object_ref;
-		}
-
-		$this->options = array(
-				'script_url' => $_SERVER['PHP_SELF'],
-				'upload_dir' => $dir_output . '/' . $object_ref . '/',
-				'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/',
-				'param_name' => 'files',
-				// Set the following option to 'POST', if your server does not support
-				// DELETE requests. This is a parameter sent to the client:
-				'delete_type' => 'DELETE',
-				// The php.ini settings upload_max_filesize and post_max_size
-				// take precedence over the following max_file_size setting:
-				'max_file_size' => null,
-				'min_file_size' => 1,
-				'accept_file_types' => '/.+$/i',
-				// The maximum number of files for the upload directory:
-				'max_number_of_files' => null,
-				// Image resolution restrictions:
-				'max_width' => null,
-				'max_height' => null,
-				'min_width' => 1,
-				'min_height' => 1,
-				// Set the following option to false to enable resumable uploads:
-				'discard_aborted_uploads' => true,
-				'image_versions' => array(
-						// Uncomment the following version to restrict the size of
-						// uploaded images. You can also add additional versions with
-						// their own upload directories:
-						/*
+    protected $options;
+    protected $fk_element;
+    protected $element;
+
+    /**
+     * Constructor
+     *
+     * @param array		$options		Options array
+     * @param int		$fk_element		fk_element
+     * @param string	$element		element
+     */
+    function __construct($options=null,$fk_element=null,$element=null)
+    {
+        global $db, $conf;
+        global $object;
+
+        $this->fk_element=$fk_element;
+        $this->element=$element;
+
+        $pathname=$filename=$element;
+        if (preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+        {
+            $pathname = $regs[1];
+            $filename = $regs[2];
+        }
+
+        $parentForeignKey = '';
+
+        // For compatibility
+        if ($element == 'propal') {
+            $pathname = 'comm/propal';
+            $dir_output=$conf->$element->dir_output;
+        }
+        elseif ($element == 'facture') {
+            $pathname = 'compta/facture';
+            $dir_output=$conf->$element->dir_output;
+        }
+        elseif ($element == 'project') {
+            $element = $pathname = 'projet';
+            $dir_output=$conf->$element->dir_output;
+        }
+        elseif ($element == 'project_task') {
+            $pathname = 'projet'; $filename='task';
+            $dir_output=$conf->projet->dir_output;
+            $parentForeignKey = 'fk_project';
+            $parentClass = 'Project';
+            $parentElement = 'projet';
+            $parentObject = 'project';
+        }
+        elseif ($element == 'fichinter') {
+            $element='ficheinter';
+            $dir_output=$conf->$element->dir_output;
+        }
+        elseif ($element == 'order_supplier') {
+            $pathname = 'fourn'; $filename='fournisseur.commande';
+            $dir_output=$conf->fournisseur->commande->dir_output;
+        }
+        elseif ($element == 'invoice_supplier') {
+            $pathname = 'fourn'; $filename='fournisseur.facture';
+            $dir_output=$conf->fournisseur->facture->dir_output;
+        }
+        elseif ($element == 'product') {
+            $dir_output = $conf->product->multidir_output[$conf->entity];
+        }
+        elseif ($element == 'productbatch') {
+            $dir_output = $conf->productbatch->multidir_output[$conf->entity];
+        }
+        elseif ($element == 'action') {
+            $pathname = 'comm/action'; $filename='actioncomm';
+            $dir_output=$conf->agenda->dir_output;
+        }
+        elseif ($element == 'chargesociales') {
+            $pathname = 'compta/sociales'; $filename='chargesociales';
+            $dir_output=$conf->tax->dir_output;
+        } else {
+            $dir_output=$conf->$element->dir_output;
+        }
+
+        dol_include_once('/'.$pathname.'/class/'.$filename.'.class.php');
+
+        $classname = ucfirst($filename);
+
+        if ($element == 'order_supplier') {
+            $classname = 'CommandeFournisseur';
+        } elseif ($element == 'invoice_supplier') {
+            $classname = 'FactureFournisseur';
+        }
+
+        $object = new $classname($db);
+
+        $object->fetch($fk_element);
+        if (!empty($parentForeignKey)) {
+            dol_include_once('/'.$parentElement.'/class/'.$parentObject.'.class.php');
+            $parent = new $parentClass($db);
+            $parent->fetch($object->$parentForeignKey);
+            if (!empty($parent->socid)) {
+                $parent->fetch_thirdparty();
+            }
+            $object->$parentObject = clone $parent;
+        } else {
+            $object->fetch_thirdparty();
+        }
+
+        $object_ref = dol_sanitizeFileName($object->ref);
+        if ($element == 'invoice_supplier') {
+            $object_ref = get_exdir($object->id,2,0,0,$object,'invoice_supplier') . $object_ref;
+        } else if ($element == 'project_task') {
+            $object_ref = $object->project->ref . '/' . $object_ref;
+        }
+
+        $this->options = array(
+                'script_url' => $_SERVER['PHP_SELF'],
+                'upload_dir' => $dir_output . '/' . $object_ref . '/',
+                'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/',
+                'param_name' => 'files',
+                // Set the following option to 'POST', if your server does not support
+                // DELETE requests. This is a parameter sent to the client:
+                'delete_type' => 'DELETE',
+                // The php.ini settings upload_max_filesize and post_max_size
+                // take precedence over the following max_file_size setting:
+                'max_file_size' => null,
+                'min_file_size' => 1,
+                'accept_file_types' => '/.+$/i',
+                // The maximum number of files for the upload directory:
+                'max_number_of_files' => null,
+                // Image resolution restrictions:
+                'max_width' => null,
+                'max_height' => null,
+                'min_width' => 1,
+                'min_height' => 1,
+                // Set the following option to false to enable resumable uploads:
+                'discard_aborted_uploads' => true,
+                'image_versions' => array(
+                        // Uncomment the following version to restrict the size of
+                        // uploaded images. You can also add additional versions with
+                        // their own upload directories:
+                        /*
 		'large' => array(
 				'upload_dir' => dirname($_SERVER['SCRIPT_FILENAME']).'/files/',
 				'upload_url' => $this->getFullUrl().'/files/',
@@ -175,338 +175,338 @@ 
 				'jpeg_quality' => 95
 		),
 		*/
-						'thumbnail' => array(
-								'upload_dir' => $dir_output . '/' . $object_ref . '/thumbs/',
-								'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/thumbs/',
-								'max_width' => 80,
-								'max_height' => 80
-						)
-				)
-		);
-		if ($options) {
-			$this->options = array_replace_recursive($this->options, $options);
-		}
-	}
-
-	/**
-	 *	Return full URL
-	 *
-	 *	@return	string			URL
-	 */
-	protected function getFullUrl()
-	{
-		$https = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
-		return
-		($https ? 'https://' : 'http://').
-		(!empty($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : '').
-		(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME'].
-				($https && $_SERVER['SERVER_PORT'] === 443 ||
-						$_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))).
-						substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
-	}
-
-	/**
-	 * Set delete url
-	 *
-	 * @param 	string	$file		Filename
-	 * @return	void
-	 */
-	protected function setFileDeleteUrl($file)
-	{
-		$file->delete_url = $this->options['script_url']
-		.'?file='.rawurlencode($file->name).'&fk_element='.$this->fk_element.'&element='.$this->element;
-		$file->delete_type = $this->options['delete_type'];
-		if ($file->delete_type !== 'DELETE') {
-			$file->delete_url .= '&_method=DELETE';
-		}
-	}
-
-	/**
-	 * getFileObject
-	 *
-	 * @param	string		$file_name		Filename
-	 * @return 	stdClass|null
-	 */
-	protected function getFileObject($file_name)
-	{
-		$file_path = $this->options['upload_dir'].$file_name;
-		if (is_file($file_path) && $file_name[0] !== '.')
-		{
-			$file = new stdClass();
-			$file->name = $file_name;
-			$file->mime = dol_mimetype($file_name,'',2);
-			$file->size = filesize($file_path);
-			$file->url = $this->options['upload_url'].rawurlencode($file->name);
-			foreach($this->options['image_versions'] as $version => $options) {
-				if (is_file($options['upload_dir'].$file_name)) {
-					$tmp=explode('.',$file->name);
-					$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
-				}
-			}
-			$this->setFileDeleteUrl($file);
-			return $file;
-		}
-		return null;
-	}
-
-	/**
-	 * getFileObjects
-	 *
-	 * @return	void
-	 */
-	protected function getFileObjects()
-	{
-		return array_values(array_filter(array_map(array($this, 'getFileObject'), scandir($this->options['upload_dir']))));
-	}
-
-	/**
-	 *  Create thumbs of a file uploaded. Only the "mini" thumb is generated.
-	 *
-	 *  @param	string	$file_name		Filename
-	 *  @param	string	$options 		is array('max_width', 'max_height')
-	 *  @return	boolean
-	 */
-	protected function createScaledImage($file_name, $options)
-	{
-		global $maxwidthmini, $maxheightmini;
-
-		$file_path = $this->options['upload_dir'].$file_name;
-		$new_file_path = $options['upload_dir'].$file_name;
-
-		if (dol_mkdir($options['upload_dir']) >= 0)
-		{
-			list($img_width, $img_height) = @getimagesize($file_path);
-			if (!$img_width || !$img_height) {
-				return false;
-			}
-
-			$res=vignette($file_path,$maxwidthmini,$maxheightmini,'_mini');  // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
-
-			if (preg_match('/error/i',$res)) return false;
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Enter description here ...
-	 *
-	 * @param 	string	$uploaded_file		Uploade file
-	 * @param 	string	$file				File
-	 * @param 	string	$error				Error
-	 * @param	string	$index				Index
-	 * @return  boolean                     True if OK, False if KO
-	 */
-	protected function validate($uploaded_file, $file, $error, $index)
-	{
-		if ($error) {
-			$file->error = $error;
-			return false;
-		}
-		if (!$file->name) {
-			$file->error = 'missingFileName';
-			return false;
-		}
-		if (!preg_match($this->options['accept_file_types'], $file->name)) {
-			$file->error = 'acceptFileTypes';
-			return false;
-		}
-		if ($uploaded_file && is_uploaded_file($uploaded_file)) {
-			$file_size = filesize($uploaded_file);
-		} else {
-			$file_size = $_SERVER['CONTENT_LENGTH'];
-		}
-		if ($this->options['max_file_size'] && (
-				$file_size > $this->options['max_file_size'] ||
-				$file->size > $this->options['max_file_size'])
-		) {
-			$file->error = 'maxFileSize';
-			return false;
-		}
-		if ($this->options['min_file_size'] &&
-				$file_size < $this->options['min_file_size']) {
-			$file->error = 'minFileSize';
-			return false;
-		}
-		if (is_numeric($this->options['max_number_of_files']) && (
-				count($this->getFileObjects()) >= $this->options['max_number_of_files'])
-		) {
-			$file->error = 'maxNumberOfFiles';
-			return false;
-		}
-		list($img_width, $img_height) = @getimagesize($uploaded_file);
-		if (is_numeric($img_width)) {
-			if ($this->options['max_width'] && $img_width > $this->options['max_width'] ||
-					$this->options['max_height'] && $img_height > $this->options['max_height']) {
-				$file->error = 'maxResolution';
-				return false;
-			}
-			if ($this->options['min_width'] && $img_width < $this->options['min_width'] ||
-					$this->options['min_height'] && $img_height < $this->options['min_height']) {
-				$file->error = 'minResolution';
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Enter description here ...
-	 *
-	 * @param 	int		$matches		???
-	 * @return	string					???
-	 */
-	protected function upcountNameCallback($matches)
-	{
-		$index = isset($matches[1]) ? intval($matches[1]) + 1 : 1;
-		$ext = isset($matches[2]) ? $matches[2] : '';
-		return ' ('.$index.')'.$ext;
-	}
-
-	/**
-	 * Enter description here ...
-	 *
-	 * @param 	string		$name		???
-	 * @return	string					???
-	 */
-	protected function upcountName($name)
-	{
-		return preg_replace_callback('/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/', array($this, 'upcountNameCallback'), $name, 1);
-	}
-
-	/**
-	 * trimFileName
-	 *
-	 * @param 	string $name		Filename
-	 * @param 	string $type		???
-	 * @param 	string $index		???
-	 * @return	string
-	 */
-	protected function trimFileName($name, $type, $index)
-	{
-		// Remove path information and dots around the filename, to prevent uploading
-		// into different directories or replacing hidden system files.
-		// Also remove control characters and spaces (\x00..\x20) around the filename:
-		$file_name = trim(basename(stripslashes($name)), ".\x00..\x20");
-		// Add missing file extension for known image types:
-		if (strpos($file_name, '.') === false &&
-				preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
-			$file_name .= '.'.$matches[1];
-		}
-		if ($this->options['discard_aborted_uploads'])
-		{
-			while(is_file($this->options['upload_dir'].$file_name))
-			{
-				$file_name = $this->upcountName($file_name);
-			}
-		}
-		return $file_name;
-	}
-
-	/**
-	 * handleFileUpload
-	 *
-	 * @param 	string		$uploaded_file		Uploade file
-	 * @param 	string		$name				Name
-	 * @param 	int			$size				Size
-	 * @param 	string		$type				Type
-	 * @param 	string		$error				Error
-	 * @param	string		$index				Index
-	 * @return stdClass
-	 */
-	protected function handleFileUpload($uploaded_file, $name, $size, $type, $error, $index)
-	{
-		$file = new stdClass();
-		$file->name = $this->trimFileName($name, $type, $index);
-		$file->mime = dol_mimetype($file->name,'',2);
-		$file->size = intval($size);
-		$file->type = $type;
-		if ($this->validate($uploaded_file, $file, $error, $index) && dol_mkdir($this->options['upload_dir']) >= 0)
-		{
-			$file_path = $this->options['upload_dir'].$file->name;
-			$append_file = !$this->options['discard_aborted_uploads'] && is_file($file_path) && $file->size > filesize($file_path);
-			clearstatcache();
-			if ($uploaded_file && is_uploaded_file($uploaded_file)) {
-				// multipart/formdata uploads (POST method uploads)
-				if ($append_file)
-				{
-					file_put_contents($file_path, fopen($uploaded_file, 'r'), FILE_APPEND);
-				} else {
-					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
-				}
-			}
-			else
-			{
-				// Non-multipart uploads (PUT method support)
-				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
-			}
-			$file_size = filesize($file_path);
-			if ($file_size === $file->size)
-			{
-				$file->url = $this->options['upload_url'].rawurlencode($file->name);
-				foreach($this->options['image_versions'] as $version => $options)
-				{
-					if ($this->createScaledImage($file->name, $options))
-					{
-						$tmp=explode('.',$file->name);
-						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
-					}
-				}
-			}
-			else if ($this->options['discard_aborted_uploads'])
-			{
-				unlink($file_path);
-				$file->error = 'abort';
-			}
-			$file->size = $file_size;
-			$this->setFileDeleteUrl($file);
-		}
-		return $file;
-	}
-
-	/**
-	 * Output data
-	 *
-	 * @return	void
-	 */
-	public function get()
-	{
-		$file_name = isset($_REQUEST['file']) ?
-		basename(stripslashes($_REQUEST['file'])) : null;
-		if ($file_name)
-		{
-			$info = $this->getFileObject($file_name);
-		}
-		else
-		{
-			$info = $this->getFileObjects();
-		}
-		header('Content-type: application/json');
-		echo json_encode($info);
-	}
-
-	/**
-	 * Output data
-	 *
-	 * @return	void
-	 */
-	public function post()
-	{
-		if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE')
-		{
-			return $this->delete();
-		}
-		$upload = isset($_FILES[$this->options['param_name']]) ?
-		$_FILES[$this->options['param_name']] : null;
-		$info = array();
-		if ($upload && is_array($upload['tmp_name']))
-		{
-			// param_name is an array identifier like "files[]",
-			// $_FILES is a multi-dimensional array:
-			foreach ($upload['tmp_name'] as $index => $value) {
+                        'thumbnail' => array(
+                                'upload_dir' => $dir_output . '/' . $object_ref . '/thumbs/',
+                                'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/thumbs/',
+                                'max_width' => 80,
+                                'max_height' => 80
+                        )
+                )
+        );
+        if ($options) {
+            $this->options = array_replace_recursive($this->options, $options);
+        }
+    }
+
+    /**
+     *	Return full URL
+     *
+     *	@return	string			URL
+     */
+    protected function getFullUrl()
+    {
+        $https = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
+        return
+        ($https ? 'https://' : 'http://').
+        (!empty($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : '').
+        (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME'].
+                ($https && $_SERVER['SERVER_PORT'] === 443 ||
+                        $_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))).
+                        substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
+    }
+
+    /**
+     * Set delete url
+     *
+     * @param 	string	$file		Filename
+     * @return	void
+     */
+    protected function setFileDeleteUrl($file)
+    {
+        $file->delete_url = $this->options['script_url']
+        .'?file='.rawurlencode($file->name).'&fk_element='.$this->fk_element.'&element='.$this->element;
+        $file->delete_type = $this->options['delete_type'];
+        if ($file->delete_type !== 'DELETE') {
+            $file->delete_url .= '&_method=DELETE';
+        }
+    }
+
+    /**
+     * getFileObject
+     *
+     * @param	string		$file_name		Filename
+     * @return 	stdClass|null
+     */
+    protected function getFileObject($file_name)
+    {
+        $file_path = $this->options['upload_dir'].$file_name;
+        if (is_file($file_path) && $file_name[0] !== '.')
+        {
+            $file = new stdClass();
+            $file->name = $file_name;
+            $file->mime = dol_mimetype($file_name,'',2);
+            $file->size = filesize($file_path);
+            $file->url = $this->options['upload_url'].rawurlencode($file->name);
+            foreach($this->options['image_versions'] as $version => $options) {
+                if (is_file($options['upload_dir'].$file_name)) {
+                    $tmp=explode('.',$file->name);
+                    $file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
+                }
+            }
+            $this->setFileDeleteUrl($file);
+            return $file;
+        }
+        return null;
+    }
+
+    /**
+     * getFileObjects
+     *
+     * @return	void
+     */
+    protected function getFileObjects()
+    {
+        return array_values(array_filter(array_map(array($this, 'getFileObject'), scandir($this->options['upload_dir']))));
+    }
+
+    /**
+     *  Create thumbs of a file uploaded. Only the "mini" thumb is generated.
+     *
+     *  @param	string	$file_name		Filename
+     *  @param	string	$options 		is array('max_width', 'max_height')
+     *  @return	boolean
+     */
+    protected function createScaledImage($file_name, $options)
+    {
+        global $maxwidthmini, $maxheightmini;
+
+        $file_path = $this->options['upload_dir'].$file_name;
+        $new_file_path = $options['upload_dir'].$file_name;
+
+        if (dol_mkdir($options['upload_dir']) >= 0)
+        {
+            list($img_width, $img_height) = @getimagesize($file_path);
+            if (!$img_width || !$img_height) {
+                return false;
+            }
+
+            $res=vignette($file_path,$maxwidthmini,$maxheightmini,'_mini');  // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
+
+            if (preg_match('/error/i',$res)) return false;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    /**
+     * Enter description here ...
+     *
+     * @param 	string	$uploaded_file		Uploade file
+     * @param 	string	$file				File
+     * @param 	string	$error				Error
+     * @param	string	$index				Index
+     * @return  boolean                     True if OK, False if KO
+     */
+    protected function validate($uploaded_file, $file, $error, $index)
+    {
+        if ($error) {
+            $file->error = $error;
+            return false;
+        }
+        if (!$file->name) {
+            $file->error = 'missingFileName';
+            return false;
+        }
+        if (!preg_match($this->options['accept_file_types'], $file->name)) {
+            $file->error = 'acceptFileTypes';
+            return false;
+        }
+        if ($uploaded_file && is_uploaded_file($uploaded_file)) {
+            $file_size = filesize($uploaded_file);
+        } else {
+            $file_size = $_SERVER['CONTENT_LENGTH'];
+        }
+        if ($this->options['max_file_size'] && (
+                $file_size > $this->options['max_file_size'] ||
+                $file->size > $this->options['max_file_size'])
+        ) {
+            $file->error = 'maxFileSize';
+            return false;
+        }
+        if ($this->options['min_file_size'] &&
+                $file_size < $this->options['min_file_size']) {
+            $file->error = 'minFileSize';
+            return false;
+        }
+        if (is_numeric($this->options['max_number_of_files']) && (
+                count($this->getFileObjects()) >= $this->options['max_number_of_files'])
+        ) {
+            $file->error = 'maxNumberOfFiles';
+            return false;
+        }
+        list($img_width, $img_height) = @getimagesize($uploaded_file);
+        if (is_numeric($img_width)) {
+            if ($this->options['max_width'] && $img_width > $this->options['max_width'] ||
+                    $this->options['max_height'] && $img_height > $this->options['max_height']) {
+                $file->error = 'maxResolution';
+                return false;
+            }
+            if ($this->options['min_width'] && $img_width < $this->options['min_width'] ||
+                    $this->options['min_height'] && $img_height < $this->options['min_height']) {
+                $file->error = 'minResolution';
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Enter description here ...
+     *
+     * @param 	int		$matches		???
+     * @return	string					???
+     */
+    protected function upcountNameCallback($matches)
+    {
+        $index = isset($matches[1]) ? intval($matches[1]) + 1 : 1;
+        $ext = isset($matches[2]) ? $matches[2] : '';
+        return ' ('.$index.')'.$ext;
+    }
+
+    /**
+     * Enter description here ...
+     *
+     * @param 	string		$name		???
+     * @return	string					???
+     */
+    protected function upcountName($name)
+    {
+        return preg_replace_callback('/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/', array($this, 'upcountNameCallback'), $name, 1);
+    }
+
+    /**
+     * trimFileName
+     *
+     * @param 	string $name		Filename
+     * @param 	string $type		???
+     * @param 	string $index		???
+     * @return	string
+     */
+    protected function trimFileName($name, $type, $index)
+    {
+        // Remove path information and dots around the filename, to prevent uploading
+        // into different directories or replacing hidden system files.
+        // Also remove control characters and spaces (\x00..\x20) around the filename:
+        $file_name = trim(basename(stripslashes($name)), ".\x00..\x20");
+        // Add missing file extension for known image types:
+        if (strpos($file_name, '.') === false &&
+                preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
+            $file_name .= '.'.$matches[1];
+        }
+        if ($this->options['discard_aborted_uploads'])
+        {
+            while(is_file($this->options['upload_dir'].$file_name))
+            {
+                $file_name = $this->upcountName($file_name);
+            }
+        }
+        return $file_name;
+    }
+
+    /**
+     * handleFileUpload
+     *
+     * @param 	string		$uploaded_file		Uploade file
+     * @param 	string		$name				Name
+     * @param 	int			$size				Size
+     * @param 	string		$type				Type
+     * @param 	string		$error				Error
+     * @param	string		$index				Index
+     * @return stdClass
+     */
+    protected function handleFileUpload($uploaded_file, $name, $size, $type, $error, $index)
+    {
+        $file = new stdClass();
+        $file->name = $this->trimFileName($name, $type, $index);
+        $file->mime = dol_mimetype($file->name,'',2);
+        $file->size = intval($size);
+        $file->type = $type;
+        if ($this->validate($uploaded_file, $file, $error, $index) && dol_mkdir($this->options['upload_dir']) >= 0)
+        {
+            $file_path = $this->options['upload_dir'].$file->name;
+            $append_file = !$this->options['discard_aborted_uploads'] && is_file($file_path) && $file->size > filesize($file_path);
+            clearstatcache();
+            if ($uploaded_file && is_uploaded_file($uploaded_file)) {
+                // multipart/formdata uploads (POST method uploads)
+                if ($append_file)
+                {
+                    file_put_contents($file_path, fopen($uploaded_file, 'r'), FILE_APPEND);
+                } else {
+                    dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
+                }
+            }
+            else
+            {
+                // Non-multipart uploads (PUT method support)
+                file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
+            }
+            $file_size = filesize($file_path);
+            if ($file_size === $file->size)
+            {
+                $file->url = $this->options['upload_url'].rawurlencode($file->name);
+                foreach($this->options['image_versions'] as $version => $options)
+                {
+                    if ($this->createScaledImage($file->name, $options))
+                    {
+                        $tmp=explode('.',$file->name);
+                        $file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
+                    }
+                }
+            }
+            else if ($this->options['discard_aborted_uploads'])
+            {
+                unlink($file_path);
+                $file->error = 'abort';
+            }
+            $file->size = $file_size;
+            $this->setFileDeleteUrl($file);
+        }
+        return $file;
+    }
+
+    /**
+     * Output data
+     *
+     * @return	void
+     */
+    public function get()
+    {
+        $file_name = isset($_REQUEST['file']) ?
+        basename(stripslashes($_REQUEST['file'])) : null;
+        if ($file_name)
+        {
+            $info = $this->getFileObject($file_name);
+        }
+        else
+        {
+            $info = $this->getFileObjects();
+        }
+        header('Content-type: application/json');
+        echo json_encode($info);
+    }
+
+    /**
+     * Output data
+     *
+     * @return	void
+     */
+    public function post()
+    {
+        if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE')
+        {
+            return $this->delete();
+        }
+        $upload = isset($_FILES[$this->options['param_name']]) ?
+        $_FILES[$this->options['param_name']] : null;
+        $info = array();
+        if ($upload && is_array($upload['tmp_name']))
+        {
+            // param_name is an array identifier like "files[]",
+            // $_FILES is a multi-dimensional array:
+            foreach ($upload['tmp_name'] as $index => $value) {
                 $info[] = $this->handleFileUpload(
                     $upload['tmp_name'][$index],
                     isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index],
@@ -515,10 +515,10 @@ 
                     $upload['error'][$index],
                     $index
                 );
-			}
-		} elseif ($upload || isset($_SERVER['HTTP_X_FILE_NAME'])) {
-			// param_name is a single object identifier like "file",
-			// $_FILES is a one-dimensional array:
+            }
+        } elseif ($upload || isset($_SERVER['HTTP_X_FILE_NAME'])) {
+            // param_name is a single object identifier like "file",
+            // $_FILES is a one-dimensional array:
             $info[] = $this->handleFileUpload(
                 isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
                 isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? $upload['name'] : null),
@@ -527,47 +527,47 @@ 
                 isset($upload['error']) ? $upload['error'] : null,
                 0
             );
-		}
-		header('Vary: Accept');
-		$json = json_encode($info);
-		$redirect = isset($_REQUEST['redirect']) ?
-		stripslashes($_REQUEST['redirect']) : null;
-		if ($redirect) {
-			header('Location: '.sprintf($redirect, rawurlencode($json)));
-			return;
-		}
-		if (isset($_SERVER['HTTP_ACCEPT']) &&
-				(strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) {
-			header('Content-type: application/json');
-		} else {
-			header('Content-type: text/plain');
-		}
-		echo $json;
-	}
-
-	/**
-	 * Delete uploaded file
-	 *
-	 * @return	void
-	 */
-	public function delete()
-	{
-		$file_name = isset($_REQUEST['file']) ?
-		basename(stripslashes($_REQUEST['file'])) : null;
-		$file_path = $this->options['upload_dir'].$file_name;
-		$success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
-		if ($success)
-		{
-			foreach($this->options['image_versions'] as $version => $options)
-			{
-				$file = $options['upload_dir'].$file_name;
-				if (is_file($file))
-				{
-					unlink($file);
-				}
-			}
-		}
-		header('Content-type: application/json');
-		echo json_encode($success);
-	}
+        }
+        header('Vary: Accept');
+        $json = json_encode($info);
+        $redirect = isset($_REQUEST['redirect']) ?
+        stripslashes($_REQUEST['redirect']) : null;
+        if ($redirect) {
+            header('Location: '.sprintf($redirect, rawurlencode($json)));
+            return;
+        }
+        if (isset($_SERVER['HTTP_ACCEPT']) &&
+                (strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) {
+            header('Content-type: application/json');
+        } else {
+            header('Content-type: text/plain');
+        }
+        echo $json;
+    }
+
+    /**
+     * Delete uploaded file
+     *
+     * @return	void
+     */
+    public function delete()
+    {
+        $file_name = isset($_REQUEST['file']) ?
+        basename(stripslashes($_REQUEST['file'])) : null;
+        $file_path = $this->options['upload_dir'].$file_name;
+        $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
+        if ($success)
+        {
+            foreach($this->options['image_versions'] as $version => $options)
+            {
+                $file = $options['upload_dir'].$file_name;
+                if (is_file($file))
+                {
+                    unlink($file);
+                }
+            }
+        }
+        header('Content-type: application/json');
+        echo json_encode($success);
+    }
 }

Spacing +36 added lines, -36 removed lines

@@ -41,16 +41,16 @@ 
 	 * @param int		$fk_element		fk_element
 	 * @param string	$element		element
 	 */
-	function __construct($options=null,$fk_element=null,$element=null)
+	function __construct($options = null, $fk_element = null, $element = null)
 	{
 		global $db, $conf;
 		global $object;
 
-		$this->fk_element=$fk_element;
-		$this->element=$element;
+		$this->fk_element = $fk_element;
+		$this->element = $element;
 
-		$pathname=$filename=$element;
-		if (preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
+		$pathname = $filename = $element;
+		if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
 		{
 			$pathname = $regs[1];
 			$filename = $regs[2];
@@ -61,35 +61,35 @@ 
 		// For compatibility
 		if ($element == 'propal') {
 			$pathname = 'comm/propal';
-			$dir_output=$conf->$element->dir_output;
+			$dir_output = $conf->$element->dir_output;
 		}
 		elseif ($element == 'facture') {
 			$pathname = 'compta/facture';
-			$dir_output=$conf->$element->dir_output;
+			$dir_output = $conf->$element->dir_output;
 		}
 		elseif ($element == 'project') {
 			$element = $pathname = 'projet';
-			$dir_output=$conf->$element->dir_output;
+			$dir_output = $conf->$element->dir_output;
 		}
 		elseif ($element == 'project_task') {
-			$pathname = 'projet'; $filename='task';
-			$dir_output=$conf->projet->dir_output;
+			$pathname = 'projet'; $filename = 'task';
+			$dir_output = $conf->projet->dir_output;
 			$parentForeignKey = 'fk_project';
 			$parentClass = 'Project';
 			$parentElement = 'projet';
 			$parentObject = 'project';
 		}
 		elseif ($element == 'fichinter') {
-			$element='ficheinter';
-			$dir_output=$conf->$element->dir_output;
+			$element = 'ficheinter';
+			$dir_output = $conf->$element->dir_output;
 		}
 		elseif ($element == 'order_supplier') {
-			$pathname = 'fourn'; $filename='fournisseur.commande';
-			$dir_output=$conf->fournisseur->commande->dir_output;
+			$pathname = 'fourn'; $filename = 'fournisseur.commande';
+			$dir_output = $conf->fournisseur->commande->dir_output;
 		}
 		elseif ($element == 'invoice_supplier') {
-			$pathname = 'fourn'; $filename='fournisseur.facture';
-			$dir_output=$conf->fournisseur->facture->dir_output;
+			$pathname = 'fourn'; $filename = 'fournisseur.facture';
+			$dir_output = $conf->fournisseur->facture->dir_output;
 		}
 		elseif ($element == 'product') {
 			$dir_output = $conf->product->multidir_output[$conf->entity];
@@ -98,14 +98,14 @@ 
 			$dir_output = $conf->productbatch->multidir_output[$conf->entity];
 		}
 		elseif ($element == 'action') {
-			$pathname = 'comm/action'; $filename='actioncomm';
-			$dir_output=$conf->agenda->dir_output;
+			$pathname = 'comm/action'; $filename = 'actioncomm';
+			$dir_output = $conf->agenda->dir_output;
 		}
 		elseif ($element == 'chargesociales') {
-			$pathname = 'compta/sociales'; $filename='chargesociales';
-			$dir_output=$conf->tax->dir_output;
+			$pathname = 'compta/sociales'; $filename = 'chargesociales';
+			$dir_output = $conf->tax->dir_output;
 		} else {
-			$dir_output=$conf->$element->dir_output;
+			$dir_output = $conf->$element->dir_output;
 		}
 
 		dol_include_once('/'.$pathname.'/class/'.$filename.'.class.php');
@@ -135,14 +135,14 @@ 
 
 		$object_ref = dol_sanitizeFileName($object->ref);
 		if ($element == 'invoice_supplier') {
-			$object_ref = get_exdir($object->id,2,0,0,$object,'invoice_supplier') . $object_ref;
+			$object_ref = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$object_ref;
 		} else if ($element == 'project_task') {
-			$object_ref = $object->project->ref . '/' . $object_ref;
+			$object_ref = $object->project->ref.'/'.$object_ref;
 		}
 
 		$this->options = array(
 				'script_url' => $_SERVER['PHP_SELF'],
-				'upload_dir' => $dir_output . '/' . $object_ref . '/',
+				'upload_dir' => $dir_output.'/'.$object_ref.'/',
 				'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/',
 				'param_name' => 'files',
 				// Set the following option to 'POST', if your server does not support
@@ -176,7 +176,7 @@ 
 		),
 		*/
 						'thumbnail' => array(
-								'upload_dir' => $dir_output . '/' . $object_ref . '/thumbs/',
+								'upload_dir' => $dir_output.'/'.$object_ref.'/thumbs/',
 								'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.$element.'&attachment=1&file=/'.$object_ref.'/thumbs/',
 								'max_width' => 80,
 								'max_height' => 80
@@ -202,7 +202,7 @@ 
 		(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME'].
 				($https && $_SERVER['SERVER_PORT'] === 443 ||
 						$_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))).
-						substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
+						substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
 	}
 
 	/**
@@ -234,12 +234,12 @@ 
 		{
 			$file = new stdClass();
 			$file->name = $file_name;
-			$file->mime = dol_mimetype($file_name,'',2);
+			$file->mime = dol_mimetype($file_name, '', 2);
 			$file->size = filesize($file_path);
 			$file->url = $this->options['upload_url'].rawurlencode($file->name);
-			foreach($this->options['image_versions'] as $version => $options) {
+			foreach ($this->options['image_versions'] as $version => $options) {
 				if (is_file($options['upload_dir'].$file_name)) {
-					$tmp=explode('.',$file->name);
+					$tmp = explode('.', $file->name);
 					$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 				}
 			}
@@ -280,9 +280,9 @@ 
 				return false;
 			}
 
-			$res=vignette($file_path,$maxwidthmini,$maxheightmini,'_mini');  // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
+			$res = vignette($file_path, $maxwidthmini, $maxheightmini, '_mini'); // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
 
-			if (preg_match('/error/i',$res)) return false;
+			if (preg_match('/error/i', $res)) return false;
 			return true;
 		}
 		else
@@ -398,7 +398,7 @@ 
 		}
 		if ($this->options['discard_aborted_uploads'])
 		{
-			while(is_file($this->options['upload_dir'].$file_name))
+			while (is_file($this->options['upload_dir'].$file_name))
 			{
 				$file_name = $this->upcountName($file_name);
 			}
@@ -421,7 +421,7 @@ 
 	{
 		$file = new stdClass();
 		$file->name = $this->trimFileName($name, $type, $index);
-		$file->mime = dol_mimetype($file->name,'',2);
+		$file->mime = dol_mimetype($file->name, '', 2);
 		$file->size = intval($size);
 		$file->type = $type;
 		if ($this->validate($uploaded_file, $file, $error, $index) && dol_mkdir($this->options['upload_dir']) >= 0)
@@ -447,11 +447,11 @@ 
 			if ($file_size === $file->size)
 			{
 				$file->url = $this->options['upload_url'].rawurlencode($file->name);
-				foreach($this->options['image_versions'] as $version => $options)
+				foreach ($this->options['image_versions'] as $version => $options)
 				{
 					if ($this->createScaledImage($file->name, $options))
 					{
-						$tmp=explode('.',$file->name);
+						$tmp = explode('.', $file->name);
 						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 					}
 				}
@@ -558,7 +558,7 @@ 
 		$success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
 		if ($success)
 		{
-			foreach($this->options['image_versions'] as $version => $options)
+			foreach ($this->options['image_versions'] as $version => $options)
 			{
 				$file = $options['upload_dir'].$file_name;
 				if (is_file($file))

Braces +17 added lines, -29 removed lines

@@ -62,46 +62,36 @@ 
 		if ($element == 'propal') {
 			$pathname = 'comm/propal';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'facture') {
+		} elseif ($element == 'facture') {
 			$pathname = 'compta/facture';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'project') {
+		} elseif ($element == 'project') {
 			$element = $pathname = 'projet';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'project_task') {
+		} elseif ($element == 'project_task') {
 			$pathname = 'projet'; $filename='task';
 			$dir_output=$conf->projet->dir_output;
 			$parentForeignKey = 'fk_project';
 			$parentClass = 'Project';
 			$parentElement = 'projet';
 			$parentObject = 'project';
-		}
-		elseif ($element == 'fichinter') {
+		} elseif ($element == 'fichinter') {
 			$element='ficheinter';
 			$dir_output=$conf->$element->dir_output;
-		}
-		elseif ($element == 'order_supplier') {
+		} elseif ($element == 'order_supplier') {
 			$pathname = 'fourn'; $filename='fournisseur.commande';
 			$dir_output=$conf->fournisseur->commande->dir_output;
-		}
-		elseif ($element == 'invoice_supplier') {
+		} elseif ($element == 'invoice_supplier') {
 			$pathname = 'fourn'; $filename='fournisseur.facture';
 			$dir_output=$conf->fournisseur->facture->dir_output;
-		}
-		elseif ($element == 'product') {
+		} elseif ($element == 'product') {
 			$dir_output = $conf->product->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'productbatch') {
+		} elseif ($element == 'productbatch') {
 			$dir_output = $conf->productbatch->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'action') {
+		} elseif ($element == 'action') {
 			$pathname = 'comm/action'; $filename='actioncomm';
 			$dir_output=$conf->agenda->dir_output;
-		}
-		elseif ($element == 'chargesociales') {
+		} elseif ($element == 'chargesociales') {
 			$pathname = 'compta/sociales'; $filename='chargesociales';
 			$dir_output=$conf->tax->dir_output;
 		} else {
@@ -282,10 +272,11 @@ 
 
 			$res=vignette($file_path,$maxwidthmini,$maxheightmini,'_mini');  // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
 
-			if (preg_match('/error/i',$res)) return false;
+			if (preg_match('/error/i',$res)) {
+			    return false;
+			}
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -437,8 +428,7 @@ 
 				} else {
 					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
 				}
-			}
-			else
+			} else
 			{
 				// Non-multipart uploads (PUT method support)
 				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
@@ -455,8 +445,7 @@ 
 						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 					}
 				}
-			}
-			else if ($this->options['discard_aborted_uploads'])
+			} else if ($this->options['discard_aborted_uploads'])
 			{
 				unlink($file_path);
 				$file->error = 'abort';
@@ -479,8 +468,7 @@ 
 		if ($file_name)
 		{
 			$info = $this->getFileObject($file_name);
-		}
-		else
+		} else
 		{
 			$info = $this->getFileObjects();
 		}

dolibarr/htdocs/core/class/commonorder.class.php

Indentation +107 added lines, -107 removed lines

@@ -37,112 +37,112 @@
  */
 abstract class CommonOrderLine extends CommonObjectLine
 {
-	/**
-	 * Product ref
-	 * @var string
-	 * @deprecated Use product_ref
-	 * @see product_ref
-	 */
-	public $ref;
-
-	/**
-	 * Product ref
-	 * @var string
-	 */
-	public $product_ref;
-
-	/**
-	 * Product label
-	 * @var string
-	 * @deprecated Use product_label
-	 * @see product_label
-	 */
-	public $libelle;
-
-	/**
-	 * Product label
-	 * @var string
-	 */
-	public $product_label;
-
-	/**
-	 * Product description
-	 * @var string
-	 */
-	public $product_desc;
-
-	/**
-	 * Quantity
-	 * @var float
-	 */
-	public $qty;
-
-	/**
-	 * Unit price
-	 * @deprecated
-	 * @see subprice
-	 */
-	var $price;
-
-	/**
-	 * Unit price before taxes
-	 * @var float
-	 */
-	public $subprice;
-
-	/**
-	 * Type of the product. 0 for product 1 for service
-	 * @var int
-	 */
-	public $product_type = 0;
-
-	/**
-	 * Description of the line
-	 * @var string
-	 */
-	public $desc;
-
-	/**
-	 * Id of corresponding product
-	 * @var int
-	 */
-	public $fk_product;
-
-	/**
-	 * Percent line discount
-	 * @var float
-	 */
-	public $remise_percent;
-
-	/**
-	 * VAT %
-	 * @var float
-	 */
-	public $tva_tx;
-
-	/**
-	 * Local tax 1 %
-	 * @var float
-	 */
-	public $localtax1_tx;
-
-	/**
-	 * Local tax 2 %
-	 * @var float
-	 */
-	public $localtax2_tx;
-
-	public $localtax1_type;
-	public $localtax2_type;
-
-	/**
-	 * Liste d'options cumulables:
-	 * Bit 0:	0 si TVA normal - 1 si TVA NPR
-	 * Bit 1:	0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
-	 * @var int
-	 */
-	public $info_bits = 0;
-
-	public $special_code = 0;
+    /**
+     * Product ref
+     * @var string
+     * @deprecated Use product_ref
+     * @see product_ref
+     */
+    public $ref;
+
+    /**
+     * Product ref
+     * @var string
+     */
+    public $product_ref;
+
+    /**
+     * Product label
+     * @var string
+     * @deprecated Use product_label
+     * @see product_label
+     */
+    public $libelle;
+
+    /**
+     * Product label
+     * @var string
+     */
+    public $product_label;
+
+    /**
+     * Product description
+     * @var string
+     */
+    public $product_desc;
+
+    /**
+     * Quantity
+     * @var float
+     */
+    public $qty;
+
+    /**
+     * Unit price
+     * @deprecated
+     * @see subprice
+     */
+    var $price;
+
+    /**
+     * Unit price before taxes
+     * @var float
+     */
+    public $subprice;
+
+    /**
+     * Type of the product. 0 for product 1 for service
+     * @var int
+     */
+    public $product_type = 0;
+
+    /**
+     * Description of the line
+     * @var string
+     */
+    public $desc;
+
+    /**
+     * Id of corresponding product
+     * @var int
+     */
+    public $fk_product;
+
+    /**
+     * Percent line discount
+     * @var float
+     */
+    public $remise_percent;
+
+    /**
+     * VAT %
+     * @var float
+     */
+    public $tva_tx;
+
+    /**
+     * Local tax 1 %
+     * @var float
+     */
+    public $localtax1_tx;
+
+    /**
+     * Local tax 2 %
+     * @var float
+     */
+    public $localtax2_tx;
+
+    public $localtax1_type;
+    public $localtax2_type;
+
+    /**
+     * Liste d'options cumulables:
+     * Bit 0:	0 si TVA normal - 1 si TVA NPR
+     * Bit 1:	0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
+     * @var int
+     */
+    public $info_bits = 0;
+
+    public $special_code = 0;
 }
 

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
  *       \brief      File of the superclass of orders classes (customer and supplier)
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 
 /**
  *      Superclass for orders classes

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

Indentation +616 added lines, -616 removed lines

@@ -29,660 +29,660 @@
  */
 class FormProjets
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Output a combo list with projects qualified for a third party / user
-	 *
-	 *	@param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
-	 *	@param  string	$selected   	Id project preselected ('' or id of project)
-	 *	@param  string	$htmlname   	Name of HTML field
-	 *	@param	int		$maxlength		Maximum length of label
-	 *	@param	int		$option_only	Return only html options lines without the select tag
-	 *	@param	int		$show_empty		Add an empty line
-	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
-	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)
-	 *  @param	int		$disabled		Disabled
-	 *  @param  int     $mode           0 for HTML mode and 1 for JSON mode
-	 *  @param  string  $filterkey      Key to filter
-	 *  @param  int     $nooutput       No print output. Return it only.
-	 *  @param  int     $forceaddid     Force to add project id in list, event if not qualified
-	 *  @param  string  $morecss        More css
-	 *	@param  int     $htmlid         Html id to use instead of htmlname
-	 *	@return string           		Return html content
-	 */
-	function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0, $morecss='', $htmlid='')
-	{
+    /**
+     *	Output a combo list with projects qualified for a third party / user
+     *
+     *	@param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+     *	@param  string	$selected   	Id project preselected ('' or id of project)
+     *	@param  string	$htmlname   	Name of HTML field
+     *	@param	int		$maxlength		Maximum length of label
+     *	@param	int		$option_only	Return only html options lines without the select tag
+     *	@param	int		$show_empty		Add an empty line
+     *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
+     *  @param	int		$forcefocus		Force focus on field (works with javascript only)
+     *  @param	int		$disabled		Disabled
+     *  @param  int     $mode           0 for HTML mode and 1 for JSON mode
+     *  @param  string  $filterkey      Key to filter
+     *  @param  int     $nooutput       No print output. Return it only.
+     *  @param  int     $forceaddid     Force to add project id in list, event if not qualified
+     *  @param  string  $morecss        More css
+     *	@param  int     $htmlid         Html id to use instead of htmlname
+     *	@return string           		Return html content
+     */
+    function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0, $morecss='', $htmlid='')
+    {
         // phpcs:enable
-		global $langs,$conf,$form;
-
-		$out='';
-
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))
-		{
-			$placeholder='';
-
-			if ($selected && empty($selected_input_value))
-			{
-				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$project = new Project($this->db);
-				$project->fetch($selected);
-				$selected_input_value=$project->ref;
-			}
-			$urloption='socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;
-			$out.=ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(
+        global $langs,$conf,$form;
+
+        $out='';
+
+        if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))
+        {
+            $placeholder='';
+
+            if ($selected && empty($selected_input_value))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $project = new Project($this->db);
+                $project->fetch($selected);
+                $selected_input_value=$project->ref;
+            }
+            $urloption='socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;
+            $out.=ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(
 //				'update' => array(
 //					'projectid' => 'id'
 //				)
-			));
-
-			$out.='<input type="text" class="minwidth200'.($morecss?' '.$morecss:'').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else
-		{
-			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
-		}
-		if ($discard_closed)
-		{
-			if (class_exists('Form'))
-			{
-				if (empty($form)) $form=new Form($this->db);
-				$out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
-			}
-		}
-
-		if (empty($nooutput))
-		{
-		    print $out;
-		    return '';
-		}
-		else return $out;
-	}
+            ));
+
+            $out.='<input type="text" class="minwidth200'.($morecss?' '.$morecss:'').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
+        }
+        else
+        {
+            $out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
+        }
+        if ($discard_closed)
+        {
+            if (class_exists('Form'))
+            {
+                if (empty($form)) $form=new Form($this->db);
+                $out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
+            }
+        }
+
+        if (empty($nooutput))
+        {
+            print $out;
+            return '';
+        }
+        else return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Returns an array with projects qualified for a third party
-	 *
-	 * @param  int     $socid      	       Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
-	 * @param  int     $selected   	       Id project preselected
-	 * @param  string  $htmlname   	       Nom de la zone html
-	 * @param  int     $maxlength          Maximum length of label
-	 * @param  int     $option_only	       Return only html options lines without the select tag
-	 * @param  int     $show_empty		   Add an empty line
-	 * @param  int     $discard_closed     Discard closed projects (0=Keep,1=hide completely,2=Disable)
+    /**
+     * Returns an array with projects qualified for a third party
+     *
+     * @param  int     $socid      	       Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+     * @param  int     $selected   	       Id project preselected
+     * @param  string  $htmlname   	       Nom de la zone html
+     * @param  int     $maxlength          Maximum length of label
+     * @param  int     $option_only	       Return only html options lines without the select tag
+     * @param  int     $show_empty		   Add an empty line
+     * @param  int     $discard_closed     Discard closed projects (0=Keep,1=hide completely,2=Disable)
      * @param  int     $forcefocus		   Force focus on field (works with javascript only)
      * @param  int     $disabled           Disabled
-	 * @param  int     $mode               0 for HTML mode and 1 for array return (to be used by json_encode for example)
-	 * @param  string  $filterkey          Key to filter
-	 * @param  int     $nooutput           No print output. Return it only.
-	 * @param  int     $forceaddid         Force to add project id in list, event if not qualified
-	 * @param  int     $htmlid             Html id to use instead of htmlname
-	 * @param  string  $morecss            More CSS
-	 * @return int         			       Nb of project if OK, <0 if KO
-	 */
-	function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode=0, $filterkey = '', $nooutput=0, $forceaddid=0, $htmlid='', $morecss='maxwidth500')
-	{
+     * @param  int     $mode               0 for HTML mode and 1 for array return (to be used by json_encode for example)
+     * @param  string  $filterkey          Key to filter
+     * @param  int     $nooutput           No print output. Return it only.
+     * @param  int     $forceaddid         Force to add project id in list, event if not qualified
+     * @param  int     $htmlid             Html id to use instead of htmlname
+     * @param  string  $morecss            More CSS
+     * @return int         			       Nb of project if OK, <0 if KO
+     */
+    function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode=0, $filterkey = '', $nooutput=0, $forceaddid=0, $htmlid='', $morecss='maxwidth500')
+    {
         // phpcs:enable
-		global $user,$conf,$langs;
-
-		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-		if (empty($htmlid)) $htmlid = $htmlname;
-
-		$out='';
-		$outarray=array();
-
-		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
-
-		$projectsListId = false;
-		if (empty($user->rights->projet->all->lire))
-		{
-			$projectstatic=new Project($this->db);
-			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
-		}
-
-		// Search all projects
-		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
-		$sql.= " WHERE p.entity IN (".getEntity('project').")";
-		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)
-		{
-		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		    else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-		    {
-		        $sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
-		    }
-		}
-		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
-		$sql.= " ORDER BY p.ref ASC";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			// Use select2 selector
-			if (! empty($conf->use_javascript_ajax))
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-	           	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
-            	$out.=$comboenhancement;
-            	$morecss.=' minwidth100';
-			}
-
-			if (empty($option_only)) {
-				$out.= '<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlid.'" name="'.$htmlname.'">';
-			}
-			if (!empty($show_empty)) {
-				$out.= '<option value="0">&nbsp;</option>';
-			}
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
-					{
-						// Do nothing
-					}
-					else
-					{
-						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
-						{
-							$i++;
-							continue;
-						}
-
-						$labeltoshow=dol_trunc($obj->ref,18);
-						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
-						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						$labeltoshow.=', '.dol_trunc($obj->title, $maxlength);
-						if ($obj->name)
-						{
-						    $labeltoshow.=' - '.$obj->name;
-						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
-						}
-
-						$disabled=0;
-						if ($obj->fk_statut == 0)
-						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Draft");
-						}
-						else if ($obj->fk_statut == 2)
-						{
-							if ($discard_closed == 2) $disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Closed");
-						}
-						else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
-						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
-						}
-
-						if (!empty($selected) && $selected == $obj->rowid)
-						{
-							$out.= '<option value="'.$obj->rowid.'" selected';
-							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out.= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
-							{
-								$resultat='';
-							}
-							else
-							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
-								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>';
-								$resultat.=$labeltoshow;
-								$resultat.='</option>';
-							}
-							$out.= $resultat;
-
-							$outarray[] = array(
-								'key' => (int) $obj->rowid,
-								'value' => $obj->ref,
-								'ref' => $obj->ref,
-								'label' => $labeltoshow,
-								'disabled' => (bool) $disabled
-							);
-						}
-					}
-					$i++;
-				}
-			}
-
-			$this->db->free($resql);
-
-			if (!$mode) {
-				if (empty($option_only)) $out.= '</select>';
-				if (empty($nooutput))
-				{
-				    print $out;
-				    return '';
-				}
-				else return $out;
-			} else {
-				return $outarray;
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
-	/**
-	 *	Output a combo list with tasks qualified for a third party
-	 *
-	 *	@param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
-	 *	@param  int		$selected   	Id task preselected
-	 *	@param  string	$htmlname   	Name of HTML select
-	 *	@param	int		$maxlength		Maximum length of label
-	 *	@param	int		$option_only	Return only html options lines without the select tag
-	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
-	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
+        global $user,$conf,$langs;
+
+        require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+        if (empty($htmlid)) $htmlid = $htmlname;
+
+        $out='';
+        $outarray=array();
+
+        $hideunselectables = false;
+        if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+
+        $projectsListId = false;
+        if (empty($user->rights->projet->all->lire))
+        {
+            $projectstatic=new Project($this->db);
+            $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+        }
+
+        // Search all projects
+        $sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
+        $sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
+        $sql.= " WHERE p.entity IN (".getEntity('project').")";
+        if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
+        if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+        if ($socid > 0)
+        {
+            if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+            else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
+            {
+                $sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
+            }
+        }
+        if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
+        $sql.= " ORDER BY p.ref ASC";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            // Use select2 selector
+            if (! empty($conf->use_javascript_ajax))
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                    $comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
+                $out.=$comboenhancement;
+                $morecss.=' minwidth100';
+            }
+
+            if (empty($option_only)) {
+                $out.= '<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlid.'" name="'.$htmlname.'">';
+            }
+            if (!empty($show_empty)) {
+                $out.= '<option value="0">&nbsp;</option>';
+            }
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    // If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+                    if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+                    {
+                        // Do nothing
+                    }
+                    else
+                    {
+                        if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
+                        {
+                            $i++;
+                            continue;
+                        }
+
+                        $labeltoshow=dol_trunc($obj->ref,18);
+                        //if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
+                        //else $labeltoshow.=' ('.$langs->trans("Private").')';
+                        $labeltoshow.=', '.dol_trunc($obj->title, $maxlength);
+                        if ($obj->name)
+                        {
+                            $labeltoshow.=' - '.$obj->name;
+                            if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
+                        }
+
+                        $disabled=0;
+                        if ($obj->fk_statut == 0)
+                        {
+                            $disabled=1;
+                            $labeltoshow.=' - '.$langs->trans("Draft");
+                        }
+                        else if ($obj->fk_statut == 2)
+                        {
+                            if ($discard_closed == 2) $disabled=1;
+                            $labeltoshow.=' - '.$langs->trans("Closed");
+                        }
+                        else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+                        {
+                            $disabled=1;
+                            $labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+                        }
+
+                        if (!empty($selected) && $selected == $obj->rowid)
+                        {
+                            $out.= '<option value="'.$obj->rowid.'" selected';
+                            //if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
+                            $out.= '>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            if ($hideunselectables && $disabled && ($selected != $obj->rowid))
+                            {
+                                $resultat='';
+                            }
+                            else
+                            {
+                                $resultat='<option value="'.$obj->rowid.'"';
+                                if ($disabled) $resultat.=' disabled';
+                                //if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
+                                //else $labeltoshow.=' ('.$langs->trans("Private").')';
+                                $resultat.='>';
+                                $resultat.=$labeltoshow;
+                                $resultat.='</option>';
+                            }
+                            $out.= $resultat;
+
+                            $outarray[] = array(
+                                'key' => (int) $obj->rowid,
+                                'value' => $obj->ref,
+                                'ref' => $obj->ref,
+                                'label' => $labeltoshow,
+                                'disabled' => (bool) $disabled
+                            );
+                        }
+                    }
+                    $i++;
+                }
+            }
+
+            $this->db->free($resql);
+
+            if (!$mode) {
+                if (empty($option_only)) $out.= '</select>';
+                if (empty($nooutput))
+                {
+                    print $out;
+                    return '';
+                }
+                else return $out;
+            } else {
+                return $outarray;
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *	Output a combo list with tasks qualified for a third party
+     *
+     *	@param	int		$socid      	Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+     *	@param  int		$selected   	Id task preselected
+     *	@param  string	$htmlname   	Name of HTML select
+     *	@param	int		$maxlength		Maximum length of label
+     *	@param	int		$option_only	Return only html options lines without the select tag
+     *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
+     *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
      *  @param	int		$forcefocus		Force focus on field (works with javascript only)
      *  @param	int		$disabled		Disabled
-	 *  @param	string	$morecss        More css added to the select component
-	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
-	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
-	 *  @param	User	$usertofilter	User object to use for filtering
-	 *	@return int         			Nbr of project if OK, <0 if KO
-	 */
-	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty='1', $discard_closed=0, $forcefocus=0, $disabled=0, $morecss='maxwidth500', $projectsListId='', $showproject='all', $usertofilter=null)
-	{
-		global $user,$conf,$langs;
-
-		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-		if (is_null($usertofilter))
-		{
-			$usertofilter = $user;
-		}
-
-		$out='';
-
-		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
-
-		if (empty($projectsListId))
-		{
-			if (empty($usertofilter->rights->projet->all->lire))
-			{
-				$projectstatic=new Project($this->db);
-				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter,0,1);
-			}
-		}
-
-		// Search all projects
-		$sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
-		$sql.= ' s.nom as name';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
-		$sql.= ' '.MAIN_DB_PREFIX.'projet_task as t';
-		$sql.= " WHERE p.entity IN (".getEntity('project').")";
-		$sql.= " AND t.fk_projet = p.rowid";
-		if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		$sql.= " ORDER BY p.ref, t.ref ASC";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			// Use select2 selector
-			if (! empty($conf->use_javascript_ajax))
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
-            	$out.=$comboenhancement;
-            	$morecss='minwidth200 maxwidth500';
-			}
-
-			if (empty($option_only)) {
-				$out.= '<select class="valignmiddle flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'">';
-			}
-			if (! empty($show_empty)) {
-				$out.= '<option value="0" class="optiongrey">';
-				if (! is_numeric($show_empty)) $out.=$show_empty;
-				else $out.='&nbsp;';
-				$out.= '</option>';
-			}
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
-					{
-						// Do nothing
-					}
-					else
-					{
-						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
-						{
-							$i++;
-							continue;
-						}
-
-						$labeltoshow = '';
-
-						if ($showproject == 'all')
-						{
-							$labeltoshow.=dol_trunc($obj->ref,18);     // Project ref
-							//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
-							//else $labeltoshow.=' ('.$langs->trans("Private").')';
-							$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
-
-							if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
-
-							$disabled=0;
-							if ($obj->fk_statut == Project::STATUS_DRAFT)
-							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("Draft");
-							}
-							else if ($obj->fk_statut == Project::STATUS_CLOSED)
-							{
-								if ($discard_closed == 2) $disabled=1;
-								$labeltoshow.=' - '.$langs->trans("Closed");
-							}
-							else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
-							}
-							$labeltoshow.=' - ';
-						}
-
-						// Label for task
-						$labeltoshow.=$obj->tref.' '.dol_trunc($obj->tlabel,$maxlength);
-
-						if (!empty($selected) && $selected == $obj->rowid)
-						{
-							$out.= '<option value="'.$obj->rowid.'" selected';
-							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out.= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
-							{
-								$resultat='';
-							}
-							else
-							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
-								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>';
-								$resultat.=$labeltoshow;
-								$resultat.='</option>';
-							}
-							$out.= $resultat;
-						}
-					}
-					$i++;
-				}
-			}
-			if (empty($option_only)) {
-				$out.= '</select>';
-			}
-
-			print $out;
-
-			$this->db->free($resql);
-			return $num;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
+     *  @param	string	$morecss        More css added to the select component
+     *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
+     *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
+     *  @param	User	$usertofilter	User object to use for filtering
+     *	@return int         			Nbr of project if OK, <0 if KO
+     */
+    function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty='1', $discard_closed=0, $forcefocus=0, $disabled=0, $morecss='maxwidth500', $projectsListId='', $showproject='all', $usertofilter=null)
+    {
+        global $user,$conf,$langs;
+
+        require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+        if (is_null($usertofilter))
+        {
+            $usertofilter = $user;
+        }
+
+        $out='';
+
+        $hideunselectables = false;
+        if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+
+        if (empty($projectsListId))
+        {
+            if (empty($usertofilter->rights->projet->all->lire))
+            {
+                $projectstatic=new Project($this->db);
+                $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter,0,1);
+            }
+        }
+
+        // Search all projects
+        $sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
+        $sql.= ' s.nom as name';
+        $sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
+        $sql.= ' '.MAIN_DB_PREFIX.'projet_task as t';
+        $sql.= " WHERE p.entity IN (".getEntity('project').")";
+        $sql.= " AND t.fk_projet = p.rowid";
+        if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
+        if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+        if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+        $sql.= " ORDER BY p.ref, t.ref ASC";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            // Use select2 selector
+            if (! empty($conf->use_javascript_ajax))
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                    $comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+                $out.=$comboenhancement;
+                $morecss='minwidth200 maxwidth500';
+            }
+
+            if (empty($option_only)) {
+                $out.= '<select class="valignmiddle flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'">';
+            }
+            if (! empty($show_empty)) {
+                $out.= '<option value="0" class="optiongrey">';
+                if (! is_numeric($show_empty)) $out.=$show_empty;
+                else $out.='&nbsp;';
+                $out.= '</option>';
+            }
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    // If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+                    if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
+                    {
+                        // Do nothing
+                    }
+                    else
+                    {
+                        if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
+                        {
+                            $i++;
+                            continue;
+                        }
+
+                        $labeltoshow = '';
+
+                        if ($showproject == 'all')
+                        {
+                            $labeltoshow.=dol_trunc($obj->ref,18);     // Project ref
+                            //if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
+                            //else $labeltoshow.=' ('.$langs->trans("Private").')';
+                            $labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
+
+                            if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
+
+                            $disabled=0;
+                            if ($obj->fk_statut == Project::STATUS_DRAFT)
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' - '.$langs->trans("Draft");
+                            }
+                            else if ($obj->fk_statut == Project::STATUS_CLOSED)
+                            {
+                                if ($discard_closed == 2) $disabled=1;
+                                $labeltoshow.=' - '.$langs->trans("Closed");
+                            }
+                            else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+                            }
+                            $labeltoshow.=' - ';
+                        }
+
+                        // Label for task
+                        $labeltoshow.=$obj->tref.' '.dol_trunc($obj->tlabel,$maxlength);
+
+                        if (!empty($selected) && $selected == $obj->rowid)
+                        {
+                            $out.= '<option value="'.$obj->rowid.'" selected';
+                            //if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
+                            $out.= '>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            if ($hideunselectables && $disabled && ($selected != $obj->rowid))
+                            {
+                                $resultat='';
+                            }
+                            else
+                            {
+                                $resultat='<option value="'.$obj->rowid.'"';
+                                if ($disabled) $resultat.=' disabled';
+                                //if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
+                                //else $labeltoshow.=' ('.$langs->trans("Private").')';
+                                $resultat.='>';
+                                $resultat.=$labeltoshow;
+                                $resultat.='</option>';
+                            }
+                            $out.= $resultat;
+                        }
+                    }
+                    $i++;
+                }
+            }
+            if (empty($option_only)) {
+                $out.= '</select>';
+            }
+
+            print $out;
+
+            $this->db->free($resql);
+            return $num;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
-	 *
-	 *    @param	string		$table_element		Table of the element to update
-	 *    @param	string		$socid				If of thirdparty to use as filter or 'id1,id2,...'
-	 *    @param	string		$morecss			More CSS
-	 *    @param    int         $limitonstatus      Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement
-	 *    @param	string		$projectkey			Equivalent key  to fk_projet for actual table_element
-	 *    @return	int|string						The HTML select list of element or '' if nothing or -1 if KO
-	 */
-	function select_element($table_element, $socid=0, $morecss='', $limitonstatus=-2,$projectkey="fk_projet")
-	{
+    /**
+     *    Build a HTML select list of element of same thirdparty to suggest to link them to project
+     *
+     *    @param	string		$table_element		Table of the element to update
+     *    @param	string		$socid				If of thirdparty to use as filter or 'id1,id2,...'
+     *    @param	string		$morecss			More CSS
+     *    @param    int         $limitonstatus      Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement
+     *    @param	string		$projectkey			Equivalent key  to fk_projet for actual table_element
+     *    @return	int|string						The HTML select list of element or '' if nothing or -1 if KO
+     */
+    function select_element($table_element, $socid=0, $morecss='', $limitonstatus=-2,$projectkey="fk_projet")
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
-
-		$linkedtothirdparty=false;
-		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','payment_salary','payment_various','chargesociales'))) $linkedtothirdparty=true;
-
-		$sqlfilter='';
-
-		//print $table_element;
-		switch ($table_element)
-		{
-			case "loan":
-				$sql = "SELECT t.rowid, t.label as ref";
-				break;
-			case "facture":
-				$sql = "SELECT t.rowid, t.ref as ref";
-				break;
-			case "facture_fourn":
-				$sql = "SELECT t.rowid, t.ref, t.ref_supplier";
-				break;
-			case "commande_fourn":
-			case "commande_fournisseur":
-			    $sql = "SELECT t.rowid, t.ref, t.ref_supplier";
-				break;
-			case "facture_rec":
-				$sql = "SELECT t.rowid, t.titre as ref";
-				break;
-			case "actioncomm":
-				$sql = "SELECT t.id as rowid, t.label as ref";
-				$projectkey="fk_project";
-				break;
-			case "expensereport":
-				return '';
-			case "expensereport_det":
-				/*$sql = "SELECT rowid, '' as ref";	// table is llx_expensereport_det
+        global $conf, $langs;
+
+        if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
+
+        $linkedtothirdparty=false;
+        if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','payment_salary','payment_various','chargesociales'))) $linkedtothirdparty=true;
+
+        $sqlfilter='';
+
+        //print $table_element;
+        switch ($table_element)
+        {
+            case "loan":
+                $sql = "SELECT t.rowid, t.label as ref";
+                break;
+            case "facture":
+                $sql = "SELECT t.rowid, t.ref as ref";
+                break;
+            case "facture_fourn":
+                $sql = "SELECT t.rowid, t.ref, t.ref_supplier";
+                break;
+            case "commande_fourn":
+            case "commande_fournisseur":
+                $sql = "SELECT t.rowid, t.ref, t.ref_supplier";
+                break;
+            case "facture_rec":
+                $sql = "SELECT t.rowid, t.titre as ref";
+                break;
+            case "actioncomm":
+                $sql = "SELECT t.id as rowid, t.label as ref";
+                $projectkey="fk_project";
+                break;
+            case "expensereport":
+                return '';
+            case "expensereport_det":
+                /*$sql = "SELECT rowid, '' as ref";	// table is llx_expensereport_det
 				$projectkey="fk_projet";
 				break;*/
-				return '';
-			case "commande":
-		    case "contrat":
-			case "fichinter":
-			    $sql = "SELECT t.rowid, t.ref";
-			    break;
-			case 'stock_mouvement':
-				$sql = 'SELECT t.rowid, t.label as ref';
-				$projectkey='fk_origin';
-				break;
-			case "payment_salary":
-				$sql = "SELECT t.rowid, t.num_payment as ref";	// TODO In a future fill and use real ref field
-				break;
-			case "payment_various":
-				$sql = "SELECT t.rowid, t.num_payment as ref";
-				break;
-			case "chargesociales":
-			default:
-				$sql = "SELECT t.rowid, t.ref";
-				break;
-		}
-		if ($linkedtothirdparty) $sql.=", s.nom as name";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
-		if ($linkedtothirdparty) $sql.=", ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE ".$projectkey." is null";
-		if (! empty($socid) && $linkedtothirdparty)
-		{
-		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
-		    else $sql.= " AND t.fk_soc IN (".$socid.")";
-		}
-		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
-		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
-		if ($sqlfilter) $sql.= " AND ".$sqlfilter;
-		$sql.= " ORDER BY ref DESC";
-
-		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num > 0)
-			{
-				$sellist = '<select class="flat elementselect css'.$table_element.($morecss?' '.$morecss:'').'" name="elementselect">';
-				$sellist .='<option value="-1"></option>';
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-					$ref=$obj->ref?$obj->ref:$obj->rowid;
-					if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')';
-					if (! empty($obj->name)) $ref.=' - '.$obj->name;
-					$sellist .='<option value="'.$obj->rowid.'">'.$ref.'</option>';
-					$i++;
-				}
-				$sellist .='</select>';
-			}
-			/*else
+                return '';
+            case "commande":
+            case "contrat":
+            case "fichinter":
+                $sql = "SELECT t.rowid, t.ref";
+                break;
+            case 'stock_mouvement':
+                $sql = 'SELECT t.rowid, t.label as ref';
+                $projectkey='fk_origin';
+                break;
+            case "payment_salary":
+                $sql = "SELECT t.rowid, t.num_payment as ref";	// TODO In a future fill and use real ref field
+                break;
+            case "payment_various":
+                $sql = "SELECT t.rowid, t.num_payment as ref";
+                break;
+            case "chargesociales":
+            default:
+                $sql = "SELECT t.rowid, t.ref";
+                break;
+        }
+        if ($linkedtothirdparty) $sql.=", s.nom as name";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
+        if ($linkedtothirdparty) $sql.=", ".MAIN_DB_PREFIX."societe as s";
+        $sql.= " WHERE ".$projectkey." is null";
+        if (! empty($socid) && $linkedtothirdparty)
+        {
+            if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
+            else $sql.= " AND t.fk_soc IN (".$socid.")";
+        }
+        if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
+        if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
+        if ($sqlfilter) $sql.= " AND ".$sqlfilter;
+        $sql.= " ORDER BY ref DESC";
+
+        dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num > 0)
+            {
+                $sellist = '<select class="flat elementselect css'.$table_element.($morecss?' '.$morecss:'').'" name="elementselect">';
+                $sellist .='<option value="-1"></option>';
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    $ref=$obj->ref?$obj->ref:$obj->rowid;
+                    if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')';
+                    if (! empty($obj->name)) $ref.=' - '.$obj->name;
+                    $sellist .='<option value="'.$obj->rowid.'">'.$ref.'</option>';
+                    $i++;
+                }
+                $sellist .='</select>';
+            }
+            /*else
 			{
 				$sellist = '<select class="flat" name="elementselect">';
 				$sellist.= '<option value="0" disabled>'.$langs->trans("None").'</option>';
 				$sellist.= '</select>';
 			}*/
-			$this->db->free($resql);
-
-			return $sellist;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR);
-			return -1;
-		}
-	}
-
-
-	/**
-	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
-	 *
-	 *    @param   string      $htmlname           HTML name
-	 *    @param   string      $preselected        Preselected (int or 'all' or 'none')
-	 *    @param   int         $showempty          Add an empty line
-	 *    @param   int         $useshortlabel      Use short label
-	 *    @param   int         $showallnone        Add choice "All" and "None"
-	 *    @param   int         $showpercent        Show default probability for status
-	 *    @param   string      $morecss            Add more css
-	 *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
-	 */
-	function selectOpportunityStatus($htmlname, $preselected='-1', $showempty=1, $useshortlabel=0, $showallnone=0, $showpercent=0, $morecss='')
-	{
-		global $conf, $langs;
-
-		$sql = "SELECT rowid, code, label, percent";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
-		$sql.= " WHERE active = 1";
-		$sql.= " ORDER BY position";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num > 0)
-			{
-				$sellist = '<select class="flat oppstatus'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-				if ($showempty) {
+            $this->db->free($resql);
+
+            return $sellist;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            $this->error=$this->db->lasterror();
+            $this->errors[]=$this->db->lasterror();
+            dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR);
+            return -1;
+        }
+    }
+
+
+    /**
+     *    Build a HTML select list of element of same thirdparty to suggest to link them to project
+     *
+     *    @param   string      $htmlname           HTML name
+     *    @param   string      $preselected        Preselected (int or 'all' or 'none')
+     *    @param   int         $showempty          Add an empty line
+     *    @param   int         $useshortlabel      Use short label
+     *    @param   int         $showallnone        Add choice "All" and "None"
+     *    @param   int         $showpercent        Show default probability for status
+     *    @param   string      $morecss            Add more css
+     *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
+     */
+    function selectOpportunityStatus($htmlname, $preselected='-1', $showempty=1, $useshortlabel=0, $showallnone=0, $showpercent=0, $morecss='')
+    {
+        global $conf, $langs;
+
+        $sql = "SELECT rowid, code, label, percent";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
+        $sql.= " WHERE active = 1";
+        $sql.= " ORDER BY position";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            if ($num > 0)
+            {
+                $sellist = '<select class="flat oppstatus'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+                if ($showempty) {
                     // Without &nbsp, strange move of screen when switching value
                     $sellist.= '<option value="-1">&nbsp;</option>';
                 }
-				if ($showallnone) {
+                if ($showallnone) {
                     $sellist.= '<option value="all"'.($preselected == 'all'?' selected="selected"':'').'>-- '.$langs->trans("OnlyOpportunitiesShort").' --</option>';
-				    $sellist.= '<option value="openedopp"'.($preselected == 'openedopp'?' selected="selected"':'').'>-- '.$langs->trans("OpenedOpportunitiesShort").' --</option>';
-				    $sellist.= '<option value="notopenedopp"'.($preselected == 'notopenedopp'?' selected="selected"':'').'>-- '.$langs->trans("NotOpenedOpportunitiesShort").' --</option>';
-				    $sellist.= '<option value="none"'.($preselected == 'none'?' selected="selected"':'').'>-- '.$langs->trans("NotAnOpportunityShort").' --</option>';
+                    $sellist.= '<option value="openedopp"'.($preselected == 'openedopp'?' selected="selected"':'').'>-- '.$langs->trans("OpenedOpportunitiesShort").' --</option>';
+                    $sellist.= '<option value="notopenedopp"'.($preselected == 'notopenedopp'?' selected="selected"':'').'>-- '.$langs->trans("NotOpenedOpportunitiesShort").' --</option>';
+                    $sellist.= '<option value="none"'.($preselected == 'none'?' selected="selected"':'').'>-- '.$langs->trans("NotAnOpportunityShort").' --</option>';
+                }
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+
+                    $sellist .='<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
+                    if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';
+                    $sellist .= '>';
+                    if ($useshortlabel)
+                    {
+                        $finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
+                    }
+                    else
+                    {
+                        $finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
+                        if ($showpercent) $finallabel.= ' ('.$obj->percent.'%)';
+                    }
+                    $sellist .= $finallabel;
+                    $sellist .='</option>';
+                    $i++;
                 }
-				while ($i < $num)
-				{
-					$obj = $this->db->fetch_object($resql);
-
-					$sellist .='<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
-					if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';
-					$sellist .= '>';
-					if ($useshortlabel)
-					{
-						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-					}
-					else
-					{
-						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-						if ($showpercent) $finallabel.= ' ('.$obj->percent.'%)';
-					}
-					$sellist .= $finallabel;
-					$sellist .='</option>';
-					$i++;
-				}
-				$sellist .='</select>';
-			}
-			/*else
+                $sellist .='</select>';
+            }
+            /*else
 			{
 				$sellist = '<select class="flat" name="elementselect">';
 				$sellist.= '<option value="0" disabled>'.$langs->trans("None").'</option>';
 				$sellist.= '</select>';
 			}*/
-			$this->db->free($resql);
-
-			return $sellist;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->db->lasterror();
-			dol_syslog(get_class($this) . "::selectOpportunityStatus " . $this->error, LOG_ERR);
-			return -1;
-		}
-	}
+            $this->db->free($resql);
+
+            return $sellist;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            $this->errors[]=$this->db->lasterror();
+            dol_syslog(get_class($this) . "::selectOpportunityStatus " . $this->error, LOG_ERR);
+            return -1;
+        }
+    }
 }

Spacing +156 added lines, -156 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -71,43 +71,43 @@ 
 	 *	@param  int     $htmlid         Html id to use instead of htmlname
 	 *	@return string           		Return html content
 	 */
-	function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0, $morecss='', $htmlid='')
+	function select_projects($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 16, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $morecss = '', $htmlid = '')
 	{
         // phpcs:enable
-		global $langs,$conf,$form;
+		global $langs, $conf, $form;
 
-		$out='';
+		$out = '';
 
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))
 		{
-			$placeholder='';
+			$placeholder = '';
 
 			if ($selected && empty($selected_input_value))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$project = new Project($this->db);
 				$project->fetch($selected);
-				$selected_input_value=$project->ref;
+				$selected_input_value = $project->ref;
 			}
-			$urloption='socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;
-			$out.=ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(
+			$urloption = 'socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(
 //				'update' => array(
 //					'projectid' => 'id'
 //				)
 			));
 
-			$out.='<input type="text" class="minwidth200'.($morecss?' '.$morecss:'').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
+			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
 		}
 		else
 		{
-			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
+			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
 		}
 		if ($discard_closed)
 		{
 			if (class_exists('Form'))
 			{
-				if (empty($form)) $form=new Form($this->db);
-				$out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
+				if (empty($form)) $form = new Form($this->db);
+				$out .= $form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
 			}
 		}
 
@@ -140,62 +140,62 @@ 
 	 * @param  string  $morecss            More CSS
 	 * @return int         			       Nb of project if OK, <0 if KO
 	 */
-	function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode=0, $filterkey = '', $nooutput=0, $forceaddid=0, $htmlid='', $morecss='maxwidth500')
+	function select_projects_list($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 24, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $htmlid = '', $morecss = 'maxwidth500')
 	{
         // phpcs:enable
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 		if (empty($htmlid)) $htmlid = $htmlname;
 
-		$out='';
-		$outarray=array();
+		$out = '';
+		$outarray = array();
 
 		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		$projectsListId = false;
 		if (empty($user->rights->projet->all->lire))
 		{
-			$projectstatic=new Project($this->db);
-			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+			$projectstatic = new Project($this->db);
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		}
 
 		// Search all projects
 		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
-		$sql.= " WHERE p.entity IN (".getEntity('project').")";
-		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+		$sql .= " WHERE p.entity IN (".getEntity('project').")";
+		if ($projectsListId !== false) $sql .= " AND p.rowid IN (".$projectsListId.")";
+		if ($socid == 0) $sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		if ($socid > 0)
 		{
-		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 		    else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 		    {
-		        $sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
+		        $sql .= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
 		    }
 		}
 		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
-		$sql.= " ORDER BY p.ref ASC";
+		$sql .= " ORDER BY p.ref ASC";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			// Use select2 selector
-			if (! empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
-            	$out.=$comboenhancement;
-            	$morecss.=' minwidth100';
+            	$out .= $comboenhancement;
+            	$morecss .= ' minwidth100';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlid.'" name="'.$htmlname.'">';
+				$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlid.'" name="'.$htmlname.'">';
 			}
 			if (!empty($show_empty)) {
-				$out.= '<option value="0">&nbsp;</option>';
+				$out .= '<option value="0">&nbsp;</option>';
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -205,7 +205,7 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
 					}
@@ -217,56 +217,56 @@ 
 							continue;
 						}
 
-						$labeltoshow=dol_trunc($obj->ref,18);
+						$labeltoshow = dol_trunc($obj->ref, 18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						$labeltoshow.=', '.dol_trunc($obj->title, $maxlength);
+						$labeltoshow .= ', '.dol_trunc($obj->title, $maxlength);
 						if ($obj->name)
 						{
-						    $labeltoshow.=' - '.$obj->name;
-						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
+						    $labeltoshow .= ' - '.$obj->name;
+						    if ($obj->name_alias) $labeltoshow .= ' ('.$obj->name_alias.')';
 						}
 
-						$disabled=0;
+						$disabled = 0;
 						if ($obj->fk_statut == 0)
 						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Draft");
+							$disabled = 1;
+							$labeltoshow .= ' - '.$langs->trans("Draft");
 						}
 						else if ($obj->fk_statut == 2)
 						{
-							if ($discard_closed == 2) $disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Closed");
+							if ($discard_closed == 2) $disabled = 1;
+							$labeltoshow .= ' - '.$langs->trans("Closed");
 						}
-						else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						else if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+							$disabled = 1;
+							$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 						}
 
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
-							$out.= '<option value="'.$obj->rowid.'" selected';
+							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out.= '>'.$labeltoshow.'</option>';
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 						else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>';
-								$resultat.=$labeltoshow;
-								$resultat.='</option>';
+								$resultat .= '>';
+								$resultat .= $labeltoshow;
+								$resultat .= '</option>';
 							}
-							$out.= $resultat;
+							$out .= $resultat;
 
 							$outarray[] = array(
 								'key' => (int) $obj->rowid,
@@ -284,7 +284,7 @@ 
 			$this->db->free($resql);
 
 			if (!$mode) {
-				if (empty($option_only)) $out.= '</select>';
+				if (empty($option_only)) $out .= '</select>';
 				if (empty($nooutput))
 				{
 				    print $out;
@@ -320,9 +320,9 @@ 
 	 *  @param	User	$usertofilter	User object to use for filtering
 	 *	@return int         			Nbr of project if OK, <0 if KO
 	 */
-	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty='1', $discard_closed=0, $forcefocus=0, $disabled=0, $morecss='maxwidth500', $projectsListId='', $showproject='all', $usertofilter=null)
+	function selectTasks($socid = -1, $selected = '', $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
@@ -331,53 +331,53 @@ 
 			$usertofilter = $user;
 		}
 
-		$out='';
+		$out = '';
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		if (empty($projectsListId))
 		{
 			if (empty($usertofilter->rights->projet->all->lire))
 			{
-				$projectstatic=new Project($this->db);
-				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter,0,1);
+				$projectstatic = new Project($this->db);
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1);
 			}
 		}
 
 		// Search all projects
 		$sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
-		$sql.= ' s.nom as name';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
-		$sql.= ' '.MAIN_DB_PREFIX.'projet_task as t';
-		$sql.= " WHERE p.entity IN (".getEntity('project').")";
-		$sql.= " AND t.fk_projet = p.rowid";
-		if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		$sql.= " ORDER BY p.ref, t.ref ASC";
-
-		$resql=$this->db->query($sql);
+		$sql .= ' s.nom as name';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
+		$sql .= ' '.MAIN_DB_PREFIX.'projet_task as t';
+		$sql .= " WHERE p.entity IN (".getEntity('project').")";
+		$sql .= " AND t.fk_projet = p.rowid";
+		if ($projectsListId) $sql .= " AND p.rowid IN (".$projectsListId.")";
+		if ($socid == 0) $sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		if ($socid > 0)  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		$sql .= " ORDER BY p.ref, t.ref ASC";
+
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			// Use select2 selector
-			if (! empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
-            	$out.=$comboenhancement;
-            	$morecss='minwidth200 maxwidth500';
+            	$out .= $comboenhancement;
+            	$morecss = 'minwidth200 maxwidth500';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="valignmiddle flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'">';
+				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlname.'" name="'.$htmlname.'">';
 			}
-			if (! empty($show_empty)) {
-				$out.= '<option value="0" class="optiongrey">';
-				if (! is_numeric($show_empty)) $out.=$show_empty;
-				else $out.='&nbsp;';
-				$out.= '</option>';
+			if (!empty($show_empty)) {
+				$out .= '<option value="0" class="optiongrey">';
+				if (!is_numeric($show_empty)) $out .= $show_empty;
+				else $out .= '&nbsp;';
+				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -403,65 +403,65 @@ 
 
 						if ($showproject == 'all')
 						{
-							$labeltoshow.=dol_trunc($obj->ref,18);     // Project ref
+							$labeltoshow .= dol_trunc($obj->ref, 18); // Project ref
 							//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 							//else $labeltoshow.=' ('.$langs->trans("Private").')';
-							$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
+							$labeltoshow .= ' '.dol_trunc($obj->title, $maxlength);
 
-							if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
+							if ($obj->name) $labeltoshow .= ' ('.$obj->name.')';
 
-							$disabled=0;
+							$disabled = 0;
 							if ($obj->fk_statut == Project::STATUS_DRAFT)
 							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("Draft");
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("Draft");
 							}
 							else if ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
-								if ($discard_closed == 2) $disabled=1;
-								$labeltoshow.=' - '.$langs->trans("Closed");
+								if ($discard_closed == 2) $disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("Closed");
 							}
-							else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							else if ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
-							$labeltoshow.=' - ';
+							$labeltoshow .= ' - ';
 						}
 
 						// Label for task
-						$labeltoshow.=$obj->tref.' '.dol_trunc($obj->tlabel,$maxlength);
+						$labeltoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
 
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
-							$out.= '<option value="'.$obj->rowid.'" selected';
+							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out.= '>'.$labeltoshow.'</option>';
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 						else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>';
-								$resultat.=$labeltoshow;
-								$resultat.='</option>';
+								$resultat .= '>';
+								$resultat .= $labeltoshow;
+								$resultat .= '</option>';
 							}
-							$out.= $resultat;
+							$out .= $resultat;
 						}
 					}
 					$i++;
 				}
 			}
 			if (empty($option_only)) {
-				$out.= '</select>';
+				$out .= '</select>';
 			}
 
 			print $out;
@@ -488,17 +488,17 @@ 
 	 *    @param	string		$projectkey			Equivalent key  to fk_projet for actual table_element
 	 *    @return	int|string						The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	function select_element($table_element, $socid=0, $morecss='', $limitonstatus=-2,$projectkey="fk_projet")
+	function select_element($table_element, $socid = 0, $morecss = '', $limitonstatus = -2, $projectkey = "fk_projet")
 	{
         // phpcs:enable
 		global $conf, $langs;
 
-		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
+		if ($table_element == 'projet_task') return ''; // Special cas of element we never link to a project (already always done)
 
-		$linkedtothirdparty=false;
-		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','payment_salary','payment_various','chargesociales'))) $linkedtothirdparty=true;
+		$linkedtothirdparty = false;
+		if (!in_array($table_element, array('don', 'expensereport_det', 'expensereport', 'loan', 'stock_mouvement', 'payment_salary', 'payment_various', 'chargesociales'))) $linkedtothirdparty = true;
 
-		$sqlfilter='';
+		$sqlfilter = '';
 
 		//print $table_element;
 		switch ($table_element)
@@ -521,7 +521,7 @@ 
 				break;
 			case "actioncomm":
 				$sql = "SELECT t.id as rowid, t.label as ref";
-				$projectkey="fk_project";
+				$projectkey = "fk_project";
 				break;
 			case "expensereport":
 				return '';
@@ -537,10 +537,10 @@ 
 			    break;
 			case 'stock_mouvement':
 				$sql = 'SELECT t.rowid, t.label as ref';
-				$projectkey='fk_origin';
+				$projectkey = 'fk_origin';
 				break;
 			case "payment_salary":
-				$sql = "SELECT t.rowid, t.num_payment as ref";	// TODO In a future fill and use real ref field
+				$sql = "SELECT t.rowid, t.num_payment as ref"; // TODO In a future fill and use real ref field
 				break;
 			case "payment_various":
 				$sql = "SELECT t.rowid, t.num_payment as ref";
@@ -550,40 +550,40 @@ 
 				$sql = "SELECT t.rowid, t.ref";
 				break;
 		}
-		if ($linkedtothirdparty) $sql.=", s.nom as name";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
-		if ($linkedtothirdparty) $sql.=", ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE ".$projectkey." is null";
-		if (! empty($socid) && $linkedtothirdparty)
+		if ($linkedtothirdparty) $sql .= ", s.nom as name";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
+		if ($linkedtothirdparty) $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE ".$projectkey." is null";
+		if (!empty($socid) && $linkedtothirdparty)
 		{
-		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
-		    else $sql.= " AND t.fk_soc IN (".$socid.")";
+		    if (is_numeric($socid)) $sql .= " AND t.fk_soc=".$socid;
+		    else $sql .= " AND t.fk_soc IN (".$socid.")";
 		}
-		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
-		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
-		if ($sqlfilter) $sql.= " AND ".$sqlfilter;
-		$sql.= " ORDER BY ref DESC";
+		if (!in_array($table_element, array('expensereport_det', 'stock_mouvement'))) $sql .= ' AND t.entity IN ('.getEntity('project').')';
+		if ($linkedtothirdparty) $sql .= " AND s.rowid = t.fk_soc";
+		if ($sqlfilter) $sql .= " AND ".$sqlfilter;
+		$sql .= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num > 0)
 			{
-				$sellist = '<select class="flat elementselect css'.$table_element.($morecss?' '.$morecss:'').'" name="elementselect">';
-				$sellist .='<option value="-1"></option>';
+				$sellist = '<select class="flat elementselect css'.$table_element.($morecss ? ' '.$morecss : '').'" name="elementselect">';
+				$sellist .= '<option value="-1"></option>';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$ref=$obj->ref?$obj->ref:$obj->rowid;
-					if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')';
-					if (! empty($obj->name)) $ref.=' - '.$obj->name;
-					$sellist .='<option value="'.$obj->rowid.'">'.$ref.'</option>';
+					$ref = $obj->ref ? $obj->ref : $obj->rowid;
+					if (!empty($obj->ref_supplier)) $ref .= ' ('.$obj->ref_supplier.')';
+					if (!empty($obj->name)) $ref .= ' - '.$obj->name;
+					$sellist .= '<option value="'.$obj->rowid.'">'.$ref.'</option>';
 					$i++;
 				}
-				$sellist .='</select>';
+				$sellist .= '</select>';
 			}
 			/*else
 			{
@@ -598,9 +598,9 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR);
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
+			dol_syslog(get_class($this)."::select_element ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -618,38 +618,38 @@ 
 	 *    @param   string      $morecss            Add more css
 	 *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	function selectOpportunityStatus($htmlname, $preselected='-1', $showempty=1, $useshortlabel=0, $showallnone=0, $showpercent=0, $morecss='')
+	function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '')
 	{
 		global $conf, $langs;
 
 		$sql = "SELECT rowid, code, label, percent";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
-		$sql.= " WHERE active = 1";
-		$sql.= " ORDER BY position";
+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
+		$sql .= " WHERE active = 1";
+		$sql .= " ORDER BY position";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num > 0)
 			{
-				$sellist = '<select class="flat oppstatus'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+				$sellist = '<select class="flat oppstatus'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
 				if ($showempty) {
                     // Without &nbsp, strange move of screen when switching value
-                    $sellist.= '<option value="-1">&nbsp;</option>';
+                    $sellist .= '<option value="-1">&nbsp;</option>';
                 }
 				if ($showallnone) {
-                    $sellist.= '<option value="all"'.($preselected == 'all'?' selected="selected"':'').'>-- '.$langs->trans("OnlyOpportunitiesShort").' --</option>';
-				    $sellist.= '<option value="openedopp"'.($preselected == 'openedopp'?' selected="selected"':'').'>-- '.$langs->trans("OpenedOpportunitiesShort").' --</option>';
-				    $sellist.= '<option value="notopenedopp"'.($preselected == 'notopenedopp'?' selected="selected"':'').'>-- '.$langs->trans("NotOpenedOpportunitiesShort").' --</option>';
-				    $sellist.= '<option value="none"'.($preselected == 'none'?' selected="selected"':'').'>-- '.$langs->trans("NotAnOpportunityShort").' --</option>';
+                    $sellist .= '<option value="all"'.($preselected == 'all' ? ' selected="selected"' : '').'>-- '.$langs->trans("OnlyOpportunitiesShort").' --</option>';
+				    $sellist .= '<option value="openedopp"'.($preselected == 'openedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("OpenedOpportunitiesShort").' --</option>';
+				    $sellist .= '<option value="notopenedopp"'.($preselected == 'notopenedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotOpenedOpportunitiesShort").' --</option>';
+				    $sellist .= '<option value="none"'.($preselected == 'none' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotAnOpportunityShort").' --</option>';
                 }
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
 
-					$sellist .='<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
+					$sellist .= '<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
 					if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';
 					$sellist .= '>';
 					if ($useshortlabel)
@@ -659,13 +659,13 @@ 
 					else
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-						if ($showpercent) $finallabel.= ' ('.$obj->percent.'%)';
+						if ($showpercent) $finallabel .= ' ('.$obj->percent.'%)';
 					}
 					$sellist .= $finallabel;
-					$sellist .='</option>';
+					$sellist .= '</option>';
 					$i++;
 				}
-				$sellist .='</select>';
+				$sellist .= '</select>';
 			}
 			/*else
 			{
@@ -679,9 +679,9 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->db->lasterror();
-			dol_syslog(get_class($this) . "::selectOpportunityStatus " . $this->error, LOG_ERR);
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
+			dol_syslog(get_class($this)."::selectOpportunityStatus ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}

Braces +123 added lines, -69 removed lines

@@ -97,8 +97,7 @@ 
 			));
 
 			$out.='<input type="text" class="minwidth200'.($morecss?' '.$morecss:'').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else
+		} else
 		{
 			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
 		}
@@ -106,7 +105,9 @@ 
 		{
 			if (class_exists('Form'))
 			{
-				if (empty($form)) $form=new Form($this->db);
+				if (empty($form)) {
+				    $form=new Form($this->db);
+				}
 				$out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
 			}
 		}
@@ -115,8 +116,9 @@ 
 		{
 		    print $out;
 		    return '';
+		} else {
+		    return $out;
 		}
-		else return $out;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -147,13 +149,17 @@ 
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($htmlid)) $htmlid = $htmlname;
+		if (empty($htmlid)) {
+		    $htmlid = $htmlname;
+		}
 
 		$out='';
 		$outarray=array();
 
 		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) {
+		    $hideunselectables = true;
+		}
 
 		$projectsListId = false;
 		if (empty($user->rights->projet->all->lire))
@@ -166,17 +172,26 @@ 
 		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
 		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
 		$sql.= " WHERE p.entity IN (".getEntity('project').")";
-		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		if ($projectsListId !== false) {
+		    $sql.= " AND p.rowid IN (".$projectsListId.")";
+		}
+		if ($socid == 0) {
+		    $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		}
 		if ($socid > 0)
 		{
-		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		    else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
+		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+		        $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		    } else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') {
+		        // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 		    {
 		        $sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
 		    }
+		    }
+		}
+		if (!empty($filterkey)) {
+		    $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
 		}
-		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
 		$sql.= " ORDER BY p.ref ASC";
 
 		$resql=$this->db->query($sql);
@@ -208,12 +223,13 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
-						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
+						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) {
+						    // We discard closed except if selected
 						{
 							$i++;
+						}
 							continue;
 						}
 
@@ -224,7 +240,9 @@ 
 						if ($obj->name)
 						{
 						    $labeltoshow.=' - '.$obj->name;
-						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
+						    if ($obj->name_alias) {
+						        $labeltoshow.=' ('.$obj->name_alias.')';
+						    }
 						}
 
 						$disabled=0;
@@ -232,13 +250,13 @@ 
 						{
 							$disabled=1;
 							$labeltoshow.=' - '.$langs->trans("Draft");
-						}
-						else if ($obj->fk_statut == 2)
+						} else if ($obj->fk_statut == 2)
 						{
-							if ($discard_closed == 2) $disabled=1;
+							if ($discard_closed == 2) {
+							    $disabled=1;
+							}
 							$labeltoshow.=' - '.$langs->trans("Closed");
-						}
-						else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						} else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
 							$disabled=1;
 							$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
@@ -249,17 +267,17 @@ 
 							$out.= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out.= '>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat='';
-							}
-							else
+							} else
 							{
 								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								if ($disabled) {
+								    $resultat.=' disabled';
+								}
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
 								$resultat.='>';
@@ -284,18 +302,20 @@ 
 			$this->db->free($resql);
 
 			if (!$mode) {
-				if (empty($option_only)) $out.= '</select>';
+				if (empty($option_only)) {
+				    $out.= '</select>';
+				}
 				if (empty($nooutput))
 				{
 				    print $out;
 				    return '';
+				} else {
+				    return $out;
 				}
-				else return $out;
 			} else {
 				return $outarray;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -334,7 +354,9 @@ 
 		$out='';
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+		    $hideunselectables = true;
+		}
 
 		if (empty($projectsListId))
 		{
@@ -353,9 +375,15 @@ 
 		$sql.= ' '.MAIN_DB_PREFIX.'projet_task as t';
 		$sql.= " WHERE p.entity IN (".getEntity('project').")";
 		$sql.= " AND t.fk_projet = p.rowid";
-		if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		if ($projectsListId) {
+		    $sql.= " AND p.rowid IN (".$projectsListId.")";
+		}
+		if ($socid == 0) {
+		    $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		}
+		if ($socid > 0) {
+		    $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		}
 		$sql.= " ORDER BY p.ref, t.ref ASC";
 
 		$resql=$this->db->query($sql);
@@ -375,8 +403,11 @@ 
 			}
 			if (! empty($show_empty)) {
 				$out.= '<option value="0" class="optiongrey">';
-				if (! is_numeric($show_empty)) $out.=$show_empty;
-				else $out.='&nbsp;';
+				if (! is_numeric($show_empty)) {
+				    $out.=$show_empty;
+				} else {
+				    $out.='&nbsp;';
+				}
 				$out.= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
@@ -390,8 +421,7 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
@@ -408,20 +438,22 @@ 
 							//else $labeltoshow.=' ('.$langs->trans("Private").')';
 							$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
 
-							if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
+							if ($obj->name) {
+							    $labeltoshow.=' ('.$obj->name.')';
+							}
 
 							$disabled=0;
 							if ($obj->fk_statut == Project::STATUS_DRAFT)
 							{
 								$disabled=1;
 								$labeltoshow.=' - '.$langs->trans("Draft");
-							}
-							else if ($obj->fk_statut == Project::STATUS_CLOSED)
+							} else if ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
-								if ($discard_closed == 2) $disabled=1;
+								if ($discard_closed == 2) {
+								    $disabled=1;
+								}
 								$labeltoshow.=' - '.$langs->trans("Closed");
-							}
-							else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							} else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled=1;
 								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
@@ -437,17 +469,17 @@ 
 							$out.= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out.= '>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat='';
-							}
-							else
+							} else
 							{
 								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								if ($disabled) {
+								    $resultat.=' disabled';
+								}
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
 								$resultat.='>';
@@ -468,8 +500,7 @@ 
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -493,10 +524,15 @@ 
         // phpcs:enable
 		global $conf, $langs;
 
-		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
+		if ($table_element == 'projet_task') {
+		    return '';
+		}
+		// Special cas of element we never link to a project (already always done)
 
 		$linkedtothirdparty=false;
-		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','payment_salary','payment_various','chargesociales'))) $linkedtothirdparty=true;
+		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','payment_salary','payment_various','chargesociales'))) {
+		    $linkedtothirdparty=true;
+		}
 
 		$sqlfilter='';
 
@@ -550,18 +586,31 @@ 
 				$sql = "SELECT t.rowid, t.ref";
 				break;
 		}
-		if ($linkedtothirdparty) $sql.=", s.nom as name";
+		if ($linkedtothirdparty) {
+		    $sql.=", s.nom as name";
+		}
 		$sql.= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
-		if ($linkedtothirdparty) $sql.=", ".MAIN_DB_PREFIX."societe as s";
+		if ($linkedtothirdparty) {
+		    $sql.=", ".MAIN_DB_PREFIX."societe as s";
+		}
 		$sql.= " WHERE ".$projectkey." is null";
 		if (! empty($socid) && $linkedtothirdparty)
 		{
-		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
-		    else $sql.= " AND t.fk_soc IN (".$socid.")";
+		    if (is_numeric($socid)) {
+		        $sql.= " AND t.fk_soc=".$socid;
+		    } else {
+		        $sql.= " AND t.fk_soc IN (".$socid.")";
+		    }
+		}
+		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) {
+		    $sql.= ' AND t.entity IN ('.getEntity('project').')';
+		}
+		if ($linkedtothirdparty) {
+		    $sql.=" AND s.rowid = t.fk_soc";
+		}
+		if ($sqlfilter) {
+		    $sql.= " AND ".$sqlfilter;
 		}
-		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
-		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
-		if ($sqlfilter) $sql.= " AND ".$sqlfilter;
 		$sql.= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
@@ -578,8 +627,12 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 					$ref=$obj->ref?$obj->ref:$obj->rowid;
-					if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')';
-					if (! empty($obj->name)) $ref.=' - '.$obj->name;
+					if (! empty($obj->ref_supplier)) {
+					    $ref.=' ('.$obj->ref_supplier.')';
+					}
+					if (! empty($obj->name)) {
+					    $ref.=' - '.$obj->name;
+					}
 					$sellist .='<option value="'.$obj->rowid.'">'.$ref.'</option>';
 					$i++;
 				}
@@ -594,8 +647,7 @@ 
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->lasterror();
@@ -650,16 +702,19 @@ 
 					$obj = $this->db->fetch_object($resql);
 
 					$sellist .='<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
-					if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';
+					if ($obj->rowid == $preselected) {
+					    $sellist .= ' selected="selected"';
+					}
 					$sellist .= '>';
 					if ($useshortlabel)
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-					}
-					else
+					} else
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-						if ($showpercent) $finallabel.= ' ('.$obj->percent.'%)';
+						if ($showpercent) {
+						    $finallabel.= ' ('.$obj->percent.'%)';
+						}
 					}
 					$sellist .= $finallabel;
 					$sellist .='</option>';
@@ -676,8 +731,7 @@ 
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errors[]=$this->db->lasterror();

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

Indentation +50 added lines, -50 removed lines

@@ -31,7 +31,7 @@ 
 class FormOrder extends Form
 {
 
-	/**
+    /**
      *    Return combo list of differents status of a orders
      *
      *    @param	string	$selected   Preselected value
@@ -41,64 +41,64 @@ 
      */
     public function selectSupplierOrderStatus($selected='', $short=0, $hmlname='order_status')
     {
-	    $options = array();
-
-	    // 7 is same label than 6. 8 does not exists (billed is another field)
-	    $statustohow = array(
-		    '0' => '0',
-		    '1' => '1',
-		    '2' => '2',
-		    '3' => '3',
-		    '4' => '4',
-		    '5' => '5',
-		    '6' => '6,7',
-		    '9' => '9'
-	    );
-
-	    $tmpsupplierorder = new CommandeFournisseur($this->db);
-
-	    foreach ($statustohow as $key => $value) {
-		    $tmpsupplierorder->statut = $key;
-		    $options[$value] = $tmpsupplierorder->getLibStatut($short);
-	    }
-
-	    print Form::selectarray($hmlname, $options, $selected, 1);
+        $options = array();
+
+        // 7 is same label than 6. 8 does not exists (billed is another field)
+        $statustohow = array(
+            '0' => '0',
+            '1' => '1',
+            '2' => '2',
+            '3' => '3',
+            '4' => '4',
+            '5' => '5',
+            '6' => '6,7',
+            '9' => '9'
+        );
+
+        $tmpsupplierorder = new CommandeFournisseur($this->db);
+
+        foreach ($statustohow as $key => $value) {
+            $tmpsupplierorder->statut = $key;
+            $options[$value] = $tmpsupplierorder->getLibStatut($short);
+        }
+
+        print Form::selectarray($hmlname, $options, $selected, 1);
     }
 
-	/**
-	 *	Return list of input method (mode used to receive order, like order received by email, fax, online)
-	 *  List found into table c_input_method.
-	 *
-	 *	@param	string	$selected		Id of preselected input method
-	 *  @param  string	$htmlname 		Name of HTML select list
-	 *  @param  int		$addempty		0=list with no empty value, 1=list with empty value
-	 *  @return	array					Tableau des sources de commandes
-	 */
-	public function selectInputMethod($selected='',$htmlname='source_id',$addempty=0)
-	{
-		global $langs;
+    /**
+     *	Return list of input method (mode used to receive order, like order received by email, fax, online)
+     *  List found into table c_input_method.
+     *
+     *	@param	string	$selected		Id of preselected input method
+     *  @param  string	$htmlname 		Name of HTML select list
+     *  @param  int		$addempty		0=list with no empty value, 1=list with empty value
+     *  @return	array					Tableau des sources de commandes
+     */
+    public function selectInputMethod($selected='',$htmlname='source_id',$addempty=0)
+    {
+        global $langs;
 
         $listofmethods=array();
 
-		$sql = "SELECT rowid, code, libelle as label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
-		$sql.= " WHERE active = 1";
+        $sql = "SELECT rowid, code, libelle as label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
+        $sql.= " WHERE active = 1";
 
-		dol_syslog(get_class($this)."::selectInputMethod", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+        dol_syslog(get_class($this)."::selectInputMethod", LOG_DEBUG);
+        $resql=$this->db->query($sql);
 
-		if (!$resql) {
-			dol_print_error($this->db);
-			return -1;
-		}
+        if (!$resql) {
+            dol_print_error($this->db);
+            return -1;
+        }
 
-		while ($obj = $this->db->fetch_object($resql)) {
-			$listofmethods[$obj->rowid] = $langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : $obj->label;
-		}
+        while ($obj = $this->db->fetch_object($resql)) {
+            $listofmethods[$obj->rowid] = $langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : $obj->label;
+        }
 
-		print Form::selectarray($htmlname,$listofmethods,$selected,$addempty);
+        print Form::selectarray($htmlname,$listofmethods,$selected,$addempty);
 
-		return 1;
-	}
+        return 1;
+    }
 }
 

Spacing +8 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
  *	\brief      File of predefined functions for HTML forms for order module
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 /**
  *	Class to manage HTML output components for orders
@@ -39,7 +39,7 @@ 
      *    @param	string	$hmlname	Name of HTML select element
      *    @return	void
      */
-    public function selectSupplierOrderStatus($selected='', $short=0, $hmlname='order_status')
+    public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status')
     {
 	    $options = array();
 
@@ -74,18 +74,18 @@ 
 	 *  @param  int		$addempty		0=list with no empty value, 1=list with empty value
 	 *  @return	array					Tableau des sources de commandes
 	 */
-	public function selectInputMethod($selected='',$htmlname='source_id',$addempty=0)
+	public function selectInputMethod($selected = '', $htmlname = 'source_id', $addempty = 0)
 	{
 		global $langs;
 
-        $listofmethods=array();
+        $listofmethods = array();
 
 		$sql = "SELECT rowid, code, libelle as label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
-		$sql.= " WHERE active = 1";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method";
+		$sql .= " WHERE active = 1";
 
 		dol_syslog(get_class($this)."::selectInputMethod", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 
 		if (!$resql) {
 			dol_print_error($this->db);
@@ -96,7 +96,7 @@ 
 			$listofmethods[$obj->rowid] = $langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : $obj->label;
 		}
 
-		print Form::selectarray($htmlname,$listofmethods,$selected,$addempty);
+		print Form::selectarray($htmlname, $listofmethods, $selected, $addempty);
 
 		return 1;
 	}

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

Indentation +146 added lines, -146 removed lines

@@ -40,9 +40,9 @@ 
     private $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+     * @var string Error code (or message)
+     */
+    public $error;
 
 
     /**
@@ -73,7 +73,7 @@ 
         $sql = "SELECT rowid, label";
         $sql.= " FROM ".MAIN_DB_PREFIX."export_model";
         $sql.= " WHERE type = '".$type."'";
-		if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;
+        if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;
         $sql.= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
@@ -179,7 +179,7 @@ 
         $sql.= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
         $sql.= " ORDER BY country, e.organization ASC, e.code ASC";
 
-    	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
+        dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -230,50 +230,50 @@ 
     function select_revenue_stamp($selected='', $htmlname='revenuestamp', $country_code='')
     {
         // phpcs:enable
-    	global $langs;
-
-    	$out='';
-
-    	$sql = "SELECT r.taux, r.revenuestamp_type";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
-    	$sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
-    	$sql.= " AND c.code = '".$country_code."'";
-
-    	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
-    	$resql=$this->db->query($sql);
-    	if ($resql)
-    	{
-    		$out.='<select class="flat" name="'.$htmlname.'">';
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
-    		$out.='<option value="0">&nbsp;</option>'."\n";
-    		if ($num)
-    		{
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($resql);
-    				if (($selected && $selected == $obj->taux) || $num == 1)
-    				{
-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
-    				}
-    				else
-    				{
-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
-    					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
-    				}
-    				$out.=$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
-    				$out.='</option>';
-    				$i++;
-    			}
-    		}
-    		$out.='</select>';
-    		return $out;
-    	}
-    	else
-    	{
-    		dol_print_error($this->db);
-    		return '';
-    	}
+        global $langs;
+
+        $out='';
+
+        $sql = "SELECT r.taux, r.revenuestamp_type";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
+        $sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
+        $sql.= " AND c.code = '".$country_code."'";
+
+        dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $out.='<select class="flat" name="'.$htmlname.'">';
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            $out.='<option value="0">&nbsp;</option>'."\n";
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($resql);
+                    if (($selected && $selected == $obj->taux) || $num == 1)
+                    {
+                        $out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
+                    }
+                    else
+                    {
+                        $out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
+                        //print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
+                    }
+                    $out.=$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
+                    $out.='</option>';
+                    $i++;
+                }
+            }
+            $out.='</select>';
+            return $out;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return '';
+        }
     }
 
 
@@ -368,8 +368,8 @@ 
         }
         if ($nocateg)
         {
-        	$langs->load("categories");
-        	$moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected':'').'>- '.$langs->trans("NotCategorized").' -</option>';
+            $langs->load("categories");
+            $moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected':'').'>- '.$langs->trans("NotCategorized").' -</option>';
         }
         $moreforfilter.='</select>';
 
@@ -404,7 +404,7 @@ 
             $comboenhancement = ajax_combobox($htmlname);
             if ($comboenhancement)
             {
-            	$out.=$comboenhancement;
+                $out.=$comboenhancement;
             }
         }
         // Select each sales and print them in a select input
@@ -426,7 +426,7 @@ 
             $sql_usr.= " WHERE u2.entity IN (0,".$conf->entity.")";
             $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;
         }
-	    $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
+        $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
         //print $sql_usr;exit;
 
         $resql_usr = $this->db->query($sql_usr);
@@ -450,18 +450,18 @@ 
                 }
                 if ($showstatus >= 0)
                 {
-					if ($obj_usr->statut == 1 && $showstatus == 1)
-					{
-						$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
-	                	$moreinfo++;
-					}
-					if ($obj_usr->statut == 0)
-					{
-						$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
-                		$moreinfo++;
-					}
-				}
-				$out.=($moreinfo?')':'');
+                    if ($obj_usr->statut == 1 && $showstatus == 1)
+                    {
+                        $out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
+                        $moreinfo++;
+                    }
+                    if ($obj_usr->statut == 0)
+                    {
+                        $out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
+                        $moreinfo++;
+                    }
+                }
+                $out.=($moreinfo?')':'');
                 $out.='</option>';
             }
             $this->db->free($resql_usr);
@@ -486,7 +486,7 @@ 
      * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists
      *  @param  int		$useempty       		0=Allow empty values
      *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
-	 *  @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated status)
+     *  @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated status)
      *  @param	string	$morecss				More css
      *  @return	void
      */
@@ -501,7 +501,7 @@ 
         $tasksarray=$task->getTasksArray($modetask?$user:0, $modeproject?$user:0, $projectid, 0, $mode, '', $filteronprojstatus);
         if ($tasksarray)
         {
-        	print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+            print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
             if ($useempty) print '<option value="0">&nbsp;</option>';
             $j=0;
             $level=0;
@@ -537,11 +537,11 @@ 
         $numlines=count($lines);
         for ($i = 0 ; $i < $numlines ; $i++)
         {
-        	if ($lines[$i]->fk_parent == $parent)
+            if ($lines[$i]->fk_parent == $parent)
             {
                 $var = !$var;
 
-				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
+                //var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
 
                 // Break on a new project
                 if ($parent == 0)	// We are on a task at first level
@@ -574,13 +574,13 @@ 
                 // Print task
                 if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
                 {
-                	// Check if we must disable entry
-                	$disabled=0;
-                	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
-                	{
-               			$disabled++;
-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too
-                	}
+                    // Check if we must disable entry
+                    $disabled=0;
+                    if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
+                    {
+                            $disabled++;
+                            if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too
+                    }
 
                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
                     if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
@@ -623,14 +623,14 @@ 
      */
     static function showColor($color, $textifnotdefined='')
     {
-    	$textcolor='FFF';
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-    	if(colorIsLight($color)) $textcolor='000';
+        $textcolor='FFF';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        if(colorIsLight($color)) $textcolor='000';
 
-    	$color = colorArrayToHex(colorStringToArray($color,array()),'');
+        $color = colorArrayToHex(colorStringToArray($color,array()),'');
 
-		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
-		else print $textifnotdefined;
+        if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
+        else print $textifnotdefined;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -649,7 +649,7 @@ 
     function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')
     {
         // phpcs:enable
-    	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
+        print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
     }
 
     /**
@@ -666,10 +666,10 @@ 
      */
     static function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
     {
-	    // Deprecation warning
-	    if ($form_name) {
-		    dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);
-	    }
+        // Deprecation warning
+        if ($form_name) {
+            dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);
+        }
 
         global $langs,$conf;
 
@@ -680,9 +680,9 @@ 
             $langs->load("other");
             if (empty($conf->dol_use_jmobile))
             {
-	            $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
-	            $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
-	            $out.= '<script type="text/javascript">
+                $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
+                $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
+                $out.= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                $(\'#colorpicker'.$prefix.'\').jPicker( {
 	                window: {
@@ -726,9 +726,9 @@ 
         {
             if (empty($conf->dol_use_jmobile))
             {
-	        	$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
-	            $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
-	            $out.= '<script type="text/javascript">
+                $out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
+                $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
+                $out.= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
 	                     size: 14,
@@ -929,7 +929,7 @@ 
         $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
         if($useempty)
         {
-        	$selected_html='';
+            $selected_html='';
             if ($selected == '') $selected_html = ' selected';
             $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';
         }
@@ -1028,55 +1028,55 @@ 
         $boxidactivatedforuser=array();
         foreach($boxactivated as $box)
         {
-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user
+            if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user
         }
 
         // Define selectboxlist
         $arrayboxtoactivatelabel=array();
         if (! empty($user->conf->$confuserzone))
         {
-        	$boxorder='';
-        	$langs->load("boxes");	// Load label of boxes
-        	foreach($boxactivated as $box)
-        	{
-        		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user
-        		$label=$langs->transnoentitiesnoconv($box->boxlabel);
-        		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
-        		if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')
-        		{
-        			$label=$label.' <span class="fa fa-bar-chart"></span>';
-        		}
-        		$arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list
-        	}
+            $boxorder='';
+            $langs->load("boxes");	// Load label of boxes
+            foreach($boxactivated as $box)
+            {
+                if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user
+                $label=$langs->transnoentitiesnoconv($box->boxlabel);
+                //if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
+                if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')
+                {
+                    $label=$label.' <span class="fa fa-bar-chart"></span>';
+                }
+                $arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list
+            }
             foreach($boxidactivatedforuser as $boxid)
-        	{
-       			if (empty($boxorder)) $boxorder.='A:';
-  				$boxorder.=$boxid.',';
-        	}
-
-        	//var_dump($boxidactivatedforuser);
-
-        	// Class Form must have been already loaded
-        	$selectboxlist.='<!-- Form with select box list -->'."\n";
-			$selectboxlist.='<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-			$selectboxlist.='<input type="hidden" name="addbox" value="addbox">';
-			$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';
-			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';
-			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';
-			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
+            {
+                    if (empty($boxorder)) $boxorder.='A:';
+                    $boxorder.=$boxid.',';
+            }
+
+            //var_dump($boxidactivatedforuser);
+
+            // Class Form must have been already loaded
+            $selectboxlist.='<!-- Form with select box list -->'."\n";
+            $selectboxlist.='<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+            $selectboxlist.='<input type="hidden" name="addbox" value="addbox">';
+            $selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';
+            $selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';
+            $selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';
+            $selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
             if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
             $selectboxlist.='</form>';
             if (! empty($conf->use_javascript_ajax))
             {
-            	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-            	$selectboxlist.=ajax_combobox("boxcombo");
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $selectboxlist.=ajax_combobox("boxcombo");
             }
         }
 
         // Javascript code for dynamic actions
         if (! empty($conf->use_javascript_ajax))
         {
-	        $selectboxlist.='<script type="text/javascript" language="javascript">
+            $selectboxlist.='<script type="text/javascript" language="javascript">
 
 	        // To update list of activated boxes
 	        function updateBoxOrder(closing) {
@@ -1115,8 +1115,8 @@ 
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;
 	                }
 	        	});';
-	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';
-	        	$selectboxlist.='
+                if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';
+                $selectboxlist.='
 
 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({
 	    	    	handle: \'.boxhandle\',
@@ -1141,7 +1141,7 @@ 
 
         	});'."\n";
 
-	        $selectboxlist.='</script>'."\n";
+            $selectboxlist.='</script>'."\n";
         }
 
         // Define boxlista and boxlistb
@@ -1149,10 +1149,10 @@ 
 
         if ($nbboxactivated)
         {
-        	// Load translation files required by the page
+            // Load translation files required by the page
             $langs->loadLangs(array("boxes","projects"));
 
-        	$emptybox=new ModeleBoxes($db);
+            $emptybox=new ModeleBoxes($db);
 
             $boxlista.="\n<!-- Box left container -->\n";
 
@@ -1163,9 +1163,9 @@ 
             $ii=0;
             foreach ($boxactivated as $key => $box)
             {
-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^A/i',$box->box_order)) // column A
+                if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+                if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
+                if (preg_match('/^A/i',$box->box_order)) // column A
                 {
                     $ii++;
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
@@ -1178,10 +1178,10 @@ 
 
             if ($conf->browser->layout != 'phone')
             {
-            	$emptybox->box_id='A';
-            	$emptybox->info_box_head=array();
-            	$emptybox->info_box_contents=array();
-            	$boxlista.= $emptybox->outputBox(array(),array());
+                $emptybox->box_id='A';
+                $emptybox->info_box_head=array();
+                $emptybox->info_box_contents=array();
+                $boxlista.= $emptybox->outputBox(array(),array());
             }
             $boxlista.= "<!-- End box left container -->\n";
 
@@ -1190,9 +1190,9 @@ 
             $ii=0;
             foreach ($boxactivated as $key => $box)
             {
-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^B/i',$box->box_order)) // colonne B
+                if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+                if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
+                if (preg_match('/^B/i',$box->box_order)) // colonne B
                 {
                     $ii++;
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
@@ -1205,10 +1205,10 @@ 
 
             if ($conf->browser->layout != 'phone')
             {
-            	$emptybox->box_id='B';
-            	$emptybox->info_box_head=array();
-            	$emptybox->info_box_contents=array();
-            	$boxlistb.= $emptybox->outputBox(array(),array());
+                $emptybox->box_id='B';
+                $emptybox->info_box_head=array();
+                $emptybox->info_box_contents=array();
+                $boxlistb.= $emptybox->outputBox(array(),array());
             }
 
             $boxlistb.= "<!-- End box right container -->\n";
@@ -1274,7 +1274,7 @@ 
                 print "</select>";
             }
             else
-			{
+            {
                 print $langs->trans("DictionaryEmpty");
             }
         }

Spacing +223 added lines, -223 removed lines

@@ -67,14 +67,14 @@ 
      *    @param    int		$fk_user          Utilisateur créant le modèle
      *    @return	void
      */
-    function select_export_model($selected='', $htmlname='exportmodelid', $type='', $useempty=0, $fk_user=null)
+    function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)
     {
         // phpcs:enable
         $sql = "SELECT rowid, label";
-        $sql.= " FROM ".MAIN_DB_PREFIX."export_model";
-        $sql.= " WHERE type = '".$type."'";
-		if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;
-        $sql.= " ORDER BY rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."export_model";
+        $sql .= " WHERE type = '".$type."'";
+		if (!empty($fk_user)) $sql .= " AND fk_user=".$fk_user;
+        $sql .= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -119,13 +119,13 @@ 
      *    @param    int		$useempty          Affiche valeur vide dans liste
      *    @return	void
      */
-    function select_import_model($selected='', $htmlname='importmodelid', $type='', $useempty=0)
+    function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0)
     {
         // phpcs:enable
         $sql = "SELECT rowid, label";
-        $sql.= " FROM ".MAIN_DB_PREFIX."import_model";
-        $sql.= " WHERE type = '".$type."'";
-        $sql.= " ORDER BY rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."import_model";
+        $sql .= " WHERE type = '".$type."'";
+        $sql .= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -168,19 +168,19 @@ 
      *    @param    string	$htmlname	Name of combo list
      *    @return	integer
      */
-    function select_ecotaxes($selected='', $htmlname='ecotaxe_id')
+    function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')
     {
         // phpcs:enable
         global $langs;
 
         $sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";
-        $sql.= " c.label as country";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
-        $sql.= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
-        $sql.= " ORDER BY country, e.organization ASC, e.code ASC";
+        $sql .= " c.label as country";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
+        $sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
+        $sql .= " ORDER BY country, e.organization ASC, e.code ASC";
 
     	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             print '<select class="flat" name="'.$htmlname.'">';
@@ -227,26 +227,26 @@ 
      *    @param    string	$country_code   Country Code
      *    @return	string					HTML select list
      */
-    function select_revenue_stamp($selected='', $htmlname='revenuestamp', $country_code='')
+    function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')
     {
         // phpcs:enable
     	global $langs;
 
-    	$out='';
+    	$out = '';
 
     	$sql = "SELECT r.taux, r.revenuestamp_type";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
-    	$sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
-    	$sql.= " AND c.code = '".$country_code."'";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
+    	$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
+    	$sql .= " AND c.code = '".$country_code."'";
 
     	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
-    	$resql=$this->db->query($sql);
+    	$resql = $this->db->query($sql);
     	if ($resql)
     	{
-    		$out.='<select class="flat" name="'.$htmlname.'">';
+    		$out .= '<select class="flat" name="'.$htmlname.'">';
     		$num = $this->db->num_rows($resql);
     		$i = 0;
-    		$out.='<option value="0">&nbsp;</option>'."\n";
+    		$out .= '<option value="0">&nbsp;</option>'."\n";
     		if ($num)
     		{
     			while ($i < $num)
@@ -254,19 +254,19 @@ 
     				$obj = $this->db->fetch_object($resql);
     				if (($selected && $selected == $obj->taux) || $num == 1)
     				{
-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
+    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
     				}
     				else
     				{
-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
+    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
     					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
     				}
-    				$out.=$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
-    				$out.='</option>';
+    				$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
+    				$out .= '</option>';
     				$i++;
     			}
     		}
-    		$out.='</select>';
+    		$out .= '</select>';
     		return $out;
     	}
     	else
@@ -290,27 +290,27 @@ 
      *    @param    int     $showempty      Add also an empty line
      *    @return   string					HTML select string
      */
-    function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100,$showempty=0)
+    function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)
     {
         // phpcs:enable
-        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>';
-        if ($showempty) $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';
+        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
+        if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
 
-        for ($i = $start ; $i <= $end ; $i += $increment)
+        for ($i = $start; $i <= $end; $i += $increment)
         {
             if ($selected != '' && (int) $selected == $i)
             {
-                $return.= '<option value="'.$i.'" selected>';
+                $return .= '<option value="'.$i.'" selected>';
             }
             else
             {
-                $return.= '<option value="'.$i.'">';
+                $return .= '<option value="'.$i.'">';
             }
-            $return.= $i.' % ';
-            $return.= '</option>';
+            $return .= $i.' % ';
+            $return .= '</option>';
         }
 
-        $return.= '</select>';
+        $return .= '</select>';
 
         return $return;
     }
@@ -328,7 +328,7 @@ 
      * @return  string		        	Html combo list code
      * @see	select_all_categories
      */
-    function select_categories($type, $selected=0, $htmlname='search_categ', $nocateg=0, $showempty=1, $morecss='')
+    function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')
     {
         // phpcs:enable
         global $conf, $langs;
@@ -337,7 +337,7 @@ 
         // For backward compatibility
         if (is_numeric($type))
         {
-            dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
+            dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
         }
 
         // Load list of "categories"
@@ -348,30 +348,30 @@ 
         // Enhance with select2
         if ($conf->use_javascript_ajax)
         {
-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
             $comboenhancement = ajax_combobox('select_categ_'.$htmlname);
-            $moreforfilter.=$comboenhancement;
+            $moreforfilter .= $comboenhancement;
         }
 
         // Print a select with each of them
-        $moreforfilter.='<select class="flat minwidth100'.($morecss?' '.$morecss:'').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $moreforfilter.='<option value="0">&nbsp;</option>';	// Should use -1 to say nothing
+        $moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
+        if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing
 
         if (is_array($tab_categs))
         {
             foreach ($tab_categs as $categ)
             {
-                $moreforfilter.='<option value="'.$categ['id'].'"';
-                if ($categ['id'] == $selected) $moreforfilter.=' selected';
-                $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';
+                $moreforfilter .= '<option value="'.$categ['id'].'"';
+                if ($categ['id'] == $selected) $moreforfilter .= ' selected';
+                $moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';
             }
         }
         if ($nocateg)
         {
         	$langs->load("categories");
-        	$moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected':'').'>- '.$langs->trans("NotCategorized").' -</option>';
+        	$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';
         }
-        $moreforfilter.='</select>';
+        $moreforfilter .= '</select>';
 
         return $moreforfilter;
     }
@@ -389,44 +389,44 @@ 
      *  @param	string	$morecss		More CSS
      *  @return string					Html combo list code
      */
-    function select_salesrepresentatives($selected,$htmlname,$user,$showstatus=0,$showempty=1,$morecss='')
+    function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '')
     {
         // phpcs:enable
-        global $conf,$langs;
+        global $conf, $langs;
         $langs->load('users');
 
         $out = '';
         // Enhance with select2
         if ($conf->use_javascript_ajax)
         {
-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 
             $comboenhancement = ajax_combobox($htmlname);
             if ($comboenhancement)
             {
-            	$out.=$comboenhancement;
+            	$out .= $comboenhancement;
             }
         }
         // Select each sales and print them in a select input
-        $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $out.='<option value="0">&nbsp;</option>';
+        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+        if ($showempty) $out .= '<option value="0">&nbsp;</option>';
 
         // Get list of users allowed to be viewed
         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
-        $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";
-        $sql_usr.= " WHERE u.entity IN (0,".$conf->entity.")";
-        if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;
-        if (! empty($user->societe_id)) $sql_usr.=" AND u.fk_soc = ".$user->societe_id;
+        $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
+        $sql_usr .= " WHERE u.entity IN (0,".$conf->entity.")";
+        if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;
+        if (!empty($user->societe_id)) $sql_usr .= " AND u.fk_soc = ".$user->societe_id;
         // Add existing sales representatives of thirdparty of external user
         if (empty($user->rights->user->user->lire) && $user->societe_id)
         {
-            $sql_usr.=" UNION ";
-            $sql_usr.= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
-            $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-            $sql_usr.= " WHERE u2.entity IN (0,".$conf->entity.")";
-            $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;
+            $sql_usr .= " UNION ";
+            $sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
+            $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql_usr .= " WHERE u2.entity IN (0,".$conf->entity.")";
+            $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;
         }
-	    $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
+	    $sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
         //print $sql_usr;exit;
 
         $resql_usr = $this->db->query($sql_usr);
@@ -435,34 +435,34 @@ 
             while ($obj_usr = $this->db->fetch_object($resql_usr))
             {
 
-                $out.='<option value="'.$obj_usr->rowid.'"';
+                $out .= '<option value="'.$obj_usr->rowid.'"';
 
-                if ($obj_usr->rowid == $selected) $out.=' selected';
+                if ($obj_usr->rowid == $selected) $out .= ' selected';
 
-                $out.='>';
-                $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
+                $out .= '>';
+                $out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
                 // Complete name with more info
-                $moreinfo=0;
-                if (! empty($conf->global->MAIN_SHOW_LOGIN))
+                $moreinfo = 0;
+                if (!empty($conf->global->MAIN_SHOW_LOGIN))
                 {
-                    $out.=($moreinfo?' - ':' (').$obj_usr->login;
+                    $out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
                     $moreinfo++;
                 }
                 if ($showstatus >= 0)
                 {
 					if ($obj_usr->statut == 1 && $showstatus == 1)
 					{
-						$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
+						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
 	                	$moreinfo++;
 					}
 					if ($obj_usr->statut == 0)
 					{
-						$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
+						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
                 		$moreinfo++;
 					}
 				}
-				$out.=($moreinfo?')':'');
-                $out.='</option>';
+				$out .= ($moreinfo ? ')' : '');
+                $out .= '</option>';
             }
             $this->db->free($resql_usr);
         }
@@ -470,7 +470,7 @@ 
         {
             dol_print_error($this->db);
         }
-        $out.='</select>';
+        $out .= '</select>';
 
         return $out;
     }
@@ -490,21 +490,21 @@ 
      *  @param	string	$morecss				More css
      *  @return	void
      */
-    function selectProjectTasks($selectedtask='', $projectid=0, $htmlname='task_parent', $modeproject=0, $modetask=0, $mode=0, $useempty=0, $disablechildoftaskid=0, $filteronprojstatus='', $morecss='')
+    function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')
     {
         global $user, $langs;
 
         require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
         //print $modeproject.'-'.$modetask;
-        $task=new Task($this->db);
-        $tasksarray=$task->getTasksArray($modetask?$user:0, $modeproject?$user:0, $projectid, 0, $mode, '', $filteronprojstatus);
+        $task = new Task($this->db);
+        $tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);
         if ($tasksarray)
         {
-        	print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+        	print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
             if ($useempty) print '<option value="0">&nbsp;</option>';
-            $j=0;
-            $level=0;
+            $j = 0;
+            $level = 0;
             $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
             print '</select>';
 
@@ -528,14 +528,14 @@ 
      * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
      * @return	void
      */
-    private function _pLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selectedproject=0, $disablechildoftaskid=0)
+    private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)
     {
         global $langs, $user, $conf;
 
-        $lastprojectid=0;
+        $lastprojectid = 0;
 
-        $numlines=count($lines);
-        for ($i = 0 ; $i < $numlines ; $i++)
+        $numlines = count($lines);
+        for ($i = 0; $i < $numlines; $i++)
         {
         	if ($lines[$i]->fk_parent == $parent)
             {
@@ -551,7 +551,7 @@ 
                         if ($i > 0) print '<option value="0" disabled>----------</option>';
                         print '<option value="'.$lines[$i]->fk_project.'_0"';
                         if ($selectedproject == $lines[$i]->fk_project) print ' selected';
-                        print '>';	// Project -> Task
+                        print '>'; // Project -> Task
                         print $langs->trans("Project").' '.$lines[$i]->projectref;
                         if (empty($lines[$i]->public))
                         {
@@ -564,22 +564,22 @@ 
                         //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
                         print "</option>\n";
 
-                        $lastprojectid=$lines[$i]->fk_project;
+                        $lastprojectid = $lines[$i]->fk_project;
                         $inc++;
                     }
                 }
 
-                $newdisablechildoftaskid=$disablechildoftaskid;
+                $newdisablechildoftaskid = $disablechildoftaskid;
 
                 // Print task
                 if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
                 {
                 	// Check if we must disable entry
-                	$disabled=0;
+                	$disabled = 0;
                 	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
                 	{
                			$disabled++;
-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too
+               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too
                 	}
 
                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
@@ -597,7 +597,7 @@ 
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                     }
                     if ($lines[$i]->id) print ' > ';
-                    for ($k = 0 ; $k < $level ; $k++)
+                    for ($k = 0; $k < $level; $k++)
                     {
                         print "&nbsp;&nbsp;&nbsp;";
                     }
@@ -621,13 +621,13 @@ 
      * 		@return	string							HTML code for color thumb
      *		@see selectColor
      */
-    static function showColor($color, $textifnotdefined='')
+    static function showColor($color, $textifnotdefined = '')
     {
-    	$textcolor='FFF';
+    	$textcolor = 'FFF';
     	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-    	if(colorIsLight($color)) $textcolor='000';
+    	if (colorIsLight($color)) $textcolor = '000';
 
-    	$color = colorArrayToHex(colorStringToArray($color,array()),'');
+    	$color = colorArrayToHex(colorStringToArray($color, array()), '');
 
 		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
 		else print $textifnotdefined;
@@ -646,7 +646,7 @@ 
      * 		@deprecated Use instead selectColor
      *      @see selectColor()
      */
-    function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')
+    function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')
     {
         // phpcs:enable
     	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
@@ -664,25 +664,25 @@ 
      * 		@return	string
      *		@see showColor
      */
-    static function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
+    static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '')
     {
 	    // Deprecation warning
 	    if ($form_name) {
-		    dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);
+		    dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);
 	    }
 
-        global $langs,$conf;
+        global $langs, $conf;
 
-        $out='';
+        $out = '';
 
-        if (! is_array($arrayofcolors) || count($arrayofcolors) < 1)
+        if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)
         {
             $langs->load("other");
             if (empty($conf->dol_use_jmobile))
             {
-	            $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
-	            $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
-	            $out.= '<script type="text/javascript">
+	            $out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
+	            $out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
+	            $out .= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                $(\'#colorpicker'.$prefix.'\').jPicker( {
 	                window: {
@@ -720,15 +720,15 @@ 
 			        } ); });
 	             </script>';
             }
-            $out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';
+            $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.$set_color.'" />';
         }
         else  // In most cases, this is not used. We used instead function with no specific list of colors
         {
             if (empty($conf->dol_use_jmobile))
             {
-	        	$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
-	            $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
-	            $out.= '<script type="text/javascript">
+	        	$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
+	            $out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
+	            $out .= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
 	                     size: 14,
@@ -738,15 +738,15 @@ 
 	             });
 	             </script>';
             }
-            $out.= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss?' '.$morecss:'').'" name="'.$prefix.'">';
+            $out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
             //print '<option value="-1">&nbsp;</option>';
             foreach ($arrayofcolors as $val)
             {
-                $out.= '<option value="'.$val.'"';
-                if ($set_color == $val) $out.= ' selected';
-                $out.= '>'.$val.'</option>';
+                $out .= '<option value="'.$val.'"';
+                if ($set_color == $val) $out .= ' selected';
+                $out .= '>'.$val.'</option>';
             }
-            $out.= '</select>';
+            $out .= '</select>';
         }
 
         return $out;
@@ -763,7 +763,7 @@ 
      *	@param	int		$y      	Hauteur de l'image en pixels
      *	@return	void
      */
-    function CreateColorIcon($color,$module,$name,$x='12',$y='12')
+    function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')
     {
         // phpcs:enable
         global $conf;
@@ -771,25 +771,25 @@ 
         $file = $conf->$module->dir_temp.'/'.$name.'.png';
 
         // On cree le repertoire contenant les icones
-        if (! file_exists($conf->$module->dir_temp))
+        if (!file_exists($conf->$module->dir_temp))
         {
             dol_mkdir($conf->$module->dir_temp);
         }
 
         // On cree l'image en vraies couleurs
-        $image = imagecreatetruecolor($x,$y);
+        $image = imagecreatetruecolor($x, $y);
 
-        $color = substr($color,1,6);
+        $color = substr($color, 1, 6);
 
-        $rouge = hexdec(substr($color,0,2)); //conversion du canal rouge
-        $vert  = hexdec(substr($color,2,2)); //conversion du canal vert
-        $bleu  = hexdec(substr($color,4,2)); //conversion du canal bleu
+        $rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge
+        $vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert
+        $bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu
 
-        $couleur = imagecolorallocate($image,$rouge,$vert,$bleu);
+        $couleur = imagecolorallocate($image, $rouge, $vert, $bleu);
         //print $rouge.$vert.$bleu;
-        imagefill($image,0,0,$couleur); //on remplit l'image
+        imagefill($image, 0, 0, $couleur); //on remplit l'image
         // On cree la couleur et on l'attribue a une variable pour ne pas la perdre
-        ImagePng($image,$file); //renvoie une image sous format png
+        ImagePng($image, $file); //renvoie une image sous format png
         ImageDestroy($image);
     }
 
@@ -802,7 +802,7 @@ 
      *    	@param  int			$useempty          Affiche valeur vide dans liste
      *    	@return	string
      */
-    function select_dayofweek($selected='',$htmlname='weekid',$useempty=0)
+    function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)
     {
         // phpcs:enable
         global $langs;
@@ -850,17 +850,17 @@ 
      *      @param	string		$morecss			More Css
      *      @return string
      */
-    function select_month($selected='', $htmlname='monthid', $useempty=0, $longlabel=0, $morecss='')
+    function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = '')
     {
         // phpcs:enable
         global $langs;
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        if ($longlabel) $montharray = monthArray($langs, 0);	// Get array
+        if ($longlabel) $montharray = monthArray($langs, 0); // Get array
         else $montharray = monthArray($langs, 1);
 
-        $select_month = '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+        $select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
         if ($useempty)
         {
             $select_month .= '<option value="0">&nbsp;</option>';
@@ -897,10 +897,10 @@ 
      *  @param	string		$morecss		More CSS
      *  @return	string
      */
-    function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='valignmiddle widthauto')
+    function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle widthauto')
     {
         // phpcs:enable
-        print $this->selectyear($selected,$htmlname,$useempty,$min_year,$max_year,$offset,$invert,$option,$morecss);
+        print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);
     }
 
     /**
@@ -917,41 +917,41 @@ 
      *  @param	string	$morecss		More css
      *  @return	string
      */
-    function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='', $morecss='valignmiddle widthauto')
+    function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle widthauto')
     {
-        $out='';
+        $out = '';
 
-        $currentyear = date("Y")+$offset;
-        $max_year = $currentyear+$max_year;
-        $min_year = $currentyear-$min_year;
-        if(empty($selected) && empty($useempty)) $selected = $currentyear;
+        $currentyear = date("Y") + $offset;
+        $max_year = $currentyear + $max_year;
+        $min_year = $currentyear - $min_year;
+        if (empty($selected) && empty($useempty)) $selected = $currentyear;
 
-        $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
-        if($useempty)
+        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';
+        if ($useempty)
         {
-        	$selected_html='';
+        	$selected_html = '';
             if ($selected == '') $selected_html = ' selected';
-            $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';
+            $out .= '<option value=""'.$selected_html.'>&nbsp;</option>';
         }
-        if (! $invert)
+        if (!$invert)
         {
             for ($y = $max_year; $y >= $min_year; $y--)
             {
-                $selected_html='';
+                $selected_html = '';
                 if ($selected > 0 && $y == $selected) $selected_html = ' selected';
-                $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
+                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
             }
         }
         else
         {
             for ($y = $min_year; $y <= $max_year; $y++)
             {
-                $selected_html='';
+                $selected_html = '';
                 if ($selected > 0 && $y == $selected) $selected_html = ' selected';
-                $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
+                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
             }
         }
-        $out.= "</select>\n";
+        $out .= "</select>\n";
 
         return $out;
     }
@@ -968,10 +968,10 @@ 
      * @param  	int		$originid      	Id de l'origine
      * @return	void
      */
-    function form_address($page, $selected, $socid, $htmlname='address_id', $origin='', $originid='')
+    function form_address($page, $selected, $socid, $htmlname = 'address_id', $origin = '', $originid = '')
     {
         // phpcs:enable
-        global $langs,$conf;
+        global $langs, $conf;
         global $form;
 
         if ($htmlname != "none")
@@ -989,9 +989,9 @@ 
         {
             if ($selected)
             {
-                require_once DOL_DOCUMENT_ROOT .'/societe/class/address.class.php';
-                $address=new Address($this->db);
-                $result=$address->fetch_address($selected);
+                require_once DOL_DOCUMENT_ROOT.'/societe/class/address.class.php';
+                $address = new Address($this->db);
+                $result = $address->fetch_address($selected);
                 print '<a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$address->socid.'&id='.$address->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$address->label.'</a>';
             }
             else
@@ -1011,72 +1011,72 @@ 
      * 	@param	   String       $areacode    Code of area for pages ('0'=value for Home page)
      * 	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlista'=>, 'boxlistb'=>)
      */
-    static function getBoxesArea($user,$areacode)
+    static function getBoxesArea($user, $areacode)
     {
-        global $conf,$langs,$db;
+        global $conf, $langs, $db;
 
         include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
-        $confuserzone='MAIN_BOXES_'.$areacode;
+        $confuserzone = 'MAIN_BOXES_'.$areacode;
 
         // $boxactivated will be array of boxes enabled into global setup
         // $boxidactivatedforuser will be array of boxes choosed by user
 
-        $selectboxlist='';
-        $boxactivated=InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone)?null:$user), array(), 0);	// Search boxes of common+user (or common only if user has no specific setup)
+        $selectboxlist = '';
+        $boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)
 
-        $boxidactivatedforuser=array();
-        foreach($boxactivated as $box)
+        $boxidactivatedforuser = array();
+        foreach ($boxactivated as $box)
         {
-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user
+        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user
         }
 
         // Define selectboxlist
-        $arrayboxtoactivatelabel=array();
-        if (! empty($user->conf->$confuserzone))
+        $arrayboxtoactivatelabel = array();
+        if (!empty($user->conf->$confuserzone))
         {
-        	$boxorder='';
-        	$langs->load("boxes");	// Load label of boxes
-        	foreach($boxactivated as $box)
+        	$boxorder = '';
+        	$langs->load("boxes"); // Load label of boxes
+        	foreach ($boxactivated as $box)
         	{
-        		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user
-        		$label=$langs->transnoentitiesnoconv($box->boxlabel);
+        		if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user
+        		$label = $langs->transnoentitiesnoconv($box->boxlabel);
         		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
-        		if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')
+        		if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')
         		{
-        			$label=$label.' <span class="fa fa-bar-chart"></span>';
+        			$label = $label.' <span class="fa fa-bar-chart"></span>';
         		}
-        		$arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list
+        		$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list
         	}
-            foreach($boxidactivatedforuser as $boxid)
+            foreach ($boxidactivatedforuser as $boxid)
         	{
-       			if (empty($boxorder)) $boxorder.='A:';
-  				$boxorder.=$boxid.',';
+       			if (empty($boxorder)) $boxorder .= 'A:';
+  				$boxorder .= $boxid.',';
         	}
 
         	//var_dump($boxidactivatedforuser);
 
         	// Class Form must have been already loaded
-        	$selectboxlist.='<!-- Form with select box list -->'."\n";
-			$selectboxlist.='<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-			$selectboxlist.='<input type="hidden" name="addbox" value="addbox">';
-			$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';
-			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';
-			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';
-			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
-            if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
-            $selectboxlist.='</form>';
-            if (! empty($conf->use_javascript_ajax))
+        	$selectboxlist .= '<!-- Form with select box list -->'."\n";
+			$selectboxlist .= '<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+			$selectboxlist .= '<input type="hidden" name="addbox" value="addbox">';
+			$selectboxlist .= '<input type="hidden" name="userid" value="'.$user->id.'">';
+			$selectboxlist .= '<input type="hidden" name="areacode" value="'.$areacode.'">';
+			$selectboxlist .= '<input type="hidden" name="boxorder" value="'.$boxorder.'">';
+			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
+            if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+            $selectboxlist .= '</form>';
+            if (!empty($conf->use_javascript_ajax))
             {
-            	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-            	$selectboxlist.=ajax_combobox("boxcombo");
+            	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+            	$selectboxlist .= ajax_combobox("boxcombo");
             }
         }
 
         // Javascript code for dynamic actions
-        if (! empty($conf->use_javascript_ajax))
+        if (!empty($conf->use_javascript_ajax))
         {
-	        $selectboxlist.='<script type="text/javascript" language="javascript">
+	        $selectboxlist .= '<script type="text/javascript" language="javascript">
 
 	        // To update list of activated boxes
 	        function updateBoxOrder(closing) {
@@ -1090,7 +1090,7 @@ 
 	        			async: false
 	        		});
 	        		// We force reload to be sure to get all boxes into list
-	        		window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=delbox\';
+	        		window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=delbox\';
 	        	}
 	        	else
 	        	{
@@ -1112,11 +1112,11 @@ 
 	    					url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\',
 	    			        async: false
 	    		        });
-	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;
+	        			window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=addbox&boxid=\'+boxid;
 	                }
 	        	});';
-	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';
-	        	$selectboxlist.='
+	        	if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';
+	        	$selectboxlist .= '
 
 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({
 	    	    	handle: \'.boxhandle\',
@@ -1141,80 +1141,80 @@ 
 
         	});'."\n";
 
-	        $selectboxlist.='</script>'."\n";
+	        $selectboxlist .= '</script>'."\n";
         }
 
         // Define boxlista and boxlistb
-        $nbboxactivated=count($boxidactivatedforuser);
+        $nbboxactivated = count($boxidactivatedforuser);
 
         if ($nbboxactivated)
         {
         	// Load translation files required by the page
-            $langs->loadLangs(array("boxes","projects"));
+            $langs->loadLangs(array("boxes", "projects"));
 
-        	$emptybox=new ModeleBoxes($db);
+        	$emptybox = new ModeleBoxes($db);
 
-            $boxlista.="\n<!-- Box left container -->\n";
+            $boxlista .= "\n<!-- Box left container -->\n";
 
             // Define $box_max_lines
-            $box_max_lines=5;
-            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
+            $box_max_lines = 5;
+            if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
 
-            $ii=0;
+            $ii = 0;
             foreach ($boxactivated as $key => $box)
             {
-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^A/i',$box->box_order)) // column A
+            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
+            	if (preg_match('/^A/i', $box->box_order)) // column A
                 {
                     $ii++;
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                     // Show box
                     $box->loadBox($box_max_lines);
-                    $boxlista.= $box->outputBox();
+                    $boxlista .= $box->outputBox();
                 }
             }
 
             if ($conf->browser->layout != 'phone')
             {
-            	$emptybox->box_id='A';
-            	$emptybox->info_box_head=array();
-            	$emptybox->info_box_contents=array();
-            	$boxlista.= $emptybox->outputBox(array(),array());
+            	$emptybox->box_id = 'A';
+            	$emptybox->info_box_head = array();
+            	$emptybox->info_box_contents = array();
+            	$boxlista .= $emptybox->outputBox(array(), array());
             }
-            $boxlista.= "<!-- End box left container -->\n";
+            $boxlista .= "<!-- End box left container -->\n";
 
-            $boxlistb.= "\n<!-- Box right container -->\n";
+            $boxlistb .= "\n<!-- Box right container -->\n";
 
-            $ii=0;
+            $ii = 0;
             foreach ($boxactivated as $key => $box)
             {
-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^B/i',$box->box_order)) // colonne B
+            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
+            	if (preg_match('/^B/i', $box->box_order)) // colonne B
                 {
                     $ii++;
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                     // Show box
                     $box->loadBox($box_max_lines);
-                    $boxlistb.= $box->outputBox();
+                    $boxlistb .= $box->outputBox();
                 }
             }
 
             if ($conf->browser->layout != 'phone')
             {
-            	$emptybox->box_id='B';
-            	$emptybox->info_box_head=array();
-            	$emptybox->info_box_contents=array();
-            	$boxlistb.= $emptybox->outputBox(array(),array());
+            	$emptybox->box_id = 'B';
+            	$emptybox->info_box_head = array();
+            	$emptybox->info_box_contents = array();
+            	$boxlistb .= $emptybox->outputBox(array(), array());
             }
 
-            $boxlistb.= "<!-- End box right container -->\n";
+            $boxlistb .= "<!-- End box right container -->\n";
         }
 
-        return array('selectboxlist'=>count($boxactivated)?$selectboxlist:'', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
+        return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
     }
 
 
@@ -1231,7 +1231,7 @@ 
      *  @param  string  $moreattrib         More attributes on HTML select tag
      * 	@return	void
      */
-    function select_dictionary($htmlname,$dictionarytable,$keyfield='code',$labelfield='label',$selected='',$useempty=0,$moreattrib='')
+    function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')
     {
         // phpcs:enable
         global $langs, $conf;
@@ -1239,8 +1239,8 @@ 
         $langs->load("admin");
 
         $sql = "SELECT rowid, ".$keyfield.", ".$labelfield;
-        $sql.= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
-        $sql.= " ORDER BY ".$labelfield;
+        $sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
+        $sql .= " ORDER BY ".$labelfield;
 
         dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
         $result = $this->db->query($sql);
@@ -1250,7 +1250,7 @@ 
             $i = 0;
             if ($num)
             {
-                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
                 if ($useempty == 1 || ($useempty == 2 && $num > 1))
                 {
                     print '<option value="-1">&nbsp;</option>';

Braces +145 added lines, -83 removed lines

@@ -73,7 +73,9 @@ 
         $sql = "SELECT rowid, label";
         $sql.= " FROM ".MAIN_DB_PREFIX."export_model";
         $sql.= " WHERE type = '".$type."'";
-		if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;
+		if (!empty($fk_user)) {
+		    $sql.=" AND fk_user=".$fk_user;
+		}
         $sql.= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
@@ -92,8 +94,7 @@ 
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     print '<option value="'.$obj->rowid.'">';
                 }
@@ -102,8 +103,7 @@ 
                 $i++;
             }
             print "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -143,8 +143,7 @@ 
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     print '<option value="'.$obj->rowid.'">';
                 }
@@ -153,8 +152,7 @@ 
                 $i++;
             }
             print "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -195,8 +193,7 @@ 
                     if ($selected && $selected == $obj->rowid)
                     {
                         print '<option value="'.$obj->rowid.'" selected>';
-                    }
-                    else
+                    } else
                     {
                         print '<option value="'.$obj->rowid.'">';
                         //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
@@ -209,8 +206,7 @@ 
             }
             print '</select>';
             return 0;
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
             return 1;
@@ -255,8 +251,7 @@ 
     				if (($selected && $selected == $obj->taux) || $num == 1)
     				{
     					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
-    				}
-    				else
+    				} else
     				{
     					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
     					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
@@ -268,8 +263,7 @@ 
     		}
     		$out.='</select>';
     		return $out;
-    	}
-    	else
+    	} else
     	{
     		dol_print_error($this->db);
     		return '';
@@ -294,15 +288,16 @@ 
     {
         // phpcs:enable
         $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>';
-        if ($showempty) $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';
+        if ($showempty) {
+            $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';
+        }
 
         for ($i = $start ; $i <= $end ; $i += $increment)
         {
             if ($selected != '' && (int) $selected == $i)
             {
                 $return.= '<option value="'.$i.'" selected>';
-            }
-            else
+            } else
             {
                 $return.= '<option value="'.$i.'">';
             }
@@ -355,14 +350,19 @@ 
 
         // Print a select with each of them
         $moreforfilter.='<select class="flat minwidth100'.($morecss?' '.$morecss:'').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $moreforfilter.='<option value="0">&nbsp;</option>';	// Should use -1 to say nothing
+        if ($showempty) {
+            $moreforfilter.='<option value="0">&nbsp;</option>';
+        }
+        // Should use -1 to say nothing
 
         if (is_array($tab_categs))
         {
             foreach ($tab_categs as $categ)
             {
                 $moreforfilter.='<option value="'.$categ['id'].'"';
-                if ($categ['id'] == $selected) $moreforfilter.=' selected';
+                if ($categ['id'] == $selected) {
+                    $moreforfilter.=' selected';
+                }
                 $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';
             }
         }
@@ -409,14 +409,20 @@ 
         }
         // Select each sales and print them in a select input
         $out.='<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $out.='<option value="0">&nbsp;</option>';
+        if ($showempty) {
+            $out.='<option value="0">&nbsp;</option>';
+        }
 
         // Get list of users allowed to be viewed
         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
         $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";
         $sql_usr.= " WHERE u.entity IN (0,".$conf->entity.")";
-        if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;
-        if (! empty($user->societe_id)) $sql_usr.=" AND u.fk_soc = ".$user->societe_id;
+        if (empty($user->rights->user->user->lire)) {
+            $sql_usr.=" AND u.rowid = ".$user->id;
+        }
+        if (! empty($user->societe_id)) {
+            $sql_usr.=" AND u.fk_soc = ".$user->societe_id;
+        }
         // Add existing sales representatives of thirdparty of external user
         if (empty($user->rights->user->user->lire) && $user->societe_id)
         {
@@ -437,7 +443,9 @@ 
 
                 $out.='<option value="'.$obj_usr->rowid.'"';
 
-                if ($obj_usr->rowid == $selected) $out.=' selected';
+                if ($obj_usr->rowid == $selected) {
+                    $out.=' selected';
+                }
 
                 $out.='>';
                 $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
@@ -465,8 +473,7 @@ 
                 $out.='</option>';
             }
             $this->db->free($resql_usr);
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }
@@ -502,15 +509,16 @@ 
         if ($tasksarray)
         {
         	print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty) print '<option value="0">&nbsp;</option>';
+            if ($useempty) {
+                print '<option value="0">&nbsp;</option>';
+            }
             $j=0;
             $level=0;
             $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
             print '</select>';
 
             print ajax_combobox($htmlname);
-        }
-        else
+        } else
         {
             print '<div class="warning">'.$langs->trans("NoProject").'</div>';
         }
@@ -544,20 +552,23 @@ 
 				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
 
                 // Break on a new project
-                if ($parent == 0)	// We are on a task at first level
+                if ($parent == 0) {
+                    // We are on a task at first level
                 {
                     if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
                     {
                         if ($i > 0) print '<option value="0" disabled>----------</option>';
+                }
                         print '<option value="'.$lines[$i]->fk_project.'_0"';
-                        if ($selectedproject == $lines[$i]->fk_project) print ' selected';
+                        if ($selectedproject == $lines[$i]->fk_project) {
+                            print ' selected';
+                        }
                         print '>';	// Project -> Task
                         print $langs->trans("Project").' '.$lines[$i]->projectref;
                         if (empty($lines[$i]->public))
                         {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                        }
-                        else
+                        } else
                         {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                         }
@@ -572,31 +583,41 @@ 
                 $newdisablechildoftaskid=$disablechildoftaskid;
 
                 // Print task
-                if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
+                if (isset($lines[$i]->id)) {
+                    // We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
                 {
                 	// Check if we must disable entry
                 	$disabled=0;
+                }
                 	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
                 	{
                			$disabled++;
-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too
+               			if ($lines[$i]->fk_parent == $disablechildoftaskid) {
+               			    $newdisablechildoftaskid=$lines[$i]->id;
+               			}
+               			// If task is child of a disabled parent, we will propagate id to disable next child too
                 	}
 
                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
-                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
-                    if ($disabled) print ' disabled';
+                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) {
+                        print ' selected';
+                    }
+                    if ($disabled) {
+                        print ' disabled';
+                    }
                     print '>';
                     print $langs->trans("Project").' '.$lines[$i]->projectref;
                     print ' '.$lines[$i]->projectlabel;
                     if (empty($lines[$i]->public))
                     {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                    }
-                    else
+                    } else
                     {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                     }
-                    if ($lines[$i]->id) print ' > ';
+                    if ($lines[$i]->id) {
+                        print ' > ';
+                    }
                     for ($k = 0 ; $k < $level ; $k++)
                     {
                         print "&nbsp;&nbsp;&nbsp;";
@@ -606,7 +627,9 @@ 
                 }
 
                 $level++;
-                if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+                if ($lines[$i]->id) {
+                    $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+                }
                 $level--;
             }
         }
@@ -625,12 +648,17 @@ 
     {
     	$textcolor='FFF';
     	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-    	if(colorIsLight($color)) $textcolor='000';
+    	if(colorIsLight($color)) {
+    	    $textcolor='000';
+    	}
 
     	$color = colorArrayToHex(colorStringToArray($color,array()),'');
 
-		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
-		else print $textifnotdefined;
+		if ($color) {
+		    print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
+		} else {
+		    print $textifnotdefined;
+		}
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -721,8 +749,7 @@ 
 	             </script>';
             }
             $out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';
-        }
-        else  // In most cases, this is not used. We used instead function with no specific list of colors
+        } else  // In most cases, this is not used. We used instead function with no specific list of colors
         {
             if (empty($conf->dol_use_jmobile))
             {
@@ -743,7 +770,9 @@ 
             foreach ($arrayofcolors as $val)
             {
                 $out.= '<option value="'.$val.'"';
-                if ($set_color == $val) $out.= ' selected';
+                if ($set_color == $val) {
+                    $out.= ' selected';
+                }
                 $out.= '>'.$val.'</option>';
             }
             $out.= '</select>';
@@ -827,8 +856,7 @@ 
             if ($selected == $key)
             {
                 $select_week .= '<option value="'.$key.'" selected>';
-            }
-            else
+            } else
             {
                 $select_week .= '<option value="'.$key.'">';
             }
@@ -857,8 +885,13 @@ 
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        if ($longlabel) $montharray = monthArray($langs, 0);	// Get array
-        else $montharray = monthArray($langs, 1);
+        if ($longlabel) {
+            $montharray = monthArray($langs, 0);
+        }
+        // Get array
+        else {
+            $montharray = monthArray($langs, 1);
+        }
 
         $select_month = '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';
         if ($useempty)
@@ -870,8 +903,7 @@ 
             if ($selected == $key)
             {
                 $select_month .= '<option value="'.$key.'" selected>';
-            }
-            else
+            } else
             {
                 $select_month .= '<option value="'.$key.'">';
             }
@@ -924,13 +956,17 @@ 
         $currentyear = date("Y")+$offset;
         $max_year = $currentyear+$max_year;
         $min_year = $currentyear-$min_year;
-        if(empty($selected) && empty($useempty)) $selected = $currentyear;
+        if(empty($selected) && empty($useempty)) {
+            $selected = $currentyear;
+        }
 
         $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
         if($useempty)
         {
         	$selected_html='';
-            if ($selected == '') $selected_html = ' selected';
+            if ($selected == '') {
+                $selected_html = ' selected';
+            }
             $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';
         }
         if (! $invert)
@@ -938,16 +974,19 @@ 
             for ($y = $max_year; $y >= $min_year; $y--)
             {
                 $selected_html='';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+                if ($selected > 0 && $y == $selected) {
+                    $selected_html = ' selected';
+                }
                 $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
             }
-        }
-        else
+        } else
         {
             for ($y = $min_year; $y <= $max_year; $y++)
             {
                 $selected_html='';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+                if ($selected > 0 && $y == $selected) {
+                    $selected_html = ' selected';
+                }
                 $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
             }
         }
@@ -984,8 +1023,7 @@ 
             $langs->load("companies");
             print ' &nbsp; <a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$socid.'&action=create&origin='.$origin.'&originid='.$originid.'>'.$langs->trans("AddAddress").'</a>';
             print '</form>';
-        }
-        else
+        } else
         {
             if ($selected)
             {
@@ -993,8 +1031,7 @@ 
                 $address=new Address($this->db);
                 $result=$address->fetch_address($selected);
                 print '<a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$address->socid.'&id='.$address->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$address->label.'</a>';
-            }
-            else
+            } else
             {
                 print "&nbsp;";
             }
@@ -1028,7 +1065,10 @@ 
         $boxidactivatedforuser=array();
         foreach($boxactivated as $box)
         {
-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user
+        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) {
+        	    $boxidactivatedforuser[$box->id]=$box->id;
+        	}
+        	// We keep only boxes to show for user
         }
 
         // Define selectboxlist
@@ -1039,7 +1079,10 @@ 
         	$langs->load("boxes");	// Load label of boxes
         	foreach($boxactivated as $box)
         	{
-        		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user
+        		if (! empty($boxidactivatedforuser[$box->id])) {
+        		    continue;
+        		}
+        		// Already visible for user
         		$label=$langs->transnoentitiesnoconv($box->boxlabel);
         		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
         		if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')
@@ -1050,7 +1093,9 @@ 
         	}
             foreach($boxidactivatedforuser as $boxid)
         	{
-       			if (empty($boxorder)) $boxorder.='A:';
+       			if (empty($boxorder)) {
+       			    $boxorder.='A:';
+       			}
   				$boxorder.=$boxid.',';
         	}
 
@@ -1064,7 +1109,9 @@ 
 			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';
 			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';
 			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
-            if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+            if (empty($conf->use_javascript_ajax)) {
+                $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+            }
             $selectboxlist.='</form>';
             if (! empty($conf->use_javascript_ajax))
             {
@@ -1115,7 +1162,9 @@ 
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;
 	                }
 	        	});';
-	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';
+	        	if (! count($arrayboxtoactivatelabel)) {
+	        	    $selectboxlist.='jQuery("#boxcombo").hide();';
+	        	}
 	        	$selectboxlist.='
 
 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({
@@ -1158,16 +1207,25 @@ 
 
             // Define $box_max_lines
             $box_max_lines=5;
-            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
+            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) {
+                $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
+            }
 
             $ii=0;
             foreach ($boxactivated as $key => $box)
             {
-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^A/i',$box->box_order)) // column A
+            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {
+            	    continue;
+            	}
+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {
+				    $box->box_order='A'.sprintf("%02d",($ii+1));
+				}
+				// When box_order was not yet set to Axx or Bxx and is still 0
+            	if (preg_match('/^A/i',$box->box_order)) {
+            	    // column A
                 {
                     $ii++;
+            	}
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                     // Show box
@@ -1190,11 +1248,18 @@ 
             $ii=0;
             foreach ($boxactivated as $key => $box)
             {
-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^B/i',$box->box_order)) // colonne B
+            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {
+            	    continue;
+            	}
+            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {
+            	    $box->box_order='B'.sprintf("%02d",($ii+1));
+            	}
+            	// When box_order was not yet set to Axx or Bxx and is still 0
+            	if (preg_match('/^B/i',$box->box_order)) {
+            	    // colonne B
                 {
                     $ii++;
+            	}
                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';
                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
                     // Show box
@@ -1262,8 +1327,7 @@ 
                     if ($selected == $obj->rowid || $selected == $obj->$keyfield)
                     {
                         print '<option value="'.$obj->$keyfield.'" selected>';
-                    }
-                    else
+                    } else
                     {
                         print '<option value="'.$obj->$keyfield.'">';
                     }
@@ -1272,13 +1336,11 @@ 
                     $i++;
                 }
                 print "</select>";
-            }
-            else
+            } else
 			{
                 print $langs->trans("DictionaryEmpty");
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }

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

Indentation +1356 added lines, -1356 removed lines

@@ -36,15 +36,15 @@ 
  */
 class FormMail extends Form
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	public $withform;				// 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button
+    public $withform;				// 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button
 
-	public $fromname;
-	public $frommail;
+    public $fromname;
+    public $frommail;
 
     /**
      * @var string user, company, robot
@@ -67,1391 +67,1391 @@ 
     public $toid;
 
     public $replytoname;
-	public $replytomail;
-	public $toname;
-	public $tomail;
-	public $trackid;
-
-	public $withsubstit;			// Show substitution array
-	public $withfrom;
-
-	/**
-	 * @var int
-	 * @deprecated Fill withto with array before calling method.
-	 * @see withto
-	 */
-	public $withtosocid;
-
-	/**
-	 * @var int|int[]
-	 */
-	public $withto;				// Show recipient emails
-
-	public $withtofree;			// Show free text for recipient emails
-	public $withtocc;
-	public $withtoccc;
-	public $withtopic;
-	public $withfile;				// 0=No attaches files, 1=Show attached files, 2=Can add new attached files
-	public $withmaindocfile;		// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
-	public $withbody;
-
-	public $withfromreadonly;
-	public $withreplytoreadonly;
-	public $withtoreadonly;
-	public $withtoccreadonly;
-	public $withtocccreadonly;
-	public $withtopicreadonly;
-	public $withfilereadonly;
-	public $withdeliveryreceipt;
-	public $withcancel;
-	public $withfckeditor;
-
-	public $substit=array();
-	public $substit_lines=array();
-	public $param=array();
-
-	public $withtouser=array();
-	public $withtoccuser=array();
-
-	public $lines_model;
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param	DoliDB	$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-
-		$this->withform=1;
-
-		$this->withfrom=1;
-		$this->withto=1;
-		$this->withtofree=1;
-		$this->withtocc=1;
-		$this->withtoccc=0;
-		$this->witherrorsto=0;
-		$this->withtopic=1;
-		$this->withfile=0;			// 1=Add section "Attached files". 2=Can add files.
-		$this->withmaindocfile=0;	// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
-		$this->withbody=1;
-
-		$this->withfromreadonly=1;
-		$this->withreplytoreadonly=1;
-		$this->withtoreadonly=0;
-		$this->withtoccreadonly=0;
-		$this->withtocccreadonly=0;
-		$this->witherrorstoreadonly=0;
-		$this->withtopicreadonly=0;
-		$this->withfilereadonly=0;
-		$this->withbodyreadonly=0;
-		$this->withdeliveryreceiptreadonly=0;
-		$this->withfckeditor=-1;	// -1 = Auto
-	}
+    public $replytomail;
+    public $toname;
+    public $tomail;
+    public $trackid;
+
+    public $withsubstit;			// Show substitution array
+    public $withfrom;
+
+    /**
+     * @var int
+     * @deprecated Fill withto with array before calling method.
+     * @see withto
+     */
+    public $withtosocid;
+
+    /**
+     * @var int|int[]
+     */
+    public $withto;				// Show recipient emails
+
+    public $withtofree;			// Show free text for recipient emails
+    public $withtocc;
+    public $withtoccc;
+    public $withtopic;
+    public $withfile;				// 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+    public $withmaindocfile;		// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
+    public $withbody;
+
+    public $withfromreadonly;
+    public $withreplytoreadonly;
+    public $withtoreadonly;
+    public $withtoccreadonly;
+    public $withtocccreadonly;
+    public $withtopicreadonly;
+    public $withfilereadonly;
+    public $withdeliveryreceipt;
+    public $withcancel;
+    public $withfckeditor;
+
+    public $substit=array();
+    public $substit_lines=array();
+    public $param=array();
+
+    public $withtouser=array();
+    public $withtoccuser=array();
+
+    public $lines_model;
+
+
+    /**
+     *	Constructor
+     *
+     *  @param	DoliDB	$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+
+        $this->withform=1;
+
+        $this->withfrom=1;
+        $this->withto=1;
+        $this->withtofree=1;
+        $this->withtocc=1;
+        $this->withtoccc=0;
+        $this->witherrorsto=0;
+        $this->withtopic=1;
+        $this->withfile=0;			// 1=Add section "Attached files". 2=Can add files.
+        $this->withmaindocfile=0;	// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
+        $this->withbody=1;
+
+        $this->withfromreadonly=1;
+        $this->withreplytoreadonly=1;
+        $this->withtoreadonly=0;
+        $this->withtoccreadonly=0;
+        $this->withtocccreadonly=0;
+        $this->witherrorstoreadonly=0;
+        $this->withtopicreadonly=0;
+        $this->withfilereadonly=0;
+        $this->withbodyreadonly=0;
+        $this->withdeliveryreceiptreadonly=0;
+        $this->withfckeditor=-1;	// -1 = Auto
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Clear list of attached files in send mail form (also stored in session)
-	 *
-	 * @return	void
-	 */
-	function clear_attached_files()
-	{
+    /**
+     * Clear list of attached files in send mail form (also stored in session)
+     *
+     * @return	void
+     */
+    function clear_attached_files()
+    {
         // phpcs:enable
-		global $conf,$user;
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        global $conf,$user;
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		// Set tmp user directory
-		$vardir=$conf->user->dir_output."/".$user->id;
-		$upload_dir = $vardir.'/temp/';                     // TODO Add $keytoavoidconflict in upload_dir path
-		if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);
+        // Set tmp user directory
+        $vardir=$conf->user->dir_output."/".$user->id;
+        $upload_dir = $vardir.'/temp/';                     // TODO Add $keytoavoidconflict in upload_dir path
+        if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);
 
-		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		unset($_SESSION["listofpaths".$keytoavoidconflict]);
-		unset($_SESSION["listofnames".$keytoavoidconflict]);
-		unset($_SESSION["listofmimes".$keytoavoidconflict]);
-	}
+        $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
+        unset($_SESSION["listofpaths".$keytoavoidconflict]);
+        unset($_SESSION["listofnames".$keytoavoidconflict]);
+        unset($_SESSION["listofmimes".$keytoavoidconflict]);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Add a file into the list of attached files (stored in SECTION array)
-	 *
-	 * @param 	string   $path   Full absolute path on filesystem of file, including file name
-	 * @param 	string   $file   Only filename (can be basename($path))
-	 * @param 	string   $type   Mime type (can be dol_mimetype($file))
-	 * @return	void
-	 */
-	function add_attached_files($path, $file='', $type='')
-	{
+    /**
+     * Add a file into the list of attached files (stored in SECTION array)
+     *
+     * @param 	string   $path   Full absolute path on filesystem of file, including file name
+     * @param 	string   $file   Only filename (can be basename($path))
+     * @param 	string   $type   Mime type (can be dol_mimetype($file))
+     * @return	void
+     */
+    function add_attached_files($path, $file='', $type='')
+    {
         // phpcs:enable
-		$listofpaths=array();
-		$listofnames=array();
-		$listofmimes=array();
-
-		if (empty($file)) $file=basename($path);
-		if (empty($type)) $type=dol_mimetype($file);
-
-		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
-		if (! in_array($file,$listofnames))
-		{
-			$listofpaths[]=$path;
-			$listofnames[]=$file;
-			$listofmimes[]=$type;
-			$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
-			$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
-			$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
-		}
-	}
+        $listofpaths=array();
+        $listofnames=array();
+        $listofmimes=array();
+
+        if (empty($file)) $file=basename($path);
+        if (empty($type)) $type=dol_mimetype($file);
+
+        $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
+        if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+        if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+        if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+        if (! in_array($file,$listofnames))
+        {
+            $listofpaths[]=$path;
+            $listofnames[]=$file;
+            $listofmimes[]=$type;
+            $_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
+            $_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
+            $_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Remove a file from the list of attached files (stored in SECTION array)
-	 *
-	 * @param  	string	$keytodelete     Key in file array (0, 1, 2, ...)
-	 * @return	void
-	 */
-	function remove_attached_files($keytodelete)
-	{
+    /**
+     * Remove a file from the list of attached files (stored in SECTION array)
+     *
+     * @param  	string	$keytodelete     Key in file array (0, 1, 2, ...)
+     * @return	void
+     */
+    function remove_attached_files($keytodelete)
+    {
         // phpcs:enable
-		$listofpaths=array();
-		$listofnames=array();
-		$listofmimes=array();
-
-		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
-		if ($keytodelete >= 0)
-		{
-			unset ($listofpaths[$keytodelete]);
-			unset ($listofnames[$keytodelete]);
-			unset ($listofmimes[$keytodelete]);
-			$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
-			$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
-			$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
-			//var_dump($_SESSION['listofpaths']);
-		}
-	}
+        $listofpaths=array();
+        $listofnames=array();
+        $listofmimes=array();
+
+        $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
+        if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+        if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+        if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+        if ($keytodelete >= 0)
+        {
+            unset ($listofpaths[$keytodelete]);
+            unset ($listofnames[$keytodelete]);
+            unset ($listofmimes[$keytodelete]);
+            $_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
+            $_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
+            $_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
+            //var_dump($_SESSION['listofpaths']);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return list of attached files (stored in SECTION array)
-	 *
-	 * @return	array       array('paths'=> ,'names'=>, 'mimes'=> )
-	 */
-	function get_attached_files()
-	{
+    /**
+     * Return list of attached files (stored in SECTION array)
+     *
+     * @return	array       array('paths'=> ,'names'=>, 'mimes'=> )
+     */
+    function get_attached_files()
+    {
         // phpcs:enable
-		$listofpaths=array();
-		$listofnames=array();
-		$listofmimes=array();
+        $listofpaths=array();
+        $listofnames=array();
+        $listofmimes=array();
 
-		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
-		return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
-	}
+        $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
+        if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+        if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+        if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+        return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show the form to input an email
-	 *  this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
-	 *  this->withmaindocfile
-	 *
-	 *	@param	string	$addfileaction		Name of action when posting file attachments
-	 *	@param	string	$removefileaction	Name of action when removing file attachments
-	 *	@return	void
-	 */
-	function show_form($addfileaction='addfile',$removefileaction='removefile')
-	{
+    /**
+     *	Show the form to input an email
+     *  this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+     *  this->withmaindocfile
+     *
+     *	@param	string	$addfileaction		Name of action when posting file attachments
+     *	@param	string	$removefileaction	Name of action when removing file attachments
+     *	@return	void
+     */
+    function show_form($addfileaction='addfile',$removefileaction='removefile')
+    {
         // phpcs:enable
-		print $this->get_form($addfileaction,$removefileaction);
-	}
+        print $this->get_form($addfileaction,$removefileaction);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Get the form to input an email
-	 *  this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
-	 *  this->withfile
-	 *  this->param:	Contains more parameters like email templates info
-	 *
-	 *	@param	string	$addfileaction		Name of action when posting file attachments
-	 *	@param	string	$removefileaction	Name of action when removing file attachments
-	 *	@return string						Form to show
-	 */
-	function get_form($addfileaction='addfile', $removefileaction='removefile')
-	{
+    /**
+     *	Get the form to input an email
+     *  this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+     *  this->withfile
+     *  this->param:	Contains more parameters like email templates info
+     *
+     *	@param	string	$addfileaction		Name of action when posting file attachments
+     *	@param	string	$removefileaction	Name of action when removing file attachments
+     *	@return string						Form to show
+     */
+    function get_form($addfileaction='addfile', $removefileaction='removefile')
+    {
         // phpcs:enable
-		global $conf, $langs, $user, $hookmanager, $form;
+        global $conf, $langs, $user, $hookmanager, $form;
 
-		if (! is_object($form)) $form=new Form($this->db);
+        if (! is_object($form)) $form=new Form($this->db);
 
-		// Load translation files required by the page
+        // Load translation files required by the page
         $langs->loadLangs(array('other', 'mails'));
 
-		// Clear temp files. Must be done at beginning, before call of triggers
-		if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
-		{
-			$this->clear_attached_files();
-		}
-
-		// Call hook getFormMail
-		$hookmanager->initHooks(array('formmail'));
-
-		$parameters=array(
-			'addfileaction' => $addfileaction,
-			'removefileaction'=> $removefileaction,
-			'trackid'=> $this->trackid
-		);
-		$reshook=$hookmanager->executeHooks('getFormMail', $parameters, $this);
-
-		if (!empty($reshook))
-		{
-			return $hookmanager->resPrint;
-		}
-		else
-		{
-			$out='';
-
-			$disablebademails=1;
-
-			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];
-			if (! empty($newlang))
-			{
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-				$outputlangs->load('other');
-			}
-
-			// Get message template for $this->param["models"] into c_email_templates
-			$arraydefaultmessage = -1;
-			if ($this->param['models'] != 'none')
-			{
-				$model_id=0;
-				if (array_key_exists('models_id',$this->param))
-				{
-					$model_id=$this->param["models_id"];
-				}
-
-				$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);		// If $model_id is empty, preselect the first one
-			}
-
-			// Define list of attached files
-			$listofpaths=array();
-			$listofnames=array();
-			$listofmimes=array();
-			$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-
-			if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
-			{
-				if (! empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))
-				{
-					foreach($this->param['fileinit'] as $file)
-					{
-						$this->add_attached_files($file, basename($file), dol_mimetype($file));
-					}
-				}
-			}
-
-	   		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	   		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	   		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
-
-
-			$out.= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
-			if ($this->withform == 1)
-			{
-				$out.= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
-
-				$out.= '<a id="formmail" name="formmail"></a>';
-				$out.= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
-				$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-				$out.= '<input type="hidden" name="trackid" value="'.$this->trackid.'" />';
-			}
-			if (! empty($this->withfrom))
-			{
-				if (! empty($this->withfromreadonly))
-				{
-					$out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
-					$out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
-				}
-			}
-			foreach ($this->param as $key=>$value)
-			{
-				$out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
-			}
-
-			$modelmail_array=array();
-			if ($this->param['models'] != 'none')
-			{
-				$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
-				if ($result < 0)
-				{
-					setEventMessages($this->error, $this->errors, 'errors');
-				}
-				foreach($this->lines_model as $line)
-				{
-					$langs->trans("members");
-					if (preg_match('/\((.*)\)/', $line->label, $reg))
-					{
-						$modelmail_array[$line->id]=$langs->trans($reg[1]);		// langs->trans when label is __(xxx)__
-					}
-					else
-					{
-						$modelmail_array[$line->id]=$line->label;
-					}
-					if ($line->lang) $modelmail_array[$line->id].=' ('.$line->lang.')';
-					if ($line->private) $modelmail_array[$line->id].=' - '.$langs->trans("Private");
-					//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
-				}
-			}
-
-			// Zone to select email template
-			if (count($modelmail_array)>0)
-			{
-				// If list of template is filled
-				$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-				$out.= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
-				$out.= ' &nbsp; ';
-				$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
-				$out.= ' &nbsp; ';
-				$out.= '</div>';
-			}
-			elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
-					'propal_send','order_send','facture_send',
-					'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send',
-					'invoice_supplier_send','thirdparty','contract','user','all'
-		   		)))
-			{
-				// If list of template is empty
-				$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-				$out.= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>';    // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
-				if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
-				$out.= ' &nbsp; ';
-				$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
-				$out.= ' &nbsp; ';
-				$out.= '</div>';
-			}
-
-
-
-			$out.= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";
-
-			// Substitution array/string
-			$helpforsubstitution='';
-			if (is_array($this->substit) && count($this->substit)) $helpforsubstitution.=$langs->trans('AvailableVariables').' :<br>'."\n";
-			foreach($this->substit as $key => $val)
-			{
-				$helpforsubstitution.=$key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';
-			}
-			if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
-			{
-				$out.= '<tr><td colspan="2" align="right">';
-				//$out.='<div class="floatright">';
-				if (is_numeric($this->withsubstit)) $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');	// Old usage
-				else $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');															// New usage
-				$out.= "</td></tr>\n";
-				//$out.='</div>';
-			}
-
-			/*var_dump(! empty($this->withfromreadonly));
+        // Clear temp files. Must be done at beginning, before call of triggers
+        if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
+        {
+            $this->clear_attached_files();
+        }
+
+        // Call hook getFormMail
+        $hookmanager->initHooks(array('formmail'));
+
+        $parameters=array(
+            'addfileaction' => $addfileaction,
+            'removefileaction'=> $removefileaction,
+            'trackid'=> $this->trackid
+        );
+        $reshook=$hookmanager->executeHooks('getFormMail', $parameters, $this);
+
+        if (!empty($reshook))
+        {
+            return $hookmanager->resPrint;
+        }
+        else
+        {
+            $out='';
+
+            $disablebademails=1;
+
+            // Define output language
+            $outputlangs = $langs;
+            $newlang = '';
+            if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];
+            if (! empty($newlang))
+            {
+                $outputlangs = new Translate("", $conf);
+                $outputlangs->setDefaultLang($newlang);
+                $outputlangs->load('other');
+            }
+
+            // Get message template for $this->param["models"] into c_email_templates
+            $arraydefaultmessage = -1;
+            if ($this->param['models'] != 'none')
+            {
+                $model_id=0;
+                if (array_key_exists('models_id',$this->param))
+                {
+                    $model_id=$this->param["models_id"];
+                }
+
+                $arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);		// If $model_id is empty, preselect the first one
+            }
+
+            // Define list of attached files
+            $listofpaths=array();
+            $listofnames=array();
+            $listofmimes=array();
+            $keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
+
+            if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
+            {
+                if (! empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))
+                {
+                    foreach($this->param['fileinit'] as $file)
+                    {
+                        $this->add_attached_files($file, basename($file), dol_mimetype($file));
+                    }
+                }
+            }
+
+                if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+                if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+                if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+
+
+            $out.= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
+            if ($this->withform == 1)
+            {
+                $out.= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
+
+                $out.= '<a id="formmail" name="formmail"></a>';
+                $out.= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
+                $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+                $out.= '<input type="hidden" name="trackid" value="'.$this->trackid.'" />';
+            }
+            if (! empty($this->withfrom))
+            {
+                if (! empty($this->withfromreadonly))
+                {
+                    $out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
+                    $out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
+                }
+            }
+            foreach ($this->param as $key=>$value)
+            {
+                $out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+            }
+
+            $modelmail_array=array();
+            if ($this->param['models'] != 'none')
+            {
+                $result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
+                if ($result < 0)
+                {
+                    setEventMessages($this->error, $this->errors, 'errors');
+                }
+                foreach($this->lines_model as $line)
+                {
+                    $langs->trans("members");
+                    if (preg_match('/\((.*)\)/', $line->label, $reg))
+                    {
+                        $modelmail_array[$line->id]=$langs->trans($reg[1]);		// langs->trans when label is __(xxx)__
+                    }
+                    else
+                    {
+                        $modelmail_array[$line->id]=$line->label;
+                    }
+                    if ($line->lang) $modelmail_array[$line->id].=' ('.$line->lang.')';
+                    if ($line->private) $modelmail_array[$line->id].=' - '.$langs->trans("Private");
+                    //if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
+                }
+            }
+
+            // Zone to select email template
+            if (count($modelmail_array)>0)
+            {
+                // If list of template is filled
+                $out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
+                $out.= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+                if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+                $out.= ' &nbsp; ';
+                $out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
+                $out.= ' &nbsp; ';
+                $out.= '</div>';
+            }
+            elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
+                    'propal_send','order_send','facture_send',
+                    'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send',
+                    'invoice_supplier_send','thirdparty','contract','user','all'
+                    )))
+            {
+                // If list of template is empty
+                $out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
+                $out.= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>';    // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
+                if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+                $out.= ' &nbsp; ';
+                $out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
+                $out.= ' &nbsp; ';
+                $out.= '</div>';
+            }
+
+
+
+            $out.= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";
+
+            // Substitution array/string
+            $helpforsubstitution='';
+            if (is_array($this->substit) && count($this->substit)) $helpforsubstitution.=$langs->trans('AvailableVariables').' :<br>'."\n";
+            foreach($this->substit as $key => $val)
+            {
+                $helpforsubstitution.=$key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';
+            }
+            if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+            {
+                $out.= '<tr><td colspan="2" align="right">';
+                //$out.='<div class="floatright">';
+                if (is_numeric($this->withsubstit)) $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');	// Old usage
+                else $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');															// New usage
+                $out.= "</td></tr>\n";
+                //$out.='</div>';
+            }
+
+            /*var_dump(! empty($this->withfromreadonly));
 			var_dump($this->withfrom);
 			var_dump($this->fromtype);
 			var_dump($this->fromname);*/
 
-			// From
-			if (! empty($this->withfrom))
-			{
-				if (! empty($this->withfromreadonly))
-				{
-					$out.= '<tr><td class="fieldrequired minwidth200">'.$langs->trans("MailFrom").'</td><td>';
-
-					// $this->fromtype is the default value to use to select sender
-					if (! ($this->fromtype === 'user' && $this->fromid > 0)
-						&& ! ($this->fromtype === 'company')
-						&& ! ($this->fromtype === 'robot')
-						&& ! preg_match('/user_aliases/', $this->fromtype)
-						&& ! preg_match('/global_aliases/', $this->fromtype)
-						&& ! preg_match('/senderprofile/', $this->fromtype)
-						)
-					{
-						// Use this->fromname and this->frommail or error if not defined
-						$out.= $this->fromname;
-						if ($this->frommail)
-						{
-							$out.= ' &lt;'.$this->frommail.'&gt;';
-						}
-						else
-						{
-							if ($this->fromtype)
-							{
-								$langs->load('errors');
-								$out.= '<span class="warning"> &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt; </span>';
-							}
-						}
-					} else {
-						$liste = array();
-
-						// Add user email
-						if (empty($user->email))
-						{
-							$langs->load('errors');
-							$liste['user'] = $user->getFullName($langs) . ' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
-						}
-						else
-						{
-							$liste['user'] = $user->getFullName($langs) .' &lt;'.$user->email.'&gt;';
-						}
-
-						// Add also company main email
-						$liste['company'] = $conf->global->MAIN_INFO_SOCIETE_NOM .' &lt;'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'&gt;';
-
-						// Add also email aliases if there is some
-						$listaliases=array('user_aliases'=>$user->email_aliases, 'global_aliases'=>$conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
-
-						// Also add robot email
-						if (! empty($this->fromalsorobot))
-						{
-							if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && $conf->global->MAIN_MAIL_EMAIL_FROM != $conf->global->MAIN_INFO_SOCIETE_MAIL)
-							{
-								$liste['robot'] = $conf->global->MAIN_MAIL_EMAIL_FROM;
-								if ($this->frommail)
-								{
-									$liste['robot'] .= ' &lt;'.$conf->global->MAIN_MAIL_EMAIL_FROM.'&gt;';
-								}
-							}
-						}
-
-						// Add also email aliases from the c_email_senderprofile table
-						$sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE active = 1 ORDER BY position';
-						$resql = $this->db->query($sql);
-						if ($resql)
-						{
-							$num = $this->db->num_rows($resql);
-							$i=0;
-							while($i < $num)
-							{
-								$obj = $this->db->fetch_object($resql);
-								if ($obj)
-								{
-									$listaliases['senderprofile_'.$obj->rowid] = $obj->label.' <'.$obj->email.'>';
-								}
-								$i++;
-							}
-						}
-						else dol_print_error($this->db);
-
-						foreach($listaliases as $typealias => $listalias)
-						{
-							$posalias=0;
-							$listaliasarray=explode(',', $listalias);
-							foreach ($listaliasarray as $listaliasval)
-							{
-								$posalias++;
-								$listaliasval=trim($listaliasval);
-								if ($listaliasval)
-								{
-									$listaliasval=preg_replace('/</', '&lt;', $listaliasval);
-									$listaliasval=preg_replace('/>/', '&gt;', $listaliasval);
-									if (! preg_match('/&lt;/', $listaliasval)) $listaliasval='&lt;'.$listaliasval.'&gt;';
-									$liste[$typealias.'_'.$posalias]=$listaliasval;
-								}
-							}
-						}
-
-						// Set the default "From"
-						$defaultfrom='';
-						$reshook=$hookmanager->executeHooks('getDefaultFromEmail', $parameters, $this);
-						if (empty($reshook))
-						{
-							$defaultfrom = $this->fromtype;
-						}
-						if (! empty($hookmanager->resArray['defaultfrom'])) $defaultfrom=$hookmanager->resArray['defaultfrom'];
-
-						// Using combo here make the '<email>' no more visible on list.
-						//$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
-						$out.= ' '.$form->selectarray('fromtype', $liste, $defaultfrom, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 0, '', $disablebademails);
-					}
-
-					$out.= "</td></tr>\n";
-				}
-				else
-				{
-					$out.= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
-					$out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
-					$out.= '&nbsp; &nbsp; ';
-					$out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" class="maxwidth200onsmartphone" value="'.$this->frommail.'" />&gt;';
-					$out.= "</td></tr>\n";
-				}
-			}
-
-			// To
-			if (! empty($this->withto) || is_array($this->withto))
-			{
-				$out.= '<tr><td class="fieldrequired">';
-				if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-				else $out.= $langs->trans("MailTo");
-				$out.= '</td><td>';
-				if ($this->withtoreadonly)
-				{
-					if (! empty($this->toname) && ! empty($this->tomail))
-					{
-						$out.= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
-						$out.= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
-						if ($this->totype == 'thirdparty')
-						{
-							$soc=new Societe($this->db);
-							$soc->fetch($this->toid);
-							$out.= $soc->getNomUrl(1);
-						}
-						else if ($this->totype == 'contact')
-						{
-							$contact=new Contact($this->db);
-							$contact->fetch($this->toid);
-							$out.= $contact->getNomUrl(1);
-						}
-						else
-						{
-							$out.= $this->toname;
-						}
-						$out.= ' &lt;'.$this->tomail.'&gt;';
-						if ($this->withtofree)
-						{
-							$out.= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
-						}
-					}
-					else
-					{
-						// Note withto may be a text like 'AllRecipientSelected'
-						$out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
-					}
-				}
-				else
-				{
-					if (! empty($this->withtofree))
-					{
-						$out.= '<input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
-					}
-					if (! empty($this->withto) && is_array($this->withto))
-					{
-						if (! empty($this->withtofree)) $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
-						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
-						$tmparray = $this->withto;
-						foreach($tmparray as $key => $val)
-						{
-							$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
-						}
-						$withtoselected=GETPOST("receiver",'none');     // Array of selected value
-						if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
-						{
-							$withtoselected = array_keys($tmparray);
-						}
-						$out.= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
-					}
-				}
-				$out.= "</td></tr>\n";
-			}
-
-			// To User
-			if (! empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
-			{
-				$out.= '<tr><td>';
-				$out.= $langs->trans("MailToUsers");
-				$out.= '</td><td>';
-
-				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
-				$tmparray = $this->withtouser;
-				foreach($tmparray as $key => $val)
-				{
-					$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
-				}
-				$withtoselected=GETPOST("receiveruser",'none');     // Array of selected value
-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
-				{
-					$withtoselected = array_keys($tmparray);
-				}
-				$out.= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
-				$out.= "</td></tr>\n";
-			}
-
-			// withoptiononeemailperrecipient
-			if (! empty($this->withoptiononeemailperrecipient))
-			{
-				$out.= '<tr><td class="minwidth200">';
-				$out.= $langs->trans("GroupEmails");
-				$out.= '</td><td>';
-				$out.=' <input type="checkbox" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0?' checked="checked"':'').'> ';
-				$out.= $langs->trans("OneEmailPerRecipient");
-				$out.='<span class="hideonsmartphone">';
-				$out.=' - ';
-				$out.= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
-				$out.='</span>';
-				$out.= '</td></tr>';
-			}
-
-			// CC
-			if (! empty($this->withtocc) || is_array($this->withtocc))
-			{
-				$out.= '<tr><td>';
-				$out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-				$out.= '</td><td>';
-				if ($this->withtoccreadonly)
-				{
-					$out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
-				}
-				else
-				{
-					$out.= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
-					if (! empty($this->withtocc) && is_array($this->withtocc))
-					{
-						$out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
-						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
-						$tmparray = $this->withtocc;
-						foreach($tmparray as $key => $val)
-						{
-							$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
-						}
-						$withtoccselected=GETPOST("receivercc");     // Array of selected value
-						$out.= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500',null, "");
-					}
-				}
-				$out.= "</td></tr>\n";
-			}
-
-			// To User cc
-			if (! empty($this->withtoccuser) && is_array($this->withtoccuser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
-			{
-				$out.= '<tr><td>';
-				$out.= $langs->trans("MailToCCUsers");
-				$out.= '</td><td>';
-
-				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
-				$tmparray = $this->withtoccuser;
-				foreach($tmparray as $key => $val)
-				{
-					$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
-				}
-				$withtoselected=GETPOST("receiverccuser",'none');     // Array of selected value
-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
-				{
-					$withtoselected = array_keys($tmparray);
-				}
-				$out.= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
-				$out.= "</td></tr>\n";
-			}
-
-			// CCC
-			if (! empty($this->withtoccc) || is_array($this->withtoccc)) {
-				$out .= $this->getHtmlForWithCcc();
-			}
-
-			// Replyto
-			if (! empty($this->withreplyto))
-			{
-				if ($this->withreplytoreadonly)
-				{
-					$out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
-					$out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
-					$out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
-					$out.= "</td></tr>\n";
-				}
-			}
-
-			// Errorsto
-			if (! empty($this->witherrorsto)) {
-				$out .= $this->getHtmlForWithErrorsTo();
-			}
-
-			// Ask delivery receipt
-			if (! empty($this->withdeliveryreceipt)) {
-				$out .= $this->getHtmlForDeliveryReceipt();
-			}
-
-			// Topic
-			if (! empty($this->withtopic)) {
-				$out .= $this->getHtmlForTopic();
-			}
-
-			// Attached files
-			if (! empty($this->withfile))
-			{
-				$out.= '<tr>';
-				$out.= '<td>'.$langs->trans("MailFile").'</td>';
-
-				$out.= '<td>';
-
-				if ($this->withmaindocfile)	// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
-				{
-					if (GETPOSTISSET('sendmail'))
-					{
-						$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
-					}
-					// If a template was selected, we use setup of template to define if join file checkbox is selected or not.
-					elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-					{
-						$this->withmaindocfile = ($arraydefaultmessage->joinfiles ? -1 : 1);
-					}
-				}
-
-				if (! empty($this->withmaindocfile))
-				{
-					if ($this->withmaindocfile == 1)
-					{
-						$out.='<input type="checkbox" name="addmaindocfile" value="1" />';
-					}
-					if ($this->withmaindocfile == -1)
-					{
-						$out.='<input type="checkbox" name="addmaindocfile" value="1" checked="checked" />';
-					}
-					$out.=' '.$langs->trans("JoinMainDoc").'.<br>';
-				}
-
-				if (is_numeric($this->withfile))
-				{
-					// TODO Trick to have param removedfile containing nb of file 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($listofnames[$key]).' '.$listofnames[$key];
-							if (! $this->withfilereadonly)
-							{
-								$out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
-								//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
-							}
-							$out.= '<br></div>';
-						}
-					}
-					else if (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
-					{
-						$out.= $langs->trans("NoAttachedFiles").'<br>';
-					}
-					if ($this->withfile == 2)	// Can add other files
-					{
-						if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out.= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
-						else $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-						$out.= ' ';
-						$out.= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
-					}
-				}
-				else
-				{
-					$out.=$this->withfile;
-				}
-
-				$out.= "</td></tr>\n";
-			}
-
-			// Message
-			if (! empty($this->withbody))
-			{
-				$defaultmessage=GETPOST('message','none');
-				if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1')
-				{
-					if ($arraydefaultmessage && $arraydefaultmessage->content) {
-						$defaultmessage = $arraydefaultmessage->content;
-					} elseif (! is_numeric($this->withbody)) {
-						$defaultmessage = $this->withbody;
-					}
-				}
-
-				// Complete substitution array with the url to make online payment
-				$paymenturl=''; $validpaymentmethod=array();
-				if (empty($this->substit['__REF__']))
-				{
-					$paymenturl='';
-				}
-				else
-				{
-					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
-					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-					$langs->loadLangs(array('paypal','other'));
-					$typeforonlinepayment='free';
-					if ($this->param["models"]=='order'   || $this->param["models"]=='order_send')   $typeforonlinepayment='order';		// TODO use detection on something else than template
-					if ($this->param["models"]=='invoice' || $this->param["models"]=='facture_send') $typeforonlinepayment='invoice';	// TODO use detection on something else than template
-					if ($this->param["models"]=='member') $typeforonlinepayment='member';												// TODO use detection on something else than template
-					$url=getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
-					$paymenturl=$url;
-
-					$validpaymentmethod = getValidOnlinePaymentMethods('');
-				}
-
-				if (count($validpaymentmethod) > 0 && $paymenturl)
-				{
-					$langs->load('other');
-					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']=str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
-					$this->substit['__ONLINE_PAYMENT_URL__']=$paymenturl;
-				}
-				else
-				{
-					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']='';
-					$this->substit['__ONLINE_PAYMENT_URL__']='';
-				}
-
-				//Add lines substitution key from each line
-				$lines = '';
-				$defaultlines = $arraydefaultmessage->content_lines;
-				if (isset($defaultlines))
-				{
-					foreach ($this->substit_lines as $substit_line)
-					{
-						$lines .= make_substitutions($defaultlines,$substit_line)."\n";
-					}
-				}
-				$this->substit['__LINES__']=$lines;
-
-				$defaultmessage=str_replace('\n',"\n",$defaultmessage);
-
-				// Deal with format differences between message and signature (text / HTML)
-				if (dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
-					$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
-				} else if(!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
-					$defaultmessage = dol_nl2br($defaultmessage);
-				}
-
-				if (isset($_POST["message"]) && ! $_POST['modelselected']) $defaultmessage=$_POST["message"];
-				else
-				{
-					$defaultmessage=make_substitutions($defaultmessage,$this->substit);
-					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
-					$defaultmessage=preg_replace("/^(<br>)+/","",$defaultmessage);
-					$defaultmessage=preg_replace("/^\n+/","",$defaultmessage);
-				}
-
-				$out.= '<tr>';
-				$out.= '<td valign="top">';
-				$out.=$form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
-				$out.='</td>';
-				$out.= '<td>';
-				if ($this->withbodyreadonly)
-				{
-					$out.= nl2br($defaultmessage);
-					$out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
-				}
-				else
-				{
-					if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
-
-					// Editor wysiwyg
-					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					if ($this->withfckeditor == -1)
-					{
-						if (! empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor=1;
-						else $this->withfckeditor=0;
-					}
-
-					$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,'95%');
-					$out.= $doleditor->Create(1);
-				}
-				$out.= "</td></tr>\n";
-			}
-
-			$out.= '</table>'."\n";
-
-			if ($this->withform == 1 || $this->withform == -1)
-			{
-				$out.= '<br><div class="center">';
-				$out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
-				// Add a javascript test to avoid to forget to submit file before sending email
-				if ($this->withfile == 2 && $conf->use_javascript_ajax)
-				{
-					$out.= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
-				}
-				$out.= ' />';
-				if ($this->withcancel)
-				{
-					$out.= ' &nbsp; &nbsp; ';
-					$out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
-				}
-				$out.= '</div>'."\n";
-			}
-
-			if ($this->withform == 1) $out.= '</form>'."\n";
-
-			// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
-			if (! empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY))
-			{
-				$out.= '<script type="text/javascript" language="javascript">';
-				$out.= 'jQuery(document).ready(function () {';
-				$out.= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
+            // From
+            if (! empty($this->withfrom))
+            {
+                if (! empty($this->withfromreadonly))
+                {
+                    $out.= '<tr><td class="fieldrequired minwidth200">'.$langs->trans("MailFrom").'</td><td>';
+
+                    // $this->fromtype is the default value to use to select sender
+                    if (! ($this->fromtype === 'user' && $this->fromid > 0)
+                        && ! ($this->fromtype === 'company')
+                        && ! ($this->fromtype === 'robot')
+                        && ! preg_match('/user_aliases/', $this->fromtype)
+                        && ! preg_match('/global_aliases/', $this->fromtype)
+                        && ! preg_match('/senderprofile/', $this->fromtype)
+                        )
+                    {
+                        // Use this->fromname and this->frommail or error if not defined
+                        $out.= $this->fromname;
+                        if ($this->frommail)
+                        {
+                            $out.= ' &lt;'.$this->frommail.'&gt;';
+                        }
+                        else
+                        {
+                            if ($this->fromtype)
+                            {
+                                $langs->load('errors');
+                                $out.= '<span class="warning"> &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt; </span>';
+                            }
+                        }
+                    } else {
+                        $liste = array();
+
+                        // Add user email
+                        if (empty($user->email))
+                        {
+                            $langs->load('errors');
+                            $liste['user'] = $user->getFullName($langs) . ' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
+                        }
+                        else
+                        {
+                            $liste['user'] = $user->getFullName($langs) .' &lt;'.$user->email.'&gt;';
+                        }
+
+                        // Add also company main email
+                        $liste['company'] = $conf->global->MAIN_INFO_SOCIETE_NOM .' &lt;'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'&gt;';
+
+                        // Add also email aliases if there is some
+                        $listaliases=array('user_aliases'=>$user->email_aliases, 'global_aliases'=>$conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+
+                        // Also add robot email
+                        if (! empty($this->fromalsorobot))
+                        {
+                            if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && $conf->global->MAIN_MAIL_EMAIL_FROM != $conf->global->MAIN_INFO_SOCIETE_MAIL)
+                            {
+                                $liste['robot'] = $conf->global->MAIN_MAIL_EMAIL_FROM;
+                                if ($this->frommail)
+                                {
+                                    $liste['robot'] .= ' &lt;'.$conf->global->MAIN_MAIL_EMAIL_FROM.'&gt;';
+                                }
+                            }
+                        }
+
+                        // Add also email aliases from the c_email_senderprofile table
+                        $sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE active = 1 ORDER BY position';
+                        $resql = $this->db->query($sql);
+                        if ($resql)
+                        {
+                            $num = $this->db->num_rows($resql);
+                            $i=0;
+                            while($i < $num)
+                            {
+                                $obj = $this->db->fetch_object($resql);
+                                if ($obj)
+                                {
+                                    $listaliases['senderprofile_'.$obj->rowid] = $obj->label.' <'.$obj->email.'>';
+                                }
+                                $i++;
+                            }
+                        }
+                        else dol_print_error($this->db);
+
+                        foreach($listaliases as $typealias => $listalias)
+                        {
+                            $posalias=0;
+                            $listaliasarray=explode(',', $listalias);
+                            foreach ($listaliasarray as $listaliasval)
+                            {
+                                $posalias++;
+                                $listaliasval=trim($listaliasval);
+                                if ($listaliasval)
+                                {
+                                    $listaliasval=preg_replace('/</', '&lt;', $listaliasval);
+                                    $listaliasval=preg_replace('/>/', '&gt;', $listaliasval);
+                                    if (! preg_match('/&lt;/', $listaliasval)) $listaliasval='&lt;'.$listaliasval.'&gt;';
+                                    $liste[$typealias.'_'.$posalias]=$listaliasval;
+                                }
+                            }
+                        }
+
+                        // Set the default "From"
+                        $defaultfrom='';
+                        $reshook=$hookmanager->executeHooks('getDefaultFromEmail', $parameters, $this);
+                        if (empty($reshook))
+                        {
+                            $defaultfrom = $this->fromtype;
+                        }
+                        if (! empty($hookmanager->resArray['defaultfrom'])) $defaultfrom=$hookmanager->resArray['defaultfrom'];
+
+                        // Using combo here make the '<email>' no more visible on list.
+                        //$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
+                        $out.= ' '.$form->selectarray('fromtype', $liste, $defaultfrom, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 0, '', $disablebademails);
+                    }
+
+                    $out.= "</td></tr>\n";
+                }
+                else
+                {
+                    $out.= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
+                    $out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
+                    $out.= '&nbsp; &nbsp; ';
+                    $out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" class="maxwidth200onsmartphone" value="'.$this->frommail.'" />&gt;';
+                    $out.= "</td></tr>\n";
+                }
+            }
+
+            // To
+            if (! empty($this->withto) || is_array($this->withto))
+            {
+                $out.= '<tr><td class="fieldrequired">';
+                if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+                else $out.= $langs->trans("MailTo");
+                $out.= '</td><td>';
+                if ($this->withtoreadonly)
+                {
+                    if (! empty($this->toname) && ! empty($this->tomail))
+                    {
+                        $out.= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
+                        $out.= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
+                        if ($this->totype == 'thirdparty')
+                        {
+                            $soc=new Societe($this->db);
+                            $soc->fetch($this->toid);
+                            $out.= $soc->getNomUrl(1);
+                        }
+                        else if ($this->totype == 'contact')
+                        {
+                            $contact=new Contact($this->db);
+                            $contact->fetch($this->toid);
+                            $out.= $contact->getNomUrl(1);
+                        }
+                        else
+                        {
+                            $out.= $this->toname;
+                        }
+                        $out.= ' &lt;'.$this->tomail.'&gt;';
+                        if ($this->withtofree)
+                        {
+                            $out.= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+                        }
+                    }
+                    else
+                    {
+                        // Note withto may be a text like 'AllRecipientSelected'
+                        $out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+                    }
+                }
+                else
+                {
+                    if (! empty($this->withtofree))
+                    {
+                        $out.= '<input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+                    }
+                    if (! empty($this->withto) && is_array($this->withto))
+                    {
+                        if (! empty($this->withtofree)) $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+                        // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+                        $tmparray = $this->withto;
+                        foreach($tmparray as $key => $val)
+                        {
+                            $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+                        }
+                        $withtoselected=GETPOST("receiver",'none');     // Array of selected value
+                        if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+                        {
+                            $withtoselected = array_keys($tmparray);
+                        }
+                        $out.= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+                    }
+                }
+                $out.= "</td></tr>\n";
+            }
+
+            // To User
+            if (! empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
+            {
+                $out.= '<tr><td>';
+                $out.= $langs->trans("MailToUsers");
+                $out.= '</td><td>';
+
+                // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+                $tmparray = $this->withtouser;
+                foreach($tmparray as $key => $val)
+                {
+                    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+                }
+                $withtoselected=GETPOST("receiveruser",'none');     // Array of selected value
+                if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+                {
+                    $withtoselected = array_keys($tmparray);
+                }
+                $out.= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+                $out.= "</td></tr>\n";
+            }
+
+            // withoptiononeemailperrecipient
+            if (! empty($this->withoptiononeemailperrecipient))
+            {
+                $out.= '<tr><td class="minwidth200">';
+                $out.= $langs->trans("GroupEmails");
+                $out.= '</td><td>';
+                $out.=' <input type="checkbox" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0?' checked="checked"':'').'> ';
+                $out.= $langs->trans("OneEmailPerRecipient");
+                $out.='<span class="hideonsmartphone">';
+                $out.=' - ';
+                $out.= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
+                $out.='</span>';
+                $out.= '</td></tr>';
+            }
+
+            // CC
+            if (! empty($this->withtocc) || is_array($this->withtocc))
+            {
+                $out.= '<tr><td>';
+                $out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+                $out.= '</td><td>';
+                if ($this->withtoccreadonly)
+                {
+                    $out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
+                }
+                else
+                {
+                    $out.= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
+                    if (! empty($this->withtocc) && is_array($this->withtocc))
+                    {
+                        $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+                        // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+                        $tmparray = $this->withtocc;
+                        foreach($tmparray as $key => $val)
+                        {
+                            $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+                        }
+                        $withtoccselected=GETPOST("receivercc");     // Array of selected value
+                        $out.= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500',null, "");
+                    }
+                }
+                $out.= "</td></tr>\n";
+            }
+
+            // To User cc
+            if (! empty($this->withtoccuser) && is_array($this->withtoccuser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
+            {
+                $out.= '<tr><td>';
+                $out.= $langs->trans("MailToCCUsers");
+                $out.= '</td><td>';
+
+                // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+                $tmparray = $this->withtoccuser;
+                foreach($tmparray as $key => $val)
+                {
+                    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+                }
+                $withtoselected=GETPOST("receiverccuser",'none');     // Array of selected value
+                if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+                {
+                    $withtoselected = array_keys($tmparray);
+                }
+                $out.= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+                $out.= "</td></tr>\n";
+            }
+
+            // CCC
+            if (! empty($this->withtoccc) || is_array($this->withtoccc)) {
+                $out .= $this->getHtmlForWithCcc();
+            }
+
+            // Replyto
+            if (! empty($this->withreplyto))
+            {
+                if ($this->withreplytoreadonly)
+                {
+                    $out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
+                    $out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
+                    $out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
+                    $out.= "</td></tr>\n";
+                }
+            }
+
+            // Errorsto
+            if (! empty($this->witherrorsto)) {
+                $out .= $this->getHtmlForWithErrorsTo();
+            }
+
+            // Ask delivery receipt
+            if (! empty($this->withdeliveryreceipt)) {
+                $out .= $this->getHtmlForDeliveryReceipt();
+            }
+
+            // Topic
+            if (! empty($this->withtopic)) {
+                $out .= $this->getHtmlForTopic();
+            }
+
+            // Attached files
+            if (! empty($this->withfile))
+            {
+                $out.= '<tr>';
+                $out.= '<td>'.$langs->trans("MailFile").'</td>';
+
+                $out.= '<td>';
+
+                if ($this->withmaindocfile)	// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
+                {
+                    if (GETPOSTISSET('sendmail'))
+                    {
+                        $this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
+                    }
+                    // If a template was selected, we use setup of template to define if join file checkbox is selected or not.
+                    elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
+                    {
+                        $this->withmaindocfile = ($arraydefaultmessage->joinfiles ? -1 : 1);
+                    }
+                }
+
+                if (! empty($this->withmaindocfile))
+                {
+                    if ($this->withmaindocfile == 1)
+                    {
+                        $out.='<input type="checkbox" name="addmaindocfile" value="1" />';
+                    }
+                    if ($this->withmaindocfile == -1)
+                    {
+                        $out.='<input type="checkbox" name="addmaindocfile" value="1" checked="checked" />';
+                    }
+                    $out.=' '.$langs->trans("JoinMainDoc").'.<br>';
+                }
+
+                if (is_numeric($this->withfile))
+                {
+                    // TODO Trick to have param removedfile containing nb of file 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($listofnames[$key]).' '.$listofnames[$key];
+                            if (! $this->withfilereadonly)
+                            {
+                                $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+                                //$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
+                            }
+                            $out.= '<br></div>';
+                        }
+                    }
+                    else if (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
+                    {
+                        $out.= $langs->trans("NoAttachedFiles").'<br>';
+                    }
+                    if ($this->withfile == 2)	// Can add other files
+                    {
+                        if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out.= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
+                        else $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+                        $out.= ' ';
+                        $out.= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+                    }
+                }
+                else
+                {
+                    $out.=$this->withfile;
+                }
+
+                $out.= "</td></tr>\n";
+            }
+
+            // Message
+            if (! empty($this->withbody))
+            {
+                $defaultmessage=GETPOST('message','none');
+                if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1')
+                {
+                    if ($arraydefaultmessage && $arraydefaultmessage->content) {
+                        $defaultmessage = $arraydefaultmessage->content;
+                    } elseif (! is_numeric($this->withbody)) {
+                        $defaultmessage = $this->withbody;
+                    }
+                }
+
+                // Complete substitution array with the url to make online payment
+                $paymenturl=''; $validpaymentmethod=array();
+                if (empty($this->substit['__REF__']))
+                {
+                    $paymenturl='';
+                }
+                else
+                {
+                    // Set the online payment url link into __ONLINE_PAYMENT_URL__ key
+                    require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+                    $langs->loadLangs(array('paypal','other'));
+                    $typeforonlinepayment='free';
+                    if ($this->param["models"]=='order'   || $this->param["models"]=='order_send')   $typeforonlinepayment='order';		// TODO use detection on something else than template
+                    if ($this->param["models"]=='invoice' || $this->param["models"]=='facture_send') $typeforonlinepayment='invoice';	// TODO use detection on something else than template
+                    if ($this->param["models"]=='member') $typeforonlinepayment='member';												// TODO use detection on something else than template
+                    $url=getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
+                    $paymenturl=$url;
+
+                    $validpaymentmethod = getValidOnlinePaymentMethods('');
+                }
+
+                if (count($validpaymentmethod) > 0 && $paymenturl)
+                {
+                    $langs->load('other');
+                    $this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']=str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
+                    $this->substit['__ONLINE_PAYMENT_URL__']=$paymenturl;
+                }
+                else
+                {
+                    $this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']='';
+                    $this->substit['__ONLINE_PAYMENT_URL__']='';
+                }
+
+                //Add lines substitution key from each line
+                $lines = '';
+                $defaultlines = $arraydefaultmessage->content_lines;
+                if (isset($defaultlines))
+                {
+                    foreach ($this->substit_lines as $substit_line)
+                    {
+                        $lines .= make_substitutions($defaultlines,$substit_line)."\n";
+                    }
+                }
+                $this->substit['__LINES__']=$lines;
+
+                $defaultmessage=str_replace('\n',"\n",$defaultmessage);
+
+                // Deal with format differences between message and signature (text / HTML)
+                if (dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
+                    $this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
+                } else if(!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
+                    $defaultmessage = dol_nl2br($defaultmessage);
+                }
+
+                if (isset($_POST["message"]) && ! $_POST['modelselected']) $defaultmessage=$_POST["message"];
+                else
+                {
+                    $defaultmessage=make_substitutions($defaultmessage,$this->substit);
+                    // Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
+                    $defaultmessage=preg_replace("/^(<br>)+/","",$defaultmessage);
+                    $defaultmessage=preg_replace("/^\n+/","",$defaultmessage);
+                }
+
+                $out.= '<tr>';
+                $out.= '<td valign="top">';
+                $out.=$form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
+                $out.='</td>';
+                $out.= '<td>';
+                if ($this->withbodyreadonly)
+                {
+                    $out.= nl2br($defaultmessage);
+                    $out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
+                }
+                else
+                {
+                    if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
+
+                    // Editor wysiwyg
+                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                    if ($this->withfckeditor == -1)
+                    {
+                        if (! empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor=1;
+                        else $this->withfckeditor=0;
+                    }
+
+                    $doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,'95%');
+                    $out.= $doleditor->Create(1);
+                }
+                $out.= "</td></tr>\n";
+            }
+
+            $out.= '</table>'."\n";
+
+            if ($this->withform == 1 || $this->withform == -1)
+            {
+                $out.= '<br><div class="center">';
+                $out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
+                // Add a javascript test to avoid to forget to submit file before sending email
+                if ($this->withfile == 2 && $conf->use_javascript_ajax)
+                {
+                    $out.= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
+                }
+                $out.= ' />';
+                if ($this->withcancel)
+                {
+                    $out.= ' &nbsp; &nbsp; ';
+                    $out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
+                }
+                $out.= '</div>'."\n";
+            }
+
+            if ($this->withform == 1) $out.= '</form>'."\n";
+
+            // Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
+            if (! empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY))
+            {
+                $out.= '<script type="text/javascript" language="javascript">';
+                $out.= 'jQuery(document).ready(function () {';
+                $out.= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
 	    						var code = e.keyCode || e.which;
 	    						if (code == 13) {
 	        						e.preventDefault();
 	        						return false;
 	    						}
 							});';
-				$out.='		})';
-				$out.= '</script>';
-			}
-
-			$out.= "<!-- End form mail -->\n";
-
-			return $out;
-		}
-	}
-
-	/**
-	 * get html For WithCCC
-	 *
-	 * @return string html
-	 */
-	public function getHtmlForWithCcc()
-	{
-		global $conf, $langs, $form;
-		$out = '<tr><td>';
-		$out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-		$out.= '</td><td>';
-		if (! empty($this->withtocccreadonly)) {
-			$out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
-		} else {
-			$out.= '<input class="minwidth200" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
-			if (! empty($this->withtoccc) && is_array($this->withtoccc)) {
-				$out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
-				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
-				$tmparray = $this->withtoccc;
-				foreach ($tmparray as $key => $val) {
-					$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
-				}
-				$withtocccselected=GETPOST("receiverccc");     // Array of selected value
-				$out.= $form->multiselectarray("receiverccc", $tmparray, $withtocccselected, null, null, null,null, "90%");
-			}
-		}
-
-		$showinfobcc='';
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
-		if ($showinfobcc) $out.=' + '.$showinfobcc;
-		$out.= "</td></tr>\n";
-		return $out;
-	}
-
-	/**
-	 * get Html For WithErrorsTo
-	 *
-	 * @return string html
-	 */
-	public function getHtmlForWithErrorsTo()
-	{
-		global $conf, $langs;
-		//if (! $this->errorstomail) $this->errorstomail=$this->frommail;
-		$errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
-		if ($this->witherrorstoreadonly) {
-			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-			$out = '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-			$out.= $errorstomail;
-			$out.= "</td></tr>\n";
-		} else {
-			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-			$out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-			$out.= "</td></tr>\n";
-		}
-		return $out;
-	}
-
-	/**
-	 * get Html For Asking for Deliveriy Receipt
-	 *
-	 * @return string html
-	 */
-	public function getHtmlForDeliveryreceipt()
-	{
-		global $conf, $langs, $form;
-		$out = '<tr><td>'.$langs->trans("DeliveryReceipt").'</td><td>';
-
-		if (! empty($this->withdeliveryreceiptreadonly)) {
-			$out.= yn($this->withdeliveryreceipt);
-		} else {
-			$defaultvaluefordeliveryreceipt=0;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt=1;
-			$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:$defaultvaluefordeliveryreceipt), 1);
-		}
-		$out.= "</td></tr>\n";
-		return $out;
-	}
-
-	/**
-	 * get Html For Topic of message
-	 *
-	 * @return string html
-	 */
-	public function getHtmlForTopic()
-	{
-		global $conf, $langs, $form;
-		$defaulttopic = GETPOST('subject','none');
-		if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1') {
-			if ($arraydefaultmessage && $arraydefaultmessage->topic) {
-				$defaulttopic = $arraydefaultmessage->topic;
-			} elseif (! is_numeric($this->withtopic)) {
-				$defaulttopic = $this->withtopic;
-			}
-		}
-
-		$defaulttopic=make_substitutions($defaulttopic,$this->substit);
-
-		$out = '<tr>';
-		$out.= '<td class="fieldrequired">';
-		$out.= $form->textwithpicto($langs->trans('MailTopic'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfromtopic');
-		$out.= '</td>';
-		$out.= '<td>';
-		if ($this->withtopicreadonly) {
-			$out.= $defaulttopic;
-			$out.= '<input type="hidden" class="quatrevingtpercent" id="subject" name="subject" value="'.$defaulttopic.'" />';
-		} else {
-			$out.= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'. ((isset($_POST["subject"]) && ! $_POST['modelselected'])?$_POST["subject"]:($defaulttopic?$defaulttopic:'')) .'" />';
-		}
-		$out.= "</td></tr>\n";
-		return $out;
-	}
-
-	/**
-	 *      Return templates of email with type = $type_template or type = 'all'.
-	 *      This search into table c_email_templates. Used by the get_form function.
-	 *
-	 * 		@param	DoliDB		$db				Database handler
-	 * 		@param	string		$type_template	Get message for model/type=$type_template, type='all' also included.
-	 *      @param	string		$user			Get template public or limited to this user
-	 *      @param	Translate	$outputlangs	Output lang object
-	 *      @param	int			$id				Id of template to find, or -1 for first found with position 0, or 0 for first found whatever is position (priority order depends on lang provided or not) or -2 for exact match with label (no answer if not found)
-	 *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All
-	 *      @param	string		$label			Label of template
-	 *      @return ModelMail					One instance of ModelMail
-	 */
-	public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id=0, $active=1, $label='')
-	{
-		$ret = new ModelMail();
-
-		if ($id == -2 && empty($label))
-		{
-			$this->error = 'LabelIsMandatoryWhenIdIs-2';
-			return -1;
-		}
-
-		$sql = "SELECT rowid, label, topic, joinfiles, content, content_lines, lang";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
-		$sql.= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
-		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
-		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";				// Get all public or private owned
-		if ($active >= 0) $sql.=" AND active = ".$active;
-		if ($label) $sql.=" AND label ='".$db->escape($label)."'";
-		if (! ($id > 0) && is_object($outputlangs)) $sql.= " AND (lang = '".$db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
-		if ($id > 0)   $sql.= " AND rowid=".$id;
-		if ($id == -1) $sql.= " AND position=0";
-		if (is_object($outputlangs)) $sql.= $db->order("position,lang,label","ASC,DESC,ASC");		// We want line with lang set first, then with lang null or ''
-		else $sql.= $db->order("position,lang,label","ASC,ASC,ASC");		// If no language provided, we give priority to lang not defined
-		$sql.= $db->plimit(1);
-		//print $sql;
-
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			// Get first found
-			$obj = $db->fetch_object($resql);
-
-			if ($obj) {
-				$ret->id = $obj->rowid;
-				$ret->label = $obj->label;
-				$ret->lang = $obj->lang;
-				$ret->topic = $obj->topic;
-				$ret->content = $obj->content;
-				$ret->content_lines = $obj->content_lines;
-				$ret->joinfiles = $obj->joinfiles;
-			}
-			elseif($id == -2) {
-				// Not found with the provided label
-				return -1;
-			}
-			else {	// If there is no template at all
-				$defaultmessage='';
-				if ($type_template=='body')							{ $defaultmessage=$this->withbody; }		// Special case to use this->withbody as content
-				elseif ($type_template=='facture_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
-				elseif ($type_template=='facture_relance')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-				elseif ($type_template=='propal_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
-				elseif ($type_template=='supplier_proposal_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
-				elseif ($type_template=='order_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
-				elseif ($type_template=='order_supplier_send')		{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-				elseif ($type_template=='invoice_supplier_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-				elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
-				elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
-				elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
-				elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); }
-				elseif (!empty($type_template))				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
-
-				$ret->label = 'default';
-				$ret->lang = $outputlangs->defaultlang;
-				$ret->topic = '';
-				$ret->joinfiles = 1;
-				$ret->content = $defaultmessage;
-				$ret->content_lines ='';
-			}
-
-			$db->free($resql);
-			return $ret;
-		}
-		else
-		{
-			dol_print_error($db);
-			return -1;
-		}
-	}
-
-	/**
-	 *      Find if template exists
-	 *      Search into table c_email_templates
-	 *
-	 * 		@param	string		$type_template	Get message for key module
-	 *      @param	string		$user			Use template public or limited to this user
-	 *      @param	Translate	$outputlangs	Output lang object
-	 *      @return	int		<0 if KO,
-	 */
-	public function isEMailTemplate($type_template, $user, $outputlangs)
-	{
-		$ret=array();
-
-		$sql = "SELECT label, topic, content, lang";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
-		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
-		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
-		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
-		$sql.= $this->db->order("lang,label","ASC");
-		//print $sql;
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num= $this->db->num_rows($resql);
-			$this->db->free($resql);
-			return $num;
-		}
-		else
-		{
-			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 *      Find if template exists and are available for current user, then set them into $this->lines_module.
-	 *      Search into table c_email_templates
-	 *
-	 * 		@param	string		$type_template	Get message for key module
-	 *      @param	string		$user			Use template public or limited to this user
-	 *      @param	Translate	$outputlangs	Output lang object
-	 *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All
-	 *      @return	int		                    <0 if KO, nb of records found if OK
-	 */
-	public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active=1)
-	{
-		$ret=array();
-
-		$sql = "SELECT rowid, label, topic, content, content_lines, lang, fk_user, private, position";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
-		$sql.= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
-		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
-		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";		// See all public templates or templates I own.
-		if ($active >= 0) $sql.=" AND active = ".$active;
-		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";	// Return all languages
-		$sql.= $this->db->order("position,lang,label","ASC");
-		//print $sql;
-
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num=$this->db->num_rows($resql);
-			$this->lines_model=array();
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				$line = new ModelMail();
-				$line->id=$obj->rowid;
-				$line->label=$obj->label;
-				$line->lang=$obj->lang;
-				$line->fk_user=$obj->fk_user;
-				$line->private=$obj->private;
-				$line->position=$obj->position;
-				$line->topic=$obj->topic;
-				$line->content=$obj->content;
-				$line->content_lines=$obj->content_lines;
-
-				$this->lines_model[]=$line;
-			}
-			$this->db->free($resql);
-			return $num;
-		}
-		else
-		{
-			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-
-	/**
-	 * Set substit array from object. This is call when suggesting the email template into forms before sending email.
-	 *
-	 * @param	CommonObject	$object		   Object to use
-	 * @param   Translate  		$outputlangs   Object lang
-	 * @return	void
-	 * @see getCommonSubstitutionArray
-	 */
-	function setSubstitFromObject($object, $outputlangs)
-	{
-		global $conf, $user;
-
-		$parameters=array();
-		$tmparray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
-		complete_substitutions_array($tmparray, $outputlangs, null, $parameters);
-
-		$this->substit=$tmparray;
-
-		// Fill substit_lines with each object lines content
-		if (is_array($object->lines))
-		{
-			foreach ($object->lines as $line)
-			{
-				$substit_line = array(
-					'__PRODUCT_REF__' => isset($line->product_ref) ? $line->product_ref : '',
-					'__PRODUCT_LABEL__' => isset($line->product_label) ? $line->product_label : '',
-					'__PRODUCT_DESCRIPTION__' => isset($line->product_desc) ? $line->product_desc : '',
-					'__LABEL__' => isset($line->label) ? $line->label : '',
-					'__DESCRIPTION__' => isset($line->desc) ? $line->desc : '',
-					'__DATE_START_YMD__' => dol_print_date($line->date_start, 'day', 0, $outputlangs),
-					'__DATE_END_YMD__' => dol_print_date($line->date_end, 'day', 0, $outputlangs),
-					'__QUANTITY__' => $line->qty,
-					'__SUBPRICE__' => price($line->subprice),
-					'__AMOUNT__' => price($line->total_ttc),
-					'__AMOUNT_EXCL_TAX__' => price($line->total_ht)
-				);
-
-				// Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
-				if (!empty($line->fk_product))
-				{
-					if (! is_object($extrafields)) $extrafields = new ExtraFields($this->db);
-					$extrafields->fetch_name_optionals_label('product', true);
-					$product = new Product($this->db);
-					$product->fetch($line->fk_product, '', '', 1);
-					$product->fetch_optionals();
-					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-					{
-						foreach ($extrafields->attributes[$product->table_element]['label'] as $key => $label) {
-							$substit_line['__PRODUCT_EXTRAFIELD_' . strtoupper($key) . '__'] = $product->array_options['options_' . $key];
-						}
-					}
-				}
-				$this->substit_lines[] = $substit_line;
-			}
-		}
-	}
-
-	/**
-	 * Get list of substitution keys available for emails. This is used for tooltips help.
-	 * This include the complete_substitutions_array.
-	 *
-	 * @param	string	$mode		'formemail', 'formemailwithlines', 'formemailforlines', 'emailing', ...
-	 * @param	Object	$object		Object if applicable
-	 * @return	array               Array of substitution values for emails.
-	 */
-	static function getAvailableSubstitKey($mode='formemail', $object=null)
-	{
-		global $conf, $langs;
-
-		$tmparray=array();
-		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
-		{
-			$parameters=array('mode'=>$mode);
-			$tmparray=getCommonSubstitutionArray($langs, 2, null, $object);			// Note: On email templated edition, this is null because it is related to all type of objects
-			complete_substitutions_array($tmparray, $langs, null, $parameters);
-
-			if ($mode == 'formwithlines')
-			{
-				$tmparray['__LINES__'] = '__LINES__';      // Will be set by the get_form function
-			}
-			if ($mode == 'formforlines')
-			{
-				$tmparray['__QUANTITY__'] = '__QUANTITY__';   // Will be set by the get_form function
-			}
-		}
-
-		if ($mode == 'emailing')
-		{
-			$parameters=array('mode'=>$mode);
-			$tmparray=getCommonSubstitutionArray($langs, 2, array('object','objectamount'), $object);			// Note: On email templated edition, this is null because it is related to all type of objects
-			complete_substitutions_array($tmparray, $langs, null, $parameters);
-
-			// For mass emailing, we have different keys
-			$tmparray['__ID__'] = 'IdRecord';
-			$tmparray['__EMAIL__'] = 'EMailRecipient';
-			$tmparray['__LASTNAME__'] = 'Lastname';
-			$tmparray['__FIRSTNAME__'] = 'Firstname';
-			$tmparray['__MAILTOEMAIL__'] = 'TagMailtoEmail';
-			$tmparray['__OTHER1__'] = 'Other1';
-			$tmparray['__OTHER2__'] = 'Other2';
-			$tmparray['__OTHER3__'] = 'Other3';
-			$tmparray['__OTHER4__'] = 'Other4';
-			$tmparray['__OTHER5__'] = 'Other5';
-			$tmparray['__USER_SIGNATURE__'] = 'TagSignature';
-			$tmparray['__CHECK_READ__'] = 'TagCheckMail';
-			$tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe';
-				//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
-
-			$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))
-			{
-				$tmparray['__SECUREKEYPAYMENT__']=$conf->global->PAYMENT_SECURITY_TOKEN;
-				if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-				{
-					if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__']='SecureKeyPAYMENTUniquePerMember';
-					if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__']='SecureKeyPAYMENTUniquePerInvoice';
-					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__']='SecureKeyPAYMENTUniquePerOrder';
-					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__']='SecureKeyPAYMENTUniquePerContractLine';
-				}
-			}
-			else
-			{
-				/* No need to show into tooltip help, option is not enabled
+                $out.='		})';
+                $out.= '</script>';
+            }
+
+            $out.= "<!-- End form mail -->\n";
+
+            return $out;
+        }
+    }
+
+    /**
+     * get html For WithCCC
+     *
+     * @return string html
+     */
+    public function getHtmlForWithCcc()
+    {
+        global $conf, $langs, $form;
+        $out = '<tr><td>';
+        $out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+        $out.= '</td><td>';
+        if (! empty($this->withtocccreadonly)) {
+            $out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
+        } else {
+            $out.= '<input class="minwidth200" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
+            if (! empty($this->withtoccc) && is_array($this->withtoccc)) {
+                $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+                // multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
+                $tmparray = $this->withtoccc;
+                foreach ($tmparray as $key => $val) {
+                    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+                }
+                $withtocccselected=GETPOST("receiverccc");     // Array of selected value
+                $out.= $form->multiselectarray("receiverccc", $tmparray, $withtocccselected, null, null, null,null, "90%");
+            }
+        }
+
+        $showinfobcc='';
+        if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
+        if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
+        if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
+        if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
+        if ($showinfobcc) $out.=' + '.$showinfobcc;
+        $out.= "</td></tr>\n";
+        return $out;
+    }
+
+    /**
+     * get Html For WithErrorsTo
+     *
+     * @return string html
+     */
+    public function getHtmlForWithErrorsTo()
+    {
+        global $conf, $langs;
+        //if (! $this->errorstomail) $this->errorstomail=$this->frommail;
+        $errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
+        if ($this->witherrorstoreadonly) {
+            $out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+            $out = '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+            $out.= $errorstomail;
+            $out.= "</td></tr>\n";
+        } else {
+            $out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+            $out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+            $out.= "</td></tr>\n";
+        }
+        return $out;
+    }
+
+    /**
+     * get Html For Asking for Deliveriy Receipt
+     *
+     * @return string html
+     */
+    public function getHtmlForDeliveryreceipt()
+    {
+        global $conf, $langs, $form;
+        $out = '<tr><td>'.$langs->trans("DeliveryReceipt").'</td><td>';
+
+        if (! empty($this->withdeliveryreceiptreadonly)) {
+            $out.= yn($this->withdeliveryreceipt);
+        } else {
+            $defaultvaluefordeliveryreceipt=0;
+            if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt=1;
+            if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt=1;
+            if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt=1;
+            if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt=1;
+            $out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:$defaultvaluefordeliveryreceipt), 1);
+        }
+        $out.= "</td></tr>\n";
+        return $out;
+    }
+
+    /**
+     * get Html For Topic of message
+     *
+     * @return string html
+     */
+    public function getHtmlForTopic()
+    {
+        global $conf, $langs, $form;
+        $defaulttopic = GETPOST('subject','none');
+        if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1') {
+            if ($arraydefaultmessage && $arraydefaultmessage->topic) {
+                $defaulttopic = $arraydefaultmessage->topic;
+            } elseif (! is_numeric($this->withtopic)) {
+                $defaulttopic = $this->withtopic;
+            }
+        }
+
+        $defaulttopic=make_substitutions($defaulttopic,$this->substit);
+
+        $out = '<tr>';
+        $out.= '<td class="fieldrequired">';
+        $out.= $form->textwithpicto($langs->trans('MailTopic'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfromtopic');
+        $out.= '</td>';
+        $out.= '<td>';
+        if ($this->withtopicreadonly) {
+            $out.= $defaulttopic;
+            $out.= '<input type="hidden" class="quatrevingtpercent" id="subject" name="subject" value="'.$defaulttopic.'" />';
+        } else {
+            $out.= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'. ((isset($_POST["subject"]) && ! $_POST['modelselected'])?$_POST["subject"]:($defaulttopic?$defaulttopic:'')) .'" />';
+        }
+        $out.= "</td></tr>\n";
+        return $out;
+    }
+
+    /**
+     *      Return templates of email with type = $type_template or type = 'all'.
+     *      This search into table c_email_templates. Used by the get_form function.
+     *
+     * 		@param	DoliDB		$db				Database handler
+     * 		@param	string		$type_template	Get message for model/type=$type_template, type='all' also included.
+     *      @param	string		$user			Get template public or limited to this user
+     *      @param	Translate	$outputlangs	Output lang object
+     *      @param	int			$id				Id of template to find, or -1 for first found with position 0, or 0 for first found whatever is position (priority order depends on lang provided or not) or -2 for exact match with label (no answer if not found)
+     *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All
+     *      @param	string		$label			Label of template
+     *      @return ModelMail					One instance of ModelMail
+     */
+    public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id=0, $active=1, $label='')
+    {
+        $ret = new ModelMail();
+
+        if ($id == -2 && empty($label))
+        {
+            $this->error = 'LabelIsMandatoryWhenIdIs-2';
+            return -1;
+        }
+
+        $sql = "SELECT rowid, label, topic, joinfiles, content, content_lines, lang";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+        $sql.= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
+        $sql.= " AND entity IN (".getEntity('c_email_templates').")";
+        $sql.= " AND (private = 0 OR fk_user = ".$user->id.")";				// Get all public or private owned
+        if ($active >= 0) $sql.=" AND active = ".$active;
+        if ($label) $sql.=" AND label ='".$db->escape($label)."'";
+        if (! ($id > 0) && is_object($outputlangs)) $sql.= " AND (lang = '".$db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
+        if ($id > 0)   $sql.= " AND rowid=".$id;
+        if ($id == -1) $sql.= " AND position=0";
+        if (is_object($outputlangs)) $sql.= $db->order("position,lang,label","ASC,DESC,ASC");		// We want line with lang set first, then with lang null or ''
+        else $sql.= $db->order("position,lang,label","ASC,ASC,ASC");		// If no language provided, we give priority to lang not defined
+        $sql.= $db->plimit(1);
+        //print $sql;
+
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            // Get first found
+            $obj = $db->fetch_object($resql);
+
+            if ($obj) {
+                $ret->id = $obj->rowid;
+                $ret->label = $obj->label;
+                $ret->lang = $obj->lang;
+                $ret->topic = $obj->topic;
+                $ret->content = $obj->content;
+                $ret->content_lines = $obj->content_lines;
+                $ret->joinfiles = $obj->joinfiles;
+            }
+            elseif($id == -2) {
+                // Not found with the provided label
+                return -1;
+            }
+            else {	// If there is no template at all
+                $defaultmessage='';
+                if ($type_template=='body')							{ $defaultmessage=$this->withbody; }		// Special case to use this->withbody as content
+                elseif ($type_template=='facture_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
+                elseif ($type_template=='facture_relance')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+                elseif ($type_template=='propal_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
+                elseif ($type_template=='supplier_proposal_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
+                elseif ($type_template=='order_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
+                elseif ($type_template=='order_supplier_send')		{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+                elseif ($type_template=='invoice_supplier_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+                elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
+                elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
+                elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
+                elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); }
+                elseif (!empty($type_template))				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
+
+                $ret->label = 'default';
+                $ret->lang = $outputlangs->defaultlang;
+                $ret->topic = '';
+                $ret->joinfiles = 1;
+                $ret->content = $defaultmessage;
+                $ret->content_lines ='';
+            }
+
+            $db->free($resql);
+            return $ret;
+        }
+        else
+        {
+            dol_print_error($db);
+            return -1;
+        }
+    }
+
+    /**
+     *      Find if template exists
+     *      Search into table c_email_templates
+     *
+     * 		@param	string		$type_template	Get message for key module
+     *      @param	string		$user			Use template public or limited to this user
+     *      @param	Translate	$outputlangs	Output lang object
+     *      @return	int		<0 if KO,
+     */
+    public function isEMailTemplate($type_template, $user, $outputlangs)
+    {
+        $ret=array();
+
+        $sql = "SELECT label, topic, content, lang";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+        $sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
+        $sql.= " AND entity IN (".getEntity('c_email_templates').")";
+        $sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
+        if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+        $sql.= $this->db->order("lang,label","ASC");
+        //print $sql;
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num= $this->db->num_rows($resql);
+            $this->db->free($resql);
+            return $num;
+        }
+        else
+        {
+            $this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    /**
+     *      Find if template exists and are available for current user, then set them into $this->lines_module.
+     *      Search into table c_email_templates
+     *
+     * 		@param	string		$type_template	Get message for key module
+     *      @param	string		$user			Use template public or limited to this user
+     *      @param	Translate	$outputlangs	Output lang object
+     *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All
+     *      @return	int		                    <0 if KO, nb of records found if OK
+     */
+    public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active=1)
+    {
+        $ret=array();
+
+        $sql = "SELECT rowid, label, topic, content, content_lines, lang, fk_user, private, position";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+        $sql.= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
+        $sql.= " AND entity IN (".getEntity('c_email_templates').")";
+        $sql.= " AND (private = 0 OR fk_user = ".$user->id.")";		// See all public templates or templates I own.
+        if ($active >= 0) $sql.=" AND active = ".$active;
+        //if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";	// Return all languages
+        $sql.= $this->db->order("position,lang,label","ASC");
+        //print $sql;
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num=$this->db->num_rows($resql);
+            $this->lines_model=array();
+            while ($obj = $this->db->fetch_object($resql))
+            {
+                $line = new ModelMail();
+                $line->id=$obj->rowid;
+                $line->label=$obj->label;
+                $line->lang=$obj->lang;
+                $line->fk_user=$obj->fk_user;
+                $line->private=$obj->private;
+                $line->position=$obj->position;
+                $line->topic=$obj->topic;
+                $line->content=$obj->content;
+                $line->content_lines=$obj->content_lines;
+
+                $this->lines_model[]=$line;
+            }
+            $this->db->free($resql);
+            return $num;
+        }
+        else
+        {
+            $this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+
+    /**
+     * Set substit array from object. This is call when suggesting the email template into forms before sending email.
+     *
+     * @param	CommonObject	$object		   Object to use
+     * @param   Translate  		$outputlangs   Object lang
+     * @return	void
+     * @see getCommonSubstitutionArray
+     */
+    function setSubstitFromObject($object, $outputlangs)
+    {
+        global $conf, $user;
+
+        $parameters=array();
+        $tmparray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+        complete_substitutions_array($tmparray, $outputlangs, null, $parameters);
+
+        $this->substit=$tmparray;
+
+        // Fill substit_lines with each object lines content
+        if (is_array($object->lines))
+        {
+            foreach ($object->lines as $line)
+            {
+                $substit_line = array(
+                    '__PRODUCT_REF__' => isset($line->product_ref) ? $line->product_ref : '',
+                    '__PRODUCT_LABEL__' => isset($line->product_label) ? $line->product_label : '',
+                    '__PRODUCT_DESCRIPTION__' => isset($line->product_desc) ? $line->product_desc : '',
+                    '__LABEL__' => isset($line->label) ? $line->label : '',
+                    '__DESCRIPTION__' => isset($line->desc) ? $line->desc : '',
+                    '__DATE_START_YMD__' => dol_print_date($line->date_start, 'day', 0, $outputlangs),
+                    '__DATE_END_YMD__' => dol_print_date($line->date_end, 'day', 0, $outputlangs),
+                    '__QUANTITY__' => $line->qty,
+                    '__SUBPRICE__' => price($line->subprice),
+                    '__AMOUNT__' => price($line->total_ttc),
+                    '__AMOUNT_EXCL_TAX__' => price($line->total_ht)
+                );
+
+                // Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
+                if (!empty($line->fk_product))
+                {
+                    if (! is_object($extrafields)) $extrafields = new ExtraFields($this->db);
+                    $extrafields->fetch_name_optionals_label('product', true);
+                    $product = new Product($this->db);
+                    $product->fetch($line->fk_product, '', '', 1);
+                    $product->fetch_optionals();
+                    if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
+                    {
+                        foreach ($extrafields->attributes[$product->table_element]['label'] as $key => $label) {
+                            $substit_line['__PRODUCT_EXTRAFIELD_' . strtoupper($key) . '__'] = $product->array_options['options_' . $key];
+                        }
+                    }
+                }
+                $this->substit_lines[] = $substit_line;
+            }
+        }
+    }
+
+    /**
+     * Get list of substitution keys available for emails. This is used for tooltips help.
+     * This include the complete_substitutions_array.
+     *
+     * @param	string	$mode		'formemail', 'formemailwithlines', 'formemailforlines', 'emailing', ...
+     * @param	Object	$object		Object if applicable
+     * @return	array               Array of substitution values for emails.
+     */
+    static function getAvailableSubstitKey($mode='formemail', $object=null)
+    {
+        global $conf, $langs;
+
+        $tmparray=array();
+        if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
+        {
+            $parameters=array('mode'=>$mode);
+            $tmparray=getCommonSubstitutionArray($langs, 2, null, $object);			// Note: On email templated edition, this is null because it is related to all type of objects
+            complete_substitutions_array($tmparray, $langs, null, $parameters);
+
+            if ($mode == 'formwithlines')
+            {
+                $tmparray['__LINES__'] = '__LINES__';      // Will be set by the get_form function
+            }
+            if ($mode == 'formforlines')
+            {
+                $tmparray['__QUANTITY__'] = '__QUANTITY__';   // Will be set by the get_form function
+            }
+        }
+
+        if ($mode == 'emailing')
+        {
+            $parameters=array('mode'=>$mode);
+            $tmparray=getCommonSubstitutionArray($langs, 2, array('object','objectamount'), $object);			// Note: On email templated edition, this is null because it is related to all type of objects
+            complete_substitutions_array($tmparray, $langs, null, $parameters);
+
+            // For mass emailing, we have different keys
+            $tmparray['__ID__'] = 'IdRecord';
+            $tmparray['__EMAIL__'] = 'EMailRecipient';
+            $tmparray['__LASTNAME__'] = 'Lastname';
+            $tmparray['__FIRSTNAME__'] = 'Firstname';
+            $tmparray['__MAILTOEMAIL__'] = 'TagMailtoEmail';
+            $tmparray['__OTHER1__'] = 'Other1';
+            $tmparray['__OTHER2__'] = 'Other2';
+            $tmparray['__OTHER3__'] = 'Other3';
+            $tmparray['__OTHER4__'] = 'Other4';
+            $tmparray['__OTHER5__'] = 'Other5';
+            $tmparray['__USER_SIGNATURE__'] = 'TagSignature';
+            $tmparray['__CHECK_READ__'] = 'TagCheckMail';
+            $tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe';
+                //,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
+
+            $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))
+            {
+                $tmparray['__SECUREKEYPAYMENT__']=$conf->global->PAYMENT_SECURITY_TOKEN;
+                if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+                {
+                    if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__']='SecureKeyPAYMENTUniquePerMember';
+                    if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__']='SecureKeyPAYMENTUniquePerInvoice';
+                    if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__']='SecureKeyPAYMENTUniquePerOrder';
+                    if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__']='SecureKeyPAYMENTUniquePerContractLine';
+                }
+            }
+            else
+            {
+                /* No need to show into tooltip help, option is not enabled
 				$vars['__SECUREKEYPAYMENT__']='';
 				$vars['__SECUREKEYPAYMENT_MEMBER__']='';
 				$vars['__SECUREKEYPAYMENT_INVOICE__']='';
 				$vars['__SECUREKEYPAYMENT_ORDER__']='';
 				$vars['__SECUREKEYPAYMENT_CONTRACTLINE__']='';
 				*/
-			}
-		}
+            }
+        }
 
-		foreach($tmparray as $key => $val)
-		{
-			if (empty($val)) $tmparray[$key]=$key;
-		}
+        foreach($tmparray as $key => $val)
+        {
+            if (empty($val)) $tmparray[$key]=$key;
+        }
 
-		return $tmparray;
-	}
+        return $tmparray;
+    }
 }
 
 
@@ -1460,19 +1460,19 @@ 
  */
 class ModelMail
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var string Model mail label
      */
     public $label;
 
-	public $topic;
-	public $content;
-	public $content_lines;
-	public $lang;
-	public $joinfiles;
+    public $topic;
+    public $content;
+    public $content_lines;
+    public $lang;
+    public $joinfiles;
 }

Spacing +479 added lines, -479 removed lines

@@ -25,7 +25,7 @@ 
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -41,7 +41,7 @@ 
      */
     public $db;
 
-	public $withform;				// 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button
+	public $withform; // 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button
 
 	public $fromname;
 	public $frommail;
@@ -72,7 +72,7 @@ 
 	public $tomail;
 	public $trackid;
 
-	public $withsubstit;			// Show substitution array
+	public $withsubstit; // Show substitution array
 	public $withfrom;
 
 	/**
@@ -85,14 +85,14 @@ 
 	/**
 	 * @var int|int[]
 	 */
-	public $withto;				// Show recipient emails
+	public $withto; // Show recipient emails
 
-	public $withtofree;			// Show free text for recipient emails
+	public $withtofree; // Show free text for recipient emails
 	public $withtocc;
 	public $withtoccc;
 	public $withtopic;
-	public $withfile;				// 0=No attaches files, 1=Show attached files, 2=Can add new attached files
-	public $withmaindocfile;		// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
+	public $withfile; // 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+	public $withmaindocfile; // 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
 	public $withbody;
 
 	public $withfromreadonly;
@@ -106,12 +106,12 @@ 
 	public $withcancel;
 	public $withfckeditor;
 
-	public $substit=array();
-	public $substit_lines=array();
-	public $param=array();
+	public $substit = array();
+	public $substit_lines = array();
+	public $param = array();
 
-	public $withtouser=array();
-	public $withtoccuser=array();
+	public $withtouser = array();
+	public $withtoccuser = array();
 
 	public $lines_model;
 
@@ -125,30 +125,30 @@ 
 	{
 		$this->db = $db;
 
-		$this->withform=1;
-
-		$this->withfrom=1;
-		$this->withto=1;
-		$this->withtofree=1;
-		$this->withtocc=1;
-		$this->withtoccc=0;
-		$this->witherrorsto=0;
-		$this->withtopic=1;
-		$this->withfile=0;			// 1=Add section "Attached files". 2=Can add files.
-		$this->withmaindocfile=0;	// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
-		$this->withbody=1;
-
-		$this->withfromreadonly=1;
-		$this->withreplytoreadonly=1;
-		$this->withtoreadonly=0;
-		$this->withtoccreadonly=0;
-		$this->withtocccreadonly=0;
-		$this->witherrorstoreadonly=0;
-		$this->withtopicreadonly=0;
-		$this->withfilereadonly=0;
-		$this->withbodyreadonly=0;
-		$this->withdeliveryreceiptreadonly=0;
-		$this->withfckeditor=-1;	// -1 = Auto
+		$this->withform = 1;
+
+		$this->withfrom = 1;
+		$this->withto = 1;
+		$this->withtofree = 1;
+		$this->withtocc = 1;
+		$this->withtoccc = 0;
+		$this->witherrorsto = 0;
+		$this->withtopic = 1;
+		$this->withfile = 0; // 1=Add section "Attached files". 2=Can add files.
+		$this->withmaindocfile = 0; // 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
+		$this->withbody = 1;
+
+		$this->withfromreadonly = 1;
+		$this->withreplytoreadonly = 1;
+		$this->withtoreadonly = 0;
+		$this->withtoccreadonly = 0;
+		$this->withtocccreadonly = 0;
+		$this->witherrorstoreadonly = 0;
+		$this->withtopicreadonly = 0;
+		$this->withfilereadonly = 0;
+		$this->withbodyreadonly = 0;
+		$this->withdeliveryreceiptreadonly = 0;
+		$this->withfckeditor = -1; // -1 = Auto
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -160,15 +160,15 @@ 
 	function clear_attached_files()
 	{
         // phpcs:enable
-		global $conf,$user;
+		global $conf, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		// Set tmp user directory
-		$vardir=$conf->user->dir_output."/".$user->id;
-		$upload_dir = $vardir.'/temp/';                     // TODO Add $keytoavoidconflict in upload_dir path
+		$vardir = $conf->user->dir_output."/".$user->id;
+		$upload_dir = $vardir.'/temp/'; // TODO Add $keytoavoidconflict in upload_dir path
 		if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);
 
-		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
+		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 		unset($_SESSION["listofpaths".$keytoavoidconflict]);
 		unset($_SESSION["listofnames".$keytoavoidconflict]);
 		unset($_SESSION["listofmimes".$keytoavoidconflict]);
@@ -183,28 +183,28 @@ 
 	 * @param 	string   $type   Mime type (can be dol_mimetype($file))
 	 * @return	void
 	 */
-	function add_attached_files($path, $file='', $type='')
+	function add_attached_files($path, $file = '', $type = '')
 	{
         // phpcs:enable
-		$listofpaths=array();
-		$listofnames=array();
-		$listofmimes=array();
-
-		if (empty($file)) $file=basename($path);
-		if (empty($type)) $type=dol_mimetype($file);
-
-		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
-		if (! in_array($file,$listofnames))
+		$listofpaths = array();
+		$listofnames = array();
+		$listofmimes = array();
+
+		if (empty($file)) $file = basename($path);
+		if (empty($type)) $type = dol_mimetype($file);
+
+		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		if (!in_array($file, $listofnames))
 		{
-			$listofpaths[]=$path;
-			$listofnames[]=$file;
-			$listofmimes[]=$type;
-			$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
-			$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
-			$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
+			$listofpaths[] = $path;
+			$listofnames[] = $file;
+			$listofmimes[] = $type;
+			$_SESSION["listofpaths".$keytoavoidconflict] = join(';', $listofpaths);
+			$_SESSION["listofnames".$keytoavoidconflict] = join(';', $listofnames);
+			$_SESSION["listofmimes".$keytoavoidconflict] = join(';', $listofmimes);
 		}
 	}
 
@@ -218,22 +218,22 @@ 
 	function remove_attached_files($keytodelete)
 	{
         // phpcs:enable
-		$listofpaths=array();
-		$listofnames=array();
-		$listofmimes=array();
-
-		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		$listofpaths = array();
+		$listofnames = array();
+		$listofmimes = array();
+
+		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
 		if ($keytodelete >= 0)
 		{
 			unset ($listofpaths[$keytodelete]);
 			unset ($listofnames[$keytodelete]);
 			unset ($listofmimes[$keytodelete]);
-			$_SESSION["listofpaths".$keytoavoidconflict]=join(';',$listofpaths);
-			$_SESSION["listofnames".$keytoavoidconflict]=join(';',$listofnames);
-			$_SESSION["listofmimes".$keytoavoidconflict]=join(';',$listofmimes);
+			$_SESSION["listofpaths".$keytoavoidconflict] = join(';', $listofpaths);
+			$_SESSION["listofnames".$keytoavoidconflict] = join(';', $listofnames);
+			$_SESSION["listofmimes".$keytoavoidconflict] = join(';', $listofmimes);
 			//var_dump($_SESSION['listofpaths']);
 		}
 	}
@@ -247,14 +247,14 @@ 
 	function get_attached_files()
 	{
         // phpcs:enable
-		$listofpaths=array();
-		$listofnames=array();
-		$listofmimes=array();
-
-		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		$listofpaths = array();
+		$listofnames = array();
+		$listofmimes = array();
+
+		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
 		return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
 	}
 
@@ -268,10 +268,10 @@ 
 	 *	@param	string	$removefileaction	Name of action when removing file attachments
 	 *	@return	void
 	 */
-	function show_form($addfileaction='addfile',$removefileaction='removefile')
+	function show_form($addfileaction = 'addfile', $removefileaction = 'removefile')
 	{
         // phpcs:enable
-		print $this->get_form($addfileaction,$removefileaction);
+		print $this->get_form($addfileaction, $removefileaction);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -285,18 +285,18 @@ 
 	 *	@param	string	$removefileaction	Name of action when removing file attachments
 	 *	@return string						Form to show
 	 */
-	function get_form($addfileaction='addfile', $removefileaction='removefile')
+	function get_form($addfileaction = 'addfile', $removefileaction = 'removefile')
 	{
         // phpcs:enable
 		global $conf, $langs, $user, $hookmanager, $form;
 
-		if (! is_object($form)) $form=new Form($this->db);
+		if (!is_object($form)) $form = new Form($this->db);
 
 		// Load translation files required by the page
         $langs->loadLangs(array('other', 'mails'));
 
 		// Clear temp files. Must be done at beginning, before call of triggers
-		if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
+		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
 		{
 			$this->clear_attached_files();
 		}
@@ -304,12 +304,12 @@ 
 		// Call hook getFormMail
 		$hookmanager->initHooks(array('formmail'));
 
-		$parameters=array(
+		$parameters = array(
 			'addfileaction' => $addfileaction,
 			'removefileaction'=> $removefileaction,
 			'trackid'=> $this->trackid
 		);
-		$reshook=$hookmanager->executeHooks('getFormMail', $parameters, $this);
+		$reshook = $hookmanager->executeHooks('getFormMail', $parameters, $this);
 
 		if (!empty($reshook))
 		{
@@ -317,15 +317,15 @@ 
 		}
 		else
 		{
-			$out='';
+			$out = '';
 
-			$disablebademails=1;
+			$disablebademails = 1;
 
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];
-			if (! empty($newlang))
+			if (!empty($newlang))
 			{
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -336,61 +336,61 @@ 
 			$arraydefaultmessage = -1;
 			if ($this->param['models'] != 'none')
 			{
-				$model_id=0;
-				if (array_key_exists('models_id',$this->param))
+				$model_id = 0;
+				if (array_key_exists('models_id', $this->param))
 				{
-					$model_id=$this->param["models_id"];
+					$model_id = $this->param["models_id"];
 				}
 
-				$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);		// If $model_id is empty, preselect the first one
+				$arraydefaultmessage = $this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); // If $model_id is empty, preselect the first one
 			}
 
 			// Define list of attached files
-			$listofpaths=array();
-			$listofnames=array();
-			$listofmimes=array();
-			$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
+			$listofpaths = array();
+			$listofnames = array();
+			$listofmimes = array();
+			$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 
-			if (GETPOST('mode','alpha') == 'init' || (GETPOST('modelmailselected','alpha') && GETPOST('modelmailselected','alpha') != '-1'))
+			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
 			{
-				if (! empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))
+				if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))
 				{
-					foreach($this->param['fileinit'] as $file)
+					foreach ($this->param['fileinit'] as $file)
 					{
 						$this->add_attached_files($file, basename($file), dol_mimetype($file));
 					}
 				}
 			}
 
-	   		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	   		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	   		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	   		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+	   		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+	   		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
 
 
-			$out.= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
+			$out .= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
 			if ($this->withform == 1)
 			{
-				$out.= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
+				$out .= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
 
-				$out.= '<a id="formmail" name="formmail"></a>';
-				$out.= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
-				$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-				$out.= '<input type="hidden" name="trackid" value="'.$this->trackid.'" />';
+				$out .= '<a id="formmail" name="formmail"></a>';
+				$out .= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
+				$out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+				$out .= '<input type="hidden" name="trackid" value="'.$this->trackid.'" />';
 			}
-			if (! empty($this->withfrom))
+			if (!empty($this->withfrom))
 			{
-				if (! empty($this->withfromreadonly))
+				if (!empty($this->withfromreadonly))
 				{
-					$out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
-					$out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
+					$out .= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
+					$out .= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
 				}
 			}
 			foreach ($this->param as $key=>$value)
 			{
-				$out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+				$out .= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
 			}
 
-			$modelmail_array=array();
+			$modelmail_array = array();
 			if ($this->param['models'] != 'none')
 			{
 				$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
@@ -398,69 +398,69 @@ 
 				{
 					setEventMessages($this->error, $this->errors, 'errors');
 				}
-				foreach($this->lines_model as $line)
+				foreach ($this->lines_model as $line)
 				{
 					$langs->trans("members");
 					if (preg_match('/\((.*)\)/', $line->label, $reg))
 					{
-						$modelmail_array[$line->id]=$langs->trans($reg[1]);		// langs->trans when label is __(xxx)__
+						$modelmail_array[$line->id] = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
 					}
 					else
 					{
-						$modelmail_array[$line->id]=$line->label;
+						$modelmail_array[$line->id] = $line->label;
 					}
-					if ($line->lang) $modelmail_array[$line->id].=' ('.$line->lang.')';
-					if ($line->private) $modelmail_array[$line->id].=' - '.$langs->trans("Private");
+					if ($line->lang) $modelmail_array[$line->id] .= ' ('.$line->lang.')';
+					if ($line->private) $modelmail_array[$line->id] .= ' - '.$langs->trans("Private");
 					//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
 				}
 			}
 
 			// Zone to select email template
-			if (count($modelmail_array)>0)
+			if (count($modelmail_array) > 0)
 			{
 				// If list of template is filled
-				$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-				$out.= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
-				$out.= ' &nbsp; ';
-				$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
-				$out.= ' &nbsp; ';
-				$out.= '</div>';
+				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
+				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
+				$out .= ' &nbsp; ';
+				$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
+				$out .= ' &nbsp; ';
+				$out .= '</div>';
 			}
-			elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
-					'propal_send','order_send','facture_send',
-					'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send',
-					'invoice_supplier_send','thirdparty','contract','user','all'
+			elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
+					'propal_send', 'order_send', 'facture_send',
+					'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
+					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'all'
 		   		)))
 			{
 				// If list of template is empty
-				$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-				$out.= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>';    // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
-				if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
-				$out.= ' &nbsp; ';
-				$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
-				$out.= ' &nbsp; ';
-				$out.= '</div>';
+				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
+				$out .= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>'; // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
+				if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
+				$out .= ' &nbsp; ';
+				$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
+				$out .= ' &nbsp; ';
+				$out .= '</div>';
 			}
 
 
 
-			$out.= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";
+			$out .= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";
 
 			// Substitution array/string
-			$helpforsubstitution='';
-			if (is_array($this->substit) && count($this->substit)) $helpforsubstitution.=$langs->trans('AvailableVariables').' :<br>'."\n";
-			foreach($this->substit as $key => $val)
+			$helpforsubstitution = '';
+			if (is_array($this->substit) && count($this->substit)) $helpforsubstitution .= $langs->trans('AvailableVariables').' :<br>'."\n";
+			foreach ($this->substit as $key => $val)
 			{
-				$helpforsubstitution.=$key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';
+				$helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';
 			}
-			if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+			if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
 			{
-				$out.= '<tr><td colspan="2" align="right">';
+				$out .= '<tr><td colspan="2" align="right">';
 				//$out.='<div class="floatright">';
-				if (is_numeric($this->withsubstit)) $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');	// Old usage
-				else $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');															// New usage
-				$out.= "</td></tr>\n";
+				if (is_numeric($this->withsubstit)) $out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage
+				else $out .= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage
+				$out .= "</td></tr>\n";
 				//$out.='</div>';
 			}
 
@@ -470,33 +470,33 @@ 
 			var_dump($this->fromname);*/
 
 			// From
-			if (! empty($this->withfrom))
+			if (!empty($this->withfrom))
 			{
-				if (! empty($this->withfromreadonly))
+				if (!empty($this->withfromreadonly))
 				{
-					$out.= '<tr><td class="fieldrequired minwidth200">'.$langs->trans("MailFrom").'</td><td>';
+					$out .= '<tr><td class="fieldrequired minwidth200">'.$langs->trans("MailFrom").'</td><td>';
 
 					// $this->fromtype is the default value to use to select sender
-					if (! ($this->fromtype === 'user' && $this->fromid > 0)
-						&& ! ($this->fromtype === 'company')
-						&& ! ($this->fromtype === 'robot')
-						&& ! preg_match('/user_aliases/', $this->fromtype)
-						&& ! preg_match('/global_aliases/', $this->fromtype)
-						&& ! preg_match('/senderprofile/', $this->fromtype)
+					if (!($this->fromtype === 'user' && $this->fromid > 0)
+						&& !($this->fromtype === 'company')
+						&& !($this->fromtype === 'robot')
+						&& !preg_match('/user_aliases/', $this->fromtype)
+						&& !preg_match('/global_aliases/', $this->fromtype)
+						&& !preg_match('/senderprofile/', $this->fromtype)
 						)
 					{
 						// Use this->fromname and this->frommail or error if not defined
-						$out.= $this->fromname;
+						$out .= $this->fromname;
 						if ($this->frommail)
 						{
-							$out.= ' &lt;'.$this->frommail.'&gt;';
+							$out .= ' &lt;'.$this->frommail.'&gt;';
 						}
 						else
 						{
 							if ($this->fromtype)
 							{
 								$langs->load('errors');
-								$out.= '<span class="warning"> &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt; </span>';
+								$out .= '<span class="warning"> &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt; </span>';
 							}
 						}
 					} else {
@@ -506,23 +506,23 @@ 
 						if (empty($user->email))
 						{
 							$langs->load('errors');
-							$liste['user'] = $user->getFullName($langs) . ' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
+							$liste['user'] = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
 						}
 						else
 						{
-							$liste['user'] = $user->getFullName($langs) .' &lt;'.$user->email.'&gt;';
+							$liste['user'] = $user->getFullName($langs).' &lt;'.$user->email.'&gt;';
 						}
 
 						// Add also company main email
-						$liste['company'] = $conf->global->MAIN_INFO_SOCIETE_NOM .' &lt;'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'&gt;';
+						$liste['company'] = $conf->global->MAIN_INFO_SOCIETE_NOM.' &lt;'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'&gt;';
 
 						// Add also email aliases if there is some
-						$listaliases=array('user_aliases'=>$user->email_aliases, 'global_aliases'=>$conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+						$listaliases = array('user_aliases'=>$user->email_aliases, 'global_aliases'=>$conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 
 						// Also add robot email
-						if (! empty($this->fromalsorobot))
+						if (!empty($this->fromalsorobot))
 						{
-							if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM) && $conf->global->MAIN_MAIL_EMAIL_FROM != $conf->global->MAIN_INFO_SOCIETE_MAIL)
+							if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && $conf->global->MAIN_MAIL_EMAIL_FROM != $conf->global->MAIN_INFO_SOCIETE_MAIL)
 							{
 								$liste['robot'] = $conf->global->MAIN_MAIL_EMAIL_FROM;
 								if ($this->frommail)
@@ -533,13 +533,13 @@ 
 						}
 
 						// Add also email aliases from the c_email_senderprofile table
-						$sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE active = 1 ORDER BY position';
+						$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE active = 1 ORDER BY position';
 						$resql = $this->db->query($sql);
 						if ($resql)
 						{
 							$num = $this->db->num_rows($resql);
-							$i=0;
-							while($i < $num)
+							$i = 0;
+							while ($i < $num)
 							{
 								$obj = $this->db->fetch_object($resql);
 								if ($obj)
@@ -551,244 +551,244 @@ 
 						}
 						else dol_print_error($this->db);
 
-						foreach($listaliases as $typealias => $listalias)
+						foreach ($listaliases as $typealias => $listalias)
 						{
-							$posalias=0;
-							$listaliasarray=explode(',', $listalias);
+							$posalias = 0;
+							$listaliasarray = explode(',', $listalias);
 							foreach ($listaliasarray as $listaliasval)
 							{
 								$posalias++;
-								$listaliasval=trim($listaliasval);
+								$listaliasval = trim($listaliasval);
 								if ($listaliasval)
 								{
-									$listaliasval=preg_replace('/</', '&lt;', $listaliasval);
-									$listaliasval=preg_replace('/>/', '&gt;', $listaliasval);
-									if (! preg_match('/&lt;/', $listaliasval)) $listaliasval='&lt;'.$listaliasval.'&gt;';
-									$liste[$typealias.'_'.$posalias]=$listaliasval;
+									$listaliasval = preg_replace('/</', '&lt;', $listaliasval);
+									$listaliasval = preg_replace('/>/', '&gt;', $listaliasval);
+									if (!preg_match('/&lt;/', $listaliasval)) $listaliasval = '&lt;'.$listaliasval.'&gt;';
+									$liste[$typealias.'_'.$posalias] = $listaliasval;
 								}
 							}
 						}
 
 						// Set the default "From"
-						$defaultfrom='';
-						$reshook=$hookmanager->executeHooks('getDefaultFromEmail', $parameters, $this);
+						$defaultfrom = '';
+						$reshook = $hookmanager->executeHooks('getDefaultFromEmail', $parameters, $this);
 						if (empty($reshook))
 						{
 							$defaultfrom = $this->fromtype;
 						}
-						if (! empty($hookmanager->resArray['defaultfrom'])) $defaultfrom=$hookmanager->resArray['defaultfrom'];
+						if (!empty($hookmanager->resArray['defaultfrom'])) $defaultfrom = $hookmanager->resArray['defaultfrom'];
 
 						// Using combo here make the '<email>' no more visible on list.
 						//$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
-						$out.= ' '.$form->selectarray('fromtype', $liste, $defaultfrom, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 0, '', $disablebademails);
+						$out .= ' '.$form->selectarray('fromtype', $liste, $defaultfrom, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 0, '', $disablebademails);
 					}
 
-					$out.= "</td></tr>\n";
+					$out .= "</td></tr>\n";
 				}
 				else
 				{
-					$out.= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
-					$out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
-					$out.= '&nbsp; &nbsp; ';
-					$out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" class="maxwidth200onsmartphone" value="'.$this->frommail.'" />&gt;';
-					$out.= "</td></tr>\n";
+					$out .= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
+					$out .= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
+					$out .= '&nbsp; &nbsp; ';
+					$out .= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" class="maxwidth200onsmartphone" value="'.$this->frommail.'" />&gt;';
+					$out .= "</td></tr>\n";
 				}
 			}
 
 			// To
-			if (! empty($this->withto) || is_array($this->withto))
+			if (!empty($this->withto) || is_array($this->withto))
 			{
-				$out.= '<tr><td class="fieldrequired">';
-				if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-				else $out.= $langs->trans("MailTo");
-				$out.= '</td><td>';
+				$out .= '<tr><td class="fieldrequired">';
+				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+				else $out .= $langs->trans("MailTo");
+				$out .= '</td><td>';
 				if ($this->withtoreadonly)
 				{
-					if (! empty($this->toname) && ! empty($this->tomail))
+					if (!empty($this->toname) && !empty($this->tomail))
 					{
-						$out.= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
-						$out.= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
+						$out .= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
+						$out .= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
 						if ($this->totype == 'thirdparty')
 						{
-							$soc=new Societe($this->db);
+							$soc = new Societe($this->db);
 							$soc->fetch($this->toid);
-							$out.= $soc->getNomUrl(1);
+							$out .= $soc->getNomUrl(1);
 						}
 						else if ($this->totype == 'contact')
 						{
-							$contact=new Contact($this->db);
+							$contact = new Contact($this->db);
 							$contact->fetch($this->toid);
-							$out.= $contact->getNomUrl(1);
+							$out .= $contact->getNomUrl(1);
 						}
 						else
 						{
-							$out.= $this->toname;
+							$out .= $this->toname;
 						}
-						$out.= ' &lt;'.$this->tomail.'&gt;';
+						$out .= ' &lt;'.$this->tomail.'&gt;';
 						if ($this->withtofree)
 						{
-							$out.= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+							$out .= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "").'" />';
 						}
 					}
 					else
 					{
 						// Note withto may be a text like 'AllRecipientSelected'
-						$out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+						$out .= (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
 					}
 				}
 				else
 				{
-					if (! empty($this->withtofree))
+					if (!empty($this->withtofree))
 					{
-						$out.= '<input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+						$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "").'" />';
 					}
-					if (! empty($this->withto) && is_array($this->withto))
+					if (!empty($this->withto) && is_array($this->withto))
 					{
-						if (! empty($this->withtofree)) $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
-						foreach($tmparray as $key => $val)
+						foreach ($tmparray as $key => $val)
 						{
-							$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
-						$withtoselected=GETPOST("receiver",'none');     // Array of selected value
-						if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+						$withtoselected = GETPOST("receiver", 'none'); // Array of selected value
+						if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')
 						{
 							$withtoselected = array_keys($tmparray);
 						}
-						$out.= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+						$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
 					}
 				}
-				$out.= "</td></tr>\n";
+				$out .= "</td></tr>\n";
 			}
 
 			// To User
-			if (! empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
+			if (!empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
 			{
-				$out.= '<tr><td>';
-				$out.= $langs->trans("MailToUsers");
-				$out.= '</td><td>';
+				$out .= '<tr><td>';
+				$out .= $langs->trans("MailToUsers");
+				$out .= '</td><td>';
 
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 				$tmparray = $this->withtouser;
-				foreach($tmparray as $key => $val)
+				foreach ($tmparray as $key => $val)
 				{
-					$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
-				$withtoselected=GETPOST("receiveruser",'none');     // Array of selected value
-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+				$withtoselected = GETPOST("receiveruser", 'none'); // Array of selected value
+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')
 				{
 					$withtoselected = array_keys($tmparray);
 				}
-				$out.= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
-				$out.= "</td></tr>\n";
+				$out .= $form->multiselectarray("receiveruser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+				$out .= "</td></tr>\n";
 			}
 
 			// withoptiononeemailperrecipient
-			if (! empty($this->withoptiononeemailperrecipient))
+			if (!empty($this->withoptiononeemailperrecipient))
 			{
-				$out.= '<tr><td class="minwidth200">';
-				$out.= $langs->trans("GroupEmails");
-				$out.= '</td><td>';
-				$out.=' <input type="checkbox" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0?' checked="checked"':'').'> ';
-				$out.= $langs->trans("OneEmailPerRecipient");
-				$out.='<span class="hideonsmartphone">';
-				$out.=' - ';
-				$out.= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
-				$out.='</span>';
-				$out.= '</td></tr>';
+				$out .= '<tr><td class="minwidth200">';
+				$out .= $langs->trans("GroupEmails");
+				$out .= '</td><td>';
+				$out .= ' <input type="checkbox" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';
+				$out .= $langs->trans("OneEmailPerRecipient");
+				$out .= '<span class="hideonsmartphone">';
+				$out .= ' - ';
+				$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
+				$out .= '</span>';
+				$out .= '</td></tr>';
 			}
 
 			// CC
-			if (! empty($this->withtocc) || is_array($this->withtocc))
+			if (!empty($this->withtocc) || is_array($this->withtocc))
 			{
-				$out.= '<tr><td>';
-				$out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-				$out.= '</td><td>';
+				$out .= '<tr><td>';
+				$out .= $form->textwithpicto($langs->trans("MailCC"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+				$out .= '</td><td>';
 				if ($this->withtoccreadonly)
 				{
-					$out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
+					$out .= (!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : "";
 				}
 				else
 				{
-					$out.= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
-					if (! empty($this->withtocc) && is_array($this->withtocc))
+					$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? (isset($_POST["sendtocc"]) ? $_POST["sendtocc"] : $this->withtocc) : (isset($_POST["sendtocc"]) ? $_POST["sendtocc"] : "")).'" />';
+					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
-						$out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withtocc;
-						foreach($tmparray as $key => $val)
+						foreach ($tmparray as $key => $val)
 						{
-							$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
-						$withtoccselected=GETPOST("receivercc");     // Array of selected value
-						$out.= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500',null, "");
+						$withtoccselected = GETPOST("receivercc"); // Array of selected value
+						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', null, "");
 					}
 				}
-				$out.= "</td></tr>\n";
+				$out .= "</td></tr>\n";
 			}
 
 			// To User cc
-			if (! empty($this->withtoccuser) && is_array($this->withtoccuser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
+			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
 			{
-				$out.= '<tr><td>';
-				$out.= $langs->trans("MailToCCUsers");
-				$out.= '</td><td>';
+				$out .= '<tr><td>';
+				$out .= $langs->trans("MailToCCUsers");
+				$out .= '</td><td>';
 
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 				$tmparray = $this->withtoccuser;
-				foreach($tmparray as $key => $val)
+				foreach ($tmparray as $key => $val)
 				{
-					$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
-				$withtoselected=GETPOST("receiverccuser",'none');     // Array of selected value
-				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
+				$withtoselected = GETPOST("receiverccuser", 'none'); // Array of selected value
+				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')
 				{
 					$withtoselected = array_keys($tmparray);
 				}
-				$out.= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
-				$out.= "</td></tr>\n";
+				$out .= $form->multiselectarray("receiverccuser", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
+				$out .= "</td></tr>\n";
 			}
 
 			// CCC
-			if (! empty($this->withtoccc) || is_array($this->withtoccc)) {
+			if (!empty($this->withtoccc) || is_array($this->withtoccc)) {
 				$out .= $this->getHtmlForWithCcc();
 			}
 
 			// Replyto
-			if (! empty($this->withreplyto))
+			if (!empty($this->withreplyto))
 			{
 				if ($this->withreplytoreadonly)
 				{
-					$out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
-					$out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
-					$out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
-					$out.= "</td></tr>\n";
+					$out .= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
+					$out .= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
+					$out .= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail ? (" &lt;".$this->replytomail."&gt;") : "");
+					$out .= "</td></tr>\n";
 				}
 			}
 
 			// Errorsto
-			if (! empty($this->witherrorsto)) {
+			if (!empty($this->witherrorsto)) {
 				$out .= $this->getHtmlForWithErrorsTo();
 			}
 
 			// Ask delivery receipt
-			if (! empty($this->withdeliveryreceipt)) {
+			if (!empty($this->withdeliveryreceipt)) {
 				$out .= $this->getHtmlForDeliveryReceipt();
 			}
 
 			// Topic
-			if (! empty($this->withtopic)) {
+			if (!empty($this->withtopic)) {
 				$out .= $this->getHtmlForTopic();
 			}
 
 			// Attached files
-			if (! empty($this->withfile))
+			if (!empty($this->withfile))
 			{
-				$out.= '<tr>';
-				$out.= '<td>'.$langs->trans("MailFile").'</td>';
+				$out .= '<tr>';
+				$out .= '<td>'.$langs->trans("MailFile").'</td>';
 
-				$out.= '<td>';
+				$out .= '<td>';
 
 				if ($this->withmaindocfile)	// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
 				{
@@ -803,94 +803,94 @@ 
 					}
 				}
 
-				if (! empty($this->withmaindocfile))
+				if (!empty($this->withmaindocfile))
 				{
 					if ($this->withmaindocfile == 1)
 					{
-						$out.='<input type="checkbox" name="addmaindocfile" value="1" />';
+						$out .= '<input type="checkbox" name="addmaindocfile" value="1" />';
 					}
 					if ($this->withmaindocfile == -1)
 					{
-						$out.='<input type="checkbox" name="addmaindocfile" value="1" checked="checked" />';
+						$out .= '<input type="checkbox" name="addmaindocfile" value="1" checked="checked" />';
 					}
-					$out.=' '.$langs->trans("JoinMainDoc").'.<br>';
+					$out .= ' '.$langs->trans("JoinMainDoc").'.<br>';
 				}
 
 				if (is_numeric($this->withfile))
 				{
 					// TODO Trick to have param removedfile containing nb of file 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($listofnames[$key]).' '.$listofnames[$key];
-							if (! $this->withfilereadonly)
+							$out .= '<div id="attachfile_'.$key.'">';
+							$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
+							if (!$this->withfilereadonly)
 							{
-								$out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+								$out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
 								//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
 							}
-							$out.= '<br></div>';
+							$out .= '<br></div>';
 						}
 					}
 					else if (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
 					{
-						$out.= $langs->trans("NoAttachedFiles").'<br>';
+						$out .= $langs->trans("NoAttachedFiles").'<br>';
 					}
 					if ($this->withfile == 2)	// Can add other files
 					{
-						if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out.= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
-						else $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-						$out.= ' ';
-						$out.= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+						if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
+						else $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+						$out .= ' ';
+						$out .= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
 				}
 				else
 				{
-					$out.=$this->withfile;
+					$out .= $this->withfile;
 				}
 
-				$out.= "</td></tr>\n";
+				$out .= "</td></tr>\n";
 			}
 
 			// Message
-			if (! empty($this->withbody))
+			if (!empty($this->withbody))
 			{
-				$defaultmessage=GETPOST('message','none');
-				if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1')
+				$defaultmessage = GETPOST('message', 'none');
+				if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1')
 				{
 					if ($arraydefaultmessage && $arraydefaultmessage->content) {
 						$defaultmessage = $arraydefaultmessage->content;
-					} elseif (! is_numeric($this->withbody)) {
+					} elseif (!is_numeric($this->withbody)) {
 						$defaultmessage = $this->withbody;
 					}
 				}
 
 				// Complete substitution array with the url to make online payment
-				$paymenturl=''; $validpaymentmethod=array();
+				$paymenturl = ''; $validpaymentmethod = array();
 				if (empty($this->substit['__REF__']))
 				{
-					$paymenturl='';
+					$paymenturl = '';
 				}
 				else
 				{
 					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-					$langs->loadLangs(array('paypal','other'));
-					$typeforonlinepayment='free';
-					if ($this->param["models"]=='order'   || $this->param["models"]=='order_send')   $typeforonlinepayment='order';		// TODO use detection on something else than template
-					if ($this->param["models"]=='invoice' || $this->param["models"]=='facture_send') $typeforonlinepayment='invoice';	// TODO use detection on something else than template
-					if ($this->param["models"]=='member') $typeforonlinepayment='member';												// TODO use detection on something else than template
-					$url=getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
-					$paymenturl=$url;
+					$langs->loadLangs(array('paypal', 'other'));
+					$typeforonlinepayment = 'free';
+					if ($this->param["models"] == 'order' || $this->param["models"] == 'order_send')   $typeforonlinepayment = 'order'; // TODO use detection on something else than template
+					if ($this->param["models"] == 'invoice' || $this->param["models"] == 'facture_send') $typeforonlinepayment = 'invoice'; // TODO use detection on something else than template
+					if ($this->param["models"] == 'member') $typeforonlinepayment = 'member'; // TODO use detection on something else than template
+					$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
+					$paymenturl = $url;
 
 					$validpaymentmethod = getValidOnlinePaymentMethods('');
 				}
@@ -898,13 +898,13 @@ 
 				if (count($validpaymentmethod) > 0 && $paymenturl)
 				{
 					$langs->load('other');
-					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']=str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
-					$this->substit['__ONLINE_PAYMENT_URL__']=$paymenturl;
+					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
+					$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
 				}
 				else
 				{
-					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']='';
-					$this->substit['__ONLINE_PAYMENT_URL__']='';
+					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '';
+					$this->substit['__ONLINE_PAYMENT_URL__'] = '';
 				}
 
 				//Add lines substitution key from each line
@@ -914,96 +914,96 @@ 
 				{
 					foreach ($this->substit_lines as $substit_line)
 					{
-						$lines .= make_substitutions($defaultlines,$substit_line)."\n";
+						$lines .= make_substitutions($defaultlines, $substit_line)."\n";
 					}
 				}
-				$this->substit['__LINES__']=$lines;
+				$this->substit['__LINES__'] = $lines;
 
-				$defaultmessage=str_replace('\n',"\n",$defaultmessage);
+				$defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
 				// Deal with format differences between message and signature (text / HTML)
 				if (dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
 					$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
-				} else if(!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
+				} else if (!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
 					$defaultmessage = dol_nl2br($defaultmessage);
 				}
 
-				if (isset($_POST["message"]) && ! $_POST['modelselected']) $defaultmessage=$_POST["message"];
+				if (isset($_POST["message"]) && !$_POST['modelselected']) $defaultmessage = $_POST["message"];
 				else
 				{
-					$defaultmessage=make_substitutions($defaultmessage,$this->substit);
+					$defaultmessage = make_substitutions($defaultmessage, $this->substit);
 					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
-					$defaultmessage=preg_replace("/^(<br>)+/","",$defaultmessage);
-					$defaultmessage=preg_replace("/^\n+/","",$defaultmessage);
+					$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
+					$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);
 				}
 
-				$out.= '<tr>';
-				$out.= '<td valign="top">';
-				$out.=$form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
-				$out.='</td>';
-				$out.= '<td>';
+				$out .= '<tr>';
+				$out .= '<td valign="top">';
+				$out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
+				$out .= '</td>';
+				$out .= '<td>';
 				if ($this->withbodyreadonly)
 				{
-					$out.= nl2br($defaultmessage);
-					$out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
+					$out .= nl2br($defaultmessage);
+					$out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
 				}
 				else
 				{
-					if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
+					if (!isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
 
 					// Editor wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					if ($this->withfckeditor == -1)
 					{
-						if (! empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor=1;
-						else $this->withfckeditor=0;
+						if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor = 1;
+						else $this->withfckeditor = 0;
 					}
 
-					$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,'95%');
-					$out.= $doleditor->Create(1);
+					$doleditor = new DolEditor('message', $defaultmessage, '', 280, $this->ckeditortoolbar, 'In', true, true, $this->withfckeditor, 8, '95%');
+					$out .= $doleditor->Create(1);
 				}
-				$out.= "</td></tr>\n";
+				$out .= "</td></tr>\n";
 			}
 
-			$out.= '</table>'."\n";
+			$out .= '</table>'."\n";
 
 			if ($this->withform == 1 || $this->withform == -1)
 			{
-				$out.= '<br><div class="center">';
-				$out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
+				$out .= '<br><div class="center">';
+				$out .= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
 				// Add a javascript test to avoid to forget to submit file before sending email
 				if ($this->withfile == 2 && $conf->use_javascript_ajax)
 				{
-					$out.= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
+					$out .= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
 				}
-				$out.= ' />';
+				$out .= ' />';
 				if ($this->withcancel)
 				{
-					$out.= ' &nbsp; &nbsp; ';
-					$out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
+					$out .= ' &nbsp; &nbsp; ';
+					$out .= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
 				}
-				$out.= '</div>'."\n";
+				$out .= '</div>'."\n";
 			}
 
-			if ($this->withform == 1) $out.= '</form>'."\n";
+			if ($this->withform == 1) $out .= '</form>'."\n";
 
 			// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
-			if (! empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY))
+			if (!empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY))
 			{
-				$out.= '<script type="text/javascript" language="javascript">';
-				$out.= 'jQuery(document).ready(function () {';
-				$out.= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
+				$out .= '<script type="text/javascript" language="javascript">';
+				$out .= 'jQuery(document).ready(function () {';
+				$out .= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
 	    						var code = e.keyCode || e.which;
 	    						if (code == 13) {
 	        						e.preventDefault();
 	        						return false;
 	    						}
 							});';
-				$out.='		})';
-				$out.= '</script>';
+				$out .= '		})';
+				$out .= '</script>';
 			}
 
-			$out.= "<!-- End form mail -->\n";
+			$out .= "<!-- End form mail -->\n";
 
 			return $out;
 		}
@@ -1018,31 +1018,31 @@ 
 	{
 		global $conf, $langs, $form;
 		$out = '<tr><td>';
-		$out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-		$out.= '</td><td>';
-		if (! empty($this->withtocccreadonly)) {
-			$out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
+		$out .= $form->textwithpicto($langs->trans("MailCCC"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+		$out .= '</td><td>';
+		if (!empty($this->withtocccreadonly)) {
+			$out .= (!is_array($this->withtoccc) && !is_numeric($this->withtoccc)) ? $this->withtoccc : "";
 		} else {
-			$out.= '<input class="minwidth200" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
-			if (! empty($this->withtoccc) && is_array($this->withtoccc)) {
-				$out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+			$out .= '<input class="minwidth200" id="sendtoccc" name="sendtoccc" value="'.((!is_array($this->withtoccc) && !is_numeric($this->withtoccc)) ? (isset($_POST["sendtoccc"]) ? $_POST["sendtoccc"] : $this->withtoccc) : (isset($_POST["sendtoccc"]) ? $_POST["sendtoccc"] : "")).'" />';
+			if (!empty($this->withtoccc) && is_array($this->withtoccc)) {
+				$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 				$tmparray = $this->withtoccc;
 				foreach ($tmparray as $key => $val) {
-					$tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
+					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
-				$withtocccselected=GETPOST("receiverccc");     // Array of selected value
-				$out.= $form->multiselectarray("receiverccc", $tmparray, $withtocccselected, null, null, null,null, "90%");
+				$withtocccselected = GETPOST("receiverccc"); // Array of selected value
+				$out .= $form->multiselectarray("receiverccc", $tmparray, $withtocccselected, null, null, null, null, "90%");
 			}
 		}
 
-		$showinfobcc='';
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
-		if ($showinfobcc) $out.=' + '.$showinfobcc;
-		$out.= "</td></tr>\n";
+		$showinfobcc = '';
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && !empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
+		if ($showinfobcc) $out .= ' + '.$showinfobcc;
+		$out .= "</td></tr>\n";
 		return $out;
 	}
 
@@ -1055,16 +1055,16 @@ 
 	{
 		global $conf, $langs;
 		//if (! $this->errorstomail) $this->errorstomail=$this->frommail;
-		$errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
+		$errorstomail = (!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
 		if ($this->witherrorstoreadonly) {
-			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+			$out .= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
 			$out = '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-			$out.= $errorstomail;
-			$out.= "</td></tr>\n";
+			$out .= $errorstomail;
+			$out .= "</td></tr>\n";
 		} else {
-			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-			$out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-			$out.= "</td></tr>\n";
+			$out .= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+			$out .= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+			$out .= "</td></tr>\n";
 		}
 		return $out;
 	}
@@ -1079,17 +1079,17 @@ 
 		global $conf, $langs, $form;
 		$out = '<tr><td>'.$langs->trans("DeliveryReceipt").'</td><td>';
 
-		if (! empty($this->withdeliveryreceiptreadonly)) {
-			$out.= yn($this->withdeliveryreceipt);
+		if (!empty($this->withdeliveryreceiptreadonly)) {
+			$out .= yn($this->withdeliveryreceipt);
 		} else {
-			$defaultvaluefordeliveryreceipt=0;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt=1;
-			$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:$defaultvaluefordeliveryreceipt), 1);
+			$defaultvaluefordeliveryreceipt = 0;
+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt = 1;
+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt = 1;
+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt = 1;
+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt = 1;
+			$out .= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"]) ? $_POST["deliveryreceipt"] : $defaultvaluefordeliveryreceipt), 1);
 		}
-		$out.= "</td></tr>\n";
+		$out .= "</td></tr>\n";
 		return $out;
 	}
 
@@ -1101,29 +1101,29 @@ 
 	public function getHtmlForTopic()
 	{
 		global $conf, $langs, $form;
-		$defaulttopic = GETPOST('subject','none');
-		if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1') {
+		$defaulttopic = GETPOST('subject', 'none');
+		if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {
 			if ($arraydefaultmessage && $arraydefaultmessage->topic) {
 				$defaulttopic = $arraydefaultmessage->topic;
-			} elseif (! is_numeric($this->withtopic)) {
+			} elseif (!is_numeric($this->withtopic)) {
 				$defaulttopic = $this->withtopic;
 			}
 		}
 
-		$defaulttopic=make_substitutions($defaulttopic,$this->substit);
+		$defaulttopic = make_substitutions($defaulttopic, $this->substit);
 
 		$out = '<tr>';
-		$out.= '<td class="fieldrequired">';
-		$out.= $form->textwithpicto($langs->trans('MailTopic'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfromtopic');
-		$out.= '</td>';
-		$out.= '<td>';
+		$out .= '<td class="fieldrequired">';
+		$out .= $form->textwithpicto($langs->trans('MailTopic'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfromtopic');
+		$out .= '</td>';
+		$out .= '<td>';
 		if ($this->withtopicreadonly) {
-			$out.= $defaulttopic;
-			$out.= '<input type="hidden" class="quatrevingtpercent" id="subject" name="subject" value="'.$defaulttopic.'" />';
+			$out .= $defaulttopic;
+			$out .= '<input type="hidden" class="quatrevingtpercent" id="subject" name="subject" value="'.$defaulttopic.'" />';
 		} else {
-			$out.= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'. ((isset($_POST["subject"]) && ! $_POST['modelselected'])?$_POST["subject"]:($defaulttopic?$defaulttopic:'')) .'" />';
+			$out .= '<input type="text" class="quatrevingtpercent" id="subject" name="subject" value="'.((isset($_POST["subject"]) && !$_POST['modelselected']) ? $_POST["subject"] : ($defaulttopic ? $defaulttopic : '')).'" />';
 		}
-		$out.= "</td></tr>\n";
+		$out .= "</td></tr>\n";
 		return $out;
 	}
 
@@ -1140,7 +1140,7 @@ 
 	 *      @param	string		$label			Label of template
 	 *      @return ModelMail					One instance of ModelMail
 	 */
-	public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id=0, $active=1, $label='')
+	public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '')
 	{
 		$ret = new ModelMail();
 
@@ -1151,18 +1151,18 @@ 
 		}
 
 		$sql = "SELECT rowid, label, topic, joinfiles, content, content_lines, lang";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
-		$sql.= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
-		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
-		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";				// Get all public or private owned
-		if ($active >= 0) $sql.=" AND active = ".$active;
-		if ($label) $sql.=" AND label ='".$db->escape($label)."'";
-		if (! ($id > 0) && is_object($outputlangs)) $sql.= " AND (lang = '".$db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
-		if ($id > 0)   $sql.= " AND rowid=".$id;
-		if ($id == -1) $sql.= " AND position=0";
-		if (is_object($outputlangs)) $sql.= $db->order("position,lang,label","ASC,DESC,ASC");		// We want line with lang set first, then with lang null or ''
-		else $sql.= $db->order("position,lang,label","ASC,ASC,ASC");		// If no language provided, we give priority to lang not defined
-		$sql.= $db->plimit(1);
+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+		$sql .= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
+		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
+		$sql .= " AND (private = 0 OR fk_user = ".$user->id.")"; // Get all public or private owned
+		if ($active >= 0) $sql .= " AND active = ".$active;
+		if ($label) $sql .= " AND label ='".$db->escape($label)."'";
+		if (!($id > 0) && is_object($outputlangs)) $sql .= " AND (lang = '".$db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
+		if ($id > 0)   $sql .= " AND rowid=".$id;
+		if ($id == -1) $sql .= " AND position=0";
+		if (is_object($outputlangs)) $sql .= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
+		else $sql .= $db->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined
+		$sql .= $db->plimit(1);
 		//print $sql;
 
 		$resql = $db->query($sql);
@@ -1180,32 +1180,32 @@ 
 				$ret->content_lines = $obj->content_lines;
 				$ret->joinfiles = $obj->joinfiles;
 			}
-			elseif($id == -2) {
+			elseif ($id == -2) {
 				// Not found with the provided label
 				return -1;
 			}
 			else {	// If there is no template at all
-				$defaultmessage='';
-				if ($type_template=='body')							{ $defaultmessage=$this->withbody; }		// Special case to use this->withbody as content
-				elseif ($type_template=='facture_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
-				elseif ($type_template=='facture_relance')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-				elseif ($type_template=='propal_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
-				elseif ($type_template=='supplier_proposal_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
-				elseif ($type_template=='order_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
-				elseif ($type_template=='order_supplier_send')		{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-				elseif ($type_template=='invoice_supplier_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-				elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
-				elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
-				elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
-				elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); }
-				elseif (!empty($type_template))				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
+				$defaultmessage = '';
+				if ($type_template == 'body') { $defaultmessage = $this->withbody; }		// Special case to use this->withbody as content
+				elseif ($type_template == 'facture_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
+				elseif ($type_template == 'facture_relance') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+				elseif ($type_template == 'propal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
+				elseif ($type_template == 'supplier_proposal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
+				elseif ($type_template == 'order_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
+				elseif ($type_template == 'order_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+				elseif ($type_template == 'invoice_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+				elseif ($type_template == 'shipping_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
+				elseif ($type_template == 'fichinter_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
+				elseif ($type_template == 'thirdparty') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
+				elseif ($type_template == 'user') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser"); }
+				elseif (!empty($type_template)) { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
 
 				$ret->label = 'default';
 				$ret->lang = $outputlangs->defaultlang;
 				$ret->topic = '';
 				$ret->joinfiles = 1;
 				$ret->content = $defaultmessage;
-				$ret->content_lines ='';
+				$ret->content_lines = '';
 			}
 
 			$db->free($resql);
@@ -1229,27 +1229,27 @@ 
 	 */
 	public function isEMailTemplate($type_template, $user, $outputlangs)
 	{
-		$ret=array();
+		$ret = array();
 
 		$sql = "SELECT label, topic, content, lang";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
-		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
-		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
-		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
-		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
-		$sql.= $this->db->order("lang,label","ASC");
+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+		$sql .= " WHERE type_template='".$this->db->escape($type_template)."'";
+		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
+		$sql .= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
+		if (is_object($outputlangs)) $sql .= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		$sql .= $this->db->order("lang,label", "ASC");
 		//print $sql;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num= $this->db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 			$this->db->free($resql);
 			return $num;
 		}
 		else
 		{
-			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
+			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1264,46 +1264,46 @@ 
 	 *      @param  int         $active         1=Only active template, 0=Only disabled, -1=All
 	 *      @return	int		                    <0 if KO, nb of records found if OK
 	 */
-	public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active=1)
+	public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active = 1)
 	{
-		$ret=array();
+		$ret = array();
 
 		$sql = "SELECT rowid, label, topic, content, content_lines, lang, fk_user, private, position";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
-		$sql.= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
-		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
-		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";		// See all public templates or templates I own.
-		if ($active >= 0) $sql.=" AND active = ".$active;
+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+		$sql .= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
+		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
+		$sql .= " AND (private = 0 OR fk_user = ".$user->id.")"; // See all public templates or templates I own.
+		if ($active >= 0) $sql .= " AND active = ".$active;
 		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";	// Return all languages
-		$sql.= $this->db->order("position,lang,label","ASC");
+		$sql .= $this->db->order("position,lang,label", "ASC");
 		//print $sql;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$this->lines_model=array();
+			$num = $this->db->num_rows($resql);
+			$this->lines_model = array();
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$line = new ModelMail();
-				$line->id=$obj->rowid;
-				$line->label=$obj->label;
-				$line->lang=$obj->lang;
-				$line->fk_user=$obj->fk_user;
-				$line->private=$obj->private;
-				$line->position=$obj->position;
-				$line->topic=$obj->topic;
-				$line->content=$obj->content;
-				$line->content_lines=$obj->content_lines;
-
-				$this->lines_model[]=$line;
+				$line->id = $obj->rowid;
+				$line->label = $obj->label;
+				$line->lang = $obj->lang;
+				$line->fk_user = $obj->fk_user;
+				$line->private = $obj->private;
+				$line->position = $obj->position;
+				$line->topic = $obj->topic;
+				$line->content = $obj->content;
+				$line->content_lines = $obj->content_lines;
+
+				$this->lines_model[] = $line;
 			}
 			$this->db->free($resql);
 			return $num;
 		}
 		else
 		{
-			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
+			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1322,11 +1322,11 @@ 
 	{
 		global $conf, $user;
 
-		$parameters=array();
-		$tmparray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+		$parameters = array();
+		$tmparray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 		complete_substitutions_array($tmparray, $outputlangs, null, $parameters);
 
-		$this->substit=$tmparray;
+		$this->substit = $tmparray;
 
 		// Fill substit_lines with each object lines content
 		if (is_array($object->lines))
@@ -1350,7 +1350,7 @@ 
 				// Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
 				if (!empty($line->fk_product))
 				{
-					if (! is_object($extrafields)) $extrafields = new ExtraFields($this->db);
+					if (!is_object($extrafields)) $extrafields = new ExtraFields($this->db);
 					$extrafields->fetch_name_optionals_label('product', true);
 					$product = new Product($this->db);
 					$product->fetch($line->fk_product, '', '', 1);
@@ -1358,7 +1358,7 @@ 
 					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 					{
 						foreach ($extrafields->attributes[$product->table_element]['label'] as $key => $label) {
-							$substit_line['__PRODUCT_EXTRAFIELD_' . strtoupper($key) . '__'] = $product->array_options['options_' . $key];
+							$substit_line['__PRODUCT_EXTRAFIELD_'.strtoupper($key).'__'] = $product->array_options['options_'.$key];
 						}
 					}
 				}
@@ -1375,31 +1375,31 @@ 
 	 * @param	Object	$object		Object if applicable
 	 * @return	array               Array of substitution values for emails.
 	 */
-	static function getAvailableSubstitKey($mode='formemail', $object=null)
+	static function getAvailableSubstitKey($mode = 'formemail', $object = null)
 	{
 		global $conf, $langs;
 
-		$tmparray=array();
+		$tmparray = array();
 		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
 		{
-			$parameters=array('mode'=>$mode);
-			$tmparray=getCommonSubstitutionArray($langs, 2, null, $object);			// Note: On email templated edition, this is null because it is related to all type of objects
+			$parameters = array('mode'=>$mode);
+			$tmparray = getCommonSubstitutionArray($langs, 2, null, $object); // Note: On email templated edition, this is null because it is related to all type of objects
 			complete_substitutions_array($tmparray, $langs, null, $parameters);
 
 			if ($mode == 'formwithlines')
 			{
-				$tmparray['__LINES__'] = '__LINES__';      // Will be set by the get_form function
+				$tmparray['__LINES__'] = '__LINES__'; // Will be set by the get_form function
 			}
 			if ($mode == 'formforlines')
 			{
-				$tmparray['__QUANTITY__'] = '__QUANTITY__';   // Will be set by the get_form function
+				$tmparray['__QUANTITY__'] = '__QUANTITY__'; // Will be set by the get_form function
 			}
 		}
 
 		if ($mode == 'emailing')
 		{
-			$parameters=array('mode'=>$mode);
-			$tmparray=getCommonSubstitutionArray($langs, 2, array('object','objectamount'), $object);			// Note: On email templated edition, this is null because it is related to all type of objects
+			$parameters = array('mode'=>$mode);
+			$tmparray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount'), $object); // Note: On email templated edition, this is null because it is related to all type of objects
 			complete_substitutions_array($tmparray, $langs, null, $parameters);
 
 			// For mass emailing, we have different keys
@@ -1419,18 +1419,18 @@ 
 				//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
 
 			$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))
 			{
-				$tmparray['__SECUREKEYPAYMENT__']=$conf->global->PAYMENT_SECURITY_TOKEN;
-				if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
+				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
+				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 				{
-					if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__']='SecureKeyPAYMENTUniquePerMember';
-					if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__']='SecureKeyPAYMENTUniquePerInvoice';
-					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__']='SecureKeyPAYMENTUniquePerOrder';
-					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__']='SecureKeyPAYMENTUniquePerContractLine';
+					if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
+					if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
+					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
+					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 				}
 			}
 			else
@@ -1445,9 +1445,9 @@ 
 			}
 		}
 
-		foreach($tmparray as $key => $val)
+		foreach ($tmparray as $key => $val)
 		{
-			if (empty($val)) $tmparray[$key]=$key;
+			if (empty($val)) $tmparray[$key] = $key;
 		}
 
 		return $tmparray;

Braces +235 added lines, -126 removed lines

@@ -166,7 +166,9 @@ 
 		// Set tmp user directory
 		$vardir=$conf->user->dir_output."/".$user->id;
 		$upload_dir = $vardir.'/temp/';                     // TODO Add $keytoavoidconflict in upload_dir path
-		if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);
+		if (is_dir($upload_dir)) {
+		    dol_delete_dir_recursive($upload_dir);
+		}
 
 		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
 		unset($_SESSION["listofpaths".$keytoavoidconflict]);
@@ -190,13 +192,23 @@ 
 		$listofnames=array();
 		$listofmimes=array();
 
-		if (empty($file)) $file=basename($path);
-		if (empty($type)) $type=dol_mimetype($file);
+		if (empty($file)) {
+		    $file=basename($path);
+		}
+		if (empty($type)) {
+		    $type=dol_mimetype($file);
+		}
 
 		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		}
 		if (! in_array($file,$listofnames))
 		{
 			$listofpaths[]=$path;
@@ -223,9 +235,15 @@ 
 		$listofmimes=array();
 
 		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		}
 		if ($keytodelete >= 0)
 		{
 			unset ($listofpaths[$keytodelete]);
@@ -252,9 +270,15 @@ 
 		$listofmimes=array();
 
 		$keytoavoidconflict = empty($this->trackid)?'':'-'.$this->trackid;   // this->trackid must be defined
-		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+		}
 		return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
 	}
 
@@ -290,7 +314,9 @@ 
         // phpcs:enable
 		global $conf, $langs, $user, $hookmanager, $form;
 
-		if (! is_object($form)) $form=new Form($this->db);
+		if (! is_object($form)) {
+		    $form=new Form($this->db);
+		}
 
 		// Load translation files required by the page
         $langs->loadLangs(array('other', 'mails'));
@@ -314,8 +340,7 @@ 
 		if (!empty($reshook))
 		{
 			return $hookmanager->resPrint;
-		}
-		else
+		} else
 		{
 			$out='';
 
@@ -324,7 +349,9 @@ 
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+			    $newlang = $this->param['langsmodels'];
+			}
 			if (! empty($newlang))
 			{
 				$outputlangs = new Translate("", $conf);
@@ -362,9 +389,15 @@ 
 				}
 			}
 
-	   		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
-	   		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
-	   		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	   		if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+	   		    $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
+	   		}
+	   		if (! empty($_SESSION["listofnames".$keytoavoidconflict])) {
+	   		    $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
+	   		}
+	   		if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+	   		    $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
+	   		}
 
 
 			$out.= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
@@ -404,13 +437,16 @@ 
 					if (preg_match('/\((.*)\)/', $line->label, $reg))
 					{
 						$modelmail_array[$line->id]=$langs->trans($reg[1]);		// langs->trans when label is __(xxx)__
-					}
-					else
+					} else
 					{
 						$modelmail_array[$line->id]=$line->label;
 					}
-					if ($line->lang) $modelmail_array[$line->id].=' ('.$line->lang.')';
-					if ($line->private) $modelmail_array[$line->id].=' - '.$langs->trans("Private");
+					if ($line->lang) {
+					    $modelmail_array[$line->id].=' ('.$line->lang.')';
+					}
+					if ($line->private) {
+					    $modelmail_array[$line->id].=' - '.$langs->trans("Private");
+					}
 					//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
 				}
 			}
@@ -421,13 +457,14 @@ 
 				// If list of template is filled
 				$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
 				$out.= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+				if ($user->admin) {
+				    $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+				}
 				$out.= ' &nbsp; ';
 				$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
 				$out.= ' &nbsp; ';
 				$out.= '</div>';
-			}
-			elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
+			} elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
 					'propal_send','order_send','facture_send',
 					'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send',
 					'invoice_supplier_send','thirdparty','contract','user','all'
@@ -436,7 +473,9 @@ 
 				// If list of template is empty
 				$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
 				$out.= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>';    // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
-				if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+				if ($user->admin) {
+				    $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
+				}
 				$out.= ' &nbsp; ';
 				$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
 				$out.= ' &nbsp; ';
@@ -449,17 +488,27 @@ 
 
 			// Substitution array/string
 			$helpforsubstitution='';
-			if (is_array($this->substit) && count($this->substit)) $helpforsubstitution.=$langs->trans('AvailableVariables').' :<br>'."\n";
+			if (is_array($this->substit) && count($this->substit)) {
+			    $helpforsubstitution.=$langs->trans('AvailableVariables').' :<br>'."\n";
+			}
 			foreach($this->substit as $key => $val)
 			{
 				$helpforsubstitution.=$key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';
 			}
-			if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+			if (! empty($this->withsubstit)) {
+			    // Unset or set ->withsubstit=0 to disable this.
 			{
 				$out.= '<tr><td colspan="2" align="right">';
+			}
 				//$out.='<div class="floatright">';
-				if (is_numeric($this->withsubstit)) $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');	// Old usage
-				else $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');															// New usage
+				if (is_numeric($this->withsubstit)) {
+				    $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');
+				}
+				// Old usage
+				else {
+				    $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip');
+				}
+				// New usage
 				$out.= "</td></tr>\n";
 				//$out.='</div>';
 			}
@@ -490,8 +539,7 @@ 
 						if ($this->frommail)
 						{
 							$out.= ' &lt;'.$this->frommail.'&gt;';
-						}
-						else
+						} else
 						{
 							if ($this->fromtype)
 							{
@@ -507,8 +555,7 @@ 
 						{
 							$langs->load('errors');
 							$liste['user'] = $user->getFullName($langs) . ' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
-						}
-						else
+						} else
 						{
 							$liste['user'] = $user->getFullName($langs) .' &lt;'.$user->email.'&gt;';
 						}
@@ -548,8 +595,9 @@ 
 								}
 								$i++;
 							}
+						} else {
+						    dol_print_error($this->db);
 						}
-						else dol_print_error($this->db);
 
 						foreach($listaliases as $typealias => $listalias)
 						{
@@ -563,7 +611,9 @@ 
 								{
 									$listaliasval=preg_replace('/</', '&lt;', $listaliasval);
 									$listaliasval=preg_replace('/>/', '&gt;', $listaliasval);
-									if (! preg_match('/&lt;/', $listaliasval)) $listaliasval='&lt;'.$listaliasval.'&gt;';
+									if (! preg_match('/&lt;/', $listaliasval)) {
+									    $listaliasval='&lt;'.$listaliasval.'&gt;';
+									}
 									$liste[$typealias.'_'.$posalias]=$listaliasval;
 								}
 							}
@@ -576,7 +626,9 @@ 
 						{
 							$defaultfrom = $this->fromtype;
 						}
-						if (! empty($hookmanager->resArray['defaultfrom'])) $defaultfrom=$hookmanager->resArray['defaultfrom'];
+						if (! empty($hookmanager->resArray['defaultfrom'])) {
+						    $defaultfrom=$hookmanager->resArray['defaultfrom'];
+						}
 
 						// Using combo here make the '<email>' no more visible on list.
 						//$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
@@ -584,8 +636,7 @@ 
 					}
 
 					$out.= "</td></tr>\n";
-				}
-				else
+				} else
 				{
 					$out.= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
 					$out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
@@ -599,8 +650,11 @@ 
 			if (! empty($this->withto) || is_array($this->withto))
 			{
 				$out.= '<tr><td class="fieldrequired">';
-				if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-				else $out.= $langs->trans("MailTo");
+				if ($this->withtofree) {
+				    $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+				} else {
+				    $out.= $langs->trans("MailTo");
+				}
 				$out.= '</td><td>';
 				if ($this->withtoreadonly)
 				{
@@ -613,14 +667,12 @@ 
 							$soc=new Societe($this->db);
 							$soc->fetch($this->toid);
 							$out.= $soc->getNomUrl(1);
-						}
-						else if ($this->totype == 'contact')
+						} else if ($this->totype == 'contact')
 						{
 							$contact=new Contact($this->db);
 							$contact->fetch($this->toid);
 							$out.= $contact->getNomUrl(1);
-						}
-						else
+						} else
 						{
 							$out.= $this->toname;
 						}
@@ -629,14 +681,12 @@ 
 						{
 							$out.= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
 						}
-					}
-					else
+					} else
 					{
 						// Note withto may be a text like 'AllRecipientSelected'
 						$out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
 					}
-				}
-				else
+				} else
 				{
 					if (! empty($this->withtofree))
 					{
@@ -644,7 +694,9 @@ 
 					}
 					if (! empty($this->withto) && is_array($this->withto))
 					{
-						if (! empty($this->withtofree)) $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						if (! empty($this->withtofree)) {
+						    $out.= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						}
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach($tmparray as $key => $val)
@@ -708,8 +760,7 @@ 
 				if ($this->withtoccreadonly)
 				{
 					$out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
-				}
-				else
+				} else
 				{
 					$out.= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
 					if (! empty($this->withtocc) && is_array($this->withtocc))
@@ -790,11 +841,13 @@ 
 
 				$out.= '<td>';
 
-				if ($this->withmaindocfile)	// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
+				if ($this->withmaindocfile) {
+				    // withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
 				{
 					if (GETPOSTISSET('sendmail'))
 					{
 						$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
+				}
 					}
 					// If a template was selected, we use setup of template to define if join file checkbox is selected or not.
 					elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
@@ -840,20 +893,23 @@ 
 							}
 							$out.= '<br></div>';
 						}
-					}
-					else if (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
+					} else if (empty($this->withmaindocfile)) {
+					    // Do not show message if we asked to show the checkbox
 					{
 						$out.= $langs->trans("NoAttachedFiles").'<br>';
 					}
-					if ($this->withfile == 2)	// Can add other files
+					}
+					if ($this->withfile == 2) {
+					    // Can add other files
 					{
 						if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out.= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
-						else $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+					} else {
+						    $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+						}
 						$out.= ' ';
 						$out.= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
-				}
-				else
+				} else
 				{
 					$out.=$this->withfile;
 				}
@@ -879,16 +935,24 @@ 
 				if (empty($this->substit['__REF__']))
 				{
 					$paymenturl='';
-				}
-				else
+				} else
 				{
 					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					$langs->loadLangs(array('paypal','other'));
 					$typeforonlinepayment='free';
-					if ($this->param["models"]=='order'   || $this->param["models"]=='order_send')   $typeforonlinepayment='order';		// TODO use detection on something else than template
-					if ($this->param["models"]=='invoice' || $this->param["models"]=='facture_send') $typeforonlinepayment='invoice';	// TODO use detection on something else than template
-					if ($this->param["models"]=='member') $typeforonlinepayment='member';												// TODO use detection on something else than template
+					if ($this->param["models"]=='order'   || $this->param["models"]=='order_send') {
+					    $typeforonlinepayment='order';
+					}
+					// TODO use detection on something else than template
+					if ($this->param["models"]=='invoice' || $this->param["models"]=='facture_send') {
+					    $typeforonlinepayment='invoice';
+					}
+					// TODO use detection on something else than template
+					if ($this->param["models"]=='member') {
+					    $typeforonlinepayment='member';
+					}
+					// TODO use detection on something else than template
 					$url=getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
 					$paymenturl=$url;
 
@@ -900,8 +964,7 @@ 
 					$langs->load('other');
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']=str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
 					$this->substit['__ONLINE_PAYMENT_URL__']=$paymenturl;
-				}
-				else
+				} else
 				{
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']='';
 					$this->substit['__ONLINE_PAYMENT_URL__']='';
@@ -928,8 +991,9 @@ 
 					$defaultmessage = dol_nl2br($defaultmessage);
 				}
 
-				if (isset($_POST["message"]) && ! $_POST['modelselected']) $defaultmessage=$_POST["message"];
-				else
+				if (isset($_POST["message"]) && ! $_POST['modelselected']) {
+				    $defaultmessage=$_POST["message"];
+				} else
 				{
 					$defaultmessage=make_substitutions($defaultmessage,$this->substit);
 					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
@@ -946,17 +1010,21 @@ 
 				{
 					$out.= nl2br($defaultmessage);
 					$out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
-				}
-				else
+				} else
 				{
-					if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
+					if (! isset($this->ckeditortoolbar)) {
+					    $this->ckeditortoolbar = 'dolibarr_notes';
+					}
 
 					// Editor wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					if ($this->withfckeditor == -1)
 					{
-						if (! empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor=1;
-						else $this->withfckeditor=0;
+						if (! empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
+						    $this->withfckeditor=1;
+						} else {
+						    $this->withfckeditor=0;
+						}
 					}
 
 					$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,'95%');
@@ -985,7 +1053,9 @@ 
 				$out.= '</div>'."\n";
 			}
 
-			if ($this->withform == 1) $out.= '</form>'."\n";
+			if ($this->withform == 1) {
+			    $out.= '</form>'."\n";
+			}
 
 			// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
 			if (! empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY))
@@ -1037,11 +1107,21 @@ 
 		}
 
 		$showinfobcc='';
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
-		if ($showinfobcc) $out.=' + '.$showinfobcc;
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') {
+		    $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
+		}
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
+		    $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
+		}
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') {
+		    $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
+		}
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') {
+		    $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
+		}
+		if ($showinfobcc) {
+		    $out.=' + '.$showinfobcc;
+		}
 		$out.= "</td></tr>\n";
 		return $out;
 	}
@@ -1083,10 +1163,18 @@ 
 			$out.= yn($this->withdeliveryreceipt);
 		} else {
 			$defaultvaluefordeliveryreceipt=0;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt=1;
-			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt=1;
+			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') {
+			    $defaultvaluefordeliveryreceipt=1;
+			}
+			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && ! empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
+			    $defaultvaluefordeliveryreceipt=1;
+			}
+			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') {
+			    $defaultvaluefordeliveryreceipt=1;
+			}
+			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') {
+			    $defaultvaluefordeliveryreceipt=1;
+			}
 			$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:$defaultvaluefordeliveryreceipt), 1);
 		}
 		$out.= "</td></tr>\n";
@@ -1155,13 +1243,29 @@ 
 		$sql.= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
 		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";				// Get all public or private owned
-		if ($active >= 0) $sql.=" AND active = ".$active;
-		if ($label) $sql.=" AND label ='".$db->escape($label)."'";
-		if (! ($id > 0) && is_object($outputlangs)) $sql.= " AND (lang = '".$db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
-		if ($id > 0)   $sql.= " AND rowid=".$id;
-		if ($id == -1) $sql.= " AND position=0";
-		if (is_object($outputlangs)) $sql.= $db->order("position,lang,label","ASC,DESC,ASC");		// We want line with lang set first, then with lang null or ''
-		else $sql.= $db->order("position,lang,label","ASC,ASC,ASC");		// If no language provided, we give priority to lang not defined
+		if ($active >= 0) {
+		    $sql.=" AND active = ".$active;
+		}
+		if ($label) {
+		    $sql.=" AND label ='".$db->escape($label)."'";
+		}
+		if (! ($id > 0) && is_object($outputlangs)) {
+		    $sql.= " AND (lang = '".$db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
+		}
+		if ($id > 0) {
+		    $sql.= " AND rowid=".$id;
+		}
+		if ($id == -1) {
+		    $sql.= " AND position=0";
+		}
+		if (is_object($outputlangs)) {
+		    $sql.= $db->order("position,lang,label","ASC,DESC,ASC");
+		}
+		// We want line with lang set first, then with lang null or ''
+		else {
+		    $sql.= $db->order("position,lang,label","ASC,ASC,ASC");
+		}
+		// If no language provided, we give priority to lang not defined
 		$sql.= $db->plimit(1);
 		//print $sql;
 
@@ -1179,26 +1283,13 @@ 
 				$ret->content = $obj->content;
 				$ret->content_lines = $obj->content_lines;
 				$ret->joinfiles = $obj->joinfiles;
-			}
-			elseif($id == -2) {
+			} elseif($id == -2) {
 				// Not found with the provided label
 				return -1;
-			}
-			else {	// If there is no template at all
+			} else {	// If there is no template at all
 				$defaultmessage='';
 				if ($type_template=='body')							{ $defaultmessage=$this->withbody; }		// Special case to use this->withbody as content
-				elseif ($type_template=='facture_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
-				elseif ($type_template=='facture_relance')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-				elseif ($type_template=='propal_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
-				elseif ($type_template=='supplier_proposal_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
-				elseif ($type_template=='order_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
-				elseif ($type_template=='order_supplier_send')		{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-				elseif ($type_template=='invoice_supplier_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-				elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
-				elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
-				elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
-				elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); }
-				elseif (!empty($type_template))				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
+				elseif ($type_template=='facture_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); } elseif ($type_template=='facture_relance')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); } elseif ($type_template=='propal_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendProposal"); } elseif ($type_template=='supplier_proposal_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); } elseif ($type_template=='order_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendOrder"); } elseif ($type_template=='order_supplier_send')		{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); } elseif ($type_template=='invoice_supplier_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); } elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); } elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); } elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); } elseif ($type_template=='user')				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentUser"); } elseif (!empty($type_template))				        { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
 
 				$ret->label = 'default';
 				$ret->lang = $outputlangs->defaultlang;
@@ -1210,8 +1301,7 @@ 
 
 			$db->free($resql);
 			return $ret;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 			return -1;
@@ -1236,7 +1326,9 @@ 
 		$sql.= " WHERE type_template='".$this->db->escape($type_template)."'";
 		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
-		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		if (is_object($outputlangs)) {
+		    $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		}
 		$sql.= $this->db->order("lang,label","ASC");
 		//print $sql;
 
@@ -1246,8 +1338,7 @@ 
 			$num= $this->db->num_rows($resql);
 			$this->db->free($resql);
 			return $num;
-		}
-		else
+		} else
 		{
 			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
@@ -1273,7 +1364,9 @@ 
 		$sql.= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
 		$sql.= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";		// See all public templates or templates I own.
-		if ($active >= 0) $sql.=" AND active = ".$active;
+		if ($active >= 0) {
+		    $sql.=" AND active = ".$active;
+		}
 		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";	// Return all languages
 		$sql.= $this->db->order("position,lang,label","ASC");
 		//print $sql;
@@ -1300,8 +1393,7 @@ 
 			}
 			$this->db->free($resql);
 			return $num;
-		}
-		else
+		} else
 		{
 			$this->error=get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
@@ -1350,7 +1442,9 @@ 
 				// Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
 				if (!empty($line->fk_product))
 				{
-					if (! is_object($extrafields)) $extrafields = new ExtraFields($this->db);
+					if (! is_object($extrafields)) {
+					    $extrafields = new ExtraFields($this->db);
+					}
 					$extrafields->fetch_name_optionals_label('product', true);
 					$product = new Product($this->db);
 					$product->fetch($line->fk_product, '', '', 1);
@@ -1419,21 +1513,34 @@ 
 				//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
 
 			$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))
 			{
 				$tmparray['__SECUREKEYPAYMENT__']=$conf->global->PAYMENT_SECURITY_TOKEN;
 				if (! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
 				{
-					if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__']='SecureKeyPAYMENTUniquePerMember';
-					if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__']='SecureKeyPAYMENTUniquePerInvoice';
-					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__']='SecureKeyPAYMENTUniquePerOrder';
-					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__']='SecureKeyPAYMENTUniquePerContractLine';
+					if ($conf->adherent->enabled) {
+					    $tmparray['__SECUREKEYPAYMENT_MEMBER__']='SecureKeyPAYMENTUniquePerMember';
+					}
+					if ($conf->facture->enabled) {
+					    $tmparray['__SECUREKEYPAYMENT_INVOICE__']='SecureKeyPAYMENTUniquePerInvoice';
+					}
+					if ($conf->commande->enabled) {
+					    $tmparray['__SECUREKEYPAYMENT_ORDER__']='SecureKeyPAYMENTUniquePerOrder';
+					}
+					if ($conf->contrat->enabled) {
+					    $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__']='SecureKeyPAYMENTUniquePerContractLine';
+					}
 				}
-			}
-			else
+			} else
 			{
 				/* No need to show into tooltip help, option is not enabled
 				$vars['__SECUREKEYPAYMENT__']='';
@@ -1447,7 +1554,9 @@ 
 
 		foreach($tmparray as $key => $val)
 		{
-			if (empty($val)) $tmparray[$key]=$key;
+			if (empty($val)) {
+			    $tmparray[$key]=$key;
+			}
 		}
 
 		return $tmparray;

dolibarr/htdocs/core/class/notify.class.php

Indentation +750 added lines, -750 removed lines

@@ -31,766 +31,766 @@
  */
 class Notify
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
-	public $author;
-	public $ref;
-	public $date;
-	public $duree;
-	public $note;
+    public $author;
+    public $ref;
+    public $date;
+    public $duree;
+    public $note;
 
-	/**
+    /**
      * @var int Project ID
      */
     public $fk_project;
 
-	// Les codes actions sont definis dans la table llx_notify_def
-
-	// codes actions supported are
-	// @TODO defined also into interface_50_modNotificiation_Notificiation.class.php
-	public $arrayofnotifsupported = array(
-		'BILL_VALIDATE',
-		'BILL_PAYED',
-		'ORDER_VALIDATE',
-		'PROPAL_VALIDATE',
-		'PROPAL_CLOSE_SIGNED',
-		'FICHINTER_VALIDATE',
-		'FICHINTER_ADD_CONTACT',
-		'ORDER_SUPPLIER_VALIDATE',
-		'ORDER_SUPPLIER_APPROVE',
-		'ORDER_SUPPLIER_REFUSE',
-		'SHIPPING_VALIDATE',
-		'EXPENSE_REPORT_VALIDATE',
-		'EXPENSE_REPORT_APPROVE',
-		'HOLIDAY_VALIDATE',
-		'HOLIDAY_APPROVE'
-	);
-
-
-	/**
-	 *	Constructor
-	 *
-	 *	@param 		DoliDB		$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *  Return message that say how many notification (and to which email) will occurs on requested event.
-	 *	This is to show confirmation messages before event is recorded.
-	 *
-	 * 	@param	string	$action		Id of action in llx_c_action_trigger
-	 * 	@param	int		$socid		Id of third party
-	 *  @param	Object	$object		Object the notification is about
-	 *	@return	string				Message
-	 */
-	function confirmMessage($action,$socid,$object)
-	{
-		global $langs;
-		$langs->load("mails");
-
-		$listofnotiftodo=$this->getNotificationsArray($action,$socid,$object,0);
-
-		$nb=-1;
-		if (is_array($listofnotiftodo)) $nb=count($listofnotiftodo);
-		if ($nb < 0)  $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
-		if ($nb == 0) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
-   		if ($nb == 1) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
-   		if ($nb >= 2) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
-
-   		if (is_array($listofnotiftodo))
-   		{
-			$i=0;
-			foreach ($listofnotiftodo as $key => $val)
-			{
-				if ($i) $texte.=', ';
-				else $texte.=' (';
-				if ($val['isemailvalid']) $texte.=$val['email'];
-				else $texte.=$val['emaildesc'];
-				$i++;
-			}
-			if ($i) $texte.=')';
-   		}
-
-		return $texte;
-	}
-
-	/**
-	 * Return number of notifications activated for action code (and third party)
-	 *
-	 * @param	string	$notifcode		Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
-	 * @param	int		$socid			Id of third party or 0 for all thirdparties or -1 for no thirdparties
-	 * @param	Object	$object			Object the notification is about (need it to check threshold value of some notifications)
-	 * @param	int		$userid         Id of user or 0 for all users or -1 for no users
-	 * @param   array   $scope          Scope where to search
-	 * @return	array|int				<0 if KO, array of notifications to send if OK
-	 */
-	function getNotificationsArray($notifcode, $socid=0, $object=null, $userid=0, $scope=array('thirdparty', 'user', 'global'))
-	{
-		global $conf, $user;
-
-		$error=0;
-		$resarray=array();
-
-		$valueforthreshold = 0;
-		if (is_object($object)) $valueforthreshold = $object->total_ht;
-
-		if (! $error)
-		{
-			if ($socid >= 0 && in_array('thirdparty', $scope))
-			{
-				$sql = "SELECT a.code, c.email, c.rowid";
-				$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-				$sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
-				$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-				$sql.= " ".MAIN_DB_PREFIX."societe as s";
-				$sql.= " WHERE n.fk_contact = c.rowid";
-				$sql.= " AND a.rowid = n.fk_action";
-				$sql.= " AND n.fk_soc = s.rowid";
-				if ($notifcode)
-				{
-					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
-				}
-				$sql.= " AND s.entity IN (".getEntity('societe').")";
-				if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
-
-				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
-
-				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					$num = $this->db->num_rows($resql);
-					$i=0;
-					while ($i < $num)
-					{
-						$obj = $this->db->fetch_object($resql);
-						if ($obj)
-						{
-							$newval2=trim($obj->email);
-							$isvalid=isValidEmail($newval2);
-							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
-						}
-						$i++;
-					}
-				}
-				else
-				{
-					$error++;
-					$this->error=$this->db->lasterror();
-				}
-			}
-		}
-
-		if (! $error)
-		{
-			if ($userid >= 0 && in_array('user', $scope))
-			{
-				$sql = "SELECT a.code, c.email, c.rowid";
-				$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-				$sql.= " ".MAIN_DB_PREFIX."user as c,";
-				$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a";
-				$sql.= " WHERE n.fk_user = c.rowid";
-				$sql.= " AND a.rowid = n.fk_action";
-				if ($notifcode)
-				{
-					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
-				}
-				$sql.= " AND c.entity IN (".getEntity('user').")";
-				if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
-
-				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
-
-				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					$num = $this->db->num_rows($resql);
-					$i=0;
-					while ($i < $num)
-					{
-						$obj = $this->db->fetch_object($resql);
-						if ($obj)
-						{
-							$newval2=trim($obj->email);
-							$isvalid=isValidEmail($newval2);
-							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
-						}
-						$i++;
-					}
-				}
-				else
-				{
-					$error++;
-					$this->error=$this->db->lasterror();
-				}
-			}
-		}
-
-		if (! $error)
-		{
-			if (in_array('global', $scope))
-			{
-				// List of notifications enabled for fixed email
-				foreach($conf->global as $key => $val)
-				{
-					if ($notifcode)
-					{
-						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-					}
-					else
-					{
-						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-					}
-
-					$threshold = (float) $reg[1];
-					if ($valueforthreshold < $threshold) continue;
-
-					$tmpemail=explode(',',$val);
-					foreach($tmpemail as $key2 => $val2)
-					{
-						$newval2=trim($val2);
-						if ($newval2 == '__SUPERVISOREMAIL__')
-						{
-							if ($user->fk_user > 0)
-							{
-								$tmpuser=new User($this->db);
-								$tmpuser->fetch($user->fk_user);
-								if ($tmpuser->email) $newval2=trim($tmpuser->email);
-								else $newval2='';
-							}
-							else $newval2='';
-						}
-						if ($newval2)
-						{
-							$isvalid=isValidEmail($newval2, 0);
-							if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
-						}
-					}
-				}
-			}
-		}
-
-		if ($error) return -1;
-
-		//var_dump($resarray);
-		return $resarray;
-	}
-
-	/**
-	 *  Check if notification are active for couple action/company.
-	 * 	If yes, send mail and save trace into llx_notify.
-	 *
-	 * 	@param	string	$notifcode			Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
-	 * 	@param	Object	$object				Object the notification deals on
-	 *	@param 	array	$filename_list		List of files to attach (full path of filename on file system)
-	 *	@param 	array	$mimetype_list		List of MIME type of attached files
-	 *	@param 	array	$mimefilename_list	List of attached file name in message
-	 *	@return	int							<0 if KO, or number of changes if OK
-	 */
-	function send($notifcode, $object, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array())
-	{
-		global $user,$conf,$langs,$mysoc;
-		global $hookmanager;
-		global $dolibarr_main_url_root;
-
-		if (! in_array($notifcode, $this->arrayofnotifsupported)) return 0;
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		if (! is_object($hookmanager))
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
-		}
-		$hookmanager->initHooks(array('notification'));
-
-		dol_syslog(get_class($this)."::send notifcode=".$notifcode.", object=".$object->id);
-
-		$langs->load("other");
-
-		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
-		//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
-
-		// Define some vars
-		$application = 'Dolibarr';
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
-		$replyto = $conf->notification->email_from;
-		$object_type = '';
-		$link = '';
-		$num = 0;
-
-		$oldref=(empty($object->oldref)?$object->ref:$object->oldref);
-		$newref=(empty($object->newref)?$object->ref:$object->newref);
-
-		$sql = '';
-
-		// Check notification per third party
-		if ($object->socid > 0)
-		{
-			$sql.= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
-			$sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
-			$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-			$sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-			$sql.= " ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
-			$sql.= " AND n.fk_soc = s.rowid";
-			if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-			else $sql.= " AND a.code = '".$notifcode."'";	// New usage
-			$sql .= " AND s.rowid = ".$object->socid;
-
-			$sql.= "\nUNION\n";
-		}
-
-		// Check notification per user
-		$sql.= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
-		$sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-		$sql.= " FROM ".MAIN_DB_PREFIX."user as c,";
-		$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-		$sql.= " ".MAIN_DB_PREFIX."notify_def as n";
-		$sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
-		if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-		else $sql.= " AND a.code = '".$this->db->escape($notifcode)."'";	// New usage
-
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$num = $this->db->num_rows($result);
-			$projtitle='';
-			if (! empty($object->fk_project))
-			{
-				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$proj = new Project($this->db);
-				$proj->fetch($object->fk_project);
-				$projtitle='('.$proj->title.')';
-			}
-
-			if ($num > 0)
-			{
-				$i = 0;
-				while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
-				{
-					$obj = $this->db->fetch_object($result);
-
-					$sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">";
-					$notifcodedefid = $obj->adid;
-
-					if (dol_strlen($obj->email))
-					{
-						// Set output language
-						$outputlangs = $langs;
-						if ($obj->default_lang && $obj->default_lang != $langs->defaultlang)
-						{
-							$outputlangs = new Translate('', $conf);
-							$outputlangs->setDefaultLang($obj->default_lang);
-							$outputlangs->loadLangs(array("main","other"));
-						}
-
-						$subject = '['.$mysoc->name.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification").($projtitle?' '.$projtitle:'');
-
-						switch ($notifcode) {
-							case 'BILL_VALIDATE':
-								$link='/compta/facture/card.php?facid='.$object->id;
-								$dir_output = $conf->facture->dir_output;
-								$object_type = 'facture';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
-								break;
-							case 'BILL_PAYED':
-								$link='/compta/facture/card.php?facid='.$object->id;
-								$dir_output = $conf->facture->dir_output;
-								$object_type = 'facture';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed",$newref);
-								break;
-							case 'ORDER_VALIDATE':
-								$link='/commande/card.php?id='.$object->id;
-								$dir_output = $conf->commande->dir_output;
-								$object_type = 'order';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderValidated",$newref);
-								break;
-							case 'PROPAL_VALIDATE':
-								$link='/comm/propal/card.php?id='.$object->id;
-								$dir_output = $conf->propal->multidir_output[$object->entity];
-								$object_type = 'propal';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
-								break;
-							case 'PROPAL_CLOSE_SIGNED':
-								$link='/comm/propal/card.php?id='.$object->id;
-								$dir_output = $conf->propal->multidir_output[$object->entity];
-								$object_type = 'propal';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedSigned",$newref);
-								break;
-							case 'FICHINTER_ADD_CONTACT':
-								$link='/fichinter/card.php?id='.$object->id;
-								$dir_output = $conf->ficheinter->dir_output;
-								$object_type = 'ficheinter';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$newref);
-								break;
-							case 'FICHINTER_VALIDATE':
-								$link='/fichinter/card.php?id='.$object->id;
-								$dir_output = $conf->ficheinter->dir_output;
-								$object_type = 'ficheinter';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionValidated",$newref);
-								break;
-							case 'ORDER_SUPPLIER_VALIDATE':
-								$link='/fourn/commande/card.php?id='.$object->id;
-								$dir_output = $conf->fournisseur->commande->dir_output;
-								$object_type = 'order_supplier';
-								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$newref,$user->getFullName($langs));
-								$mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
-								break;
-							case 'ORDER_SUPPLIER_APPROVE':
-								$link='/fourn/commande/card.php?id='.$object->id;
-								$dir_output = $conf->fournisseur->commande->dir_output;
-								$object_type = 'order_supplier';
-								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs));
-								$mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
-								break;
-							case 'ORDER_SUPPLIER_REFUSE':
-								$link='/fourn/commande/card.php?id='.$object->id;
-								$dir_output = $conf->fournisseur->commande->dir_output;
-								$object_type = 'order_supplier';
-								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$newref,$user->getFullName($langs));
-								$mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
-								break;
-							case 'SHIPPING_VALIDATE':
-								$dir_output = $conf->expedition->dir_output.'/sending/';
-								$object_type = 'order_supplier';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
-								break;
-							case 'EXPENSE_REPORT_VALIDATE':
-								$dir_output = $conf->expensereport->dir_output;
-								$object_type = 'expensereport';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportValidated",$newref);
-								break;
-							case 'EXPENSE_REPORT_APPROVE':
-								$dir_output = $conf->expensereport->dir_output;
-								$object_type = 'expensereport';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportApproved",$newref);
-								break;
-							case 'HOLIDAY_VALIDATE':
-								$dir_output = $conf->holiday->dir_output;
-								$object_type = 'holiday';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayValidated",$newref);
-								break;
-							case 'HOLIDAY_APPROVE':
-								$dir_output = $conf->holiday->dir_output;
-								$object_type = 'holiday';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved",$newref);
-								break;
-						}
-						$ref = dol_sanitizeFileName($newref);
-						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
-						if (! dol_is_file($pdf_path))
-						{
-							// We can't add PDF as it is not generated yet.
-							$filepdf = '';
-						}
-						else
-						{
-							$filepdf = $pdf_path;
-						}
-
-						$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
-						$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
-						$message.= "\n";
-						$message.= $mesg;
-						if ($link) $message.= "\n" . $urlwithroot . $link;
-
-						$parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
-						$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-						if (empty($reshook))
-						{
-							if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-							if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
-						}
-
-						$mailfile = new CMailFile(
-							$subject,
-							$sendto,
-							$replyto,
-							$message,
-							$filename_list,
-							$mimetype_list,
-							$mimefilename_list,
-							'',
-							'',
-							0,
-							-1
-						);
-
-						if ($mailfile->sendfile())
-						{
-							if ($obj->type_target == 'touserid') {
-	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
-								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
-							}
-							else {
-								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
-								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
-							}
-							if (! $this->db->query($sql))
-							{
-								dol_print_error($this->db);
-							}
-						}
-						else
-						{
-							$error++;
-							$this->errors[]=$mailfile->error;
-						}
-					}
-					else
-				  {
-						dol_syslog("No notification sent for ".$sendto." because email is empty");
-					}
-					$i++;
-				}
-			}
-			else
-			{
-				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
-			}
-		}
-		else
-		{
-	   		$error++;
-			$this->errors[]=$this->db->lasterror();
-			dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
-	   		return -1;
-		}
-
-		// Check notification using fixed email
-		if (! $error)
-		{
-			foreach($conf->global as $key => $val)
-			{
-				if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-
-				$threshold = (float) $reg[1];
-				if (!empty($object->total_ht) && $object->total_ht <= $threshold)
-				{
-					dol_syslog("A notification is requested for notifcode = ".$notifcode." but amount = ".$object->total_ht." so lower than threshold = ".$threshold.". We discard this notification");
-					continue;
-				}
-
-				$param='NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1];
-
-				$sendto = $conf->global->$param;
-				$notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
-				if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code');
-
-				$object_type = '';
-				$link = '';
-				$num++;
-
-				$subject = '['.$mysoc->name.'] '.$langs->transnoentitiesnoconv("DolibarrNotification").($projtitle?' '.$projtitle:'');
-
-				switch ($notifcode) {
-					case 'BILL_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/compta/facture/card.php?facid=' . $object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->facture->dir_output;
-						$object_type = 'facture';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$link);
-						break;
-					case 'BILL_PAYED':
-						$link ='<a href="' . $urlwithroot . '/compta/facture/card.php?facid='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->facture->dir_output;
-						$object_type = 'facture';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed",$link);
-						break;
-					case 'ORDER_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->commande->dir_output;
-						$object_type = 'order';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$link);
-						break;
-					case 'PROPAL_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->propal->multidir_output[$object->entity];
-						$object_type = 'propal';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$link);
-						break;
-					case 'PROPAL_CLOSE_SIGNED':
-						$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->propal->multidir_output[$object->entity];
-						$object_type = 'propal';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalClosedSigned",$link);
-						break;
-					case 'FICHINTER_ADD_CONTACT':
-						$link = '<a href="' . $urlwithroot . '/fichinter/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->facture->dir_output;
-						$object_type = 'ficheinter';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$link);
-						break;
-					case 'FICHINTER_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/fichinter/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->facture->dir_output;
-						$object_type = 'ficheinter';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$link);
-						break;
-					case 'ORDER_SUPPLIER_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->fournisseur->commande->dir_output;
-						$object_type = 'order_supplier';
-						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$link,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
-						break;
-					case 'ORDER_SUPPLIER_APPROVE':
-						$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->fournisseur->commande->dir_output;
-						$object_type = 'order_supplier';
-						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$link,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
-						break;
-					case 'ORDER_SUPPLIER_APPROVE2':
-						$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->fournisseur->commande->dir_output;
-						$object_type = 'order_supplier';
-						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$link,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
-						break;
-					case 'ORDER_SUPPLIER_REFUSE':
-						$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
-						$dir_output = $conf->fournisseur->dir_output.'/commande/';
-						$object_type = 'order_supplier';
-						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$link,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
-						break;
-					case 'SHIPPING_VALIDATE':
-						$dir_output = $conf->expedition->dir_output.'/sending/';
-						$object_type = 'order_supplier';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
-						break;
-					case 'EXPENSE_REPORT_VALIDATE':
-						$dir_output = $conf->expensereport->dir_output;
-						$object_type = 'expensereport';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportValidated",$newref);
-						break;
-					case 'EXPENSE_REPORT_APPROVE':
-						$dir_output = $conf->expensereport->dir_output;
-						$object_type = 'expensereport';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportApproved",$newref);
-						break;
-					case 'HOLIDAY_VALIDATE':
-						$dir_output = $conf->holiday->dir_output;
-						$object_type = 'holiday';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayValidated",$newref);
-						break;
-					case 'HOLIDAY_APPROVE':
-						$dir_output = $conf->holiday->dir_output;
-						$object_type = 'holiday';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved",$newref);
-						break;
-				}
-				$ref = dol_sanitizeFileName($newref);
-				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
-				if (! dol_is_file($pdf_path))
-				{
-					// We can't add PDF as it is not generated yet.
-					$filepdf = '';
-				}
-				else
-				{
-					$filepdf = $pdf_path;
-				}
-
-				$message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
-				$message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
-				$message.= "\n";
-				$message.= $mesg;
-				//if ($link) $message.= "\n" . $urlwithroot . $link;	// link already added around the ref into the text
-
-				$message = nl2br($message);
-
-				// Replace keyword __SUPERVISOREMAIL__
-				if (preg_match('/__SUPERVISOREMAIL__/', $sendto))
-				{
-					$newval='';
-					if ($user->fk_user > 0)
-					{
-						$supervisoruser=new User($this->db);
-						$supervisoruser->fetch($user->fk_user);
-						if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
-					}
-					dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
-					$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
-					$sendto = preg_replace('/,\s*,/', ',', $sendto);	// in some case you can have $sendto like "email, __SUPERVISOREMAIL__ , otheremail" then you have "email,  , othermail" and it's not valid
-					$sendto = preg_replace('/^[\s,]+/', '', $sendto);	// Clean start of string
-					$sendto = preg_replace('/[\s,]+$/', '', $sendto);	// Clean end of string
-				}
-
-				if ($sendto)
-				{
-					$parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
-					$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-					if (empty($reshook))
-					{
-						if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-						if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
-					}
-					$mailfile = new CMailFile(
-						$subject,
-						$sendto,
-						$replyto,
-						$message,
-						$filename_list,
-						$mimetype_list,
-						$mimefilename_list,
-						'',
-						'',
-						0,
-						1
-					);
-
-					if ($mailfile->sendfile())
-					{
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";
-						$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
-						if (! $this->db->query($sql))
-						{
-							dol_print_error($this->db);
-						}
-					}
-					else
-					{
-						$error++;
-						$this->errors[]=$mailfile->error;
-					}
-				}
-			}
-		}
-
-		if (! $error) return $num;
-		else return -1 * $error;
-	}
+    // Les codes actions sont definis dans la table llx_notify_def
+
+    // codes actions supported are
+    // @TODO defined also into interface_50_modNotificiation_Notificiation.class.php
+    public $arrayofnotifsupported = array(
+        'BILL_VALIDATE',
+        'BILL_PAYED',
+        'ORDER_VALIDATE',
+        'PROPAL_VALIDATE',
+        'PROPAL_CLOSE_SIGNED',
+        'FICHINTER_VALIDATE',
+        'FICHINTER_ADD_CONTACT',
+        'ORDER_SUPPLIER_VALIDATE',
+        'ORDER_SUPPLIER_APPROVE',
+        'ORDER_SUPPLIER_REFUSE',
+        'SHIPPING_VALIDATE',
+        'EXPENSE_REPORT_VALIDATE',
+        'EXPENSE_REPORT_APPROVE',
+        'HOLIDAY_VALIDATE',
+        'HOLIDAY_APPROVE'
+    );
+
+
+    /**
+     *	Constructor
+     *
+     *	@param 		DoliDB		$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *  Return message that say how many notification (and to which email) will occurs on requested event.
+     *	This is to show confirmation messages before event is recorded.
+     *
+     * 	@param	string	$action		Id of action in llx_c_action_trigger
+     * 	@param	int		$socid		Id of third party
+     *  @param	Object	$object		Object the notification is about
+     *	@return	string				Message
+     */
+    function confirmMessage($action,$socid,$object)
+    {
+        global $langs;
+        $langs->load("mails");
+
+        $listofnotiftodo=$this->getNotificationsArray($action,$socid,$object,0);
+
+        $nb=-1;
+        if (is_array($listofnotiftodo)) $nb=count($listofnotiftodo);
+        if ($nb < 0)  $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
+        if ($nb == 0) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
+            if ($nb == 1) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
+            if ($nb >= 2) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
+
+            if (is_array($listofnotiftodo))
+            {
+            $i=0;
+            foreach ($listofnotiftodo as $key => $val)
+            {
+                if ($i) $texte.=', ';
+                else $texte.=' (';
+                if ($val['isemailvalid']) $texte.=$val['email'];
+                else $texte.=$val['emaildesc'];
+                $i++;
+            }
+            if ($i) $texte.=')';
+            }
+
+        return $texte;
+    }
+
+    /**
+     * Return number of notifications activated for action code (and third party)
+     *
+     * @param	string	$notifcode		Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
+     * @param	int		$socid			Id of third party or 0 for all thirdparties or -1 for no thirdparties
+     * @param	Object	$object			Object the notification is about (need it to check threshold value of some notifications)
+     * @param	int		$userid         Id of user or 0 for all users or -1 for no users
+     * @param   array   $scope          Scope where to search
+     * @return	array|int				<0 if KO, array of notifications to send if OK
+     */
+    function getNotificationsArray($notifcode, $socid=0, $object=null, $userid=0, $scope=array('thirdparty', 'user', 'global'))
+    {
+        global $conf, $user;
+
+        $error=0;
+        $resarray=array();
+
+        $valueforthreshold = 0;
+        if (is_object($object)) $valueforthreshold = $object->total_ht;
+
+        if (! $error)
+        {
+            if ($socid >= 0 && in_array('thirdparty', $scope))
+            {
+                $sql = "SELECT a.code, c.email, c.rowid";
+                $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
+                $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+                $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+                $sql.= " ".MAIN_DB_PREFIX."societe as s";
+                $sql.= " WHERE n.fk_contact = c.rowid";
+                $sql.= " AND a.rowid = n.fk_action";
+                $sql.= " AND n.fk_soc = s.rowid";
+                if ($notifcode)
+                {
+                    if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
+                    else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+                }
+                $sql.= " AND s.entity IN (".getEntity('societe').")";
+                if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+
+                dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
+
+                $resql = $this->db->query($sql);
+                if ($resql)
+                {
+                    $num = $this->db->num_rows($resql);
+                    $i=0;
+                    while ($i < $num)
+                    {
+                        $obj = $this->db->fetch_object($resql);
+                        if ($obj)
+                        {
+                            $newval2=trim($obj->email);
+                            $isvalid=isValidEmail($newval2);
+                            if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+                        }
+                        $i++;
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $this->error=$this->db->lasterror();
+                }
+            }
+        }
+
+        if (! $error)
+        {
+            if ($userid >= 0 && in_array('user', $scope))
+            {
+                $sql = "SELECT a.code, c.email, c.rowid";
+                $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
+                $sql.= " ".MAIN_DB_PREFIX."user as c,";
+                $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a";
+                $sql.= " WHERE n.fk_user = c.rowid";
+                $sql.= " AND a.rowid = n.fk_action";
+                if ($notifcode)
+                {
+                    if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
+                    else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+                }
+                $sql.= " AND c.entity IN (".getEntity('user').")";
+                if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
+
+                dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
+
+                $resql = $this->db->query($sql);
+                if ($resql)
+                {
+                    $num = $this->db->num_rows($resql);
+                    $i=0;
+                    while ($i < $num)
+                    {
+                        $obj = $this->db->fetch_object($resql);
+                        if ($obj)
+                        {
+                            $newval2=trim($obj->email);
+                            $isvalid=isValidEmail($newval2);
+                            if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+                        }
+                        $i++;
+                    }
+                }
+                else
+                {
+                    $error++;
+                    $this->error=$this->db->lasterror();
+                }
+            }
+        }
+
+        if (! $error)
+        {
+            if (in_array('global', $scope))
+            {
+                // List of notifications enabled for fixed email
+                foreach($conf->global as $key => $val)
+                {
+                    if ($notifcode)
+                    {
+                        if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+                    }
+                    else
+                    {
+                        if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+                    }
+
+                    $threshold = (float) $reg[1];
+                    if ($valueforthreshold < $threshold) continue;
+
+                    $tmpemail=explode(',',$val);
+                    foreach($tmpemail as $key2 => $val2)
+                    {
+                        $newval2=trim($val2);
+                        if ($newval2 == '__SUPERVISOREMAIL__')
+                        {
+                            if ($user->fk_user > 0)
+                            {
+                                $tmpuser=new User($this->db);
+                                $tmpuser->fetch($user->fk_user);
+                                if ($tmpuser->email) $newval2=trim($tmpuser->email);
+                                else $newval2='';
+                            }
+                            else $newval2='';
+                        }
+                        if ($newval2)
+                        {
+                            $isvalid=isValidEmail($newval2, 0);
+                            if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+                        }
+                    }
+                }
+            }
+        }
+
+        if ($error) return -1;
+
+        //var_dump($resarray);
+        return $resarray;
+    }
+
+    /**
+     *  Check if notification are active for couple action/company.
+     * 	If yes, send mail and save trace into llx_notify.
+     *
+     * 	@param	string	$notifcode			Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
+     * 	@param	Object	$object				Object the notification deals on
+     *	@param 	array	$filename_list		List of files to attach (full path of filename on file system)
+     *	@param 	array	$mimetype_list		List of MIME type of attached files
+     *	@param 	array	$mimefilename_list	List of attached file name in message
+     *	@return	int							<0 if KO, or number of changes if OK
+     */
+    function send($notifcode, $object, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array())
+    {
+        global $user,$conf,$langs,$mysoc;
+        global $hookmanager;
+        global $dolibarr_main_url_root;
+
+        if (! in_array($notifcode, $this->arrayofnotifsupported)) return 0;
+
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        if (! is_object($hookmanager))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+            $hookmanager=new HookManager($this->db);
+        }
+        $hookmanager->initHooks(array('notification'));
+
+        dol_syslog(get_class($this)."::send notifcode=".$notifcode.", object=".$object->id);
+
+        $langs->load("other");
+
+        // Define $urlwithroot
+        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
+        //$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+
+        // Define some vars
+        $application = 'Dolibarr';
+        if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+        $replyto = $conf->notification->email_from;
+        $object_type = '';
+        $link = '';
+        $num = 0;
+
+        $oldref=(empty($object->oldref)?$object->ref:$object->oldref);
+        $newref=(empty($object->newref)?$object->ref:$object->newref);
+
+        $sql = '';
+
+        // Check notification per third party
+        if ($object->socid > 0)
+        {
+            $sql.= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
+            $sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
+            $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
+            $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+            $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
+            $sql.= " ".MAIN_DB_PREFIX."societe as s";
+            $sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
+            $sql.= " AND n.fk_soc = s.rowid";
+            if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
+            else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+            $sql .= " AND s.rowid = ".$object->socid;
+
+            $sql.= "\nUNION\n";
+        }
+
+        // Check notification per user
+        $sql.= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
+        $sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
+        $sql.= " FROM ".MAIN_DB_PREFIX."user as c,";
+        $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+        $sql.= " ".MAIN_DB_PREFIX."notify_def as n";
+        $sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
+        if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
+        else $sql.= " AND a.code = '".$this->db->escape($notifcode)."'";	// New usage
+
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $projtitle='';
+            if (! empty($object->fk_project))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $proj = new Project($this->db);
+                $proj->fetch($object->fk_project);
+                $projtitle='('.$proj->title.')';
+            }
+
+            if ($num > 0)
+            {
+                $i = 0;
+                while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
+                {
+                    $obj = $this->db->fetch_object($result);
+
+                    $sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">";
+                    $notifcodedefid = $obj->adid;
+
+                    if (dol_strlen($obj->email))
+                    {
+                        // Set output language
+                        $outputlangs = $langs;
+                        if ($obj->default_lang && $obj->default_lang != $langs->defaultlang)
+                        {
+                            $outputlangs = new Translate('', $conf);
+                            $outputlangs->setDefaultLang($obj->default_lang);
+                            $outputlangs->loadLangs(array("main","other"));
+                        }
+
+                        $subject = '['.$mysoc->name.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification").($projtitle?' '.$projtitle:'');
+
+                        switch ($notifcode) {
+                            case 'BILL_VALIDATE':
+                                $link='/compta/facture/card.php?facid='.$object->id;
+                                $dir_output = $conf->facture->dir_output;
+                                $object_type = 'facture';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
+                                break;
+                            case 'BILL_PAYED':
+                                $link='/compta/facture/card.php?facid='.$object->id;
+                                $dir_output = $conf->facture->dir_output;
+                                $object_type = 'facture';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed",$newref);
+                                break;
+                            case 'ORDER_VALIDATE':
+                                $link='/commande/card.php?id='.$object->id;
+                                $dir_output = $conf->commande->dir_output;
+                                $object_type = 'order';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderValidated",$newref);
+                                break;
+                            case 'PROPAL_VALIDATE':
+                                $link='/comm/propal/card.php?id='.$object->id;
+                                $dir_output = $conf->propal->multidir_output[$object->entity];
+                                $object_type = 'propal';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
+                                break;
+                            case 'PROPAL_CLOSE_SIGNED':
+                                $link='/comm/propal/card.php?id='.$object->id;
+                                $dir_output = $conf->propal->multidir_output[$object->entity];
+                                $object_type = 'propal';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedSigned",$newref);
+                                break;
+                            case 'FICHINTER_ADD_CONTACT':
+                                $link='/fichinter/card.php?id='.$object->id;
+                                $dir_output = $conf->ficheinter->dir_output;
+                                $object_type = 'ficheinter';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$newref);
+                                break;
+                            case 'FICHINTER_VALIDATE':
+                                $link='/fichinter/card.php?id='.$object->id;
+                                $dir_output = $conf->ficheinter->dir_output;
+                                $object_type = 'ficheinter';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionValidated",$newref);
+                                break;
+                            case 'ORDER_SUPPLIER_VALIDATE':
+                                $link='/fourn/commande/card.php?id='.$object->id;
+                                $dir_output = $conf->fournisseur->commande->dir_output;
+                                $object_type = 'order_supplier';
+                                $mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
+                                $mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$newref,$user->getFullName($langs));
+                                $mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
+                                break;
+                            case 'ORDER_SUPPLIER_APPROVE':
+                                $link='/fourn/commande/card.php?id='.$object->id;
+                                $dir_output = $conf->fournisseur->commande->dir_output;
+                                $object_type = 'order_supplier';
+                                $mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
+                                $mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs));
+                                $mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
+                                break;
+                            case 'ORDER_SUPPLIER_REFUSE':
+                                $link='/fourn/commande/card.php?id='.$object->id;
+                                $dir_output = $conf->fournisseur->commande->dir_output;
+                                $object_type = 'order_supplier';
+                                $mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
+                                $mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$newref,$user->getFullName($langs));
+                                $mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
+                                break;
+                            case 'SHIPPING_VALIDATE':
+                                $dir_output = $conf->expedition->dir_output.'/sending/';
+                                $object_type = 'order_supplier';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
+                                break;
+                            case 'EXPENSE_REPORT_VALIDATE':
+                                $dir_output = $conf->expensereport->dir_output;
+                                $object_type = 'expensereport';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportValidated",$newref);
+                                break;
+                            case 'EXPENSE_REPORT_APPROVE':
+                                $dir_output = $conf->expensereport->dir_output;
+                                $object_type = 'expensereport';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportApproved",$newref);
+                                break;
+                            case 'HOLIDAY_VALIDATE':
+                                $dir_output = $conf->holiday->dir_output;
+                                $object_type = 'holiday';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayValidated",$newref);
+                                break;
+                            case 'HOLIDAY_APPROVE':
+                                $dir_output = $conf->holiday->dir_output;
+                                $object_type = 'holiday';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved",$newref);
+                                break;
+                        }
+                        $ref = dol_sanitizeFileName($newref);
+                        $pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
+                        if (! dol_is_file($pdf_path))
+                        {
+                            // We can't add PDF as it is not generated yet.
+                            $filepdf = '';
+                        }
+                        else
+                        {
+                            $filepdf = $pdf_path;
+                        }
+
+                        $message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
+                        $message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
+                        $message.= "\n";
+                        $message.= $mesg;
+                        if ($link) $message.= "\n" . $urlwithroot . $link;
+
+                        $parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
+                        $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+                        if (empty($reshook))
+                        {
+                            if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
+                            if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+                        }
+
+                        $mailfile = new CMailFile(
+                            $subject,
+                            $sendto,
+                            $replyto,
+                            $message,
+                            $filename_list,
+                            $mimetype_list,
+                            $mimefilename_list,
+                            '',
+                            '',
+                            0,
+                            -1
+                        );
+
+                        if ($mailfile->sendfile())
+                        {
+                            if ($obj->type_target == 'touserid') {
+                                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
+                                $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+                            }
+                            else {
+                                $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
+                                $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+                            }
+                            if (! $this->db->query($sql))
+                            {
+                                dol_print_error($this->db);
+                            }
+                        }
+                        else
+                        {
+                            $error++;
+                            $this->errors[]=$mailfile->error;
+                        }
+                    }
+                    else
+                    {
+                        dol_syslog("No notification sent for ".$sendto." because email is empty");
+                    }
+                    $i++;
+                }
+            }
+            else
+            {
+                dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
+            }
+        }
+        else
+        {
+                $error++;
+            $this->errors[]=$this->db->lasterror();
+            dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
+                return -1;
+        }
+
+        // Check notification using fixed email
+        if (! $error)
+        {
+            foreach($conf->global as $key => $val)
+            {
+                if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+
+                $threshold = (float) $reg[1];
+                if (!empty($object->total_ht) && $object->total_ht <= $threshold)
+                {
+                    dol_syslog("A notification is requested for notifcode = ".$notifcode." but amount = ".$object->total_ht." so lower than threshold = ".$threshold.". We discard this notification");
+                    continue;
+                }
+
+                $param='NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1];
+
+                $sendto = $conf->global->$param;
+                $notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
+                if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code');
+
+                $object_type = '';
+                $link = '';
+                $num++;
+
+                $subject = '['.$mysoc->name.'] '.$langs->transnoentitiesnoconv("DolibarrNotification").($projtitle?' '.$projtitle:'');
+
+                switch ($notifcode) {
+                    case 'BILL_VALIDATE':
+                        $link = '<a href="' . $urlwithroot . '/compta/facture/card.php?facid=' . $object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->facture->dir_output;
+                        $object_type = 'facture';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$link);
+                        break;
+                    case 'BILL_PAYED':
+                        $link ='<a href="' . $urlwithroot . '/compta/facture/card.php?facid='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->facture->dir_output;
+                        $object_type = 'facture';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed",$link);
+                        break;
+                    case 'ORDER_VALIDATE':
+                        $link = '<a href="' . $urlwithroot . '/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->commande->dir_output;
+                        $object_type = 'order';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$link);
+                        break;
+                    case 'PROPAL_VALIDATE':
+                        $link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->propal->multidir_output[$object->entity];
+                        $object_type = 'propal';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$link);
+                        break;
+                    case 'PROPAL_CLOSE_SIGNED':
+                        $link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->propal->multidir_output[$object->entity];
+                        $object_type = 'propal';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextProposalClosedSigned",$link);
+                        break;
+                    case 'FICHINTER_ADD_CONTACT':
+                        $link = '<a href="' . $urlwithroot . '/fichinter/card.php?id='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->facture->dir_output;
+                        $object_type = 'ficheinter';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$link);
+                        break;
+                    case 'FICHINTER_VALIDATE':
+                        $link = '<a href="' . $urlwithroot . '/fichinter/card.php?id='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->facture->dir_output;
+                        $object_type = 'ficheinter';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$link);
+                        break;
+                    case 'ORDER_SUPPLIER_VALIDATE':
+                        $link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->fournisseur->commande->dir_output;
+                        $object_type = 'order_supplier';
+                        $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
+                        $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$link,$user->getFullName($langs));
+                        $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+                        break;
+                    case 'ORDER_SUPPLIER_APPROVE':
+                        $link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->fournisseur->commande->dir_output;
+                        $object_type = 'order_supplier';
+                        $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
+                        $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$link,$user->getFullName($langs));
+                        $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+                        break;
+                    case 'ORDER_SUPPLIER_APPROVE2':
+                        $link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->fournisseur->commande->dir_output;
+                        $object_type = 'order_supplier';
+                        $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
+                        $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$link,$user->getFullName($langs));
+                        $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+                        break;
+                    case 'ORDER_SUPPLIER_REFUSE':
+                        $link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+                        $dir_output = $conf->fournisseur->dir_output.'/commande/';
+                        $object_type = 'order_supplier';
+                        $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
+                        $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$link,$user->getFullName($langs));
+                        $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+                        break;
+                    case 'SHIPPING_VALIDATE':
+                        $dir_output = $conf->expedition->dir_output.'/sending/';
+                        $object_type = 'order_supplier';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
+                        break;
+                    case 'EXPENSE_REPORT_VALIDATE':
+                        $dir_output = $conf->expensereport->dir_output;
+                        $object_type = 'expensereport';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportValidated",$newref);
+                        break;
+                    case 'EXPENSE_REPORT_APPROVE':
+                        $dir_output = $conf->expensereport->dir_output;
+                        $object_type = 'expensereport';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportApproved",$newref);
+                        break;
+                    case 'HOLIDAY_VALIDATE':
+                        $dir_output = $conf->holiday->dir_output;
+                        $object_type = 'holiday';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextHolidayValidated",$newref);
+                        break;
+                    case 'HOLIDAY_APPROVE':
+                        $dir_output = $conf->holiday->dir_output;
+                        $object_type = 'holiday';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved",$newref);
+                        break;
+                }
+                $ref = dol_sanitizeFileName($newref);
+                $pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
+                if (! dol_is_file($pdf_path))
+                {
+                    // We can't add PDF as it is not generated yet.
+                    $filepdf = '';
+                }
+                else
+                {
+                    $filepdf = $pdf_path;
+                }
+
+                $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
+                $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
+                $message.= "\n";
+                $message.= $mesg;
+                //if ($link) $message.= "\n" . $urlwithroot . $link;	// link already added around the ref into the text
+
+                $message = nl2br($message);
+
+                // Replace keyword __SUPERVISOREMAIL__
+                if (preg_match('/__SUPERVISOREMAIL__/', $sendto))
+                {
+                    $newval='';
+                    if ($user->fk_user > 0)
+                    {
+                        $supervisoruser=new User($this->db);
+                        $supervisoruser->fetch($user->fk_user);
+                        if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+                    }
+                    dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
+                    $sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
+                    $sendto = preg_replace('/,\s*,/', ',', $sendto);	// in some case you can have $sendto like "email, __SUPERVISOREMAIL__ , otheremail" then you have "email,  , othermail" and it's not valid
+                    $sendto = preg_replace('/^[\s,]+/', '', $sendto);	// Clean start of string
+                    $sendto = preg_replace('/[\s,]+$/', '', $sendto);	// Clean end of string
+                }
+
+                if ($sendto)
+                {
+                    $parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
+                    $reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+                    if (empty($reshook))
+                    {
+                        if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
+                        if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+                    }
+                    $mailfile = new CMailFile(
+                        $subject,
+                        $sendto,
+                        $replyto,
+                        $message,
+                        $filename_list,
+                        $mimetype_list,
+                        $mimefilename_list,
+                        '',
+                        '',
+                        0,
+                        1
+                    );
+
+                    if ($mailfile->sendfile())
+                    {
+                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";
+                        $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
+                        if (! $this->db->query($sql))
+                        {
+                            dol_print_error($this->db);
+                        }
+                    }
+                    else
+                    {
+                        $error++;
+                        $this->errors[]=$mailfile->error;
+                    }
+                }
+            }
+        }
+
+        if (! $error) return $num;
+        else return -1 * $error;
+    }
 }

Spacing +196 added lines, -196 removed lines

@@ -23,7 +23,7 @@ 
  *      \ingroup    notification
  *      \brief      File of class to manage notifications
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/CMailFile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 
 
 /**
@@ -44,7 +44,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -105,32 +105,32 @@ 
 	 *  @param	Object	$object		Object the notification is about
 	 *	@return	string				Message
 	 */
-	function confirmMessage($action,$socid,$object)
+	function confirmMessage($action, $socid, $object)
 	{
 		global $langs;
 		$langs->load("mails");
 
-		$listofnotiftodo=$this->getNotificationsArray($action,$socid,$object,0);
+		$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
 
-		$nb=-1;
-		if (is_array($listofnotiftodo)) $nb=count($listofnotiftodo);
-		if ($nb < 0)  $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
-		if ($nb == 0) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
-   		if ($nb == 1) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
-   		if ($nb >= 2) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
+		$nb = -1;
+		if (is_array($listofnotiftodo)) $nb = count($listofnotiftodo);
+		if ($nb < 0)  $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
+		if ($nb == 0) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("NoNotificationsWillBeSent");
+   		if ($nb == 1) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("ANotificationsWillBeSent");
+   		if ($nb >= 2) $texte = img_object($langs->trans("Notifications"), 'email').' '.$langs->trans("SomeNotificationsWillBeSent", $nb);
 
    		if (is_array($listofnotiftodo))
    		{
-			$i=0;
+			$i = 0;
 			foreach ($listofnotiftodo as $key => $val)
 			{
-				if ($i) $texte.=', ';
-				else $texte.=' (';
-				if ($val['isemailvalid']) $texte.=$val['email'];
-				else $texte.=$val['emaildesc'];
+				if ($i) $texte .= ', ';
+				else $texte .= ' (';
+				if ($val['isemailvalid']) $texte .= $val['email'];
+				else $texte .= $val['emaildesc'];
 				$i++;
 			}
-			if ($i) $texte.=')';
+			if ($i) $texte .= ')';
    		}
 
 		return $texte;
@@ -146,35 +146,35 @@ 
 	 * @param   array   $scope          Scope where to search
 	 * @return	array|int				<0 if KO, array of notifications to send if OK
 	 */
-	function getNotificationsArray($notifcode, $socid=0, $object=null, $userid=0, $scope=array('thirdparty', 'user', 'global'))
+	function getNotificationsArray($notifcode, $socid = 0, $object = null, $userid = 0, $scope = array('thirdparty', 'user', 'global'))
 	{
 		global $conf, $user;
 
-		$error=0;
-		$resarray=array();
+		$error = 0;
+		$resarray = array();
 
 		$valueforthreshold = 0;
 		if (is_object($object)) $valueforthreshold = $object->total_ht;
 
-		if (! $error)
+		if (!$error)
 		{
 			if ($socid >= 0 && in_array('thirdparty', $scope))
 			{
 				$sql = "SELECT a.code, c.email, c.rowid";
-				$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-				$sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
-				$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-				$sql.= " ".MAIN_DB_PREFIX."societe as s";
-				$sql.= " WHERE n.fk_contact = c.rowid";
-				$sql.= " AND a.rowid = n.fk_action";
-				$sql.= " AND n.fk_soc = s.rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
+				$sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+				$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+				$sql .= " ".MAIN_DB_PREFIX."societe as s";
+				$sql .= " WHERE n.fk_contact = c.rowid";
+				$sql .= " AND a.rowid = n.fk_action";
+				$sql .= " AND n.fk_soc = s.rowid";
 				if ($notifcode)
 				{
-					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+					if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+					else $sql .= " AND a.code = '".$notifcode."'"; // New usage
 				}
-				$sql.= " AND s.entity IN (".getEntity('societe').")";
-				if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+				$sql .= " AND s.entity IN (".getEntity('societe').")";
+				if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
 
@@ -182,14 +182,14 @@ 
 				if ($resql)
 				{
 					$num = $this->db->num_rows($resql);
-					$i=0;
+					$i = 0;
 					while ($i < $num)
 					{
 						$obj = $this->db->fetch_object($resql);
 						if ($obj)
 						{
-							$newval2=trim($obj->email);
-							$isvalid=isValidEmail($newval2);
+							$newval2 = trim($obj->email);
+							$isvalid = isValidEmail($newval2);
 							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
 						}
 						$i++;
@@ -198,28 +198,28 @@ 
 				else
 				{
 					$error++;
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 				}
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			if ($userid >= 0 && in_array('user', $scope))
 			{
 				$sql = "SELECT a.code, c.email, c.rowid";
-				$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-				$sql.= " ".MAIN_DB_PREFIX."user as c,";
-				$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a";
-				$sql.= " WHERE n.fk_user = c.rowid";
-				$sql.= " AND a.rowid = n.fk_action";
+				$sql .= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
+				$sql .= " ".MAIN_DB_PREFIX."user as c,";
+				$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a";
+				$sql .= " WHERE n.fk_user = c.rowid";
+				$sql .= " AND a.rowid = n.fk_action";
 				if ($notifcode)
 				{
-					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+					if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+					else $sql .= " AND a.code = '".$notifcode."'"; // New usage
 				}
-				$sql.= " AND c.entity IN (".getEntity('user').")";
-				if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
+				$sql .= " AND c.entity IN (".getEntity('user').")";
+				if ($userid > 0) $sql .= " AND c.rowid = ".$userid;
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
 
@@ -227,14 +227,14 @@ 
 				if ($resql)
 				{
 					$num = $this->db->num_rows($resql);
-					$i=0;
+					$i = 0;
 					while ($i < $num)
 					{
 						$obj = $this->db->fetch_object($resql);
 						if ($obj)
 						{
-							$newval2=trim($obj->email);
-							$isvalid=isValidEmail($newval2);
+							$newval2 = trim($obj->email);
+							$isvalid = isValidEmail($newval2);
 							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
 						}
 						$i++;
@@ -243,49 +243,49 @@ 
 				else
 				{
 					$error++;
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 				}
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			if (in_array('global', $scope))
 			{
 				// List of notifications enabled for fixed email
-				foreach($conf->global as $key => $val)
+				foreach ($conf->global as $key => $val)
 				{
 					if ($notifcode)
 					{
-						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 					}
 					else
 					{
-						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 					}
 
 					$threshold = (float) $reg[1];
 					if ($valueforthreshold < $threshold) continue;
 
-					$tmpemail=explode(',',$val);
-					foreach($tmpemail as $key2 => $val2)
+					$tmpemail = explode(',', $val);
+					foreach ($tmpemail as $key2 => $val2)
 					{
-						$newval2=trim($val2);
+						$newval2 = trim($val2);
 						if ($newval2 == '__SUPERVISOREMAIL__')
 						{
 							if ($user->fk_user > 0)
 							{
-								$tmpuser=new User($this->db);
+								$tmpuser = new User($this->db);
 								$tmpuser->fetch($user->fk_user);
-								if ($tmpuser->email) $newval2=trim($tmpuser->email);
-								else $newval2='';
+								if ($tmpuser->email) $newval2 = trim($tmpuser->email);
+								else $newval2 = '';
 							}
-							else $newval2='';
+							else $newval2 = '';
 						}
 						if ($newval2)
 						{
-							$isvalid=isValidEmail($newval2, 0);
-							if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+							$isvalid = isValidEmail($newval2, 0);
+							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
 						}
 					}
 				}
@@ -309,19 +309,19 @@ 
 	 *	@param 	array	$mimefilename_list	List of attached file name in message
 	 *	@return	int							<0 if KO, or number of changes if OK
 	 */
-	function send($notifcode, $object, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array())
+	function send($notifcode, $object, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array())
 	{
-		global $user,$conf,$langs,$mysoc;
+		global $user, $conf, $langs, $mysoc;
 		global $hookmanager;
 		global $dolibarr_main_url_root;
 
-		if (! in_array($notifcode, $this->arrayofnotifsupported)) return 0;
+		if (!in_array($notifcode, $this->arrayofnotifsupported)) return 0;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('notification'));
 
@@ -330,72 +330,72 @@ 
 		$langs->load("other");
 
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
 
 		// Define some vars
 		$application = 'Dolibarr';
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
 		$replyto = $conf->notification->email_from;
 		$object_type = '';
 		$link = '';
 		$num = 0;
 
-		$oldref=(empty($object->oldref)?$object->ref:$object->oldref);
-		$newref=(empty($object->newref)?$object->ref:$object->newref);
+		$oldref = (empty($object->oldref) ? $object->ref : $object->oldref);
+		$newref = (empty($object->newref) ? $object->ref : $object->newref);
 
 		$sql = '';
 
 		// Check notification per third party
 		if ($object->socid > 0)
 		{
-			$sql.= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
-			$sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
-			$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-			$sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-			$sql.= " ".MAIN_DB_PREFIX."societe as s";
-			$sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
-			$sql.= " AND n.fk_soc = s.rowid";
-			if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-			else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+			$sql .= "SELECT 'tocontactid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
+			$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
+			$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+			$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+			$sql .= " ".MAIN_DB_PREFIX."societe as s";
+			$sql .= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
+			$sql .= " AND n.fk_soc = s.rowid";
+			if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+			else $sql .= " AND a.code = '".$notifcode."'"; // New usage
 			$sql .= " AND s.rowid = ".$object->socid;
 
-			$sql.= "\nUNION\n";
+			$sql .= "\nUNION\n";
 		}
 
 		// Check notification per user
-		$sql.= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
-		$sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
-		$sql.= " FROM ".MAIN_DB_PREFIX."user as c,";
-		$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-		$sql.= " ".MAIN_DB_PREFIX."notify_def as n";
-		$sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
-		if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-		else $sql.= " AND a.code = '".$this->db->escape($notifcode)."'";	// New usage
+		$sql .= "SELECT 'touserid' as type_target, c.email, c.rowid as cid, c.lastname, c.firstname, c.lang as default_lang,";
+		$sql .= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
+		$sql .= " FROM ".MAIN_DB_PREFIX."user as c,";
+		$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+		$sql .= " ".MAIN_DB_PREFIX."notify_def as n";
+		$sql .= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
+		if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
+		else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
 
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$num = $this->db->num_rows($result);
-			$projtitle='';
-			if (! empty($object->fk_project))
+			$projtitle = '';
+			if (!empty($object->fk_project))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$proj = new Project($this->db);
 				$proj->fetch($object->fk_project);
-				$projtitle='('.$proj->title.')';
+				$projtitle = '('.$proj->title.')';
 			}
 
 			if ($num > 0)
 			{
 				$i = 0;
-				while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
+				while ($i < $num && !$error)	// For each notification couple defined (third party/actioncode)
 				{
 					$obj = $this->db->fetch_object($result);
 
-					$sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">";
+					$sendto = dolGetFirstLastname($obj->firstname, $obj->lastname)." <".$obj->email.">";
 					$notifcodedefid = $obj->adid;
 
 					if (dol_strlen($obj->email))
@@ -406,107 +406,107 @@ 
 						{
 							$outputlangs = new Translate('', $conf);
 							$outputlangs->setDefaultLang($obj->default_lang);
-							$outputlangs->loadLangs(array("main","other"));
+							$outputlangs->loadLangs(array("main", "other"));
 						}
 
-						$subject = '['.$mysoc->name.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification").($projtitle?' '.$projtitle:'');
+						$subject = '['.$mysoc->name.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification").($projtitle ? ' '.$projtitle : '');
 
 						switch ($notifcode) {
 							case 'BILL_VALIDATE':
-								$link='/compta/facture/card.php?facid='.$object->id;
+								$link = '/compta/facture/card.php?facid='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceValidated", $newref);
 								break;
 							case 'BILL_PAYED':
-								$link='/compta/facture/card.php?facid='.$object->id;
+								$link = '/compta/facture/card.php?facid='.$object->id;
 								$dir_output = $conf->facture->dir_output;
 								$object_type = 'facture';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed", $newref);
 								break;
 							case 'ORDER_VALIDATE':
-								$link='/commande/card.php?id='.$object->id;
+								$link = '/commande/card.php?id='.$object->id;
 								$dir_output = $conf->commande->dir_output;
 								$object_type = 'order';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderValidated",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderValidated", $newref);
 								break;
 							case 'PROPAL_VALIDATE':
-								$link='/comm/propal/card.php?id='.$object->id;
+								$link = '/comm/propal/card.php?id='.$object->id;
 								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalValidated",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalValidated", $newref);
 								break;
 							case 'PROPAL_CLOSE_SIGNED':
-								$link='/comm/propal/card.php?id='.$object->id;
+								$link = '/comm/propal/card.php?id='.$object->id;
 								$dir_output = $conf->propal->multidir_output[$object->entity];
 								$object_type = 'propal';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedSigned",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedSigned", $newref);
 								break;
 							case 'FICHINTER_ADD_CONTACT':
-								$link='/fichinter/card.php?id='.$object->id;
+								$link = '/fichinter/card.php?id='.$object->id;
 								$dir_output = $conf->ficheinter->dir_output;
 								$object_type = 'ficheinter';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionAddedContact", $newref);
 								break;
 							case 'FICHINTER_VALIDATE':
-								$link='/fichinter/card.php?id='.$object->id;
+								$link = '/fichinter/card.php?id='.$object->id;
 								$dir_output = $conf->ficheinter->dir_output;
 								$object_type = 'ficheinter';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionValidated",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInterventionValidated", $newref);
 								break;
 							case 'ORDER_SUPPLIER_VALIDATE':
-								$link='/fourn/commande/card.php?id='.$object->id;
+								$link = '/fourn/commande/card.php?id='.$object->id;
 								$dir_output = $conf->fournisseur->commande->dir_output;
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$newref,$user->getFullName($langs));
-								$mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
+								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $newref, $user->getFullName($langs));
+								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_APPROVE':
-								$link='/fourn/commande/card.php?id='.$object->id;
+								$link = '/fourn/commande/card.php?id='.$object->id;
 								$dir_output = $conf->fournisseur->commande->dir_output;
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs));
-								$mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
+								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $newref, $user->getFullName($langs));
+								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_REFUSE':
-								$link='/fourn/commande/card.php?id='.$object->id;
+								$link = '/fourn/commande/card.php?id='.$object->id;
 								$dir_output = $conf->fournisseur->commande->dir_output;
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg.= $outputlangs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$newref,$user->getFullName($langs));
-								$mesg.= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
+								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $newref, $user->getFullName($langs));
+								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'SHIPPING_VALIDATE':
 								$dir_output = $conf->expedition->dir_output.'/sending/';
 								$object_type = 'order_supplier';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpeditionValidated", $newref);
 								break;
 							case 'EXPENSE_REPORT_VALIDATE':
 								$dir_output = $conf->expensereport->dir_output;
 								$object_type = 'expensereport';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportValidated",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportValidated", $newref);
 								break;
 							case 'EXPENSE_REPORT_APPROVE':
 								$dir_output = $conf->expensereport->dir_output;
 								$object_type = 'expensereport';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportApproved",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextExpenseReportApproved", $newref);
 								break;
 							case 'HOLIDAY_VALIDATE':
 								$dir_output = $conf->holiday->dir_output;
 								$object_type = 'holiday';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayValidated",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayValidated", $newref);
 								break;
 							case 'HOLIDAY_APPROVE':
 								$dir_output = $conf->holiday->dir_output;
 								$object_type = 'holiday';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved",$newref);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $newref);
 								break;
 						}
 						$ref = dol_sanitizeFileName($newref);
 						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
-						if (! dol_is_file($pdf_path))
+						if (!dol_is_file($pdf_path))
 						{
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
@@ -516,18 +516,18 @@ 
 							$filepdf = $pdf_path;
 						}
 
-						$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
-						$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
-						$message.= "\n";
-						$message.= $mesg;
-						if ($link) $message.= "\n" . $urlwithroot . $link;
+						$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";
+						$message .= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
+						$message .= "\n";
+						$message .= $mesg;
+						if ($link) $message .= "\n".$urlwithroot.$link;
 
-						$parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
-						$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+						$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
+						$reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 						if (empty($reshook))
 						{
-							if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-							if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+							if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];
+							if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
 						}
 
 						$mailfile = new CMailFile(
@@ -548,13 +548,13 @@ 
 						{
 							if ($obj->type_target == 'touserid') {
 	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
-								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
 							}
 							else {
 								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
-								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
 							}
-							if (! $this->db->query($sql))
+							if (!$this->db->query($sql))
 							{
 								dol_print_error($this->db);
 							}
@@ -562,7 +562,7 @@ 
 						else
 						{
 							$error++;
-							$this->errors[]=$mailfile->error;
+							$this->errors[] = $mailfile->error;
 						}
 					}
 					else
@@ -580,17 +580,17 @@ 
 		else
 		{
 	   		$error++;
-			$this->errors[]=$this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
 			dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
 	   		return -1;
 		}
 
 		// Check notification using fixed email
-		if (! $error)
+		if (!$error)
 		{
-			foreach($conf->global as $key => $val)
+			foreach ($conf->global as $key => $val)
 			{
-				if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+				if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 
 				$threshold = (float) $reg[1];
 				if (!empty($object->total_ht) && $object->total_ht <= $threshold)
@@ -599,7 +599,7 @@ 
 					continue;
 				}
 
-				$param='NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1];
+				$param = 'NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1];
 
 				$sendto = $conf->global->$param;
 				$notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
@@ -609,112 +609,112 @@ 
 				$link = '';
 				$num++;
 
-				$subject = '['.$mysoc->name.'] '.$langs->transnoentitiesnoconv("DolibarrNotification").($projtitle?' '.$projtitle:'');
+				$subject = '['.$mysoc->name.'] '.$langs->transnoentitiesnoconv("DolibarrNotification").($projtitle ? ' '.$projtitle : '');
 
 				switch ($notifcode) {
 					case 'BILL_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/compta/facture/card.php?facid=' . $object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'facture';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$link);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated", $link);
 						break;
 					case 'BILL_PAYED':
-						$link ='<a href="' . $urlwithroot . '/compta/facture/card.php?facid='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'facture';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed",$link);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoicePayed", $link);
 						break;
 					case 'ORDER_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->commande->dir_output;
 						$object_type = 'order';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$link);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated", $link);
 						break;
 					case 'PROPAL_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->propal->multidir_output[$object->entity];
 						$object_type = 'propal';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$link);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated", $link);
 						break;
 					case 'PROPAL_CLOSE_SIGNED':
-						$link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->propal->multidir_output[$object->entity];
 						$object_type = 'propal';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalClosedSigned",$link);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalClosedSigned", $link);
 						break;
 					case 'FICHINTER_ADD_CONTACT':
-						$link = '<a href="' . $urlwithroot . '/fichinter/card.php?id='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'ficheinter';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$link);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact", $link);
 						break;
 					case 'FICHINTER_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/fichinter/card.php?id='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/fichinter/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->facture->dir_output;
 						$object_type = 'ficheinter';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$link);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated", $link);
 						break;
 					case 'ORDER_SUPPLIER_VALIDATE':
-						$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->fournisseur->commande->dir_output;
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$link,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $link, $user->getFullName($langs));
+						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'ORDER_SUPPLIER_APPROVE':
-						$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->fournisseur->commande->dir_output;
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$link,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($langs));
+						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'ORDER_SUPPLIER_APPROVE2':
-						$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->fournisseur->commande->dir_output;
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$link,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($langs));
+						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'ORDER_SUPPLIER_REFUSE':
-						$link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>';
+						$link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>';
 						$dir_output = $conf->fournisseur->dir_output.'/commande/';
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$link,$user->getFullName($langs));
-						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $link, $user->getFullName($langs));
+						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'SHIPPING_VALIDATE':
 						$dir_output = $conf->expedition->dir_output.'/sending/';
 						$object_type = 'order_supplier';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated", $newref);
 						break;
 					case 'EXPENSE_REPORT_VALIDATE':
 						$dir_output = $conf->expensereport->dir_output;
 						$object_type = 'expensereport';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportValidated",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportValidated", $newref);
 						break;
 					case 'EXPENSE_REPORT_APPROVE':
 						$dir_output = $conf->expensereport->dir_output;
 						$object_type = 'expensereport';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportApproved",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextExpenseReportApproved", $newref);
 						break;
 					case 'HOLIDAY_VALIDATE':
 						$dir_output = $conf->holiday->dir_output;
 						$object_type = 'holiday';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayValidated",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayValidated", $newref);
 						break;
 					case 'HOLIDAY_APPROVE':
 						$dir_output = $conf->holiday->dir_output;
 						$object_type = 'holiday';
-						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved",$newref);
+						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved", $newref);
 						break;
 				}
 				$ref = dol_sanitizeFileName($newref);
 				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
-				if (! dol_is_file($pdf_path))
+				if (!dol_is_file($pdf_path))
 				{
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
@@ -724,10 +724,10 @@ 
 					$filepdf = $pdf_path;
 				}
 
-				$message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
-				$message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
-				$message.= "\n";
-				$message.= $mesg;
+				$message = $langs->transnoentities("YouReceiveMailBecauseOfNotification", $application, $mysoc->name)."\n";
+				$message .= $langs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
+				$message .= "\n";
+				$message .= $mesg;
 				//if ($link) $message.= "\n" . $urlwithroot . $link;	// link already added around the ref into the text
 
 				$message = nl2br($message);
@@ -735,28 +735,28 @@ 
 				// Replace keyword __SUPERVISOREMAIL__
 				if (preg_match('/__SUPERVISOREMAIL__/', $sendto))
 				{
-					$newval='';
+					$newval = '';
 					if ($user->fk_user > 0)
 					{
-						$supervisoruser=new User($this->db);
+						$supervisoruser = new User($this->db);
 						$supervisoruser->fetch($user->fk_user);
-						if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+						if ($supervisoruser->email) $newval = trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
 					}
 					dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
 					$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
-					$sendto = preg_replace('/,\s*,/', ',', $sendto);	// in some case you can have $sendto like "email, __SUPERVISOREMAIL__ , otheremail" then you have "email,  , othermail" and it's not valid
-					$sendto = preg_replace('/^[\s,]+/', '', $sendto);	// Clean start of string
-					$sendto = preg_replace('/[\s,]+$/', '', $sendto);	// Clean end of string
+					$sendto = preg_replace('/,\s*,/', ',', $sendto); // in some case you can have $sendto like "email, __SUPERVISOREMAIL__ , otheremail" then you have "email,  , othermail" and it's not valid
+					$sendto = preg_replace('/^[\s,]+/', '', $sendto); // Clean start of string
+					$sendto = preg_replace('/[\s,]+$/', '', $sendto); // Clean end of string
 				}
 
 				if ($sendto)
 				{
-					$parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
-					$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+					$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
+					$reshook = $hookmanager->executeHooks('formatNotificationMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 					if (empty($reshook))
 					{
-						if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-						if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+						if (!empty($hookmanager->resArray['subject'])) $subject .= $hookmanager->resArray['subject'];
+						if (!empty($hookmanager->resArray['message'])) $message .= $hookmanager->resArray['message'];
 					}
 					$mailfile = new CMailFile(
 						$subject,
@@ -775,8 +775,8 @@ 
 					if ($mailfile->sendfile())
 					{
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, type_target, objet_type, objet_id, email)";
-						$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
-						if (! $this->db->query($sql))
+						$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", null, 'email', 'tofixedemail', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
+						if (!$this->db->query($sql))
 						{
 							dol_print_error($this->db);
 						}
@@ -784,13 +784,13 @@ 
 					else
 					{
 						$error++;
-						$this->errors[]=$mailfile->error;
+						$this->errors[] = $mailfile->error;
 					}
 				}
 			}
 		}
 
-		if (! $error) return $num;
+		if (!$error) return $num;
 		else return -1 * $error;
 	}
 }

Braces +146 added lines, -66 removed lines

@@ -113,24 +113,42 @@ 
 		$listofnotiftodo=$this->getNotificationsArray($action,$socid,$object,0);
 
 		$nb=-1;
-		if (is_array($listofnotiftodo)) $nb=count($listofnotiftodo);
-		if ($nb < 0)  $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
-		if ($nb == 0) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
-   		if ($nb == 1) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
-   		if ($nb >= 2) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
+		if (is_array($listofnotiftodo)) {
+		    $nb=count($listofnotiftodo);
+		}
+		if ($nb < 0) {
+		    $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ErrorFailedToGetListOfNotificationsToSend");
+		}
+		if ($nb == 0) {
+		    $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent");
+		}
+   		if ($nb == 1) {
+   		    $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent");
+   		}
+   		if ($nb >= 2) {
+   		    $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb);
+   		}
 
    		if (is_array($listofnotiftodo))
    		{
 			$i=0;
 			foreach ($listofnotiftodo as $key => $val)
 			{
-				if ($i) $texte.=', ';
-				else $texte.=' (';
-				if ($val['isemailvalid']) $texte.=$val['email'];
-				else $texte.=$val['emaildesc'];
+				if ($i) {
+				    $texte.=', ';
+				} else {
+				    $texte.=' (';
+				}
+				if ($val['isemailvalid']) {
+				    $texte.=$val['email'];
+				} else {
+				    $texte.=$val['emaildesc'];
+				}
 				$i++;
 			}
-			if ($i) $texte.=')';
+			if ($i) {
+			    $texte.=')';
+			}
    		}
 
 		return $texte;
@@ -154,7 +172,9 @@ 
 		$resarray=array();
 
 		$valueforthreshold = 0;
-		if (is_object($object)) $valueforthreshold = $object->total_ht;
+		if (is_object($object)) {
+		    $valueforthreshold = $object->total_ht;
+		}
 
 		if (! $error)
 		{
@@ -170,11 +190,19 @@ 
 				$sql.= " AND n.fk_soc = s.rowid";
 				if ($notifcode)
 				{
-					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+					if (is_numeric($notifcode)) {
+					    $sql.= " AND n.fk_action = ".$notifcode;
+					}
+					// Old usage
+					else {
+					    $sql.= " AND a.code = '".$notifcode."'";
+					}
+					// New usage
 				}
 				$sql.= " AND s.entity IN (".getEntity('societe').")";
-				if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+				if ($socid > 0) {
+				    $sql.= " AND s.rowid = ".$socid;
+				}
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
 
@@ -190,12 +218,13 @@ 
 						{
 							$newval2=trim($obj->email);
 							$isvalid=isValidEmail($newval2);
-							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							if (empty($resarray[$newval2])) {
+							    $resarray[$newval2] = array('type'=> 'tocontact', 'code'=>trim($obj->code), 'emaildesc'=>'Contact id '.$obj->rowid, 'email'=>$newval2, 'contactid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							}
 						}
 						$i++;
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$this->db->lasterror();
@@ -215,11 +244,19 @@ 
 				$sql.= " AND a.rowid = n.fk_action";
 				if ($notifcode)
 				{
-					if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-					else $sql.= " AND a.code = '".$notifcode."'";			// New usage
+					if (is_numeric($notifcode)) {
+					    $sql.= " AND n.fk_action = ".$notifcode;
+					}
+					// Old usage
+					else {
+					    $sql.= " AND a.code = '".$notifcode."'";
+					}
+					// New usage
 				}
 				$sql.= " AND c.entity IN (".getEntity('user').")";
-				if ($userid > 0) $sql.= " AND c.rowid = ".$userid;
+				if ($userid > 0) {
+				    $sql.= " AND c.rowid = ".$userid;
+				}
 
 				dol_syslog(__METHOD__." ".$notifcode.", ".$socid."", LOG_DEBUG);
 
@@ -235,12 +272,13 @@ 
 						{
 							$newval2=trim($obj->email);
 							$isvalid=isValidEmail($newval2);
-							if (empty($resarray[$newval2])) $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							if (empty($resarray[$newval2])) {
+							    $resarray[$newval2] = array('type'=> 'touser', 'code'=>trim($obj->code), 'emaildesc'=>'User id '.$obj->rowid, 'email'=>$newval2, 'userid'=>$obj->rowid, 'isemailvalid'=>$isvalid);
+							}
 						}
 						$i++;
 					}
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$this->db->lasterror();
@@ -257,15 +295,20 @@ 
 				{
 					if ($notifcode)
 					{
-						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-					}
-					else
+						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+						    continue;
+						}
+					} else
 					{
-						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+						if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+						    continue;
+						}
 					}
 
 					$threshold = (float) $reg[1];
-					if ($valueforthreshold < $threshold) continue;
+					if ($valueforthreshold < $threshold) {
+					    continue;
+					}
 
 					$tmpemail=explode(',',$val);
 					foreach($tmpemail as $key2 => $val2)
@@ -277,22 +320,30 @@ 
 							{
 								$tmpuser=new User($this->db);
 								$tmpuser->fetch($user->fk_user);
-								if ($tmpuser->email) $newval2=trim($tmpuser->email);
-								else $newval2='';
+								if ($tmpuser->email) {
+								    $newval2=trim($tmpuser->email);
+								} else {
+								    $newval2='';
+								}
+							} else {
+							    $newval2='';
 							}
-							else $newval2='';
 						}
 						if ($newval2)
 						{
 							$isvalid=isValidEmail($newval2, 0);
-							if (empty($resarray[$newval2])) $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+							if (empty($resarray[$newval2])) {
+							    $resarray[$newval2]=array('type'=> 'tofixedemail', 'code'=>trim($key), 'emaildesc'=>trim($val2), 'email'=>$newval2, 'isemailvalid'=>$isvalid);
+							}
 						}
 					}
 				}
 			}
 		}
 
-		if ($error) return -1;
+		if ($error) {
+		    return -1;
+		}
 
 		//var_dump($resarray);
 		return $resarray;
@@ -315,7 +366,9 @@ 
 		global $hookmanager;
 		global $dolibarr_main_url_root;
 
-		if (! in_array($notifcode, $this->arrayofnotifsupported)) return 0;
+		if (! in_array($notifcode, $this->arrayofnotifsupported)) {
+		    return 0;
+		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		if (! is_object($hookmanager))
@@ -336,7 +389,9 @@ 
 
 		// Define some vars
 		$application = 'Dolibarr';
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+		if (! empty($conf->global->MAIN_APPLICATION_TITLE)) {
+		    $application = $conf->global->MAIN_APPLICATION_TITLE;
+		}
 		$replyto = $conf->notification->email_from;
 		$object_type = '';
 		$link = '';
@@ -358,8 +413,14 @@ 
 			$sql.= " ".MAIN_DB_PREFIX."societe as s";
 			$sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action";
 			$sql.= " AND n.fk_soc = s.rowid";
-			if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-			else $sql.= " AND a.code = '".$notifcode."'";	// New usage
+			if (is_numeric($notifcode)) {
+			    $sql.= " AND n.fk_action = ".$notifcode;
+			}
+			// Old usage
+			else {
+			    $sql.= " AND a.code = '".$notifcode."'";
+			}
+			// New usage
 			$sql .= " AND s.rowid = ".$object->socid;
 
 			$sql.= "\nUNION\n";
@@ -372,8 +433,14 @@ 
 		$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
 		$sql.= " ".MAIN_DB_PREFIX."notify_def as n";
 		$sql.= " WHERE n.fk_user = c.rowid AND a.rowid = n.fk_action";
-		if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode;	// Old usage
-		else $sql.= " AND a.code = '".$this->db->escape($notifcode)."'";	// New usage
+		if (is_numeric($notifcode)) {
+		    $sql.= " AND n.fk_action = ".$notifcode;
+		}
+		// Old usage
+		else {
+		    $sql.= " AND a.code = '".$this->db->escape($notifcode)."'";
+		}
+		// New usage
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -391,9 +458,11 @@ 
 			if ($num > 0)
 			{
 				$i = 0;
-				while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
+				while ($i < $num && ! $error) {
+				    // For each notification couple defined (third party/actioncode)
 				{
 					$obj = $this->db->fetch_object($result);
+				}
 
 					$sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">";
 					$notifcodedefid = $obj->adid;
@@ -510,8 +579,7 @@ 
 						{
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
-						}
-						else
+						} else
 						{
 							$filepdf = $pdf_path;
 						}
@@ -520,14 +588,20 @@ 
 						$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
 						$message.= "\n";
 						$message.= $mesg;
-						if ($link) $message.= "\n" . $urlwithroot . $link;
+						if ($link) {
+						    $message.= "\n" . $urlwithroot . $link;
+						}
 
 						$parameters=array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
 						$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 						if (empty($reshook))
 						{
-							if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-							if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+							if (! empty($hookmanager->resArray['subject'])) {
+							    $subject.=$hookmanager->resArray['subject'];
+							}
+							if (! empty($hookmanager->resArray['message'])) {
+							    $message.=$hookmanager->resArray['message'];
+							}
 						}
 
 						$mailfile = new CMailFile(
@@ -549,8 +623,7 @@ 
 							if ($obj->type_target == 'touserid') {
 	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
 								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
-							}
-							else {
+							} else {
 								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
 								$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid?$object->socid:'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
 							}
@@ -558,26 +631,22 @@ 
 							{
 								dol_print_error($this->db);
 							}
-						}
-						else
+						} else
 						{
 							$error++;
 							$this->errors[]=$mailfile->error;
 						}
-					}
-					else
+					} else
 				  {
 						dol_syslog("No notification sent for ".$sendto." because email is empty");
 					}
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
 			}
-		}
-		else
+		} else
 		{
 	   		$error++;
 			$this->errors[]=$this->db->lasterror();
@@ -590,7 +659,9 @@ 
 		{
 			foreach($conf->global as $key => $val)
 			{
-				if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
+				if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) {
+				    continue;
+				}
 
 				$threshold = (float) $reg[1];
 				if (!empty($object->total_ht) && $object->total_ht <= $threshold)
@@ -603,7 +674,9 @@ 
 
 				$sendto = $conf->global->$param;
 				$notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid');
-				if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code');
+				if ($notifcodedefid <= 0) {
+				    dol_print_error($this->db, 'Failed to get id from code');
+				}
 
 				$object_type = '';
 				$link = '';
@@ -718,8 +791,7 @@ 
 				{
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
-				}
-				else
+				} else
 				{
 					$filepdf = $pdf_path;
 				}
@@ -740,7 +812,9 @@ 
 					{
 						$supervisoruser=new User($this->db);
 						$supervisoruser->fetch($user->fk_user);
-						if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+						if ($supervisoruser->email) {
+						    $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>');
+						}
 					}
 					dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
 					$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
@@ -755,8 +829,12 @@ 
 					$reshook=$hookmanager->executeHooks('formatNotificationMessage',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 					if (empty($reshook))
 					{
-						if (! empty($hookmanager->resArray['subject'])) $subject.=$hookmanager->resArray['subject'];
-						if (! empty($hookmanager->resArray['message'])) $message.=$hookmanager->resArray['message'];
+						if (! empty($hookmanager->resArray['subject'])) {
+						    $subject.=$hookmanager->resArray['subject'];
+						}
+						if (! empty($hookmanager->resArray['message'])) {
+						    $message.=$hookmanager->resArray['message'];
+						}
 					}
 					$mailfile = new CMailFile(
 						$subject,
@@ -780,8 +858,7 @@ 
 						{
 							dol_print_error($this->db);
 						}
-					}
-					else
+					} else
 					{
 						$error++;
 						$this->errors[]=$mailfile->error;
@@ -790,7 +867,10 @@ 
 			}
 		}
 
-		if (! $error) return $num;
-		else return -1 * $error;
+		if (! $error) {
+		    return $num;
+		} else {
+		    return -1 * $error;
+		}
 	}
 }

dolibarr/htdocs/core/class/dolgeoip.class.php

Indentation +104 added lines, -104 removed lines

@@ -33,115 +33,115 @@
  */
 class DolGeoIP
 {
-	var $gi;
+    var $gi;
 
-	/**
-	 * Constructor
-	 *
-	 * @param 	string	$type		'country' or 'city'
-	 * @param	string	$datfile	Data file
-	 */
-	function __construct($type,$datfile)
-	{
-		if ($type == 'country')
-		{
-		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
-		}
-		else if ($type == 'city')
-		{
-		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
-		}
-		else { print 'ErrorBadParameterInConstructor'; return 0; }
+    /**
+     * Constructor
+     *
+     * @param 	string	$type		'country' or 'city'
+     * @param	string	$datfile	Data file
+     */
+    function __construct($type,$datfile)
+    {
+        if ($type == 'country')
+        {
+            // geoip may have been already included with PEAR
+            if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
+        }
+        else if ($type == 'city')
+        {
+            // geoip may have been already included with PEAR
+            if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
+        }
+        else { print 'ErrorBadParameterInConstructor'; return 0; }
 
-		// Here, function exists (embedded into PHP or exists because we made include)
-		if (empty($type) || empty($datfile))
-		{
-			$this->errorlabel='Constructor was called with no datafile parameter';
-			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
-			return 0;
-		}
-		if (! file_exists($datfile) || ! is_readable($datfile))
-		{
-			$this->error='ErrorGeoIPClassNotInitialized';
-			$this->errorlabel="Datafile ".$datfile." not found";
-			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
-			return 0;
-		}
+        // Here, function exists (embedded into PHP or exists because we made include)
+        if (empty($type) || empty($datfile))
+        {
+            $this->errorlabel='Constructor was called with no datafile parameter';
+            dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
+            return 0;
+        }
+        if (! file_exists($datfile) || ! is_readable($datfile))
+        {
+            $this->error='ErrorGeoIPClassNotInitialized';
+            $this->errorlabel="Datafile ".$datfile." not found";
+            dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
+            return 0;
+        }
 
-		if (function_exists('geoip_open'))
-		{
-			$this->gi = geoip_open($datfile,GEOIP_STANDARD);
-		}
-		else
-		{
-		    $this->gi = 'NOGI';    // We are using embedded php geoip functions
-		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
-		    //print geoip_database_info();
-		}
-	}
+        if (function_exists('geoip_open'))
+        {
+            $this->gi = geoip_open($datfile,GEOIP_STANDARD);
+        }
+        else
+        {
+            $this->gi = 'NOGI';    // We are using embedded php geoip functions
+            //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
+            //print geoip_database_info();
+        }
+    }
 
-	/**
-	 * Return in lower case the country code from an ip
-	 *
-	 * @param	string	$ip		IP to scan
-	 * @return	string			Country code (two letters)
-	 */
-	function getCountryCodeFromIP($ip)
-	{
-		if (empty($this->gi))
-		{
-			return '';
-		}
-		if ($this->gi == 'NOGI')
-		{
-		    // geoip_country_code_by_addr does not exists
-    		return strtolower(geoip_country_code_by_name($ip));
-		}
-		else
-		{
-		    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
-		    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
-		}
-	}
+    /**
+     * Return in lower case the country code from an ip
+     *
+     * @param	string	$ip		IP to scan
+     * @return	string			Country code (two letters)
+     */
+    function getCountryCodeFromIP($ip)
+    {
+        if (empty($this->gi))
+        {
+            return '';
+        }
+        if ($this->gi == 'NOGI')
+        {
+            // geoip_country_code_by_addr does not exists
+            return strtolower(geoip_country_code_by_name($ip));
+        }
+        else
+        {
+            if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+            return strtolower(geoip_country_code_by_addr($this->gi, $ip));
+        }
+    }
 
-	/**
-	 * Return in lower case the country code from a host name
-	 *
-	 * @param	string	$name	FQN of host (example: myserver.xyz.com)
-	 * @return	string			Country code (two letters)
-	 */
-	function getCountryCodeFromName($name)
-	{
-		if (empty($this->gi))
-		{
-			return '';
-		}
-		return geoip_country_code_by_name($this->gi, $name);
-	}
+    /**
+     * Return in lower case the country code from a host name
+     *
+     * @param	string	$name	FQN of host (example: myserver.xyz.com)
+     * @return	string			Country code (two letters)
+     */
+    function getCountryCodeFromName($name)
+    {
+        if (empty($this->gi))
+        {
+            return '';
+        }
+        return geoip_country_code_by_name($this->gi, $name);
+    }
 
-	/**
-	 * Return verion of data file
-	 *
-	 * @return	string		Version of datafile
-	 */
-	function getVersion()
-	{
-	    if ($this->gi == 'NOGI') return geoip_database_info();
-		return 'Not available (not using PHP internal geo functions)';
-	}
+    /**
+     * Return verion of data file
+     *
+     * @return	string		Version of datafile
+     */
+    function getVersion()
+    {
+        if ($this->gi == 'NOGI') return geoip_database_info();
+        return 'Not available (not using PHP internal geo functions)';
+    }
 
-	/**
-	 * Close geoip object
-	 *
-	 * @return	void
-	 */
-	function close()
-	{
-	    if (function_exists('geoip_close'))    // With some geoip with PEAR, geoip_close function may not exists
-	    {
-	        geoip_close($this->gi);
-	    }
-	}
+    /**
+     * Close geoip object
+     *
+     * @return	void
+     */
+    function close()
+    {
+        if (function_exists('geoip_close'))    // With some geoip with PEAR, geoip_close function may not exists
+        {
+            geoip_close($this->gi);
+        }
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -41,42 +41,42 @@ 
 	 * @param 	string	$type		'country' or 'city'
 	 * @param	string	$datfile	Data file
 	 */
-	function __construct($type,$datfile)
+	function __construct($type, $datfile)
 	{
 		if ($type == 'country')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
+		    if (!function_exists('geoip_country_code_by_name')) $res = include_once GEOIP_PATH.'geoip.inc';
 		}
 		else if ($type == 'city')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
+		    if (!function_exists('geoip_country_code_by_name')) $res = include_once GEOIP_PATH.'geoipcity.inc';
 		}
 		else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
 		if (empty($type) || empty($datfile))
 		{
-			$this->errorlabel='Constructor was called with no datafile parameter';
+			$this->errorlabel = 'Constructor was called with no datafile parameter';
 			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 			return 0;
 		}
-		if (! file_exists($datfile) || ! is_readable($datfile))
+		if (!file_exists($datfile) || !is_readable($datfile))
 		{
-			$this->error='ErrorGeoIPClassNotInitialized';
-			$this->errorlabel="Datafile ".$datfile." not found";
+			$this->error = 'ErrorGeoIPClassNotInitialized';
+			$this->errorlabel = "Datafile ".$datfile." not found";
 			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 			return 0;
 		}
 
 		if (function_exists('geoip_open'))
 		{
-			$this->gi = geoip_open($datfile,GEOIP_STANDARD);
+			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
 		}
 		else
 		{
-		    $this->gi = 'NOGI';    // We are using embedded php geoip functions
+		    $this->gi = 'NOGI'; // We are using embedded php geoip functions
 		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
 		    //print geoip_database_info();
 		}
@@ -101,7 +101,7 @@ 
 		}
 		else
 		{
-		    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+		    if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
 		    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 		}
 	}

Braces +19 added lines, -13 removed lines

@@ -46,14 +46,16 @@ 
 		if ($type == 'country')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
-		}
-		else if ($type == 'city')
+		    if (! function_exists('geoip_country_code_by_name')) {
+		        $res=include_once GEOIP_PATH.'geoip.inc';
+		    }
+		} else if ($type == 'city')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
-		}
-		else { print 'ErrorBadParameterInConstructor'; return 0; }
+		    if (! function_exists('geoip_country_code_by_name')) {
+		        $res=include_once GEOIP_PATH.'geoipcity.inc';
+		    }
+		} else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
 		if (empty($type) || empty($datfile))
@@ -73,8 +75,7 @@ 
 		if (function_exists('geoip_open'))
 		{
 			$this->gi = geoip_open($datfile,GEOIP_STANDARD);
-		}
-		else
+		} else
 		{
 		    $this->gi = 'NOGI';    // We are using embedded php geoip functions
 		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
@@ -98,10 +99,11 @@ 
 		{
 		    // geoip_country_code_by_addr does not exists
     		return strtolower(geoip_country_code_by_name($ip));
-		}
-		else
+		} else
 		{
-		    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+		    if (! function_exists('geoip_country_code_by_addr')) {
+		        return strtolower(geoip_country_code_by_name($this->gi, $ip));
+		    }
 		    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 		}
 	}
@@ -128,7 +130,9 @@ 
 	 */
 	function getVersion()
 	{
-	    if ($this->gi == 'NOGI') return geoip_database_info();
+	    if ($this->gi == 'NOGI') {
+	        return geoip_database_info();
+	    }
 		return 'Not available (not using PHP internal geo functions)';
 	}
 
@@ -139,9 +143,11 @@ 
 	 */
 	function close()
 	{
-	    if (function_exists('geoip_close'))    // With some geoip with PEAR, geoip_close function may not exists
+	    if (function_exists('geoip_close')) {
+	        // With some geoip with PEAR, geoip_close function may not exists
 	    {
 	        geoip_close($this->gi);
 	    }
+	    }
 	}
 }