alxarafe / alixar

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

Indentation +1425 added lines, -1425 removed lines

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

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

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

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

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

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

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

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

Indentation +1761 added lines, -1761 removed lines

@@ -34,312 +34,312 @@ 
  */
 class FormFile
 {
-	private $db;
+    private $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+    /**
+     * @var string Error code (or message)
+     */
+    public $error;
 
-	public $numoffiles;
-	public $infofiles;			// Used to return informations by function getDocumentsLink
+    public $numoffiles;
+    public $infofiles;			// Used to return informations by function getDocumentsLink
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numoffiles=0;
-	}
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numoffiles=0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Show form to upload a new file.
-	 *
-	 *  @param  string		$url			Url
-	 *  @param  string		$title			Title zone (Title or '' or 'none')
-	 *  @param  int			$addcancel		1=Add 'Cancel' button
-	 *	@param	int			$sectionid		If upload must be done inside a particular ECM section (is sectionid defined, sectiondir must not be)
-	 * 	@param	int			$perm			Value of permission to allow upload
-	 *  @param  int			$size          		Length of input file area. Deprecated.
-	 *  @param	Object		$object			Object to use (when attachment is done on an element)
-	 *  @param	string		$options		Add an option column
-	 *  @param	integer		$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). @deprecated 2 should never be used and if 1 is used, option should no be enabled.
-	 *  @param	string		$savingdocmask		Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
-	 *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
-	 *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
-	 *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
-	 *	@param	string		$sectiondir		If upload must be done inside a particular directory (is sectiondir defined, sectionid must not be)
-	 * 	@return	int							<0 if KO, >0 if OK
-	 */
-	function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='', $sectiondir='')
-	{
+    /**
+     *  Show form to upload a new file.
+     *
+     *  @param  string		$url			Url
+     *  @param  string		$title			Title zone (Title or '' or 'none')
+     *  @param  int			$addcancel		1=Add 'Cancel' button
+     *	@param	int			$sectionid		If upload must be done inside a particular ECM section (is sectionid defined, sectiondir must not be)
+     * 	@param	int			$perm			Value of permission to allow upload
+     *  @param  int			$size          		Length of input file area. Deprecated.
+     *  @param	Object		$object			Object to use (when attachment is done on an element)
+     *  @param	string		$options		Add an option column
+     *  @param	integer		$useajax		Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option). @deprecated 2 should never be used and if 1 is used, option should no be enabled.
+     *  @param	string		$savingdocmask		Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
+     *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
+     *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
+     *  @param	string		$accept			Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
+     *	@param	string		$sectiondir		If upload must be done inside a particular directory (is sectiondir defined, sectionid must not be)
+     * 	@return	int							<0 if KO, >0 if OK
+     */
+    function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='', $useajax=1, $savingdocmask='', $linkfiles=1, $htmlname='formuserfile', $accept='', $sectiondir='')
+    {
         // phpcs:enable
-		global $conf,$langs, $hookmanager;
-		$hookmanager->initHooks(array('formfile'));
-
-
-		if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
-
-		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
-		{
-			// TODO: Check this works with 2 forms on same page
-			// TODO: Check this works with GED module, otherwise, force useajax to 0
-			// TODO: This does not support option savingdocmask
-			// TODO: This break feature to upload links too
-			return $this->_formAjaxFileUpload($object);
-		}
-		else
-	   	{
-			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
-			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
-				return 1;
-			}
-
-			$maxlength=$size;
-
-			$out = "\n\n<!-- Start form attach new file -->\n";
-
-			if (empty($title)) $title=$langs->trans("AttachANewFile");
-			if ($title != 'none') $out.=load_fiche_titre($title, null, null);
-
-			$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
-			$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
-			$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';
-			$out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-			$out .= '<table width="100%" class="nobordernopadding">';
-			$out .= '<tr>';
-
-			if (! empty($options)) $out .= '<td>'.$options.'</td>';
-
-			$out .= '<td class="valignmiddle nowrap">';
-
-			$max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
-			$maxphp=@ini_get('upload_max_filesize');	// En inconnu
-			if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
-			if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
-			if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
-			if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
-			// Now $max and $maxphp are in Kb
-			$maxmin = $max;
-			if ($maxphp > 0) $maxmin=min($max,$maxphp);
-
-			if ($maxmin > 0)
-			{
-				// MAX_FILE_SIZE doit précéder le champ input de type file
-				$out .= '<input type="hidden" name="max_file_size" value="'.($maxmin*1024).'">';
-			}
-
-			$out .= '<input class="flat minwidth400" type="file"';
-			$out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
-			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-			$out .= (!empty($accept)?' accept="'.$accept.'"':' accept=""');
-			$out .= '>';
-			$out .= ' ';
-			$out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';
-			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-			$out .= '>';
-
-			if ($addcancel)
-			{
-				$out .= ' &nbsp; ';
-				$out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-			}
-
-			if (! empty($conf->global->MAIN_UPLOAD_DOC))
-			{
-				if ($perm)
-				{
-					$langs->load('other');
-					$out .= ' ';
-					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
-				}
-			}
-			else
-			{
-				$out .= ' ('.$langs->trans("UploadDisabled").')';
-			}
-			$out .= "</td></tr>";
-
-			if ($savingdocmask)
-			{
-				$out .= '<tr>';
-   				if (! empty($options)) $out .= '<td>'.$options.'</td>';
-				$out .= '<td valign="middle" class="nowrap">';
-				$out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
-				$out .= '</td>';
-				$out .= '</tr>';
-			}
-
-			$out .= "</table>";
-
-			$out .= '</form>';
-			if (empty($sectionid)) $out .= '<br>';
-
-			$out .= "\n<!-- End form attach new file -->\n";
-
-			if ($linkfiles)
-			{
-				$out .= "\n<!-- Start form link new url -->\n";
-				$langs->load('link');
-				$title = $langs->trans("LinkANewFile");
-				$out .= load_fiche_titre($title, null, null);
-				$out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">';
-				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">';
-				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">';
-				$out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-				$out .= '<div class="valignmiddle" >';
-				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
-				$out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
-				$out .= '</div>';
-				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
-				$out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
-				$out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
-				$out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
-				$out .= '</div>';
-				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				$out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
-				$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
-				$out .= '>';
-				$out .= '</div>';
-				$out .= '</div>';
-				$out .= '<div class="clearboth"></div>';
-				$out .= '</form><br>';
-
-				$out .= "\n<!-- End form link new url -->\n";
-			}
-
-			$parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''), 'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
-			$res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
-			if (empty($res))
-			{
-				print '<div class="attacharea attacharea'.$htmlname.'">';
-				print $out;
-				print '</div>';
-			}
-			print $hookmanager->resPrint;
-
-			return 1;
-		}
-	}
+        global $conf,$langs, $hookmanager;
+        $hookmanager->initHooks(array('formfile'));
+
+
+        if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
+
+        if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
+        {
+            // TODO: Check this works with 2 forms on same page
+            // TODO: Check this works with GED module, otherwise, force useajax to 0
+            // TODO: This does not support option savingdocmask
+            // TODO: This break feature to upload links too
+            return $this->_formAjaxFileUpload($object);
+        }
+        else
+            {
+            //If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
+            if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
+                return 1;
+            }
+
+            $maxlength=$size;
+
+            $out = "\n\n<!-- Start form attach new file -->\n";
+
+            if (empty($title)) $title=$langs->trans("AttachANewFile");
+            if ($title != 'none') $out.=load_fiche_titre($title, null, null);
+
+            $out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
+            $out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
+            $out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';
+            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+            $out .= '<table width="100%" class="nobordernopadding">';
+            $out .= '<tr>';
+
+            if (! empty($options)) $out .= '<td>'.$options.'</td>';
+
+            $out .= '<td class="valignmiddle nowrap">';
+
+            $max=$conf->global->MAIN_UPLOAD_DOC;		// En Kb
+            $maxphp=@ini_get('upload_max_filesize');	// En inconnu
+            if (preg_match('/k$/i',$maxphp)) $maxphp=$maxphp*1;
+            if (preg_match('/m$/i',$maxphp)) $maxphp=$maxphp*1024;
+            if (preg_match('/g$/i',$maxphp)) $maxphp=$maxphp*1024*1024;
+            if (preg_match('/t$/i',$maxphp)) $maxphp=$maxphp*1024*1024*1024;
+            // Now $max and $maxphp are in Kb
+            $maxmin = $max;
+            if ($maxphp > 0) $maxmin=min($max,$maxphp);
+
+            if ($maxmin > 0)
+            {
+                // MAX_FILE_SIZE doit précéder le champ input de type file
+                $out .= '<input type="hidden" name="max_file_size" value="'.($maxmin*1024).'">';
+            }
+
+            $out .= '<input class="flat minwidth400" type="file"';
+            $out .= ((! empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $conf->browser->layout != 'classic')?' name="userfile"':' name="userfile[]" multiple');
+            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+            $out .= (!empty($accept)?' accept="'.$accept.'"':' accept=""');
+            $out .= '>';
+            $out .= ' ';
+            $out .= '<input type="submit" class="button" name="sendit" value="'.$langs->trans("Upload").'"';
+            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+            $out .= '>';
+
+            if ($addcancel)
+            {
+                $out .= ' &nbsp; ';
+                $out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+            }
+
+            if (! empty($conf->global->MAIN_UPLOAD_DOC))
+            {
+                if ($perm)
+                {
+                    $langs->load('other');
+                    $out .= ' ';
+                    $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
+                }
+            }
+            else
+            {
+                $out .= ' ('.$langs->trans("UploadDisabled").')';
+            }
+            $out .= "</td></tr>";
+
+            if ($savingdocmask)
+            {
+                $out .= '<tr>';
+                    if (! empty($options)) $out .= '<td>'.$options.'</td>';
+                $out .= '<td valign="middle" class="nowrap">';
+                $out .= '<input type="checkbox" checked class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/',$langs->transnoentitiesnoconv("OriginFileName"),$savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
+                $out .= '</td>';
+                $out .= '</tr>';
+            }
+
+            $out .= "</table>";
+
+            $out .= '</form>';
+            if (empty($sectionid)) $out .= '<br>';
+
+            $out .= "\n<!-- End form attach new file -->\n";
+
+            if ($linkfiles)
+            {
+                $out .= "\n<!-- Start form link new url -->\n";
+                $langs->load('link');
+                $title = $langs->trans("LinkANewFile");
+                $out .= load_fiche_titre($title, null, null);
+                $out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">';
+                $out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">';
+                $out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">';
+                $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+                $out .= '<div class="valignmiddle" >';
+                $out .= '<div class="inline-block" style="padding-right: 10px;">';
+                if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink") . ':</label> ';
+                $out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
+                $out .= '</div>';
+                $out .= '<div class="inline-block" style="padding-right: 10px;">';
+                if (! empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label") . ':</label> ';
+                $out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
+                $out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
+                $out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
+                $out .= '</div>';
+                $out .= '<div class="inline-block" style="padding-right: 10px;">';
+                $out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
+                $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
+                $out .= '>';
+                $out .= '</div>';
+                $out .= '</div>';
+                $out .= '<div class="clearboth"></div>';
+                $out .= '</form><br>';
+
+                $out .= "\n<!-- End form link new url -->\n";
+            }
+
+            $parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''), 'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
+            $res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
+            if (empty($res))
+            {
+                print '<div class="attacharea attacharea'.$htmlname.'">';
+                print $out;
+                print '</div>';
+            }
+            print $hookmanager->resPrint;
+
+            return 1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Show the box with list of available documents for object
-	 *
-	 *      @param      string				$modulepart         propal, facture, facture_fourn, ...
-	 *      @param      string				$modulesubdir       Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-	 *      @param      string				$filedir            Directory to scan
-	 *      @param      string				$urlsource          Url of origin page (for return)
-	 *      @param      int					$genallowed         Generation is allowed (1/0 or array of formats)
-	 *      @param      int					$delallowed         Remove is allowed (1/0)
-	 *      @param      string				$modelselected      Model to preselect by default
-	 *      @param      integer				$allowgenifempty	Show warning if no model activated
-	 *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
-	 *      @param      int					$iconPDF            Show only PDF icon with link (1/0)
-	 * 		@param		int					$notused	        Not used
-	 * 		@param		integer				$noform				Do not output html form tags
-	 * 		@param		string				$param				More param on http links
-	 * 		@param		string				$title				Title to show on top of form
-	 * 		@param		string				$buttonlabel		Label on submit button
-	 * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
-	 * 		@return		int										<0 if KO, number of shown files if OK
-	 *      @deprecated                                         Use print xxx->showdocuments() instead.
-	 */
-	function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
-	{
+    /**
+     *      Show the box with list of available documents for object
+     *
+     *      @param      string				$modulepart         propal, facture, facture_fourn, ...
+     *      @param      string				$modulesubdir       Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+     *      @param      string				$filedir            Directory to scan
+     *      @param      string				$urlsource          Url of origin page (for return)
+     *      @param      int					$genallowed         Generation is allowed (1/0 or array of formats)
+     *      @param      int					$delallowed         Remove is allowed (1/0)
+     *      @param      string				$modelselected      Model to preselect by default
+     *      @param      integer				$allowgenifempty	Show warning if no model activated
+     *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
+     *      @param      int					$iconPDF            Show only PDF icon with link (1/0)
+     * 		@param		int					$notused	        Not used
+     * 		@param		integer				$noform				Do not output html form tags
+     * 		@param		string				$param				More param on http links
+     * 		@param		string				$title				Title to show on top of form
+     * 		@param		string				$buttonlabel		Label on submit button
+     * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
+     * 		@return		int										<0 if KO, number of shown files if OK
+     *      @deprecated                                         Use print xxx->showdocuments() instead.
+     */
+    function show_documents($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
+    {
         // phpcs:enable
-		$this->numoffiles=0;
-		print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$notused,$noform,$param,$title,$buttonlabel,$codelang);
-		return $this->numoffiles;
-	}
-
-	/**
-	 *      Return a string to show the box with list of available documents for object.
-	 *      This also set the property $this->numoffiles
-	 *
-	 *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule_temp', ...)
-	 *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-	 *      @param      string				$filedir            Directory to scan
-	 *      @param      string				$urlsource          Url of origin page (for return)
-	 *      @param      int					$genallowed         Generation is allowed (1/0 or array list of templates)
-	 *      @param      int					$delallowed         Remove is allowed (1/0)
-	 *      @param      string				$modelselected      Model to preselect by default
-	 *      @param      integer				$allowgenifempty	Allow generation even if list of template ($genallowed) is empty (show however a warning)
-	 *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
-	 *      @param      int					$iconPDF            Deprecated, see getDocumentsLink
-	 * 		@param		int					$notused	        Not used
-	 * 		@param		integer				$noform				Do not output html form tags
-	 * 		@param		string				$param				More param on http links
-	 * 		@param		string				$title				Title to show on top of form
-	 * 		@param		string				$buttonlabel		Label on submit button
-	 * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
-	 * 		@param		string				$morepicto			Add more HTML content into cell with picto
-	 *      @param      Object              $object             Object when method is called from an object card.
-	 *      @param		int					$hideifempty		Hide section of generated files if there is no file
-	 * 		@return		string              					Output string with HTML array of documents (might be empty string)
-	 */
-	function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null,$hideifempty=0)
-	{
-		// Deprecation warning
-		if (! empty($iconPDF)) {
-			dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
-		}
-
-		global $langs, $conf, $user, $hookmanager;
-		global $form;
-
-		if (! is_object($form)) $form=new Form($this->db);
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		// For backward compatibility
-		if (! empty($iconPDF)) {
-			return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
-		}
-
-		// Add entity in $param
-		$param.= 'entity='.(!empty($object->entity)?$object->entity:$conf->entity);
-
-		$printer=0;
-		if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport','livraison')))	// The direct print feature is implemented only for such elements
-		{
-			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
-		}
-
-		$hookmanager->initHooks(array('formfile'));
-
-		// Get list of files
-		$file_list=null;
-		if (! empty($filedir))
-		{
-			$file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
-		}
-		if ($hideifempty && empty($file_list)) return '';
-
-		$out='';
-		$forname='builddoc';
-		$headershown=0;
-		$showempty=0;
-		$i=0;
-
-		$out.= "\n".'<!-- Start show_document -->'."\n";
-		//print 'filedir='.$filedir;
-
-		if (preg_match('/massfilesarea_/', $modulepart))
-		{
-			$out.='<div id="show_files"><br></div>'."\n";
-			$title=$langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
-			$title.='<script type="text/javascript" language="javascript">
+        $this->numoffiles=0;
+        print $this->showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$notused,$noform,$param,$title,$buttonlabel,$codelang);
+        return $this->numoffiles;
+    }
+
+    /**
+     *      Return a string to show the box with list of available documents for object.
+     *      This also set the property $this->numoffiles
+     *
+     *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule_temp', ...)
+     *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+     *      @param      string				$filedir            Directory to scan
+     *      @param      string				$urlsource          Url of origin page (for return)
+     *      @param      int					$genallowed         Generation is allowed (1/0 or array list of templates)
+     *      @param      int					$delallowed         Remove is allowed (1/0)
+     *      @param      string				$modelselected      Model to preselect by default
+     *      @param      integer				$allowgenifempty	Allow generation even if list of template ($genallowed) is empty (show however a warning)
+     *      @param      integer				$forcenomultilang	Do not show language option (even if MAIN_MULTILANGS defined)
+     *      @param      int					$iconPDF            Deprecated, see getDocumentsLink
+     * 		@param		int					$notused	        Not used
+     * 		@param		integer				$noform				Do not output html form tags
+     * 		@param		string				$param				More param on http links
+     * 		@param		string				$title				Title to show on top of form
+     * 		@param		string				$buttonlabel		Label on submit button
+     * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
+     * 		@param		string				$morepicto			Add more HTML content into cell with picto
+     *      @param      Object              $object             Object when method is called from an object card.
+     *      @param		int					$hideifempty		Hide section of generated files if there is no file
+     * 		@return		string              					Output string with HTML array of documents (might be empty string)
+     */
+    function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$notused=0,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='',$object=null,$hideifempty=0)
+    {
+        // Deprecation warning
+        if (! empty($iconPDF)) {
+            dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
+        }
+
+        global $langs, $conf, $user, $hookmanager;
+        global $form;
+
+        if (! is_object($form)) $form=new Form($this->db);
+
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        // For backward compatibility
+        if (! empty($iconPDF)) {
+            return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
+        }
+
+        // Add entity in $param
+        $param.= 'entity='.(!empty($object->entity)?$object->entity:$conf->entity);
+
+        $printer=0;
+        if (in_array($modulepart,array('facture','supplier_proposal','propal','proposal','order','commande','expedition', 'commande_fournisseur', 'expensereport','livraison')))	// The direct print feature is implemented only for such elements
+        {
+            $printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
+        }
+
+        $hookmanager->initHooks(array('formfile'));
+
+        // Get list of files
+        $file_list=null;
+        if (! empty($filedir))
+        {
+            $file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
+        }
+        if ($hideifempty && empty($file_list)) return '';
+
+        $out='';
+        $forname='builddoc';
+        $headershown=0;
+        $showempty=0;
+        $i=0;
+
+        $out.= "\n".'<!-- Start show_document -->'."\n";
+        //print 'filedir='.$filedir;
+
+        if (preg_match('/massfilesarea_/', $modulepart))
+        {
+            $out.='<div id="show_files"><br></div>'."\n";
+            $title=$langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
+            $title.='<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
 					jQuery(\'#togglemassfilesarea\').click(function() {
 						if (jQuery(\'#togglemassfilesarea\').attr(\'ref\') == "shown")
@@ -358,1489 +358,1489 @@ 
 					});
 				});
 				</script>';
-		}
-
-		$titletoshow=$langs->trans("Documents");
-		if (! empty($title)) $titletoshow=$title;
-
-		// Show table
-		if ($genallowed)
-		{
-			$modellist=array();
-
-			if ($modulepart == 'company')
-			{
-				$showempty=1;
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
-					$modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'propal')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
-					$modellist=ModelePDFPropales::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'supplier_proposal')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
-					$modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'commande')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
-					$modellist=ModelePDFCommandes::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'expedition')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-					$modellist=ModelePDFExpedition::liste_modeles($this->db);
-				}
-			}
+        }
+
+        $titletoshow=$langs->trans("Documents");
+        if (! empty($title)) $titletoshow=$title;
+
+        // Show table
+        if ($genallowed)
+        {
+            $modellist=array();
+
+            if ($modulepart == 'company')
+            {
+                $showempty=1;
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
+                    $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'propal')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
+                    $modellist=ModelePDFPropales::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'supplier_proposal')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
+                    $modellist=ModelePDFSupplierProposal::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'commande')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
+                    $modellist=ModelePDFCommandes::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'expedition')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
+                    $modellist=ModelePDFExpedition::liste_modeles($this->db);
+                }
+            }
             elseif ($modulepart == 'reception')
             {
                 if (is_array($genallowed)) $modellist=$genallowed;
                 else
                 {
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
-					$modellist = ModelePdfReception::liste_modeles($this->db);
-				}
-            }
-			elseif ($modulepart == 'livraison')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
-					$modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'ficheinter')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
-					$modellist=ModelePDFFicheinter::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'facture')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-					$modellist=ModelePDFFactures::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'contract')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
-					$modellist=ModelePDFContract::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'project')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
-					$modellist=ModelePDFProjects::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'project_task')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
-					$modellist=ModelePDFTask::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'product')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
-					$modellist=ModelePDFProduct::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'product_batch')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
-					$modellist=ModelePDFProductBatch::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'stock')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
-					$modellist=ModelePDFStock::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'movement')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
-					$modellist=ModelePDFMovement::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'export')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
-					$modellist=ModeleExports::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
-					$modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
-					$modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'supplier_payment')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
-					$modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'remisecheque')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
-					$modellist=ModeleChequeReceipts::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'donation')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
-					$modellist=ModeleDon::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'member')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
-					$modellist=ModelePDFCards::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'agenda' || $modulepart == 'actions')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
-					$modellist=ModeleAction::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'expensereport')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
-					$modellist=ModeleExpenseReport::liste_modeles($this->db);
-				}
-			}
-			else if ($modulepart == 'unpaid')
-			{
-				$modellist='';
-			}
-			elseif ($modulepart == 'user')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
-					$modellist=ModelePDFUser::liste_modeles($this->db);
-				}
-			}
-			elseif ($modulepart == 'usergroup')
-			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
-					$modellist=ModelePDFUserGroup::liste_modeles($this->db);
-				}
-			}
-			else
-			{
-				// For normalized standard modules
-				$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
-				if (file_exists($file))
-				{
-					$res=include_once $file;
-				}
-				// For normalized external modules
-				else
-				{
-					$file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
-					$res=include_once $file;
-				}
-				$class='ModelePDF'.ucfirst($modulepart);
-				if (class_exists($class))
-				{
-					$modellist=call_user_func($class.'::liste_modeles',$this->db);
-				}
-				else
-				{
-					dol_print_error($this->db,'Bad value for modulepart');
-					return -1;
-				}
-			}
-
-			// Set headershown to avoid to have table opened a second time later
-			$headershown=1;
-
-			$buttonlabeltoshow=$buttonlabel;
-			if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
-
-			if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
-			if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
-			$out.= '<input type="hidden" name="action" value="builddoc">';
-			$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-			$out.= load_fiche_titre($titletoshow, '', '');
-			$out.= '<div class="div-table-responsive-no-min">';
-			$out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
-
-			$out.= '<tr class="liste_titre">';
-
-			$addcolumforpicto=($delallowed || $printer || $morepicto);
-			$out.= '<th align="center" colspan="'.(3+($addcolumforpicto?1:0)).'" class="formdoc liste_titre maxwidthonsmartphone">';
-
-			// Model
-			if (! empty($modellist))
-			{
-				$out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-				{
-					$arraykeys=array_keys($modellist);
-					$modelselected=$arraykeys[0];
-				}
-				$out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				if ($conf->use_javascript_ajax)
-				{
-					$out.= ajax_combobox('model');
-				}
-			}
-			else
-			{
-				$out.= '<div class="float">'.$langs->trans("Files").'</div>';
-			}
-
-			// Language code (if multilang)
-			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-				$formadmin=new FormAdmin($this->db);
-				$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
-				$morecss='maxwidth150';
-				if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
-				$out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
-			}
-			else
-			{
-				$out.= '&nbsp;';
-			}
-
-			// Button
-			$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-			$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
-			$genbutton.= '>';
-			if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
-			{
-			   	$langs->load("errors");
-			   	$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
-			}
-			if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-			if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
-			$out.= $genbutton;
-			$out.= '</th>';
-
-			if (!empty($hookmanager->hooks['formfile']))
-			{
-				foreach($hookmanager->hooks['formfile'] as $module)
-				{
-					if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
-				}
-			}
-			$out.= '</tr>';
-
-			// Execute hooks
-			$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
-			if (is_object($hookmanager))
-			{
-				$reshook = $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']);
-				$out.= $hookmanager->resPrint;
-			}
-		}
-
-		// Get list of files
-		if (! empty($filedir))
-		{
-			$link_list = array();
-			if (is_object($object))
-			{
-				require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-				$link = new Link($this->db);
-				$sortfield = $sortorder = null;
-				$res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
-			}
-
-			$out.= '<!-- html.formfile::showdocuments -->'."\n";
-
-			// Show title of array if not already shown
-			if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart))
-				&& ! $headershown)
-			{
-				$headershown=1;
-				$out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
-				$out.= '<div class="div-table-responsive-no-min">';
-				$out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
-			}
-
-			// Loop on each file found
-			if (is_array($file_list))
-			{
-				foreach($file_list as $file)
-				{
-					// Define relative path for download link (depends on module)
-					$relativepath=$file["name"];										// Cas general
-					if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
-					if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
-
-					$out.= '<tr class="oddeven">';
-
-					$documenturl = DOL_URL_ROOT.'/document.php';
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
-
-					// Show file name with link to download
-					$out.= '<td class="minwidth200">';
-					$out.= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
-					$mime=dol_mimetype($relativepath,'',0);
-					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
-					$out.= ' target="_blank">';
-					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]);
-					$out.= dol_trunc($file["name"], 150);
-					$out.= '</a>'."\n";
-					$out.= $this->showPreview($file,$modulepart,$relativepath,0,$param);
-					$out.= '</td>';
-
-					// Show file size
-					$size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"]));
-					$out.= '<td align="right" class="nowrap">'.dol_print_size($size,1,1).'</td>';
-
-					// Show file date
-					$date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
-					$out.= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
-
-					if ($delallowed || $printer || $morepicto)
-					{
-						$out.= '<td class="right nowraponall">';
-						if ($delallowed)
-						{
-							$tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
-							$out.= '<a href="'.$tmpurlsource.(strpos($tmpurlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
-							$out.= ($param?'&amp;'.$param:'');
-							//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
-							//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
-							$out.= '">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
-						}
-						if ($printer)
-						{
-							//$out.= '<td align="right">';
-							$out.= '<a class="paddingleft" href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
-							$out.= ($param?'&amp;'.$param:'');
-							$out.= '">'.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').'</a>';
-						}
-						if ($morepicto)
-						{
-							$morepicto=preg_replace('/__FILENAMEURLENCODED__/',urlencode($relativepath),$morepicto);
-							$out.=$morepicto;
-						}
-						$out.='</td>';
-					}
-
-					if (is_object($hookmanager))
-					{
-						$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
-						$res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
-						if (empty($res))
-						{
-							$out.= $hookmanager->resPrint;		// Complete line
-							$out.= '</tr>';
-						}
-						else $out = $hookmanager->resPrint;		// Replace line
-			  		}
-				}
-
-				$this->numoffiles++;
-			}
-			// Loop on each link found
-			if (is_array($link_list))
-			{
-				$colspan=2;
-
-				foreach($link_list as $file)
-				{
-					$out.='<tr class="oddeven">';
-					$out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
-					$out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-					$out.=$file->label;
-					$out.='</a>';
-					$out.='</td>';
-					$out.='<td align="right">';
-					$out.=dol_print_date($file->datea,'dayhour');
-					$out.='</td>';
-					if ($delallowed || $printer || $morepicto) $out.='<td></td>';
-					$out.='</tr>'."\n";
-				}
-				$this->numoffiles++;
-			}
-
-		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
-			{
-				$out.='<tr><td colspan="'.(3+($addcolumforpicto?1:0)).'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
-			}
-		}
-
-		if ($headershown)
-		{
-			// Affiche pied du tableau
-			$out.= "</table>\n";
-			$out.= "</div>\n";
-			if ($genallowed)
-			{
-				if (empty($noform)) $out.= '</form>'."\n";
-			}
-		}
-		$out.= '<!-- End show_document -->'."\n";
-		//return ($i?$i:$headershown);
-		return $out;
-	}
-
-	/**
-	 *	Show a Document icon with link(s)
-	 *  You may want to call this into a div like this:
-	 *  print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
-	 *
-	 *	@param	string	$modulepart		propal, facture, facture_fourn, ...
-	 *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-	 *	@param	string	$filedir		Full path to directory to scan
-	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
-	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
-	 */
-	function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter='')
-	{
-		global $conf, $langs;
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$out='';
-		$this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
-
-		$entity = 1; // Without multicompany
-
-		// Get object entity
-		if (! empty($conf->multicompany->enabled))
-		{
-			preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir,'/').'$/', $filedir, $regs);
-			$entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
-		}
-
-		// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
-		// @TODO Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
-		if (! empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
-		{
-			$filterforfilesearch = preg_quote(basename($modulesubdir),'/');
-		}
-		else
-		{
-			$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
-		}
-		$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// We also discard .meta and .png preview
-
-		//var_dump($file_list);
-		// For ajax treatment
-		$out.= '<!-- html.formfile::getDocumentsLink -->'."\n";
-		if (! empty($file_list))
-		{
-			$out='<dl class="dropdown inline-block">
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
+                    $modellist = ModelePdfReception::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'livraison')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
+                    $modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'ficheinter')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
+                    $modellist=ModelePDFFicheinter::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'facture')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+                    $modellist=ModelePDFFactures::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'contract')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
+                    $modellist=ModelePDFContract::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'project')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
+                    $modellist=ModelePDFProjects::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'project_task')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
+                    $modellist=ModelePDFTask::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'product')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
+                    $modellist=ModelePDFProduct::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'product_batch')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
+                    $modellist=ModelePDFProductBatch::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'stock')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
+                    $modellist=ModelePDFStock::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'movement')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
+                    $modellist=ModelePDFMovement::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'export')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
+                    $modellist=ModeleExports::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
+                    $modellist=ModelePDFSuppliersOrders::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
+                    $modellist=ModelePDFSuppliersInvoices::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'supplier_payment')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
+                    $modellist=ModelePDFSuppliersPayments::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'remisecheque')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
+                    $modellist=ModeleChequeReceipts::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'donation')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
+                    $modellist=ModeleDon::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'member')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
+                    $modellist=ModelePDFCards::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'agenda' || $modulepart == 'actions')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
+                    $modellist=ModeleAction::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'expensereport')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
+                    $modellist=ModeleExpenseReport::liste_modeles($this->db);
+                }
+            }
+            else if ($modulepart == 'unpaid')
+            {
+                $modellist='';
+            }
+            elseif ($modulepart == 'user')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
+                    $modellist=ModelePDFUser::liste_modeles($this->db);
+                }
+            }
+            elseif ($modulepart == 'usergroup')
+            {
+                if (is_array($genallowed)) $modellist=$genallowed;
+                else
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
+                    $modellist=ModelePDFUserGroup::liste_modeles($this->db);
+                }
+            }
+            else
+            {
+                // For normalized standard modules
+                $file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
+                if (file_exists($file))
+                {
+                    $res=include_once $file;
+                }
+                // For normalized external modules
+                else
+                {
+                    $file=dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
+                    $res=include_once $file;
+                }
+                $class='ModelePDF'.ucfirst($modulepart);
+                if (class_exists($class))
+                {
+                    $modellist=call_user_func($class.'::liste_modeles',$this->db);
+                }
+                else
+                {
+                    dol_print_error($this->db,'Bad value for modulepart');
+                    return -1;
+                }
+            }
+
+            // Set headershown to avoid to have table opened a second time later
+            $headershown=1;
+
+            $buttonlabeltoshow=$buttonlabel;
+            if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
+
+            if ($conf->browser->layout == 'phone') $urlsource.='#'.$forname.'_form';   // So we switch to form after a generation
+            if (empty($noform)) $out.= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc').'" id="'.$forname.'_form" method="post">';
+            $out.= '<input type="hidden" name="action" value="builddoc">';
+            $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+            $out.= load_fiche_titre($titletoshow, '', '');
+            $out.= '<div class="div-table-responsive-no-min">';
+            $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';
+
+            $out.= '<tr class="liste_titre">';
+
+            $addcolumforpicto=($delallowed || $printer || $morepicto);
+            $out.= '<th align="center" colspan="'.(3+($addcolumforpicto?1:0)).'" class="formdoc liste_titre maxwidthonsmartphone">';
+
+            // Model
+            if (! empty($modellist))
+            {
+                $out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
+                if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+                {
+                    $arraykeys=array_keys($modellist);
+                    $modelselected=$arraykeys[0];
+                }
+                $out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+                if ($conf->use_javascript_ajax)
+                {
+                    $out.= ajax_combobox('model');
+                }
+            }
+            else
+            {
+                $out.= '<div class="float">'.$langs->trans("Files").'</div>';
+            }
+
+            // Language code (if multilang)
+            if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+                $formadmin=new FormAdmin($this->db);
+                $defaultlang=$codelang?$codelang:$langs->getDefaultLang();
+                $morecss='maxwidth150';
+                if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
+                $out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
+            }
+            else
+            {
+                $out.= '&nbsp;';
+            }
+
+            // Button
+            $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+            $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
+            $genbutton.= '>';
+            if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
+            {
+                    $langs->load("errors");
+                    $genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+            }
+            if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
+            if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
+            $out.= $genbutton;
+            $out.= '</th>';
+
+            if (!empty($hookmanager->hooks['formfile']))
+            {
+                foreach($hookmanager->hooks['formfile'] as $module)
+                {
+                    if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
+                }
+            }
+            $out.= '</tr>';
+
+            // Execute hooks
+            $parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
+            if (is_object($hookmanager))
+            {
+                $reshook = $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']);
+                $out.= $hookmanager->resPrint;
+            }
+        }
+
+        // Get list of files
+        if (! empty($filedir))
+        {
+            $link_list = array();
+            if (is_object($object))
+            {
+                require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+                $link = new Link($this->db);
+                $sortfield = $sortorder = null;
+                $res = $link->fetchAll($link_list, $object->element, $object->id, $sortfield, $sortorder);
+            }
+
+            $out.= '<!-- html.formfile::showdocuments -->'."\n";
+
+            // Show title of array if not already shown
+            if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart))
+                && ! $headershown)
+            {
+                $headershown=1;
+                $out.= '<div class="titre">'.$titletoshow.'</div>'."\n";
+                $out.= '<div class="div-table-responsive-no-min">';
+                $out.= '<table class="noborder" summary="listofdocumentstable" id="'.$modulepart.'_table" width="100%">'."\n";
+            }
+
+            // Loop on each file found
+            if (is_array($file_list))
+            {
+                foreach($file_list as $file)
+                {
+                    // Define relative path for download link (depends on module)
+                    $relativepath=$file["name"];										// Cas general
+                    if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+                    if ($modulepart == 'export') $relativepath = $file["name"];			// Other case
+
+                    $out.= '<tr class="oddeven">';
+
+                    $documenturl = DOL_URL_ROOT.'/document.php';
+                    if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl=$conf->global->DOL_URL_ROOT_DOCUMENT_PHP;    // To use another wrapper
+
+                    // Show file name with link to download
+                    $out.= '<td class="minwidth200">';
+                    $out.= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
+                    $mime=dol_mimetype($relativepath,'',0);
+                    if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
+                    $out.= ' target="_blank">';
+                    $out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]);
+                    $out.= dol_trunc($file["name"], 150);
+                    $out.= '</a>'."\n";
+                    $out.= $this->showPreview($file,$modulepart,$relativepath,0,$param);
+                    $out.= '</td>';
+
+                    // Show file size
+                    $size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"]));
+                    $out.= '<td align="right" class="nowrap">'.dol_print_size($size,1,1).'</td>';
+
+                    // Show file date
+                    $date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"]));
+                    $out.= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
+
+                    if ($delallowed || $printer || $morepicto)
+                    {
+                        $out.= '<td class="right nowraponall">';
+                        if ($delallowed)
+                        {
+                            $tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
+                            $out.= '<a href="'.$tmpurlsource.(strpos($tmpurlsource,'?')?'&amp;':'?').'action=remove_file&amp;file='.urlencode($relativepath);
+                            $out.= ($param?'&amp;'.$param:'');
+                            //$out.= '&modulepart='.$modulepart; // TODO obsolete ?
+                            //$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
+                            $out.= '">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+                        }
+                        if ($printer)
+                        {
+                            //$out.= '<td align="right">';
+                            $out.= '<a class="paddingleft" href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
+                            $out.= ($param?'&amp;'.$param:'');
+                            $out.= '">'.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').'</a>';
+                        }
+                        if ($morepicto)
+                        {
+                            $morepicto=preg_replace('/__FILENAMEURLENCODED__/',urlencode($relativepath),$morepicto);
+                            $out.=$morepicto;
+                        }
+                        $out.='</td>';
+                    }
+
+                    if (is_object($hookmanager))
+                    {
+                        $parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
+                        $res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
+                        if (empty($res))
+                        {
+                            $out.= $hookmanager->resPrint;		// Complete line
+                            $out.= '</tr>';
+                        }
+                        else $out = $hookmanager->resPrint;		// Replace line
+                        }
+                }
+
+                $this->numoffiles++;
+            }
+            // Loop on each link found
+            if (is_array($link_list))
+            {
+                $colspan=2;
+
+                foreach($link_list as $file)
+                {
+                    $out.='<tr class="oddeven">';
+                    $out.='<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
+                    $out.='<a data-ajax="false" href="' . $link->url . '" target="_blank">';
+                    $out.=$file->label;
+                    $out.='</a>';
+                    $out.='</td>';
+                    $out.='<td align="right">';
+                    $out.=dol_print_date($file->datea,'dayhour');
+                    $out.='</td>';
+                    if ($delallowed || $printer || $morepicto) $out.='<td></td>';
+                    $out.='</tr>'."\n";
+                }
+                $this->numoffiles++;
+            }
+
+                if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
+            {
+                $out.='<tr><td colspan="'.(3+($addcolumforpicto?1:0)).'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
+            }
+        }
+
+        if ($headershown)
+        {
+            // Affiche pied du tableau
+            $out.= "</table>\n";
+            $out.= "</div>\n";
+            if ($genallowed)
+            {
+                if (empty($noform)) $out.= '</form>'."\n";
+            }
+        }
+        $out.= '<!-- End show_document -->'."\n";
+        //return ($i?$i:$headershown);
+        return $out;
+    }
+
+    /**
+     *	Show a Document icon with link(s)
+     *  You may want to call this into a div like this:
+     *  print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
+     *
+     *	@param	string	$modulepart		propal, facture, facture_fourn, ...
+     *	@param	string	$modulesubdir	Sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
+     *	@param	string	$filedir		Full path to directory to scan
+     *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
+     *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
+     */
+    function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter='')
+    {
+        global $conf, $langs;
+
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        $out='';
+        $this->infofiles=array('nboffiles'=>0,'extensions'=>array(),'files'=>array());
+
+        $entity = 1; // Without multicompany
+
+        // Get object entity
+        if (! empty($conf->multicompany->enabled))
+        {
+            preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir,'/').'$/', $filedir, $regs);
+            $entity = ((! empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
+        }
+
+        // Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
+        // @TODO Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
+        if (! empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
+        {
+            $filterforfilesearch = preg_quote(basename($modulesubdir),'/');
+        }
+        else
+        {
+            $filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
+        }
+        $file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// We also discard .meta and .png preview
+
+        //var_dump($file_list);
+        // For ajax treatment
+        $out.= '<!-- html.formfile::getDocumentsLink -->'."\n";
+        if (! empty($file_list))
+        {
+            $out='<dl class="dropdown inline-block">
     			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignmiddle').'</a></dt>
     			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields" style="display: none;">';
-			$tmpout='';
-
-			// Loop on each file found
-			$found=0;
-			foreach($file_list as $file)
-			{
-				$i++;
-				if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
-
-				$found++;
-				// Define relative path for download link (depends on module)
-				$relativepath=$file["name"];								// Cas general
-				if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
-				// Autre cas
-				if ($modulepart == 'donation')            {
-					$relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
-				}
-				if ($modulepart == 'export')              {
-					$relativepath = $file["name"];
-				}
-
-				$this->infofiles['nboffiles']++;
-				$this->infofiles['files'][]=$file['fullname'];
-				$ext=pathinfo($file["name"], PATHINFO_EXTENSION);
-				if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
-				else $this->infofiles['extensions'][$ext]++;
-
-				// Preview
-				if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
-				{
-					$tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
-					if ($tmparray && $tmparray['url'])
-					{
-						$tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>';
-						//$tmpout.= img_picto('','detail');
-						$tmpout.= '<i class="fa fa-search-plus paddingright" style="color: gray"></i>';
-						$tmpout.= $langs->trans("Preview").' '.$ext.'</a></li>';
-					}
-				}
-
-				// Download
-				$tmpout.= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
-				$mime=dol_mimetype($relativepath,'',0);
-				if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
-				$tmpout.= '>';
-				$tmpout.= img_mime($relativepath, $file["name"]);
-				$tmpout.= $langs->trans("Download").' '.$ext;
-				$tmpout.= '</a></li>'."\n";
-			}
-			$out.=$tmpout;
-			$out.='</ul></div></dd>
+            $tmpout='';
+
+            // Loop on each file found
+            $found=0;
+            foreach($file_list as $file)
+            {
+                $i++;
+                if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
+
+                $found++;
+                // Define relative path for download link (depends on module)
+                $relativepath=$file["name"];								// Cas general
+                if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
+                // Autre cas
+                if ($modulepart == 'donation')            {
+                    $relativepath = get_exdir($modulesubdir,2,0,0,null,'donation').$file["name"];
+                }
+                if ($modulepart == 'export')              {
+                    $relativepath = $file["name"];
+                }
+
+                $this->infofiles['nboffiles']++;
+                $this->infofiles['files'][]=$file['fullname'];
+                $ext=pathinfo($file["name"], PATHINFO_EXTENSION);
+                if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext]=1;
+                else $this->infofiles['extensions'][$ext]++;
+
+                // Preview
+                if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
+                {
+                    $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
+                    if ($tmparray && $tmparray['url'])
+                    {
+                        $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>';
+                        //$tmpout.= img_picto('','detail');
+                        $tmpout.= '<i class="fa fa-search-plus paddingright" style="color: gray"></i>';
+                        $tmpout.= $langs->trans("Preview").' '.$ext.'</a></li>';
+                    }
+                }
+
+                // Download
+                $tmpout.= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
+                $mime=dol_mimetype($relativepath,'',0);
+                if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
+                $tmpout.= '>';
+                $tmpout.= img_mime($relativepath, $file["name"]);
+                $tmpout.= $langs->trans("Download").' '.$ext;
+                $tmpout.= '</a></li>'."\n";
+            }
+            $out.=$tmpout;
+            $out.='</ul></div></dd>
     			</dl>';
 
-			if (! $found) $out='';
-		}
-		else
-		{
-			// TODO Add link to regenerate doc ?
-			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
-		}
+            if (! $found) $out='';
+        }
+        else
+        {
+            // TODO Add link to regenerate doc ?
+            //$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
+        }
 
-		return $out;
-	}
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Show list of documents in $filearray (may be they are all in same directory but may not)
-	 *  This also sync database if $upload_dir is defined.
-	 *
-	 *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this.
-	 * 	@param	 Object	$object				Object on which document is linked to.
-	 * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper.
-	 * 	@param	 string	$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)
-	 * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file.
-	 * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.
-	 * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)
-	 * 	@param	 int	$useinecm			Change output for use in ecm module:
-	 * 										0: Add a previw link. Show also rename and crop file
-	 * 										1: Add link to edit ECM entry
-	 * 										2: Add rename and crop file
-	 * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
-	 *  @param   int	$maxlength          Maximum length of file name shown.
-	 *  @param	 string	$title				Title before list. Use 'none' to disable title.
-	 *  @param	 string $url				Full url to use for click links ('' = autodetect)
-	 *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
-	 *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
-	 *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes.
-	 *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
-	 *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
-	 *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
-	 *  @param	 int	$addfilterfields	Add line with filters
-	 * 	@return	 int						<0 if KO, nb of files shown if OK
-	 *  @see list_of_autoecmfiles
-	 */
-	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0)
-	{
+    /**
+     *  Show list of documents in $filearray (may be they are all in same directory but may not)
+     *  This also sync database if $upload_dir is defined.
+     *
+     *  @param	 array	$filearray          Array of files loaded by dol_dir_list('files') function before calling this.
+     * 	@param	 Object	$object				Object on which document is linked to.
+     * 	@param	 string	$modulepart			Value for modulepart used by download or viewimage wrapper.
+     * 	@param	 string	$param				Parameters on sort links (param must start with &, example &aaa=bbb&ccc=ddd)
+     * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file.
+     * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.
+     * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)
+     * 	@param	 int	$useinecm			Change output for use in ecm module:
+     * 										0: Add a previw link. Show also rename and crop file
+     * 										1: Add link to edit ECM entry
+     * 										2: Add rename and crop file
+     * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
+     *  @param   int	$maxlength          Maximum length of file name shown.
+     *  @param	 string	$title				Title before list. Use 'none' to disable title.
+     *  @param	 string $url				Full url to use for click links ('' = autodetect)
+     *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
+     *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
+     *  @param   string $upload_dir         Full path directory so we can know dir relative to MAIN_DATA_ROOT. Fill this to complete file data with database indexes.
+     *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
+     *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
+     *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
+     *  @param	 int	$addfilterfields	Add line with filters
+     * 	@return	 int						<0 if KO, nb of files shown if OK
+     *  @see list_of_autoecmfiles
+     */
+    function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0)
+    {
         // phpcs:enable
-		global $user, $conf, $langs, $hookmanager;
-		global $sortfield, $sortorder, $maxheightmini;
-		global $dolibarr_main_url_root;
-		global $form;
-
-		$disablecrop=1;
-		if (in_array($modulepart, array('expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) $disablecrop=0;
-
-		// Define relative path used to store the file
-		if (empty($relativepath))
-		{
-			$relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
-			if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
-			if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
-		}
-		// For backward compatiblity, we detect file stored into an old path
-		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
-		{
-		    $relativepath=preg_replace('/^.*\/produit\//','',$filearray[0]['path']).'/';
-		}
-		// Defined relative dir to DOL_DATA_ROOT
-		$relativedir = '';
-		if ($upload_dir)
-		{
-			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
-			$relativedir = preg_replace('/^[\\/]/','',$relativedir);
-		}
-
-		$hookmanager->initHooks(array('formfile'));
-		$parameters=array(
-				'filearray' => $filearray,
-				'modulepart'=> $modulepart,
-				'param' => $param,
-				'forcedownload' => $forcedownload,
-				'relativepath' => $relativepath,    // relative filename to module dir
-				'relativedir' => $relativedir,      // relative dirname to DOL_DATA_ROOT
-				'permtodelete' => $permonobject,
-				'useinecm' => $useinecm,
-				'textifempty' => $textifempty,
-				'maxlength' => $maxlength,
-				'title' => $title,
-				'url' => $url
-		);
-		$reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
-
-		if (isset($reshook) && $reshook != '') // null or '' for bypass
-		{
-			return $reshook;
-		}
-		else
-		{
-			if (! is_object($form))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';		// The compoent may be included into ajax page that does not include the Form class
-				$form=new Form($this->db);
-			}
-
-			if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
-			$relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
-			if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
-
-			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
-			{
-				$permtoeditline=0;
-				if (in_array($modulepart, array('product','produit','service')))
-				{
-					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
-					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
-				}
-			}
-			if (empty($conf->global->MAIN_UPLOAD_DOC))
-			{
-				$permtoeditline=0;
-				$permonobject=0;
-			}
-
-			// Show list of existing files
-			if (empty($useinecm) && $title != 'none') print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
-			if (empty($url)) $url=$_SERVER["PHP_SELF"];
-
-			print '<!-- html.formfile::list_of_documents -->'."\n";
-			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
-			{
-				print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
-				print '<input type="hidden" name="action" value="renamefile">';
-				print '<input type="hidden" name="id" value="'.$object->id.'">';
-				print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
-			}
-
-			print '<div class="div-table-responsive-no-min">';
-			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
-
-			if (! empty($addfilterfields))
-			{
-				print '<tr class="liste_titre nodrag nodrop">';
-				print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref','alpha')).'"></td>';
-				print '<td></td>';
-				print '<td></td>';
-				if (empty($useinecm)) print '<td></td>';
-				print '<td></td>';
-				print '<td></td>';
-				if (! $disablemove) print '<td></td>';
-				print "</tr>\n";
-			}
-
-			print '<tr class="liste_titre nodrag nodrop">';
-			//print $url.' sortfield='.$sortfield.' sortorder='.$sortorder;
-			print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
-			print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-			if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');					// Preview
-			print_liste_field_titre('');
-			print_liste_field_titre('');
-			if (! $disablemove) print_liste_field_titre('');
-			print "</tr>\n";
-
-			// Get list of files stored into database for same relative directory
-			if ($relativedir)
-			{
-				completeFileArrayWithDatabaseInfo($filearray, $relativedir);
-
-				//var_dump($sortfield.' - '.$sortorder);
-				if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
-				{
-					$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
-				}
-			}
-
-			$nboffiles=count($filearray);
-			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-			$i=0; $nboflines = 0; $lastrowid=0;
-			foreach($filearray as $key => $file)      // filearray must be only files here
-			{
-				if ($file['name'] != '.'
-						&& $file['name'] != '..'
-						&& ! preg_match('/\.meta$/i',$file['name']))
-				{
-					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
-					$filepath=$relativepath.$file['name'];
-
-					$editline=0;
-					$nboflines++;
-					print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
-					// Do we have entry into database ?
-					print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
-					print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'AFTER'.$lastrowid.'POS'.($i+1)).'">';
-
-					// File name
-					print '<td class="minwith200">';
-
-					// Show file name with link to download
-					//print "XX".$file['name'];	//$file['name'] must be utf8
-					print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-					if ($forcedownload) print '&attachment=1';
-					if (! empty($object->entity)) print '&entity='.$object->entity;
-					print '&file='.urlencode($filepath);
-					print '">';
-					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'],0,0).')', 'inline-block valignbottom paddingright');
-					if ($showrelpart == 1) print $relativepath;
-					//print dol_trunc($file['name'],$maxlength,'middle');
-					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile','alpha')))
-					{
-						print '</a>';
-						$section_dir=dirname(GETPOST('urlfile','alpha'));
-						print '<input type="hidden" name="section_dir" value="'.$section_dir.'">';
-						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
-						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
-						$editline=1;
-					}
-					else
-					{
-						print dol_trunc($file['name'], 200);
-						print '</a>';
-					}
-					// Preview link
-					if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
-					// Public share link
-					//if (! $editline && ! empty($filearray[$key]['hashp'])) print pictowithlinktodirectdownload;
-
-					print "</td>\n";
-
-					// Size
-					$sizetoshow = dol_print_size($file['size'],1,1);
-					$sizetoshowbytes = dol_print_size($file['size'],0,1);
-
-					print '<td align="right" width="80px">';
-					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
-					else {
-						print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
-					}
-					print '</td>';
-
-					// Date
-					print '<td align="center" width="140px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';	// 140px = width for date with PM format
-
-					// Preview
-					if (empty($useinecm))
-					{
-						$fileinfo = pathinfo($file['name']);
-						print '<td align="center">';
-						if (image_format_supported($file['name']) > 0)
-						{
-							$minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-							if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
-							//print $file['path'].'/'.$minifile.'<br>';
-
-							$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
-							if (empty($urlforhref)) {
-								$urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
-								print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
-							} else {
-								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
-							}
-							print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
-							print '</a>';
-						}
-						else print '&nbsp;';
-						print '</td>';
-					}
-
-					// Hash of file (only if we are in a mode where a scan of dir were done and we have id of file in ECM table)
-					print '<td align="center">';
-					if ($relativedir && $filearray[$key]['rowid'] > 0)
-					{
-						if ($editline)
-						{
-							print $langs->trans("FileSharedViaALink").' ';
-							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
-						}
-						else
-						{
-							if ($file['share'])
-							{
-								// 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
-
-								//print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';
-								$forcedownload=0;
-								$paramlink='';
-								if (! empty($file['share'])) $paramlink.=($paramlink?'&':'').'hashp='.$file['share'];			// Hash for public share
-								if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
-
-								$fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
-
-								print img_picto($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
-								print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-							}
-							else
-							{
-								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
-							}
-						}
-					}
-					print '</td>';
-
-					// Actions buttons
-					if (! $editline)
-					{
-						// Delete or view link
-						// ($param must start with &)
-						print '<td class="valignmiddle right actionbuttons"><!-- action on files -->';
-						if ($useinecm == 1)
-						{
-							print '<a href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
-						}
-						if (! $useinecm || $useinecm == 2)
-						{
-							$newmodulepart=$modulepart;
-							if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
-
-							if (! $disablecrop && image_format_supported($file['name']) > 0)
-							{
-								if ($permtoeditline)
-								{
-	   								// Link to resize
-	   						   		print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("ResizeOrCrop")).'">'.img_picto($langs->trans("ResizeOrCrop"),'resize','class="paddingrightonly"').'</a>';
-								}
-							}
-
-							if ($permtoeditline)
-							{
-								$paramsectiondir=(in_array($modulepart, array('medias','ecm'))?'&section_dir='.urlencode($relativepath):'');
-								print '<a href="'.(($useinecm == 1)?'#':($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
-							}
-						}
-						if ($permonobject)
-						{
-							$useajax=1;
-							if (! empty($conf->dol_use_jmobile)) $useajax=0;
-							if (empty($conf->use_javascript_ajax)) $useajax=0;
-							if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
-							print '<a href="'.(($useinecm && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
-						}
-						print "</td>";
+        global $user, $conf, $langs, $hookmanager;
+        global $sortfield, $sortorder, $maxheightmini;
+        global $dolibarr_main_url_root;
+        global $form;
+
+        $disablecrop=1;
+        if (in_array($modulepart, array('expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) $disablecrop=0;
+
+        // Define relative path used to store the file
+        if (empty($relativepath))
+        {
+            $relativepath=(! empty($object->ref)?dol_sanitizeFileName($object->ref):'').'/';
+            if ($object->element == 'invoice_supplier') $relativepath=get_exdir($object->id,2,0,0,$object,'invoice_supplier').$relativepath;	// TODO Call using a defined value for $relativepath
+            if ($object->element == 'project_task') $relativepath='Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+        }
+        // For backward compatiblity, we detect file stored into an old path
+        if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
+        {
+            $relativepath=preg_replace('/^.*\/produit\//','',$filearray[0]['path']).'/';
+        }
+        // Defined relative dir to DOL_DATA_ROOT
+        $relativedir = '';
+        if ($upload_dir)
+        {
+            $relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir);
+            $relativedir = preg_replace('/^[\\/]/','',$relativedir);
+        }
+
+        $hookmanager->initHooks(array('formfile'));
+        $parameters=array(
+                'filearray' => $filearray,
+                'modulepart'=> $modulepart,
+                'param' => $param,
+                'forcedownload' => $forcedownload,
+                'relativepath' => $relativepath,    // relative filename to module dir
+                'relativedir' => $relativedir,      // relative dirname to DOL_DATA_ROOT
+                'permtodelete' => $permonobject,
+                'useinecm' => $useinecm,
+                'textifempty' => $textifempty,
+                'maxlength' => $maxlength,
+                'title' => $title,
+                'url' => $url
+        );
+        $reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
+
+        if (isset($reshook) && $reshook != '') // null or '' for bypass
+        {
+            return $reshook;
+        }
+        else
+        {
+            if (! is_object($form))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';		// The compoent may be included into ajax page that does not include the Form class
+                $form=new Form($this->db);
+            }
 
-						if (empty($disablemove))
-						{
-							if ($nboffiles > 1 && $conf->browser->layout != 'phone') {
-								print '<td align="center" class="linecolmove tdlineupdown">';
-								if ($i > 0) {
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
-								}
-								if ($i < $nboffiles-1) {
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
-								}
-								print '</td>';
-							}
-							else {
-							   	print '<td align="center"'.(($conf->browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
-							   	print '</td>';
-							}
-					   }
-					}
-					else
-					{
-						print '<td class="right">';
-						print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
-						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-						print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-						print '</td>';
-						if (empty($disablemove)) print '<td class="right"></td>';
-					}
-					print "</tr>\n";
-
-					$i++;
-				}
-			}
-			if ($nboffiles == 0)
-			{
-				$colspan=(empty($useinecm)?'6':'6');
-				if (empty($disablemove)) $colspan++;		// 6 columns or 7
-				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
-				if (empty($textifempty)) print $langs->trans("NoFileFound");
-				else print $textifempty;
-				print '</td></tr>';
-			}
-			print "</table>";
-			print '</div>';
-
-			if ($nboflines > 1 && is_object($object)) {
-				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
-					$table_element_line = 'ecm_files';
-					include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-				}
-			}
-
-			print ajax_autoselect('downloadlink');
-
-			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
-			{
-				print '</form>';
-			}
-
-			return $nboffiles;
-		}
-	}
+            if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
+            $relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
+            if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
+
+            if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
+            {
+                $permtoeditline=0;
+                if (in_array($modulepart, array('product','produit','service')))
+                {
+                    if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline=1;
+                    if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline=1;
+                }
+            }
+            if (empty($conf->global->MAIN_UPLOAD_DOC))
+            {
+                $permtoeditline=0;
+                $permonobject=0;
+            }
+
+            // Show list of existing files
+            if (empty($useinecm) && $title != 'none') print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
+            if (empty($url)) $url=$_SERVER["PHP_SELF"];
+
+            print '<!-- html.formfile::list_of_documents -->'."\n";
+            if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
+            {
+                print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
+                print '<input type="hidden" name="action" value="renamefile">';
+                print '<input type="hidden" name="id" value="'.$object->id.'">';
+                print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
+            }
+
+            print '<div class="div-table-responsive-no-min">';
+            print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
+
+            if (! empty($addfilterfields))
+            {
+                print '<tr class="liste_titre nodrag nodrop">';
+                print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref','alpha')).'"></td>';
+                print '<td></td>';
+                print '<td></td>';
+                if (empty($useinecm)) print '<td></td>';
+                print '<td></td>';
+                print '<td></td>';
+                if (! $disablemove) print '<td></td>';
+                print "</tr>\n";
+            }
+
+            print '<tr class="liste_titre nodrag nodrop">';
+            //print $url.' sortfield='.$sortfield.' sortorder='.$sortorder;
+            print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
+            print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
+            print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
+            if (empty($useinecm)) print_liste_field_titre('',$url,"","",$param,'align="center"');					// Preview
+            print_liste_field_titre('');
+            print_liste_field_titre('');
+            if (! $disablemove) print_liste_field_titre('');
+            print "</tr>\n";
+
+            // Get list of files stored into database for same relative directory
+            if ($relativedir)
+            {
+                completeFileArrayWithDatabaseInfo($filearray, $relativedir);
+
+                //var_dump($sortfield.' - '.$sortorder);
+                if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+                {
+                    $filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+                }
+            }
+
+            $nboffiles=count($filearray);
+            if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+            $i=0; $nboflines = 0; $lastrowid=0;
+            foreach($filearray as $key => $file)      // filearray must be only files here
+            {
+                if ($file['name'] != '.'
+                        && $file['name'] != '..'
+                        && ! preg_match('/\.meta$/i',$file['name']))
+                {
+                    if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
+                    $filepath=$relativepath.$file['name'];
+
+                    $editline=0;
+                    $nboflines++;
+                    print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
+                    // Do we have entry into database ?
+                    print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
+                    print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'AFTER'.$lastrowid.'POS'.($i+1)).'">';
+
+                    // File name
+                    print '<td class="minwith200">';
+
+                    // Show file name with link to download
+                    //print "XX".$file['name'];	//$file['name'] must be utf8
+                    print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+                    if ($forcedownload) print '&attachment=1';
+                    if (! empty($object->entity)) print '&entity='.$object->entity;
+                    print '&file='.urlencode($filepath);
+                    print '">';
+                    print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'],0,0).')', 'inline-block valignbottom paddingright');
+                    if ($showrelpart == 1) print $relativepath;
+                    //print dol_trunc($file['name'],$maxlength,'middle');
+                    if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile','alpha')))
+                    {
+                        print '</a>';
+                        $section_dir=dirname(GETPOST('urlfile','alpha'));
+                        print '<input type="hidden" name="section_dir" value="'.$section_dir.'">';
+                        print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
+                        print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
+                        $editline=1;
+                    }
+                    else
+                    {
+                        print dol_trunc($file['name'], 200);
+                        print '</a>';
+                    }
+                    // Preview link
+                    if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
+                    // Public share link
+                    //if (! $editline && ! empty($filearray[$key]['hashp'])) print pictowithlinktodirectdownload;
+
+                    print "</td>\n";
+
+                    // Size
+                    $sizetoshow = dol_print_size($file['size'],1,1);
+                    $sizetoshowbytes = dol_print_size($file['size'],0,1);
+
+                    print '<td align="right" width="80px">';
+                    if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
+                    else {
+                        print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
+                    }
+                    print '</td>';
+
+                    // Date
+                    print '<td align="center" width="140px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';	// 140px = width for date with PM format
+
+                    // Preview
+                    if (empty($useinecm))
+                    {
+                        $fileinfo = pathinfo($file['name']);
+                        print '<td align="center">';
+                        if (image_format_supported($file['name']) > 0)
+                        {
+                            $minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+                            if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+                            //print $file['path'].'/'.$minifile.'<br>';
+
+                            $urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
+                            if (empty($urlforhref)) {
+                                $urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
+                                print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
+                            } else {
+                                print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
+                            }
+                            print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
+                            print '</a>';
+                        }
+                        else print '&nbsp;';
+                        print '</td>';
+                    }
+
+                    // Hash of file (only if we are in a mode where a scan of dir were done and we have id of file in ECM table)
+                    print '<td align="center">';
+                    if ($relativedir && $filearray[$key]['rowid'] > 0)
+                    {
+                        if ($editline)
+                        {
+                            print $langs->trans("FileSharedViaALink").' ';
+                            print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
+                        }
+                        else
+                        {
+                            if ($file['share'])
+                            {
+                                // 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
+
+                                //print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';
+                                $forcedownload=0;
+                                $paramlink='';
+                                if (! empty($file['share'])) $paramlink.=($paramlink?'&':'').'hashp='.$file['share'];			// Hash for public share
+                                if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+
+                                $fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+
+                                print img_picto($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
+                                print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+                            }
+                            else
+                            {
+                                //print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
+                            }
+                        }
+                    }
+                    print '</td>';
+
+                    // Actions buttons
+                    if (! $editline)
+                    {
+                        // Delete or view link
+                        // ($param must start with &)
+                        print '<td class="valignmiddle right actionbuttons"><!-- action on files -->';
+                        if ($useinecm == 1)
+                        {
+                            print '<a href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
+                        }
+                        if (! $useinecm || $useinecm == 2)
+                        {
+                            $newmodulepart=$modulepart;
+                            if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
+
+                            if (! $disablecrop && image_format_supported($file['name']) > 0)
+                            {
+                                if ($permtoeditline)
+                                {
+                                        // Link to resize
+                                            print '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode($newmodulepart).'&id='.$object->id.'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension'])).'" title="'.dol_escape_htmltag($langs->trans("ResizeOrCrop")).'">'.img_picto($langs->trans("ResizeOrCrop"),'resize','class="paddingrightonly"').'</a>';
+                                }
+                            }
+
+                            if ($permtoeditline)
+                            {
+                                $paramsectiondir=(in_array($modulepart, array('medias','ecm'))?'&section_dir='.urlencode($relativepath):'');
+                                print '<a href="'.(($useinecm == 1)?'#':($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
+                            }
+                        }
+                        if ($permonobject)
+                        {
+                            $useajax=1;
+                            if (! empty($conf->dol_use_jmobile)) $useajax=0;
+                            if (empty($conf->use_javascript_ajax)) $useajax=0;
+                            if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
+                            print '<a href="'.(($useinecm && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
+                        }
+                        print "</td>";
+
+                        if (empty($disablemove))
+                        {
+                            if ($nboffiles > 1 && $conf->browser->layout != 'phone') {
+                                print '<td align="center" class="linecolmove tdlineupdown">';
+                                if ($i > 0) {
+                                    print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">'.img_up('default',0,'imgupforline').'</a>';
+                                }
+                                if ($i < $nboffiles-1) {
+                                    print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default',0,'imgdownforline').'</a>';
+                                }
+                                print '</td>';
+                            }
+                            else {
+                                    print '<td align="center"'.(($conf->browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
+                                    print '</td>';
+                            }
+                        }
+                    }
+                    else
+                    {
+                        print '<td class="right">';
+                        print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
+                        print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+                        print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+                        print '</td>';
+                        if (empty($disablemove)) print '<td class="right"></td>';
+                    }
+                    print "</tr>\n";
+
+                    $i++;
+                }
+            }
+            if ($nboffiles == 0)
+            {
+                $colspan=(empty($useinecm)?'6':'6');
+                if (empty($disablemove)) $colspan++;		// 6 columns or 7
+                print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
+                if (empty($textifempty)) print $langs->trans("NoFileFound");
+                else print $textifempty;
+                print '</td></tr>';
+            }
+            print "</table>";
+            print '</div>';
+
+            if ($nboflines > 1 && is_object($object)) {
+                if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
+                    $table_element_line = 'ecm_files';
+                    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+                }
+            }
+
+            print ajax_autoselect('downloadlink');
+
+            if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
+            {
+                print '</form>';
+            }
+
+            return $nboffiles;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show list of documents in a directory
-	 *
-	 *  @param	string	$upload_dir         Directory that was scanned
-	 *  @param  array	$filearray          Array of files loaded by dol_dir_list function before calling this function
-	 *  @param  string	$modulepart         Value for modulepart used by download wrapper
-	 *  @param  string	$param              Parameters on sort links
-	 *  @param  int		$forcedownload      Force to open dialog box "Save As" when clicking on file
-	 *  @param  string	$relativepath       Relative path of docs (autodefined if not provided)
-	 *  @param  int		$permtodelete       Permission to delete
-	 *  @param  int		$useinecm           Change output for use in ecm module
-	 *  @param  int		$textifempty        Text to show if filearray is empty
-	 *  @param  int		$maxlength          Maximum length of file name shown
-	 *  @param	string 	$url				Full url to use for click links ('' = autodetect)
-	 *  @param	int		$addfilterfields	Add line with filters
-	 *  @return int                 		<0 if KO, nb of files shown if OK
-	 *  @see list_of_documents
-	 */
-	function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload=0, $relativepath='', $permtodelete=1, $useinecm=0, $textifempty='', $maxlength=0, $url='', $addfilterfields=0)
-	{
+    /**
+     *	Show list of documents in a directory
+     *
+     *  @param	string	$upload_dir         Directory that was scanned
+     *  @param  array	$filearray          Array of files loaded by dol_dir_list function before calling this function
+     *  @param  string	$modulepart         Value for modulepart used by download wrapper
+     *  @param  string	$param              Parameters on sort links
+     *  @param  int		$forcedownload      Force to open dialog box "Save As" when clicking on file
+     *  @param  string	$relativepath       Relative path of docs (autodefined if not provided)
+     *  @param  int		$permtodelete       Permission to delete
+     *  @param  int		$useinecm           Change output for use in ecm module
+     *  @param  int		$textifempty        Text to show if filearray is empty
+     *  @param  int		$maxlength          Maximum length of file name shown
+     *  @param	string 	$url				Full url to use for click links ('' = autodetect)
+     *  @param	int		$addfilterfields	Add line with filters
+     *  @return int                 		<0 if KO, nb of files shown if OK
+     *  @see list_of_documents
+     */
+    function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload=0, $relativepath='', $permtodelete=1, $useinecm=0, $textifempty='', $maxlength=0, $url='', $addfilterfields=0)
+    {
         // phpcs:enable
-		global $user, $conf, $langs, $form;
-		global $sortfield, $sortorder;
-		global $search_doc_ref;
-
-		dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
-
-		// Show list of documents
-		if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
-		if (empty($url)) $url=$_SERVER["PHP_SELF"];
-
-		if (! empty($addfilterfields))
-		{
-			print '<form action="'.$_SERVER['PHP_SELF'].'">';
-			print '<input type="hidden" name="module" value="'.$modulepart.'">';
-		}
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table width="100%" class="noborder">'."\n";
-
-		if (! empty($addfilterfields))
-		{
-			print '<tr class="liste_titre nodrag nodrop">';
-			print '<td></td>';
-			print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
-			print '<td></td>';
-			print '<td></td>';
-			// Action column
-			print '<td class="liste_titre" align="middle">';
-			$searchpicto=$form->showFilterButtons();
-			print $searchpicto;
-			print '</td>';
-			print "</tr>\n";
-		}
-
-		print '<tr class="liste_titre">';
-		$sortref="fullname";
-		if ($modulepart == 'invoice_supplier') $sortref='level1name';
-		print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
-		print_liste_field_titre("Date",$url,"date","",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre('','','');
-		print '</tr>'."\n";
-
-		// To show ref or specific information according to view to show (defined by $module)
-		if ($modulepart == 'company')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-			$object_instance=new Societe($this->db);
-		}
-		else if ($modulepart == 'invoice')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$object_instance=new Facture($this->db);
-		}
-		else if ($modulepart == 'invoice_supplier')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-			$object_instance=new FactureFournisseur($this->db);
-		}
-		else if ($modulepart == 'propal')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-			$object_instance=new Propal($this->db);
-		}
-		else if ($modulepart == 'supplier_proposal')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-			$object_instance=new SupplierProposal($this->db);
-		}
-		else if ($modulepart == 'order')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-			$object_instance=new Commande($this->db);
-		}
-		else if ($modulepart == 'order_supplier')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-			$object_instance=new CommandeFournisseur($this->db);
-		}
-		else if ($modulepart == 'contract')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-			$object_instance=new Contrat($this->db);
-		}
-		else if ($modulepart == 'product')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-			$object_instance=new Product($this->db);
-		}
-		else if ($modulepart == 'tax')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-			$object_instance=new ChargeSociales($this->db);
-		}
-		else if ($modulepart == 'project')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-			$object_instance=new Project($this->db);
-		}
-		else if ($modulepart == 'fichinter')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-			$object_instance=new Fichinter($this->db);
-		}
-		else if ($modulepart == 'user')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-			$object_instance=new User($this->db);
-		}
-		else if ($modulepart == 'expensereport')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-			$object_instance=new ExpenseReport($this->db);
-		}
-		else if ($modulepart == 'holiday')
-		{
-			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
-			$object_instance=new Holiday($this->db);
-		}
-
-		foreach($filearray as $key => $file)
-		{
-			if (!is_dir($file['name'])
-			&& $file['name'] != '.'
-			&& $file['name'] != '..'
-			&& $file['name'] != 'CVS'
-			&& ! preg_match('/\.meta$/i',$file['name']))
-			{
-				// Define relative path used to store the file
-				$relativefile=preg_replace('/'.preg_quote($upload_dir.'/','/').'/','',$file['fullname']);
-
-				//var_dump($file);
-				$id=0; $ref=''; $label='';
-
-				// To show ref or specific information according to view to show (defined by $module)
-				if ($modulepart == 'company')           { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'invoice')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'invoice_supplier')  { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } }	// $ref may be also id with old supplier invoices
-				if ($modulepart == 'propal')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'order')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'order_supplier')    { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'contract')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'product')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'tax')               { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-				if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
-				if ($modulepart == 'holiday')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
-
-				if (! $id && ! $ref) continue;
-				$found=0;
-				if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
-				{
-					$found=1;
-				}
-				else
-				{
-					//print 'Fetch '.$id." - ".$ref.'<br>';
-
-					if ($id) {
-						$result = $object_instance->fetch($id);
-					} else {
-						//fetchOneLike looks for objects with wildcards in its reference.
-						//It is useful for those masks who get underscores instead of their actual symbols
-						//fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
-						//that's why we look only look fetchOneLike when fetch returns 0
-						if (!$result = $object_instance->fetch('', $ref)) {
-							$result = $object_instance->fetchOneLike($ref);
-						}
-					}
-
-					if ($result > 0) {  // Save object into a cache
-						$found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
-					}
-					if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
-				}
-
-				if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
-
-				print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
-				print '<tr class="oddeven">';
-				print '<td>';
-				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
-				else print $langs->trans("ObjectDeleted",($id?$id:$ref));
-
-				//$modulesubdir=dol_sanitizeFileName($ref);
-				$modulesubdir=dirname($relativefile);
-
-				//$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-				$filedir=$file['path'];
-				//$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-				//print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
-
-				print '</td>';
-
-				// File
-				print '<td>';
-				//print "XX".$file['name']; //$file['name'] must be utf8
-				print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-				if ($forcedownload) print '&attachment=1';
-				print '&file='.urlencode($relativefile).'">';
-				print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')');
-				print dol_trunc($file['name'],$maxlength,'middle');
-				print '</a>';
-
-				//print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$');
-				print $this->showPreview($file, $modulepart, $file['relativename']);
-
-				print "</td>\n";
-				print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
-				print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
-				print '<td align="right">';
-				//if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-				//if ($forcedownload) print '&attachment=1';
-				//print '&file='.urlencode($relativefile).'">';
-				//print img_view().'</a> &nbsp; ';
-				//if ($permtodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
-				//else print '&nbsp;';
-				print "</td></tr>\n";
-			}
-		}
-
-		if (count($filearray) == 0)
-		{
-			print '<tr class="oddeven"><td colspan="5">';
-			if (empty($textifempty)) print $langs->trans("NoFileFound");
-			else print $textifempty;
-			print '</td></tr>';
-		}
-		print "</table>";
-		print '</div>';
-
-		if (! empty($addfilterfields)) print '</form>';
-		// Fin de zone
-	}
-
-	/**
-	 *    Show form to upload a new file with jquery fileupload.
-	 *    This form use the fileupload.php file.
-	 *
-	 *    @param	Object	$object		Object to use
-	 *    @return	void
-	 */
-	private function _formAjaxFileUpload($object)
-	{
-		global $langs, $conf;
-
-		// PHP post_max_size
-		$post_max_size				= ini_get('post_max_size');
-		$mul_post_max_size			= substr($post_max_size, -1);
-		$mul_post_max_size			= ($mul_post_max_size == 'M' ? 1048576 : ($mul_post_max_size == 'K' ? 1024 : ($mul_post_max_size == 'G' ? 1073741824 : 1)));
-		$post_max_size				= $mul_post_max_size * (int) $post_max_size;
-		// PHP upload_max_filesize
-		$upload_max_filesize		= ini_get('upload_max_filesize');
-		$mul_upload_max_filesize	= substr($upload_max_filesize, -1);
-		$mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));
-		$upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;
-		// Max file size
-		$max_file_size 				= (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
-
-		// Include main
-		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';
-
-		// Include template
-		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php';
-	}
-
-	/**
-	 * Show array with linked files
-	 *
-	 * @param 	Object		$object			Object
-	 * @param 	int			$permtodelete	Deletion is allowed
-	 * @param 	string		$action			Action
-	 * @param 	string		$selected		???
-	 * @param	string		$param			More param to add into URL
-	 * @return 	int							Number of links
-	 */
-	public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
-	{
-		global $user, $conf, $langs, $user;
-		global $sortfield, $sortorder;
-
-		$langs->load("link");
-
-		require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-		$link = new Link($this->db);
-		$links = array();
-		if ($sortfield == "name") {
-			$sortfield = "label";
-		} elseif ($sortfield == "date") {
-			$sortfield = "datea";
-		} else {
-			$sortfield = null;
-		}
-		$res = $link->fetchAll($links, $object->element, $object->id, $sortfield, $sortorder);
-		$param .= (isset($object->id)?'&id=' . $object->id : '');
-
-		// Show list of associated links
-		print load_fiche_titre($langs->trans("LinkedFiles"));
-
-		print '<form action="' . $_SERVER['PHP_SELF'] . ($param?'?'.$param:'') . '" method="POST">';
-
-		print '<table width="100%" class="liste">';
-		print '<tr class="liste_titre">';
-		print_liste_field_titre(
-			$langs->trans("Links"),
-			$_SERVER['PHP_SELF'],
-			"name",
-			"",
-			$param,
-			'align="left"',
-			$sortfield,
-			$sortorder
-		);
-		print_liste_field_titre(
-			"",
-			"",
-			"",
-			"",
-			"",
-			'align="right"'
-		);
-		print_liste_field_titre(
-			$langs->trans("Date"),
-			$_SERVER['PHP_SELF'],
-			"date",
-			"",
-			$param,
-			'align="center"',
-			$sortfield,
-			$sortorder
-		);
-		print_liste_field_titre(
-			'',
-			$_SERVER['PHP_SELF'],
-			"",
-			"",
-			$param,
-			'align="center"'
-		);
-		print_liste_field_titre('','','');
-		print '</tr>';
-		$nboflinks = count($links);
-		if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-		foreach ($links as $link)
-		{
-			print '<tr class="oddeven">';
-			//edit mode
-			if ($action == 'update' && $selected === $link->id)
-			{
-				print '<td>';
-				print '<input type="hidden" name="id" value="' . $object->id . '">';
-				print '<input type="hidden" name="linkid" value="' . $link->id . '">';
-				print '<input type="hidden" name="action" value="confirm_updateline">';
-				print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
-				print '</td>';
-				print '<td>';
-				print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';
-				print '</td>';
-				print '<td align="center">' . dol_print_date(dol_now(), "dayhour", "tzuser") . '</td>';
-				print '<td align="right"></td>';
-				print '<td align="right">';
-				print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
-				print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
-				print '</td>';
-			}
-			else
-			{
-				print '<td>';
-				print img_picto('', 'object_globe').' ';
-				print '<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-				print $link->label;
-				print '</a>';
-				print '</td>'."\n";
-				print '<td align="right"></td>';
-				print '<td align="center">' . dol_print_date($link->datea, "dayhour", "tzuser") . '</td>';
-				print '<td align="center"></td>';
-				print '<td align="right">';
-				print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '" class="editfilelink" >' . img_edit() . '</a>';	// id= is included into $param
-				if ($permtodelete) {
-					print ' &nbsp; <a href="'. $_SERVER['PHP_SELF'] .'?action=delete&linkid=' . $link->id . $param . '" class="deletefilelink">' . img_delete() . '</a>';	// id= is included into $param
-				} else {
-					print '&nbsp;';
-				}
-				print '</td>';
-			}
-			print "</tr>\n";
-		}
-		if ($nboflinks == 0)
-		{
-			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">';
-			print $langs->trans("NoLinkFound");
-			print '</td></tr>';
-		}
-		print "</table>";
-
-		print '</form>';
-
-		return $nboflinks;
-	}
-
-
-	/**
-	 * Show detail icon with link for preview
-	 *
-	 * @param   array     $file           Array with data of file. Example: array('name'=>...)
-	 * @param   string    $modulepart     propal, facture, facture_fourn, ...
-	 * @param   string    $relativepath   Relative path of docs
-	 * @param   string    $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file)
-	 * @param	string	  $param		  More param on http links
-	 * @return  string    $out            Output string with HTML
-	 */
-	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
-	{
-		global $langs, $conf;
-
-		$out='';
-		if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
-		{
-			$urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
-			if (count($urladvancedpreview))
-			{
-				$out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
-				//$out.= '<a class="pictopreview">';
-				if (empty($ruleforpicto))
-				{
-					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
-					$out.='<span class="fa fa-search-plus" style="color: gray"></span>';
-				}
-				else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
-				$out.= '</a>';
-			}
-		}
-		return $out;
-	}
+        global $user, $conf, $langs, $form;
+        global $sortfield, $sortorder;
+        global $search_doc_ref;
+
+        dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
+
+        // Show list of documents
+        if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
+        if (empty($url)) $url=$_SERVER["PHP_SELF"];
+
+        if (! empty($addfilterfields))
+        {
+            print '<form action="'.$_SERVER['PHP_SELF'].'">';
+            print '<input type="hidden" name="module" value="'.$modulepart.'">';
+        }
+
+        print '<div class="div-table-responsive-no-min">';
+        print '<table width="100%" class="noborder">'."\n";
+
+        if (! empty($addfilterfields))
+        {
+            print '<tr class="liste_titre nodrag nodrop">';
+            print '<td></td>';
+            print '<td><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
+            print '<td></td>';
+            print '<td></td>';
+            // Action column
+            print '<td class="liste_titre" align="middle">';
+            $searchpicto=$form->showFilterButtons();
+            print $searchpicto;
+            print '</td>';
+            print "</tr>\n";
+        }
+
+        print '<tr class="liste_titre">';
+        $sortref="fullname";
+        if ($modulepart == 'invoice_supplier') $sortref='level1name';
+        print_liste_field_titre("Ref",$url,$sortref,"",$param,'align="left"',$sortfield,$sortorder);
+        print_liste_field_titre("Documents2",$url,"name","",$param,'align="left"',$sortfield,$sortorder);
+        print_liste_field_titre("Size",$url,"size","",$param,'align="right"',$sortfield,$sortorder);
+        print_liste_field_titre("Date",$url,"date","",$param,'align="center"',$sortfield,$sortorder);
+        print_liste_field_titre('','','');
+        print '</tr>'."\n";
+
+        // To show ref or specific information according to view to show (defined by $module)
+        if ($modulepart == 'company')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+            $object_instance=new Societe($this->db);
+        }
+        else if ($modulepart == 'invoice')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+            $object_instance=new Facture($this->db);
+        }
+        else if ($modulepart == 'invoice_supplier')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+            $object_instance=new FactureFournisseur($this->db);
+        }
+        else if ($modulepart == 'propal')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+            $object_instance=new Propal($this->db);
+        }
+        else if ($modulepart == 'supplier_proposal')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+            $object_instance=new SupplierProposal($this->db);
+        }
+        else if ($modulepart == 'order')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+            $object_instance=new Commande($this->db);
+        }
+        else if ($modulepart == 'order_supplier')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+            $object_instance=new CommandeFournisseur($this->db);
+        }
+        else if ($modulepart == 'contract')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+            $object_instance=new Contrat($this->db);
+        }
+        else if ($modulepart == 'product')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+            $object_instance=new Product($this->db);
+        }
+        else if ($modulepart == 'tax')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+            $object_instance=new ChargeSociales($this->db);
+        }
+        else if ($modulepart == 'project')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+            $object_instance=new Project($this->db);
+        }
+        else if ($modulepart == 'fichinter')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+            $object_instance=new Fichinter($this->db);
+        }
+        else if ($modulepart == 'user')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+            $object_instance=new User($this->db);
+        }
+        else if ($modulepart == 'expensereport')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+            $object_instance=new ExpenseReport($this->db);
+        }
+        else if ($modulepart == 'holiday')
+        {
+            include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+            $object_instance=new Holiday($this->db);
+        }
+
+        foreach($filearray as $key => $file)
+        {
+            if (!is_dir($file['name'])
+            && $file['name'] != '.'
+            && $file['name'] != '..'
+            && $file['name'] != 'CVS'
+            && ! preg_match('/\.meta$/i',$file['name']))
+            {
+                // Define relative path used to store the file
+                $relativefile=preg_replace('/'.preg_quote($upload_dir.'/','/').'/','',$file['fullname']);
+
+                //var_dump($file);
+                $id=0; $ref=''; $label='';
+
+                // To show ref or specific information according to view to show (defined by $module)
+                if ($modulepart == 'company')           { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'invoice')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'invoice_supplier')  { preg_match('/([^\/]+)\/[^\/]+$/',$relativefile,$reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } }	// $ref may be also id with old supplier invoices
+                if ($modulepart == 'propal')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'order')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'order_supplier')    { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'contract')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'product')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'tax')               { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
+                if ($modulepart == 'project')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'fichinter')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'user')              { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'expensereport')     { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'holiday')           { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
+
+                if (! $id && ! $ref) continue;
+                $found=0;
+                if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
+                {
+                    $found=1;
+                }
+                else
+                {
+                    //print 'Fetch '.$id." - ".$ref.'<br>';
+
+                    if ($id) {
+                        $result = $object_instance->fetch($id);
+                    } else {
+                        //fetchOneLike looks for objects with wildcards in its reference.
+                        //It is useful for those masks who get underscores instead of their actual symbols
+                        //fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
+                        //that's why we look only look fetchOneLike when fetch returns 0
+                        if (!$result = $object_instance->fetch('', $ref)) {
+                            $result = $object_instance->fetchOneLike($ref);
+                        }
+                    }
+
+                    if ($result > 0) {  // Save object into a cache
+                        $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
+                    }
+                    if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
+                }
+
+                if (! $found > 0 || ! is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue;    // We do not show orphelins files
+
+                print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
+                print '<tr class="oddeven">';
+                print '<td>';
+                if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1,'document');
+                else print $langs->trans("ObjectDeleted",($id?$id:$ref));
+
+                //$modulesubdir=dol_sanitizeFileName($ref);
+                $modulesubdir=dirname($relativefile);
+
+                //$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+                $filedir=$file['path'];
+                //$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+                //print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
+
+                print '</td>';
+
+                // File
+                print '<td>';
+                //print "XX".$file['name']; //$file['name'] must be utf8
+                print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+                if ($forcedownload) print '&attachment=1';
+                print '&file='.urlencode($relativefile).'">';
+                print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')');
+                print dol_trunc($file['name'],$maxlength,'middle');
+                print '</a>';
+
+                //print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$');
+                print $this->showPreview($file, $modulepart, $file['relativename']);
+
+                print "</td>\n";
+                print '<td align="right">'.dol_print_size($file['size'],1,1).'</td>';
+                print '<td align="center">'.dol_print_date($file['date'],"dayhour").'</td>';
+                print '<td align="right">';
+                //if (! empty($useinecm))  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+                //if ($forcedownload) print '&attachment=1';
+                //print '&file='.urlencode($relativefile).'">';
+                //print img_view().'</a> &nbsp; ';
+                //if ($permtodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
+                //else print '&nbsp;';
+                print "</td></tr>\n";
+            }
+        }
+
+        if (count($filearray) == 0)
+        {
+            print '<tr class="oddeven"><td colspan="5">';
+            if (empty($textifempty)) print $langs->trans("NoFileFound");
+            else print $textifempty;
+            print '</td></tr>';
+        }
+        print "</table>";
+        print '</div>';
+
+        if (! empty($addfilterfields)) print '</form>';
+        // Fin de zone
+    }
+
+    /**
+     *    Show form to upload a new file with jquery fileupload.
+     *    This form use the fileupload.php file.
+     *
+     *    @param	Object	$object		Object to use
+     *    @return	void
+     */
+    private function _formAjaxFileUpload($object)
+    {
+        global $langs, $conf;
+
+        // PHP post_max_size
+        $post_max_size				= ini_get('post_max_size');
+        $mul_post_max_size			= substr($post_max_size, -1);
+        $mul_post_max_size			= ($mul_post_max_size == 'M' ? 1048576 : ($mul_post_max_size == 'K' ? 1024 : ($mul_post_max_size == 'G' ? 1073741824 : 1)));
+        $post_max_size				= $mul_post_max_size * (int) $post_max_size;
+        // PHP upload_max_filesize
+        $upload_max_filesize		= ini_get('upload_max_filesize');
+        $mul_upload_max_filesize	= substr($upload_max_filesize, -1);
+        $mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));
+        $upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;
+        // Max file size
+        $max_file_size 				= (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
+
+        // Include main
+        include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';
+
+        // Include template
+        include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php';
+    }
+
+    /**
+     * Show array with linked files
+     *
+     * @param 	Object		$object			Object
+     * @param 	int			$permtodelete	Deletion is allowed
+     * @param 	string		$action			Action
+     * @param 	string		$selected		???
+     * @param	string		$param			More param to add into URL
+     * @return 	int							Number of links
+     */
+    public function listOfLinks($object, $permtodelete=1, $action=null, $selected=null, $param='')
+    {
+        global $user, $conf, $langs, $user;
+        global $sortfield, $sortorder;
+
+        $langs->load("link");
+
+        require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+        $link = new Link($this->db);
+        $links = array();
+        if ($sortfield == "name") {
+            $sortfield = "label";
+        } elseif ($sortfield == "date") {
+            $sortfield = "datea";
+        } else {
+            $sortfield = null;
+        }
+        $res = $link->fetchAll($links, $object->element, $object->id, $sortfield, $sortorder);
+        $param .= (isset($object->id)?'&id=' . $object->id : '');
+
+        // Show list of associated links
+        print load_fiche_titre($langs->trans("LinkedFiles"));
+
+        print '<form action="' . $_SERVER['PHP_SELF'] . ($param?'?'.$param:'') . '" method="POST">';
+
+        print '<table width="100%" class="liste">';
+        print '<tr class="liste_titre">';
+        print_liste_field_titre(
+            $langs->trans("Links"),
+            $_SERVER['PHP_SELF'],
+            "name",
+            "",
+            $param,
+            'align="left"',
+            $sortfield,
+            $sortorder
+        );
+        print_liste_field_titre(
+            "",
+            "",
+            "",
+            "",
+            "",
+            'align="right"'
+        );
+        print_liste_field_titre(
+            $langs->trans("Date"),
+            $_SERVER['PHP_SELF'],
+            "date",
+            "",
+            $param,
+            'align="center"',
+            $sortfield,
+            $sortorder
+        );
+        print_liste_field_titre(
+            '',
+            $_SERVER['PHP_SELF'],
+            "",
+            "",
+            $param,
+            'align="center"'
+        );
+        print_liste_field_titre('','','');
+        print '</tr>';
+        $nboflinks = count($links);
+        if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+        foreach ($links as $link)
+        {
+            print '<tr class="oddeven">';
+            //edit mode
+            if ($action == 'update' && $selected === $link->id)
+            {
+                print '<td>';
+                print '<input type="hidden" name="id" value="' . $object->id . '">';
+                print '<input type="hidden" name="linkid" value="' . $link->id . '">';
+                print '<input type="hidden" name="action" value="confirm_updateline">';
+                print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
+                print '</td>';
+                print '<td>';
+                print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';
+                print '</td>';
+                print '<td align="center">' . dol_print_date(dol_now(), "dayhour", "tzuser") . '</td>';
+                print '<td align="right"></td>';
+                print '<td align="right">';
+                print '<input type="submit" name="save" class="button" value="' . dol_escape_htmltag($langs->trans('Save')) . '">';
+                print '<input type="submit" name="cancel" class="button" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '">';
+                print '</td>';
+            }
+            else
+            {
+                print '<td>';
+                print img_picto('', 'object_globe').' ';
+                print '<a data-ajax="false" href="' . $link->url . '" target="_blank">';
+                print $link->label;
+                print '</a>';
+                print '</td>'."\n";
+                print '<td align="right"></td>';
+                print '<td align="center">' . dol_print_date($link->datea, "dayhour", "tzuser") . '</td>';
+                print '<td align="center"></td>';
+                print '<td align="right">';
+                print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '" class="editfilelink" >' . img_edit() . '</a>';	// id= is included into $param
+                if ($permtodelete) {
+                    print ' &nbsp; <a href="'. $_SERVER['PHP_SELF'] .'?action=delete&linkid=' . $link->id . $param . '" class="deletefilelink">' . img_delete() . '</a>';	// id= is included into $param
+                } else {
+                    print '&nbsp;';
+                }
+                print '</td>';
+            }
+            print "</tr>\n";
+        }
+        if ($nboflinks == 0)
+        {
+            print '<tr class="oddeven"><td colspan="5" class="opacitymedium">';
+            print $langs->trans("NoLinkFound");
+            print '</td></tr>';
+        }
+        print "</table>";
+
+        print '</form>';
+
+        return $nboflinks;
+    }
+
+
+    /**
+     * Show detail icon with link for preview
+     *
+     * @param   array     $file           Array with data of file. Example: array('name'=>...)
+     * @param   string    $modulepart     propal, facture, facture_fourn, ...
+     * @param   string    $relativepath   Relative path of docs
+     * @param   string    $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file)
+     * @param	string	  $param		  More param on http links
+     * @return  string    $out            Output string with HTML
+     */
+    public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
+    {
+        global $langs, $conf;
+
+        $out='';
+        if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
+        {
+            $urladvancedpreview=getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param);      // Return if a file is qualified for preview.
+            if (count($urladvancedpreview))
+            {
+                $out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
+                //$out.= '<a class="pictopreview">';
+                if (empty($ruleforpicto))
+                {
+                    //$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
+                    $out.='<span class="fa fa-search-plus" style="color: gray"></span>';
+                }
+                else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+                $out.= '</a>';
+            }
+        }
+        return $out;
+    }
 }

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

Indentation +303 added lines, -303 removed lines

@@ -33,110 +33,110 @@ 
 class FormAccounting extends Form
 {
 
-	private $options_cache = array();
+    private $options_cache = array();
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-   /**
-	* Constructor
-	*
-	* @param		DoliDB		$db      Database handler
-	*/
-	public function __construct($db)
-	{
-	    $this->db = $db;
-	}
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    /**
+     * Constructor
+     *
+     * @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return list of journals with label by nature
-	 *
-	 * @param	string	$selectid	Preselected pcg_type
-	 * @param	string	$htmlname	Name of field in html form
-	 * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
-	 * @param	int		$showempty	Add an empty field
-	 * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
-	 * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
-	 * @param	string	$morecss	More css non HTML object
-	 * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
-	 * @param   int     $disabledajaxcombo Disable ajax combo box.
-	 * @return	string				String with HTML select
-	 */
-	function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0)
-	{
+    /**
+     * Return list of journals with label by nature
+     *
+     * @param	string	$selectid	Preselected pcg_type
+     * @param	string	$htmlname	Name of field in html form
+     * @param	int		$nature		Limit the list to a particular type of journals (1:various operations / 2:sale / 3:purchase / 4:bank / 9: has-new)
+     * @param	int		$showempty	Add an empty field
+     * @param	int		$select_in	0=selectid value is the journal rowid (default) or 1=selectid is journal code
+     * @param	int		$select_out	Set value returned by select. 0=rowid (default), 1=code
+     * @param	string	$morecss	More css non HTML object
+     * @param	string	$usecache	Key to use to store result into a cache. Next call with same key will reuse the cache.
+     * @param   int     $disabledajaxcombo Disable ajax combo box.
+     * @return	string				String with HTML select
+     */
+    function select_journal($selectid, $htmlname = 'journal', $nature=0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='', $disabledajaxcombo=0)
+    {
         // phpcs:enable
-		global $conf,$langs;
-
-		$out = '';
-
-    	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
-		{
-		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
-		}
-		else
-		{
-			$sql = "SELECT rowid, code, label, nature, entity, active";
-			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
-			$sql.= " WHERE active = 1";
-			$sql.= " AND entity = ".$conf->entity;
-			//if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
-			$sql.= " ORDER BY code";
-
-			dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-
-			if (!$resql) {
-				$this->error = "Error ".$this->db->lasterror();
-				dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
-				return -1;
-			}
-
-    		$selected = 0;
-			$langs->load('accountancy');
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				$label = $obj->code . ' - ' . $langs->trans($obj->label);
-
-    			$select_value_in = $obj->rowid;
-				$select_value_out = $obj->rowid;
-
-				// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->code;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->code;
-    			}
-    			// Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
-
-				$options[$select_value_out] = $label;
-			}
-			$this->db->free($resql);
-
-			if ($usecache)
-			{
-				$this->options_cache[$usecache] = $options;
-			}
-		}
-
-		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo?0:1));
-
-		return $out;
-	}
+        global $conf,$langs;
+
+        $out = '';
+
+        $options = array();
+        if ($usecache && ! empty($this->options_cache[$usecache]))
+        {
+            $options = $this->options_cache[$usecache];
+            $selected=$selectid;
+        }
+        else
+        {
+            $sql = "SELECT rowid, code, label, nature, entity, active";
+            $sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
+            $sql.= " WHERE active = 1";
+            $sql.= " AND entity = ".$conf->entity;
+            //if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
+            $sql.= " ORDER BY code";
+
+            dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+
+            if (!$resql) {
+                $this->error = "Error ".$this->db->lasterror();
+                dol_syslog(get_class($this)."::select_journal ".$this->error, LOG_ERR);
+                return -1;
+            }
+
+            $selected = 0;
+            $langs->load('accountancy');
+            while ($obj = $this->db->fetch_object($resql))
+            {
+                $label = $obj->code . ' - ' . $langs->trans($obj->label);
+
+                $select_value_in = $obj->rowid;
+                $select_value_out = $obj->rowid;
+
+                // Try to guess if we have found default value
+                if ($select_in == 1) {
+                    $select_value_in = $obj->code;
+                }
+                if ($select_out == 1) {
+                    $select_value_out = $obj->code;
+                }
+                // Remember guy's we store in database llx_accounting_bookkeeping the code of accounting_journal and not the rowid
+                if ($selectid != '' && $selectid == $select_value_in) {
+                    //var_dump("Found ".$selectid." ".$select_value_in);
+                    $selected = $select_value_out;
+                }
+
+                $options[$select_value_out] = $label;
+            }
+            $this->db->free($resql);
+
+            if ($usecache)
+            {
+                $this->options_cache[$usecache] = $options;
+            }
+        }
+
+        $out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo?0:1));
+
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -167,7 +167,7 @@ 
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
             $sql.= " WHERE c.active = 1";
-			$sql.= " AND c.category_type = 0";
+            $sql.= " AND c.category_type = 0";
             if (empty($allcountries)) $sql.= " AND c.fk_country = ".$mysoc->country_id;
             $sql.= " ORDER BY c.label ASC";
         }
@@ -176,8 +176,8 @@ 
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql.= " WHERE c.active = 1";
-			$sql.= " AND c.category_type = 0";
-			$sql.= " AND c.fk_country = co.rowid";
+            $sql.= " AND c.category_type = 0";
+            $sql.= " AND c.fk_country = co.rowid";
             if (empty($allcountries)) $sql.= " AND co.code = '".$mysoc->country_code."'";
             $sql.= " ORDER BY c.label ASC";
         }
@@ -199,7 +199,7 @@ 
                     $out .= '<option value="'.$obj->rowid.'"';
                     if ($obj->rowid == $selected) $out .= ' selected';
                     $out .= '>'.($maxlen ? dol_trunc($obj->type,$maxlen) : $obj->type);
-					$out .= ' ('.$obj->range_account.')';
+                    $out .= ' ('.$obj->range_account.')';
                     $i++;
                 }
                 $out .=  '</select>';
@@ -221,231 +221,231 @@ 
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return select filter with date of transaction
-	 *
-	 * @param string $htmlname Name of select field
-	 * @param string $selectedkey Value
-	 * @return string HTML edit field
-	 */
+    /**
+     * Return select filter with date of transaction
+     *
+     * @param string $htmlname Name of select field
+     * @param string $selectedkey Value
+     * @return string HTML edit field
+     */
     function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey = '')
     {
         // phpcs:enable
-		$options = array();
+        $options = array();
 
-		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
-	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";
-		$sql .= ' ORDER BY import_key DESC';
+        $sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+        $sql .= " WHERE entity IN (".getEntity('accountancy').")";
+        $sql .= ' ORDER BY import_key DESC';
 
-		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
-		$resql = $this->db->query($sql);
+        dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
+        $resql = $this->db->query($sql);
 
-		if (!$resql) {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
-			return - 1;
-		}
+        if (!$resql) {
+            $this->error = "Error " . $this->db->lasterror();
+            dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
+            return - 1;
+        }
 
-		while ($obj = $this->db->fetch_object($resql)) {
-			$options[$obj->import_key] = dol_print_date($obj->import_key, 'dayhourtext');
-		}
+        while ($obj = $this->db->fetch_object($resql)) {
+            $options[$obj->import_key] = dol_print_date($obj->import_key, 'dayhourtext');
+        }
 
-		return Form::selectarray($htmlname, $options, $selectedkey);
-	}
+        return Form::selectarray($htmlname, $options, $selectedkey);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return list of accounts with label by chart of accounts
-	 *
-	 * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
-	 * @param string   $htmlname           Name of HTML field id. If name start with '.', it is name of HTML css class, so several component with same name in different forms can be used.
-	 * @param int      $showempty          1=Add an empty field, 2=Add an empty field+'None' field
-	 * @param array    $event              Event options
-	 * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
-	 * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number
-	 * @param string   $morecss            More css non HTML object
-	 * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
-	 * @return string                      String with HTML select
-	 */
-	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
-	{
+    /**
+     * Return list of accounts with label by chart of accounts
+     *
+     * @param string   $selectid           Preselected id or code of accounting accounts (depends on $select_in)
+     * @param string   $htmlname           Name of HTML field id. If name start with '.', it is name of HTML css class, so several component with same name in different forms can be used.
+     * @param int      $showempty          1=Add an empty field, 2=Add an empty field+'None' field
+     * @param array    $event              Event options
+     * @param int      $select_in          0=selectid value is a aa.rowid (default) or 1=selectid is aa.account_number
+     * @param int      $select_out         Set value returned by select. 0=rowid (default), 1=account_number
+     * @param string   $morecss            More css non HTML object
+     * @param string   $usecache           Key to use to store result into a cache. Next call with same key will reuse the cache.
+     * @return string                      String with HTML select
+     */
+    function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $morecss='maxwidth300 maxwidthonsmartphone', $usecache='')
+    {
         // phpcs:enable
-		global $conf, $langs;
-
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-
-		$out = '';
-
-    	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
-		{
-		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
-		}
-		else
-		{
-    		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
-
-    		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
-    		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-    		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-    		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
-    		$sql .= " AND aa.active = 1";
-    		$sql .= " AND aa.entity=".$conf->entity;
-    		$sql .= " ORDER BY aa.account_number";
-
-    		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-
-    		if (!$resql) {
-    			$this->error = "Error " . $this->db->lasterror();
-    			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
-    			return -1;
-    		}
-
-    		$selected = 0;
-    		while ($obj = $this->db->fetch_object($resql))
-    		{
-    			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
-    			$label = dol_trunc($label, $trunclength);
-
-    			$select_value_in = $obj->rowid;
-    			$select_value_out = $obj->rowid;
-
-    			// Try to guess if we have found default value
-    			if ($select_in == 1) {
-    				$select_value_in = $obj->account_number;
-    			}
-    			if ($select_out == 1) {
-    				$select_value_out = $obj->account_number;
-    			}
-    			// Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
-    			// Because same account_number can be share between different accounting_system and do have the same meaning
-    			if ($selectid != '' && $selectid == $select_value_in) {
-    			    //var_dump("Found ".$selectid." ".$select_value_in);
-    				$selected = $select_value_out;
-    			}
-
-    			$options[$select_value_out] = $label;
-    		}
-    		$this->db->free($resql);
-
-    		if ($usecache)
-    		{
+        global $conf, $langs;
+
+        require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+
+        $out = '';
+
+        $options = array();
+        if ($usecache && ! empty($this->options_cache[$usecache]))
+        {
+            $options = $this->options_cache[$usecache];
+            $selected=$selectid;
+        }
+        else
+        {
+            $trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
+
+            $sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
+            $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
+            $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+            $sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+            $sql .= " AND aa.active = 1";
+            $sql .= " AND aa.entity=".$conf->entity;
+            $sql .= " ORDER BY aa.account_number";
+
+            dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+
+            if (!$resql) {
+                $this->error = "Error " . $this->db->lasterror();
+                dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
+                return -1;
+            }
+
+            $selected = 0;
+            while ($obj = $this->db->fetch_object($resql))
+            {
+                $label = length_accountg($obj->account_number) . ' - ' . $obj->label;
+                $label = dol_trunc($label, $trunclength);
+
+                $select_value_in = $obj->rowid;
+                $select_value_out = $obj->rowid;
+
+                // Try to guess if we have found default value
+                if ($select_in == 1) {
+                    $select_value_in = $obj->account_number;
+                }
+                if ($select_out == 1) {
+                    $select_value_out = $obj->account_number;
+                }
+                // Remember guy's we store in database llx_facturedet the rowid of accounting_account and not the account_number
+                // Because same account_number can be share between different accounting_system and do have the same meaning
+                if ($selectid != '' && $selectid == $select_value_in) {
+                    //var_dump("Found ".$selectid." ".$select_value_in);
+                    $selected = $select_value_out;
+                }
+
+                $options[$select_value_out] = $label;
+            }
+            $this->db->free($resql);
+
+            if ($usecache)
+            {
                 $this->options_cache[$usecache] = $options;
-    		}
-		}
+            }
+        }
 
-		if ($showempty == 2)
-		{
-			$options['0'] = $langs->trans("None");
-		}
+        if ($showempty == 2)
+        {
+            $options['0'] = $langs->trans("None");
+        }
 
-		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty > 0 ? 1 : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
+        $out .= Form::selectarray($htmlname, $options, $selected, ($showempty > 0 ? 1 : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
-		return $out;
-	}
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return list of auxilary thirdparty accounts
-	 *
-	 * @param string   $selectid       Preselected pcg_type
-	 * @param string   $htmlname       Name of field in html form
-	 * @param int      $showempty      Add an empty field
-	 * @param string   $morecss        More css
-	 * @return string                  String with HTML select
-	 */
+    /**
+     * Return list of auxilary thirdparty accounts
+     *
+     * @param string   $selectid       Preselected pcg_type
+     * @param string   $htmlname       Name of field in html form
+     * @param int      $showempty      Add an empty field
+     * @param string   $morecss        More css
+     * @return string                  String with HTML select
+     */
     function select_auxaccount($selectid, $htmlname='account_num_aux', $showempty=0, $morecss='maxwidth200')
     {
         // phpcs:enable
 
-		$aux_account = array();
-
-		// Auxiliary customer account
-		$sql = "SELECT DISTINCT code_compta, nom ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
-		$sql .= " ORDER BY code_compta";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta)) {
-					$aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
-				}
-			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-		$this->db->free($resql);
-
-		// Auxiliary supplier account
-		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE entity IN (" . getEntity('societe') . ")";
-		$sql .= " ORDER BY code_compta_fournisseur";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!empty($obj->code_compta_fournisseur)) {
-					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
-				}
-			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
-			return -1;
-		}
-		$this->db->free($resql);
-
-		// Build select
-		$out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
-
-		return $out;
-	}
+        $aux_account = array();
+
+        // Auxiliary customer account
+        $sql = "SELECT DISTINCT code_compta, nom ";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe";
+        $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
+        $sql .= " ORDER BY code_compta";
+        dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            while ($obj = $this->db->fetch_object($resql)) {
+                if (!empty($obj->code_compta)) {
+                    $aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
+                }
+            }
+        } else {
+            $this->error = "Error ".$this->db->lasterror();
+            dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+            return -1;
+        }
+        $this->db->free($resql);
+
+        // Auxiliary supplier account
+        $sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe";
+        $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
+        $sql .= " ORDER BY code_compta_fournisseur";
+        dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            while ($obj = $this->db->fetch_object($resql)) {
+                if (!empty($obj->code_compta_fournisseur)) {
+                    $aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
+                }
+            }
+        } else {
+            $this->error = "Error ".$this->db->lasterror();
+            dol_syslog(get_class($this)."::select_pcgsubtype ".$this->error, LOG_ERR);
+            return -1;
+        }
+        $this->db->free($resql);
+
+        // Build select
+        $out .= Form::selectarray($htmlname, $aux_account, $selectid, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return HTML combo list of years existing into book keepping
-	 *
-	 * @param string $selected Preselected value
-	 * @param string $htmlname Name of HTML select object
-	 * @param int $useempty Affiche valeur vide dans liste
-	 * @param string $output_format (html/opton (for option html only)/array (to return options arrays
-	 * @return string/array
-	 */
-	function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
-	{
+    /**
+     * Return HTML combo list of years existing into book keepping
+     *
+     * @param string $selected Preselected value
+     * @param string $htmlname Name of HTML select object
+     * @param int $useempty Affiche valeur vide dans liste
+     * @param string $output_format (html/opton (for option html only)/array (to return options arrays
+     * @return string/array
+     */
+    function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html')
+    {
         // phpcs:enable
-	    global $conf;
-
-		$out_array = array();
-
-		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
-		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
-		$sql .= " ORDER BY date_format(doc_date,'%Y')";
-		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-
-		if (!$resql) {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
-			return -1;
-		}
-		while ($obj = $this->db->fetch_object($resql)) {
-			$out_array[$obj->dtyear] = $obj->dtyear;
-		}
-		$this->db->free($resql);
-
-		if ($output_format == 'html') {
-			return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
-		} else {
-			return $out_array;
-		}
-	}
+        global $conf;
+
+        $out_array = array();
+
+        $sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
+        $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
+        $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+        $sql .= " ORDER BY date_format(doc_date,'%Y')";
+        dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+        $resql = $this->db->query($sql);
+
+        if (!$resql) {
+            $this->error = "Error ".$this->db->lasterror();
+            dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
+            return -1;
+        }
+        while ($obj = $this->db->fetch_object($resql)) {
+            $out_array[$obj->dtyear] = $obj->dtyear;
+        }
+        $this->db->free($resql);
+
+        if ($output_format == 'html') {
+            return Form::selectarray($htmlname, $out_array, $selected, $useempty, 0, 0, 'placeholder="aa"');
+        } else {
+            return $out_array;
+        }
+    }
 }