alxarafe / alixar

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

Indentation +616 added lines, -616 removed lines

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

Spacing +156 added lines, -156 removed lines

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

Braces +123 added lines, -69 removed lines

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

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

Indentation +146 added lines, -146 removed lines

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

Spacing +223 added lines, -223 removed lines

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

Braces +145 added lines, -83 removed lines

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

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

Indentation +750 added lines, -750 removed lines

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

Spacing +196 added lines, -196 removed lines

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

Braces +146 added lines, -66 removed lines

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

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

Indentation +104 added lines, -104 removed lines

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

Spacing +10 added lines, -10 removed lines

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

Braces +19 added lines, -13 removed lines

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

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

Spacing +444 added lines, -444 removed lines

@@ -42,7 +42,7 @@ 
 	public $error;
 
 	public $numoffiles;
-	public $infofiles;			// Used to return informations by function getDocumentsLink
+	public $infofiles; // Used to return informations by function getDocumentsLink
 
 
 	/**
@@ -53,7 +53,7 @@ 
 	function __construct($db)
 	{
 		$this->db = $db;
-		$this->numoffiles=0;
+		$this->numoffiles = 0;
 	}
 
 
@@ -77,16 +77,16 @@ 
 	 *	@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='')
+	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;
+		global $conf, $langs, $hookmanager;
 		$hookmanager->initHooks(array('formfile'));
 
 
-		if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
+		if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax = 0;
 
-		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
+		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
@@ -101,12 +101,12 @@ 
 				return 1;
 			}
 
-			$maxlength=$size;
+			$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);
+			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.'">';
@@ -116,34 +116,34 @@ 
 			$out .= '<table width="100%" class="nobordernopadding">';
 			$out .= '<tr>';
 
-			if (! empty($options)) $out .= '<td>'.$options.'</td>';
+			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;
+			$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 ($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 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 .= ((!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 .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
 			$out .= '>';
 
 			if ($addcancel)
@@ -152,13 +152,13 @@ 
 				$out .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 			}
 
-			if (! empty($conf->global->MAIN_UPLOAD_DOC))
+			if (!empty($conf->global->MAIN_UPLOAD_DOC))
 			{
 				if ($perm)
 				{
 					$langs->load('other');
 					$out .= ' ';
-					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
+					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphp), 1);
 				}
 			}
 			else
@@ -170,9 +170,9 @@ 
 			if ($savingdocmask)
 			{
 				$out .= '<tr>';
-   				if (! empty($options)) $out .= '<td>'.$options.'</td>';
+   				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 .= '<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>';
 			}
@@ -197,18 +197,18 @@ 
 
 				$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> ';
+				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> ';
+				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 .= '<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 .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
 				$out .= '>';
 				$out .= '</div>';
 				$out .= '</div>';
@@ -218,8 +218,8 @@ 
 				$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);
+			$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.'">';
@@ -255,11 +255,11 @@ 
 	 * 		@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='')
+	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);
+		$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;
 	}
 
@@ -288,58 +288,58 @@ 
 	 *      @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)
+	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);
+		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);
+		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)) {
+		if (!empty($iconPDF)) {
 			return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
 		}
 
 		// Add entity in $param
-		$param.= 'entity='.(!empty($object->entity)?$object->entity:$conf->entity);
+		$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 = 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;
+			$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 = null;
+		if (!empty($filedir))
 		{
-			$file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
+			$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 = '';
+		$forname = 'builddoc';
+		$headershown = 0;
+		$showempty = 0;
+		$i = 0;
 
-		$out.= "\n".'<!-- Start show_document -->'."\n";
+		$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">
+			$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")
@@ -360,63 +360,63 @@ 
 				</script>';
 		}
 
-		$titletoshow=$langs->trans("Documents");
-		if (! empty($title)) $titletoshow=$title;
+		$titletoshow = $langs->trans("Documents");
+		if (!empty($title)) $titletoshow = $title;
 
 		// Show table
 		if ($genallowed)
 		{
-			$modellist=array();
+			$modellist = array();
 
 			if ($modulepart == 'company')
 			{
-				$showempty=1;
-				if (is_array($genallowed)) $modellist=$genallowed;
+				$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);
+					$modellist = ModeleThirdPartyDoc::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'propal')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
-					$modellist=ModelePDFPropales::liste_modeles($this->db);
+					$modellist = ModelePDFPropales::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'supplier_proposal')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				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);
+					$modellist = ModelePDFSupplierProposal::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'commande')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
-					$modellist=ModelePDFCommandes::liste_modeles($this->db);
+					$modellist = ModelePDFCommandes::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'expedition')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-					$modellist=ModelePDFExpedition::liste_modeles($this->db);
+					$modellist = ModelePDFExpedition::liste_modeles($this->db);
 				}
 			}
             elseif ($modulepart == 'reception')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
+                if (is_array($genallowed)) $modellist = $genallowed;
                 else
                 {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
@@ -425,407 +425,407 @@ 
             }
 			elseif ($modulepart == 'livraison')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
-					$modellist=ModelePDFDeliveryOrder::liste_modeles($this->db);
+					$modellist = ModelePDFDeliveryOrder::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'ficheinter')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
-					$modellist=ModelePDFFicheinter::liste_modeles($this->db);
+					$modellist = ModelePDFFicheinter::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'facture')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-					$modellist=ModelePDFFactures::liste_modeles($this->db);
+					$modellist = ModelePDFFactures::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'contract')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
-					$modellist=ModelePDFContract::liste_modeles($this->db);
+					$modellist = ModelePDFContract::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'project')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
-					$modellist=ModelePDFProjects::liste_modeles($this->db);
+					$modellist = ModelePDFProjects::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'project_task')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				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);
+					$modellist = ModelePDFTask::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'product')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				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);
+					$modellist = ModelePDFProduct::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'product_batch')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				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);
+					$modellist = ModelePDFProductBatch::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'stock')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
-					$modellist=ModelePDFStock::liste_modeles($this->db);
+					$modellist = ModelePDFStock::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'movement')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
-					$modellist=ModelePDFMovement::liste_modeles($this->db);
+					$modellist = ModelePDFMovement::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'export')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
-					$modellist=ModeleExports::liste_modeles($this->db);
+					$modellist = ModeleExports::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				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);
+					$modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				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);
+					$modellist = ModelePDFSuppliersInvoices::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'supplier_payment')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				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);
+					$modellist = ModelePDFSuppliersPayments::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'remisecheque')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
-					$modellist=ModeleChequeReceipts::liste_modeles($this->db);
+					$modellist = ModeleChequeReceipts::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'donation')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
-					$modellist=ModeleDon::liste_modeles($this->db);
+					$modellist = ModeleDon::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'member')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
-					$modellist=ModelePDFCards::liste_modeles($this->db);
+					$modellist = ModelePDFCards::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'agenda' || $modulepart == 'actions')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
-					$modellist=ModeleAction::liste_modeles($this->db);
+					$modellist = ModeleAction::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'expensereport')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				if (is_array($genallowed)) $modellist = $genallowed;
 				else
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
-					$modellist=ModeleExpenseReport::liste_modeles($this->db);
+					$modellist = ModeleExpenseReport::liste_modeles($this->db);
 				}
 			}
 			else if ($modulepart == 'unpaid')
 			{
-				$modellist='';
+				$modellist = '';
 			}
 			elseif ($modulepart == 'user')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				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);
+					$modellist = ModelePDFUser::liste_modeles($this->db);
 				}
 			}
 			elseif ($modulepart == 'usergroup')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
+				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);
+					$modellist = ModelePDFUserGroup::liste_modeles($this->db);
 				}
 			}
 			else
 			{
 				// For normalized standard modules
-				$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
+				$file = dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php', 0);
 				if (file_exists($file))
 				{
-					$res=include_once $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;
+					$file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php', 0);
+					$res = include_once $file;
 				}
-				$class='ModelePDF'.ucfirst($modulepart);
+				$class = 'ModelePDF'.ucfirst($modulepart);
 				if (class_exists($class))
 				{
-					$modellist=call_user_func($class.'::liste_modeles',$this->db);
+					$modellist = call_user_func($class.'::liste_modeles', $this->db);
 				}
 				else
 				{
-					dol_print_error($this->db,'Bad value for modulepart');
+					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;
+			$headershown = 1;
 
-			$buttonlabeltoshow=$buttonlabel;
-			if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
+			$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'].'">';
+			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 .= 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">';
+			$out .= '<tr class="liste_titre">';
 
-			$addcolumforpicto=($delallowed || $printer || $morepicto);
-			$out.= '<th align="center" colspan="'.(3+($addcolumforpicto?1:0)).'" class="formdoc liste_titre maxwidthonsmartphone">';
+			$addcolumforpicto = ($delallowed || $printer || $morepicto);
+			$out .= '<th align="center" colspan="'.(3 + ($addcolumforpicto ? 1 : 0)).'" class="formdoc liste_titre maxwidthonsmartphone">';
 
 			// Model
-			if (! empty($modellist))
+			if (!empty($modellist))
 			{
-				$out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
+				$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];
+					$arraykeys = array_keys($modellist);
+					$modelselected = $arraykeys[0];
 				}
-				$out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				$out .= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 				if ($conf->use_javascript_ajax)
 				{
-					$out.= ajax_combobox('model');
+					$out .= ajax_combobox('model');
 				}
 			}
 			else
 			{
-				$out.= '<div class="float">'.$langs->trans("Files").'</div>';
+				$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))
+			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);
+				$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;';
+				$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')
+			$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"));
+			   	$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 (!$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)
+				foreach ($hookmanager->hooks['formfile'] as $module)
 				{
 					if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
 				}
 			}
-			$out.= '</tr>';
+			$out .= '</tr>';
 
 			// Execute hooks
-			$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart);
+			$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;
+				$reshook = $hookmanager->executeHooks('formBuilddocOptions', $parameters, $GLOBALS['object']);
+				$out .= $hookmanager->resPrint;
 			}
 		}
 
 		// Get list of files
-		if (! empty($filedir))
+		if (!empty($filedir))
 		{
 			$link_list = array();
 			if (is_object($object))
 			{
-				require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+				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";
+			$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)
+			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";
+				$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)
+				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
+					$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">';
+					$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
+					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>';
+					$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>';
+					$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>';
+					$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">';
+						$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 .= '<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>';
+							$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>';
+							$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;
+							$morepicto = preg_replace('/__FILENAMEURLENCODED__/', urlencode($relativepath), $morepicto);
+							$out .= $morepicto;
 						}
-						$out.='</td>';
+						$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);
+						$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>';
+							$out .= $hookmanager->resPrint; // Complete line
+							$out .= '</tr>';
 						}
-						else $out = $hookmanager->resPrint;		// Replace line
+						else $out = $hookmanager->resPrint; // Replace line
 			  		}
 				}
 
@@ -834,42 +834,42 @@ 
 			// Loop on each link found
 			if (is_array($link_list))
 			{
-				$colspan=2;
+				$colspan = 2;
 
-				foreach($link_list as $file)
+				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";
+					$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";
+				$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";
+			$out .= "</table>\n";
+			$out .= "</div>\n";
 			if ($genallowed)
 			{
-				if (empty($noform)) $out.= '</form>'."\n";
+				if (empty($noform)) $out .= '</form>'."\n";
 			}
 		}
-		$out.= '<!-- End show_document -->'."\n";
+		$out .= '<!-- End show_document -->'."\n";
 		//return ($i?$i:$headershown);
 		return $out;
 	}
@@ -885,98 +885,98 @@ 
 	 *  @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='')
+	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());
+		$out = '';
+		$this->infofiles = array('nboffiles'=>0, 'extensions'=>array(), 'files'=>array());
 
 		$entity = 1; // Without multicompany
 
 		// Get object entity
-		if (! empty($conf->multicompany->enabled))
+		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
+			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))
+		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
 		{
-			$filterforfilesearch = preg_quote(basename($modulesubdir),'/');
+			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
 		}
 		else
 		{
-			$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
+			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
 		}
-		$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// We also discard .meta and .png preview
+		$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 .= '<!-- html.formfile::getDocumentsLink -->'."\n";
+		if (!empty($file_list))
 		{
-			$out='<dl class="dropdown inline-block">
+			$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='';
+			$tmpout = '';
 
 			// Loop on each file found
-			$found=0;
-			foreach($file_list as $file)
+			$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.
+				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...
+				$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 == 'donation') {
+					$relativepath = get_exdir($modulesubdir, 2, 0, 0, null, 'donation').$file["name"];
 				}
-				if ($modulepart == 'export')              {
+				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;
+				$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'))
+				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 .= '<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>';
+						$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 .= '<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='';
+			if (!$found) $out = '';
 		}
 		else
 		{
@@ -1018,7 +1018,7 @@ 
 	 * 	@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)
+	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;
@@ -1026,37 +1026,37 @@ 
 		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;
+		$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_.';
+			$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')
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
 		{
-		    $relativepath=preg_replace('/^.*\/produit\//','',$filearray[0]['path']).'/';
+		    $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);
+			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
+			$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
 		}
 
 		$hookmanager->initHooks(array('formfile'));
-		$parameters=array(
+		$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
+				'relativepath' => $relativepath, // relative filename to module dir
+				'relativedir' => $relativedir, // relative dirname to DOL_DATA_ROOT
 				'permtodelete' => $permonobject,
 				'useinecm' => $useinecm,
 				'textifempty' => $textifempty,
@@ -1064,7 +1064,7 @@ 
 				'title' => $title,
 				'url' => $url
 		);
-		$reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
+		$reshook = $hookmanager->executeHooks('showFilesList', $parameters, $object);
 
 		if (isset($reshook) && $reshook != '') // null or '' for bypass
 		{
@@ -1072,37 +1072,37 @@ 
 		}
 		else
 		{
-			if (! is_object($form))
+			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);
+				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 (!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')))
+				$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 ($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;
+				$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"];
+			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)
+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)
 			{
 				print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
 				print '<input type="hidden" name="action" value="renamefile">';
@@ -1111,30 +1111,30 @@ 
 			}
 
 			print '<div class="div-table-responsive-no-min">';
-			print '<table width="100%" id="tablelines" class="'.($useinecm?'liste noborder':'liste').'">'."\n";
+			print '<table width="100%" id="tablelines" class="'.($useinecm ? 'liste noborder' : 'liste').'">'."\n";
 
-			if (! empty($addfilterfields))
+			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><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>';
+				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('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('');
+			if (!$disablemove) print_liste_field_titre('');
 			print "</tr>\n";
 
 			// Get list of files stored into database for same relative directory
@@ -1145,29 +1145,29 @@ 
 				//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);
+					$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
 				}
 			}
 
-			$nboffiles=count($filearray);
+			$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
+			$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']))
+						&& !preg_match('/\.meta$/i', $file['name']))
 				{
 					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
-					$filepath=$relativepath.$file['name'];
+					$filepath = $relativepath.$file['name'];
 
-					$editline=0;
+					$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)).'">';
+					print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid'] > 0 ? $filearray[$key]['rowid'] : 'AFTER'.$lastrowid.'POS'.($i + 1)).'">';
 
 					// File name
 					print '<td class="minwith200">';
@@ -1176,20 +1176,20 @@ 
 					//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;
+					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');
+					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')))
+					if (GETPOST('action', 'aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile', 'alpha')))
 					{
 						print '</a>';
-						$section_dir=dirname(GETPOST('urlfile','alpha'));
+						$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;
+						$editline = 1;
 					}
 					else
 					{
@@ -1197,15 +1197,15 @@ 
 						print '</a>';
 					}
 					// Preview link
-					if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
+					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);
+					$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;
@@ -1215,7 +1215,7 @@ 
 					print '</td>';
 
 					// Date
-					print '<td align="center" width="140px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';	// 140px = width for date with PM format
+					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))
@@ -1224,18 +1224,18 @@ 
 						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
+							$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));
+							$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']));
+								$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 '<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;';
@@ -1249,26 +1249,26 @@ 
 						if ($editline)
 						{
 							print $langs->trans("FileSharedViaALink").' ';
-							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
+							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
+								$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';
+								$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:'');
+								$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 
-								print img_picto($langs->trans("FileSharedViaALink"),'object_globe.png').' ';
+								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
@@ -1280,7 +1280,7 @@ 
 					print '</td>';
 
 					// Actions buttons
-					if (! $editline)
+					if (!$editline)
 					{
 						// Delete or view link
 						// ($param must start with &)
@@ -1289,33 +1289,33 @@ 
 						{
 							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)
+						if (!$useinecm || $useinecm == 2)
 						{
-							$newmodulepart=$modulepart;
-							if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
+							$newmodulepart = $modulepart;
+							if (in_array($modulepart, array('product', 'produit', 'service'))) $newmodulepart = 'produit|service';
 
-							if (! $disablecrop && image_format_supported($file['name']) > 0)
+							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>';
+	   						   		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>';
+								$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>';
+							$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>";
 
@@ -1324,15 +1324,15 @@ 
 							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>';
+									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>';
+								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 align="center"'.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown"' : ' class="linecolmove"').'>';
 							   	print '</td>';
 							}
 					   }
@@ -1353,8 +1353,8 @@ 
 			}
 			if ($nboffiles == 0)
 			{
-				$colspan=(empty($useinecm)?'6':'6');
-				if (empty($disablemove)) $colspan++;		// 6 columns or 7
+				$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;
@@ -1364,15 +1364,15 @@ 
 			print '</div>';
 
 			if ($nboflines > 1 && is_object($object)) {
-				if (! empty($conf->use_javascript_ajax) && $permtoeditline) {
+				if (!empty($conf->use_javascript_ajax) && $permtoeditline) {
 					$table_element_line = 'ecm_files';
-					include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+					include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 				}
 			}
 
 			print ajax_autoselect('downloadlink');
 
-			if (GETPOST('action','aZ09') == 'editfile' && $permtoeditline)
+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)
 			{
 				print '</form>';
 			}
@@ -1401,7 +1401,7 @@ 
 	 *  @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)
+	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;
@@ -1412,9 +1412,9 @@ 
 
 		// Show list of documents
 		if (empty($useinecm)) print load_fiche_titre($langs->trans("AttachedFiles"));
-		if (empty($url)) $url=$_SERVER["PHP_SELF"];
+		if (empty($url)) $url = $_SERVER["PHP_SELF"];
 
-		if (! empty($addfilterfields))
+		if (!empty($addfilterfields))
 		{
 			print '<form action="'.$_SERVER['PHP_SELF'].'">';
 			print '<input type="hidden" name="module" value="'.$modulepart.'">';
@@ -1423,7 +1423,7 @@ 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table width="100%" class="noborder">'."\n";
 
-		if (! empty($addfilterfields))
+		if (!empty($addfilterfields))
 		{
 			print '<tr class="liste_titre nodrag nodrop">';
 			print '<td></td>';
@@ -1432,135 +1432,135 @@ 
 			print '<td></td>';
 			// Action column
 			print '<td class="liste_titre" align="middle">';
-			$searchpicto=$form->showFilterButtons();
+			$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('','','');
+		$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$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);
+			$object_instance = new Holiday($this->db);
 		}
 
-		foreach($filearray as $key => $file)
+		foreach ($filearray as $key => $file)
 		{
 			if (!is_dir($file['name'])
 			&& $file['name'] != '.'
 			&& $file['name'] != '..'
 			&& $file['name'] != 'CVS'
-			&& ! preg_match('/\.meta$/i',$file['name']))
+			&& !preg_match('/\.meta$/i', $file['name']))
 			{
 				// Define relative path used to store the file
-				$relativefile=preg_replace('/'.preg_quote($upload_dir.'/','/').'/','',$file['fullname']);
+				$relativefile = preg_replace('/'.preg_quote($upload_dir.'/', '/').'/', '', $file['fullname']);
 
 				//var_dump($file);
-				$id=0; $ref=''; $label='';
+				$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]))
+				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;
+					$found = 1;
 				}
 				else
 				{
@@ -1579,24 +1579,24 @@ 
 					}
 
 					if ($result > 0) {  // Save object into a cache
-						$found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
+						$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 ($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
+				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));
+				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);
+				$modulesubdir = dirname($relativefile);
 
 				//$filedir=$conf->$modulepart->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-				$filedir=$file['path'];
+				$filedir = $file['path'];
 				//$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 				//print $formfile->getDocumentsLink($modulepart, $filename, $filedir);
 
@@ -1608,16 +1608,16 @@ 
 				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 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">'.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';
@@ -1639,7 +1639,7 @@ 
 		print "</table>";
 		print '</div>';
 
-		if (! empty($addfilterfields)) print '</form>';
+		if (!empty($addfilterfields)) print '</form>';
 		// Fin de zone
 	}
 
@@ -1665,7 +1665,7 @@ 
 		$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);
+		$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';
@@ -1684,14 +1684,14 @@ 
 	 * @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='')
+	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';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 		$link = new Link($this->db);
 		$links = array();
 		if ($sortfield == "name") {
@@ -1702,12 +1702,12 @@ 
 			$sortfield = null;
 		}
 		$res = $link->fetchAll($links, $object->element, $object->id, $sortfield, $sortorder);
-		$param .= (isset($object->id)?'&id=' . $object->id : '');
+		$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 '<form action="'.$_SERVER['PHP_SELF'].($param ? '?'.$param : '').'" method="POST">';
 
 		print '<table width="100%" class="liste">';
 		print '<tr class="liste_titre">';
@@ -1747,7 +1747,7 @@ 
 			$param,
 			'align="center"'
 		);
-		print_liste_field_titre('','','');
+		print_liste_field_titre('', '', '');
 		print '</tr>';
 		$nboflinks = count($links);
 		if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -1759,36 +1759,36 @@ 
 			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="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 $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 $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="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 '<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 '<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">'.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
+				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
+					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;';
 				}
@@ -1820,25 +1820,25 @@ 
 	 * @param	string	  $param		  More param on http links
 	 * @return  string    $out            Output string with HTML
 	 */
-	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto=0, $param='')
+	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto = 0, $param = '')
 	{
 		global $langs, $conf;
 
-		$out='';
-		if ($conf->browser->layout != 'phone' && ! empty($conf->use_javascript_ajax))
+		$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.
+			$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 '.$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>';
+					$out .= '<span class="fa fa-search-plus" style="color: gray"></span>';
 				}
-				else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
-				$out.= '</a>';
+				else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+				$out .= '</a>';
 			}
 		}
 		return $out;

Braces +404 added lines, -255 removed lines

@@ -84,7 +84,9 @@ 
 		$hookmanager->initHooks(array('formfile'));
 
 
-		if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax=0;
+		if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
+		    $useajax=0;
+		}
 
 		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
 		{
@@ -93,8 +95,7 @@ 
 			// TODO: This does not support option savingdocmask
 			// TODO: This break feature to upload links too
 			return $this->_formAjaxFileUpload($object);
-		}
-		else
+		} 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)) {
@@ -105,8 +106,12 @@ 
 
 			$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);
+			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.'">';
@@ -116,19 +121,31 @@ 
 			$out .= '<table width="100%" class="nobordernopadding">';
 			$out .= '<tr>';
 
-			if (! empty($options)) $out .= '<td>'.$options.'</td>';
+			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;
+			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 ($maxphp > 0) {
+			    $maxmin=min($max,$maxphp);
+			}
 
 			if ($maxmin > 0)
 			{
@@ -160,8 +177,7 @@ 
 					$out .= ' ';
 					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
 				}
-			}
-			else
+			} else
 			{
 				$out .= ' ('.$langs->trans("UploadDisabled").')';
 			}
@@ -170,7 +186,9 @@ 
 			if ($savingdocmask)
 			{
 				$out .= '<tr>';
-   				if (! empty($options)) $out .= '<td>'.$options.'</td>';
+   				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>';
@@ -180,7 +198,9 @@ 
 			$out .= "</table>";
 
 			$out .= '</form>';
-			if (empty($sectionid)) $out .= '<br>';
+			if (empty($sectionid)) {
+			    $out .= '<br>';
+			}
 
 			$out .= "\n<!-- End form attach new file -->\n";
 
@@ -197,11 +217,15 @@ 
 
 				$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> ';
+				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> ';
+				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 . '">';
@@ -298,7 +322,9 @@ 
 		global $langs, $conf, $user, $hookmanager;
 		global $form;
 
-		if (! is_object($form)) $form=new Form($this->db);
+		if (! is_object($form)) {
+		    $form=new Form($this->db);
+		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -311,10 +337,12 @@ 
 		$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
+		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'));
 
@@ -324,7 +352,9 @@ 
 		{
 			$file_list=dol_dir_list($filedir,'files',0,'','(\.meta|_preview.*.*\.png)$','date',SORT_DESC);
 		}
-		if ($hideifempty && empty($file_list)) return '';
+		if ($hideifempty && empty($file_list)) {
+		    return '';
+		}
 
 		$out='';
 		$forname='builddoc';
@@ -361,7 +391,9 @@ 
 		}
 
 		$titletoshow=$langs->trans("Documents");
-		if (! empty($title)) $titletoshow=$title;
+		if (! empty($title)) {
+		    $titletoshow=$title;
+		}
 
 		// Show table
 		if ($genallowed)
@@ -371,252 +403,251 @@ 
 			if ($modulepart == 'company')
 			{
 				$showempty=1;
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'propal')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'supplier_proposal')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'commande')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'expedition')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'reception')
             {
-                if (is_array($genallowed)) $modellist=$genallowed;
-                else
+                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')
+            } elseif ($modulepart == 'livraison')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'ficheinter')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'facture')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'contract')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'project')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'project_task')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'product')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'product_batch')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'stock')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'movement')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'export')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'supplier_payment')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'remisecheque')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'donation')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'member')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'agenda' || $modulepart == 'actions')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'expensereport')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} else if ($modulepart == 'unpaid')
 			{
 				$modellist='';
-			}
-			elseif ($modulepart == 'user')
+			} elseif ($modulepart == 'user')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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')
+			} elseif ($modulepart == 'usergroup')
 			{
-				if (is_array($genallowed)) $modellist=$genallowed;
-				else
+				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
+			} else
 			{
 				// For normalized standard modules
 				$file=dol_buildpath('/core/modules/'.$modulepart.'/modules_'.$modulepart.'.php',0);
@@ -634,8 +665,7 @@ 
 				if (class_exists($class))
 				{
 					$modellist=call_user_func($class.'::liste_modeles',$this->db);
-				}
-				else
+				} else
 				{
 					dol_print_error($this->db,'Bad value for modulepart');
 					return -1;
@@ -646,10 +676,17 @@ 
 			$headershown=1;
 
 			$buttonlabeltoshow=$buttonlabel;
-			if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
+			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">';
+			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'].'">';
 
@@ -666,9 +703,11 @@ 
 			if (! empty($modellist))
 			{
 				$out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+				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');
@@ -676,8 +715,7 @@ 
 				{
 					$out.= ajax_combobox('model');
 				}
-			}
-			else
+			} else
 			{
 				$out.= '<div class="float">'.$langs->trans("Files").'</div>';
 			}
@@ -689,10 +727,11 @@ 
 				$formadmin=new FormAdmin($this->db);
 				$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
 				$morecss='maxwidth150';
-				if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
+				if ($conf->browser->layout == 'phone') {
+				    $morecss='maxwidth100';
+				}
 				$out.= $formadmin->select_language($defaultlang, 'lang_id', 0, 0, 0, 0, 0, $morecss);
-			}
-			else
+			} else
 			{
 				$out.= '&nbsp;';
 			}
@@ -700,15 +739,21 @@ 
 			// 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';
+			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='';
+			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>';
 
@@ -716,7 +761,9 @@ 
 			{
 				foreach($hookmanager->hooks['formfile'] as $module)
 				{
-					if (method_exists($module, 'formBuilddocLineOptions')) $out .= '<th></th>';
+					if (method_exists($module, 'formBuilddocLineOptions')) {
+					    $out .= '<th></th>';
+					}
 				}
 			}
 			$out.= '</tr>';
@@ -761,19 +808,30 @@ 
 				{
 					// 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
+					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
+					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"';
+					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);
@@ -824,8 +882,10 @@ 
 						{
 							$out.= $hookmanager->resPrint;		// Complete line
 							$out.= '</tr>';
+						} else {
+						    $out = $hookmanager->resPrint;
 						}
-						else $out = $hookmanager->resPrint;		// Replace line
+						// Replace line
 			  		}
 				}
 
@@ -847,7 +907,9 @@ 
 					$out.='<td align="right">';
 					$out.=dol_print_date($file->datea,'dayhour');
 					$out.='</td>';
-					if ($delallowed || $printer || $morepicto) $out.='<td></td>';
+					if ($delallowed || $printer || $morepicto) {
+					    $out.='<td></td>';
+					}
 					$out.='</tr>'."\n";
 				}
 				$this->numoffiles++;
@@ -866,7 +928,9 @@ 
 			$out.= "</div>\n";
 			if ($genallowed)
 			{
-				if (empty($noform)) $out.= '</form>'."\n";
+				if (empty($noform)) {
+				    $out.= '</form>'."\n";
+				}
 			}
 		}
 		$out.= '<!-- End show_document -->'."\n";
@@ -908,8 +972,7 @@ 
 		if (! empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
 		{
 			$filterforfilesearch = preg_quote(basename($modulesubdir),'/');
-		}
-		else
+		} else
 		{
 			$filterforfilesearch = preg_quote(basename($modulesubdir),'/').'[^\-]+';
 		}
@@ -930,12 +993,18 @@ 
 			foreach($file_list as $file)
 			{
 				$i++;
-				if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
+				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...
+				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"];
@@ -947,8 +1016,11 @@ 
 				$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]++;
+				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'))
@@ -966,7 +1038,9 @@ 
 				// 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"';
+				if (preg_match('/text/',$mime)) {
+				    $tmpout.= ' target="_blank"';
+				}
 				$tmpout.= '>';
 				$tmpout.= img_mime($relativepath, $file["name"]);
 				$tmpout.= $langs->trans("Download").' '.$ext;
@@ -976,9 +1050,10 @@ 
 			$out.='</ul></div></dd>
     			</dl>';
 
-			if (! $found) $out='';
-		}
-		else
+			if (! $found) {
+			    $out='';
+			}
+		} else
 		{
 			// TODO Add link to regenerate doc ?
 			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
@@ -1027,14 +1102,21 @@ 
 		global $form;
 
 		$disablecrop=1;
-		if (in_array($modulepart, array('expensereport','holiday','member','project','product','produit','service','societe','tax','ticket','user'))) $disablecrop=0;
+		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_.';
+			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')
@@ -1066,11 +1148,12 @@ 
 		);
 		$reshook=$hookmanager->executeHooks('showFilesList', $parameters, $object);
 
-		if (isset($reshook) && $reshook != '') // null or '' for bypass
+		if (isset($reshook) && $reshook != '') {
+		    // null or '' for bypass
 		{
 			return $reshook;
 		}
-		else
+		} else
 		{
 			if (! is_object($form))
 			{
@@ -1078,17 +1161,27 @@ 
 				$form=new Form($this->db);
 			}
 
-			if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
+			if (! preg_match('/&id=/', $param) && isset($object->id)) {
+			    $param.='&id='.$object->id;
+			}
 			$relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
-			if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
+			if ($relativepathwihtoutslashend) {
+			    $param.= '&file='.urlencode($relativepathwihtoutslashend);
+			}
 
-			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
+			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 ($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))
@@ -1098,8 +1191,12 @@ 
 			}
 
 			// 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"];
+			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)
@@ -1119,10 +1216,14 @@ 
 				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>';
+				if (empty($useinecm)) {
+				    print '<td></td>';
+				}
 				print '<td></td>';
 				print '<td></td>';
-				if (! $disablemove) print '<td></td>';
+				if (! $disablemove) {
+				    print '<td></td>';
+				}
 				print "</tr>\n";
 			}
 
@@ -1131,10 +1232,15 @@ 
 			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
+			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('');
+			if (! $disablemove) {
+			    print_liste_field_titre('');
+			}
 			print "</tr>\n";
 
 			// Get list of files stored into database for same relative directory
@@ -1143,23 +1249,29 @@ 
 				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)
+				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';
+			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
+			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;
@@ -1175,12 +1287,18 @@ 
 					// 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;
+					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;
+					if ($showrelpart == 1) {
+					    print $relativepath;
+					}
 					//print dol_trunc($file['name'],$maxlength,'middle');
 					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile','alpha')))
 					{
@@ -1190,14 +1308,15 @@ 
 						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
+					} else
 					{
 						print dol_trunc($file['name'], 200);
 						print '</a>';
 					}
 					// Preview link
-					if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
+					if (! $editline) {
+					    print $this->showPreview($file, $modulepart, $filepath);
+					}
 					// Public share link
 					//if (! $editline && ! empty($filearray[$key]['hashp'])) print pictowithlinktodirectdownload;
 
@@ -1208,8 +1327,9 @@ 
 					$sizetoshowbytes = dol_print_size($file['size'],0,1);
 
 					print '<td align="right" width="80px">';
-					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
-					else {
+					if ($sizetoshow == $sizetoshowbytes) {
+					    print $sizetoshow;
+					} else {
 						print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
 					}
 					print '</td>';
@@ -1225,7 +1345,10 @@ 
 						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
+							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));
@@ -1237,8 +1360,9 @@ 
 							}
 							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;';
 						}
-						else print '&nbsp;';
 						print '</td>';
 					}
 
@@ -1250,8 +1374,7 @@ 
 						{
 							print $langs->trans("FileSharedViaALink").' ';
 							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share']?' checked="checked"':'').' /> ';
-						}
-						else
+						} else
 						{
 							if ($file['share'])
 							{
@@ -1263,15 +1386,19 @@ 
 								//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';
+								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
+							} else
 							{
 								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 							}
@@ -1292,7 +1419,9 @@ 
 						if (! $useinecm || $useinecm == 2)
 						{
 							$newmodulepart=$modulepart;
-							if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
+							if (in_array($modulepart, array('product','produit','service'))) {
+							    $newmodulepart='produit|service';
+							}
 
 							if (! $disablecrop && image_format_supported($file['name']) > 0)
 							{
@@ -1312,9 +1441,15 @@ 
 						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;
+							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>";
@@ -1330,21 +1465,21 @@ 
 									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 {
+							} else {
 							   	print '<td align="center"'.(($conf->browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown"':' class="linecolmove"').'>';
 							   	print '</td>';
 							}
 					   }
-					}
-					else
+					} 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>';
+						if (empty($disablemove)) {
+						    print '<td class="right"></td>';
+						}
 					}
 					print "</tr>\n";
 
@@ -1354,10 +1489,16 @@ 
 			if ($nboffiles == 0)
 			{
 				$colspan=(empty($useinecm)?'6':'6');
-				if (empty($disablemove)) $colspan++;		// 6 columns or 7
+				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;
+				if (empty($textifempty)) {
+				    print $langs->trans("NoFileFound");
+				} else {
+				    print $textifempty;
+				}
 				print '</td></tr>';
 			}
 			print "</table>";
@@ -1411,8 +1552,12 @@ 
 		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($useinecm)) {
+		    print load_fiche_titre($langs->trans("AttachedFiles"));
+		}
+		if (empty($url)) {
+		    $url=$_SERVER["PHP_SELF"];
+		}
 
 		if (! empty($addfilterfields))
 		{
@@ -1440,7 +1585,9 @@ 
 
 		print '<tr class="liste_titre">';
 		$sortref="fullname";
-		if ($modulepart == 'invoice_supplier') $sortref='level1name';
+		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);
@@ -1453,73 +1600,59 @@ 
 		{
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 			$object_instance=new Societe($this->db);
-		}
-		else if ($modulepart == 'invoice')
+		} 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')
+		} 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')
+		} 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')
+		} 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')
+		} 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')
+		} 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')
+		} else if ($modulepart == 'contract')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 			$object_instance=new Contrat($this->db);
-		}
-		else if ($modulepart == 'product')
+		} else if ($modulepart == 'product')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$object_instance=new Product($this->db);
-		}
-		else if ($modulepart == 'tax')
+		} 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')
+		} else if ($modulepart == 'project')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 			$object_instance=new Project($this->db);
-		}
-		else if ($modulepart == 'fichinter')
+		} else if ($modulepart == 'fichinter')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 			$object_instance=new Fichinter($this->db);
-		}
-		else if ($modulepart == 'user')
+		} else if ($modulepart == 'user')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 			$object_instance=new User($this->db);
-		}
-		else if ($modulepart == 'expensereport')
+		} else if ($modulepart == 'expensereport')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 			$object_instance=new ExpenseReport($this->db);
-		}
-		else if ($modulepart == 'holiday')
+		} else if ($modulepart == 'holiday')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 			$object_instance=new Holiday($this->db);
@@ -1556,13 +1689,14 @@ 
 				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;
+				if (! $id && ! $ref) {
+				    continue;
+				}
 				$found=0;
 				if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
 				{
 					$found=1;
-				}
-				else
+				} else
 				{
 					//print 'Fetch '.$id." - ".$ref.'<br>';
 
@@ -1584,13 +1718,19 @@ 
 					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
+				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));
+				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);
@@ -1606,7 +1746,9 @@ 
 				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';
+				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');
@@ -1632,14 +1774,19 @@ 
 		if (count($filearray) == 0)
 		{
 			print '<tr class="oddeven"><td colspan="5">';
-			if (empty($textifempty)) print $langs->trans("NoFileFound");
-			else print $textifempty;
+			if (empty($textifempty)) {
+			    print $langs->trans("NoFileFound");
+			} else {
+			    print $textifempty;
+			}
 			print '</td></tr>';
 		}
 		print "</table>";
 		print '</div>';
 
-		if (! empty($addfilterfields)) print '</form>';
+		if (! empty($addfilterfields)) {
+		    print '</form>';
+		}
 		// Fin de zone
 	}
 
@@ -1750,7 +1897,9 @@ 
 		print_liste_field_titre('','','');
 		print '</tr>';
 		$nboflinks = count($links);
-		if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+		if ($nboflinks > 0) {
+		    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+		}
 
 		foreach ($links as $link)
 		{
@@ -1773,8 +1922,7 @@ 
 				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
+			} else
 			{
 				print '<td>';
 				print img_picto('', 'object_globe').' ';
@@ -1836,8 +1984,9 @@ 
 				{
 					//$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']);
 				}
-				else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
 				$out.= '</a>';
 			}
 		}

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

Spacing +54 added lines, -54 removed lines

@@ -24,7 +24,7 @@ 
  *  \ingroup    Advanced accountancy
  *	\brief      File of class with all html predefined components
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -43,7 +43,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
    /**
 	* Constructor
@@ -70,29 +70,29 @@ 
 	 * @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)
+	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;
+		global $conf, $langs;
 
 		$out = '';
 
     	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
+		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
 		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
+		    $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;
+			$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";
+			$sql .= " ORDER BY code";
 
-			dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
+			dol_syslog(get_class($this)."::select_journal", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 
 			if (!$resql) {
@@ -105,7 +105,7 @@ 
 			$langs->load('accountancy');
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$label = $obj->code . ' - ' . $langs->trans($obj->label);
+				$label = $obj->code.' - '.$langs->trans($obj->label);
 
     			$select_value_in = $obj->rowid;
 				$select_value_out = $obj->rowid;
@@ -133,7 +133,7 @@ 
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo?0:1));
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo ? 0 : 1));
 
 		return $out;
 	}
@@ -151,39 +151,39 @@ 
      *  @param  int     $allcountries   All countries
      * 	@return	void
      */
-    function select_accounting_category($selected='',$htmlname='account_category', $useempty=0, $maxlen=0, $help=1, $allcountries=0)
+    function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
     {
         // phpcs:enable
-        global $db,$langs,$user,$mysoc;
+        global $db, $langs, $user, $mysoc;
 
         if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))
         {
-            dol_print_error('','Call to select_accounting_account with mysoc country not yet defined');
+            dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
             exit;
         }
 
-        if (! empty($mysoc->country_id))
+        if (!empty($mysoc->country_id))
         {
             $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";
-            if (empty($allcountries)) $sql.= " AND c.fk_country = ".$mysoc->country_id;
-            $sql.= " ORDER BY c.label ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
+            $sql .= " WHERE c.active = 1";
+			$sql .= " AND c.category_type = 0";
+            if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
+            $sql .= " ORDER BY c.label ASC";
         }
         else
         {
             $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";
-            if (empty($allcountries)) $sql.= " AND co.code = '".$mysoc->country_code."'";
-            $sql.= " ORDER BY c.label ASC";
+            $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";
+            if (empty($allcountries)) $sql .= " AND co.code = '".$mysoc->country_code."'";
+            $sql .= " ORDER BY c.label ASC";
         }
 
         dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $num = $db->num_rows($resql);
@@ -192,27 +192,27 @@ 
                 $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) $out.= '<option value="0">&nbsp;</option>';
+                if ($useempty) $out .= '<option value="0">&nbsp;</option>';
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     $out .= '<option value="'.$obj->rowid.'"';
                     if ($obj->rowid == $selected) $out .= ' selected';
-                    $out .= '>'.($maxlen ? dol_trunc($obj->type,$maxlen) : $obj->type);
+                    $out .= '>'.($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type);
 					$out .= ' ('.$obj->range_account.')';
                     $i++;
                 }
-                $out .=  '</select>';
+                $out .= '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
             }
             else
             {
-                $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry",$mysoc->country_code);
+                $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
             }
         }
         else
         {
-            dol_print_error($db,$db->lasterror());
+            dol_print_error($db, $db->lasterror());
         }
 
         $out .= ajax_combobox($htmlname, array());
@@ -233,17 +233,17 @@ 
         // phpcs:enable
 		$options = array();
 
-		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+		$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);
+		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;
+			$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)) {
@@ -267,46 +267,46 @@ 
 	 * @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='')
+	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';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		$out = '';
 
     	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
+		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
 		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
+		    $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 .= " 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);
+    		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);
+    			$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 = length_accountg($obj->account_number).' - '.$obj->label;
     			$label = dol_trunc($label, $trunclength);
 
     			$select_value_in = $obj->rowid;
@@ -356,7 +356,7 @@ 
 	 * @param string   $morecss        More css
 	 * @return string                  String with HTML select
 	 */
-    function select_auxaccount($selectid, $htmlname='account_num_aux', $showempty=0, $morecss='maxwidth200')
+    function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200')
     {
         // phpcs:enable
 
@@ -365,7 +365,7 @@ 
 		// Auxiliary customer account
 		$sql = "SELECT DISTINCT code_compta, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity('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);
@@ -385,7 +385,7 @@ 
 		// Auxiliary supplier account
 		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE entity IN (" . getEntity('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);
@@ -427,7 +427,7 @@ 
 
 		$sql = "SELECT DISTINCT date_format(doc_date,'%Y') as dtyear";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	    $sql .= " WHERE entity IN (" . getEntity('accountancy') . ")";
+	    $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);

Braces +17 added lines, -14 removed lines

@@ -82,8 +82,7 @@ 
 		{
 		    $options = $this->options_cache[$usecache];
 		    $selected=$selectid;
-		}
-		else
+		} else
 		{
 			$sql = "SELECT rowid, code, label, nature, entity, active";
 			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
@@ -168,17 +167,20 @@ 
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
             $sql.= " WHERE c.active = 1";
 			$sql.= " AND c.category_type = 0";
-            if (empty($allcountries)) $sql.= " AND c.fk_country = ".$mysoc->country_id;
+            if (empty($allcountries)) {
+                $sql.= " AND c.fk_country = ".$mysoc->country_id;
+            }
             $sql.= " ORDER BY c.label ASC";
-        }
-        else
+        } else
         {
             $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";
-            if (empty($allcountries)) $sql.= " AND co.code = '".$mysoc->country_code."'";
+            if (empty($allcountries)) {
+                $sql.= " AND co.code = '".$mysoc->country_code."'";
+            }
             $sql.= " ORDER BY c.label ASC";
         }
 
@@ -192,25 +194,27 @@ 
                 $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) $out.= '<option value="0">&nbsp;</option>';
+                if ($useempty) {
+                    $out.= '<option value="0">&nbsp;</option>';
+                }
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     $out .= '<option value="'.$obj->rowid.'"';
-                    if ($obj->rowid == $selected) $out .= ' selected';
+                    if ($obj->rowid == $selected) {
+                        $out .= ' selected';
+                    }
                     $out .= '>'.($maxlen ? dol_trunc($obj->type,$maxlen) : $obj->type);
 					$out .= ' ('.$obj->range_account.')';
                     $i++;
                 }
                 $out .=  '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            }
-            else
+            } else
             {
                 $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry",$mysoc->country_code);
             }
-        }
-        else
+        } else
         {
             dol_print_error($db,$db->lasterror());
         }
@@ -281,8 +285,7 @@ 
 		{
 		    $options = $this->options_cache[$usecache];
 		    $selected=$selectid;
-		}
-		else
+		} else
 		{
     		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 

dolibarr/htdocs/core/class/vcard.class.php

Spacing +34 added lines, -34 removed lines

@@ -30,7 +30,7 @@ 
  */
 function encode($string)
 {
-    return str_replace(";","\;",(dol_quoted_printable_encode(utf8_decode($string))));
+    return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
 }
 
 
@@ -42,9 +42,9 @@ 
  * @param	int		$line_max	Max length of lines
  * @return	string				Encoded string
  */
-function dol_quoted_printable_encode($input, $line_max=76)
+function dol_quoted_printable_encode($input, $line_max = 76)
 {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     $lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
     $eol = "\r\n";
     $linebreak = "=0D=0A";
@@ -57,23 +57,23 @@ 
         $line = $lines[$j];
         $linlen = strlen($line);
         $newline = "";
-        for($i = 0; $i < $linlen; $i++) {
+        for ($i = 0; $i < $linlen; $i++) {
             $c = substr($line, $i, 1);
             $dec = ord($c);
-            if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
+            if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
                 $c = "=20";
-            } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-                $h2 = floor($dec/16); $h1 = floor($dec%16);
+            } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+                $h2 = floor($dec / 16); $h1 = floor($dec % 16);
                 $c = $escape.$hex["$h2"].$hex["$h1"];
             }
-            if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+            if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
                 $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
                 $newline = "    ";
             }
             $newline .= $c;
         } // end of for
         $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
+        if ($j < count($lines) - 1) $output .= $linebreak;
     }
     return trim($output);
 }
@@ -88,7 +88,7 @@ 
     var $filename;
 
     //var $encoding="UTF-8";
-    var $encoding="ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
+    var $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
 
 
     /**
@@ -98,12 +98,12 @@ 
      *	@param	string	$type		Type
      *	@return	void
      */
-    function setPhoneNumber($number, $type="")
+    function setPhoneNumber($number, $type = "")
     {
         // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
         $key = "TEL";
-        if ($type!="") $key .= ";".$type;
-        $key.= ";CHARSET=".$this->encoding;
+        if ($type != "") $key .= ";".$type;
+        $key .= ";CHARSET=".$this->encoding;
         $this->properties[$key] = encode($number);
     }
 
@@ -142,7 +142,7 @@ 
      *	@param	string	$suffix			Suffix
      *	@return	void
      */
-    function setName($family="", $first="", $additional="", $prefix="", $suffix="")
+    function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
     {
         $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
         $this->filename = "$first%20$family.vcf";
@@ -174,12 +174,12 @@ 
      *	@param	string	$type			Type
      *	@return	void
      */
-    function setAddress($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
+    function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
     {
         // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
         $key = "ADR";
-        if ($type!="") $key.= ";$type";
-        $key.= ";CHARSET=".$this->encoding;
+        if ($type != "") $key .= ";$type";
+        $key .= ";CHARSET=".$this->encoding;
         $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
         if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
@@ -201,16 +201,16 @@ 
      *	@param	string	$type			Type
      *	@return	void
      */
-    function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
+    function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
     {
         $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
+        if ($postoffice != "") $label .= "$postoffice\r\n";
+        if ($extended != "") $label .= "$extended\r\n";
+        if ($street != "") $label .= "$street\r\n";
+        if ($zip != "") $label .= "$zip ";
+        if ($city != "") $label .= "$city\r\n";
+        if ($region != "") $label .= "$region\r\n";
+        if ($country != "") $country .= "$country\r\n";
 
         $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
     }
@@ -222,7 +222,7 @@ 
      *	@param	string	$type			Vcard type
      *	@return	void
      */
-    function setEmail($address,$type="internet,pref")
+    function setEmail($address, $type = "internet,pref")
     {
         $this->properties["EMAIL;TYPE=".$type] = $address;
     }
@@ -293,11 +293,11 @@ 
      *  @param	string	$type		Type
      *	@return	void
      */
-    function setURL($url, $type="")
+    function setURL($url, $type = "")
     {
         // $type may be WORK | HOME
         $key = "URL";
-        if ($type!="") $key.= ";$type";
+        if ($type != "") $key .= ";$type";
         $this->properties[$key] = $url;
     }
 
@@ -309,15 +309,15 @@ 
     function getVCard()
     {
         $text = "BEGIN:VCARD\r\n";
-        $text.= "VERSION:3.0\r\n";
+        $text .= "VERSION:3.0\r\n";
         //$text.= "VERSION:2.1\r\n";
-        foreach($this->properties as $key => $value)
+        foreach ($this->properties as $key => $value)
         {
-            $text.= "$key:$value\r\n";
+            $text .= "$key:$value\r\n";
         }
-        $text.= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
-        $text.= "MAILER: Dolibarr\r\n";
-        $text.= "END:VCARD\r\n";
+        $text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+        $text .= "MAILER: Dolibarr\r\n";
+        $text .= "END:VCARD\r\n";
         return $text;
     }
 

Braces +36 added lines, -12 removed lines

@@ -73,7 +73,9 @@ 
             $newline .= $c;
         } // end of for
         $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
+        if ($j<count($lines)-1) {
+            $output .= $linebreak;
+        }
     }
     return trim($output);
 }
@@ -102,7 +104,9 @@ 
     {
         // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
         $key = "TEL";
-        if ($type!="") $key .= ";".$type;
+        if ($type!="") {
+            $key .= ";".$type;
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = encode($number);
     }
@@ -146,7 +150,9 @@ 
     {
         $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
         $this->filename = "$first%20$family.vcf";
-        if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        if (empty($this->properties["FN"])) {
+            $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        }
     }
 
     /**
@@ -178,7 +184,9 @@ 
     {
         // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
         $key = "ADR";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+            $key.= ";$type";
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
@@ -204,13 +212,27 @@ 
     function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
     {
         $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
+        if ($postoffice!="") {
+            $label.= "$postoffice\r\n";
+        }
+        if ($extended!="") {
+            $label.= "$extended\r\n";
+        }
+        if ($street!="") {
+            $label.= "$street\r\n";
+        }
+        if ($zip!="") {
+            $label.= "$zip ";
+        }
+        if ($city!="") {
+            $label.= "$city\r\n";
+        }
+        if ($region!="") {
+            $label.= "$region\r\n";
+        }
+        if ($country!="") {
+            $country.= "$country\r\n";
+        }
 
         $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
     }
@@ -297,7 +319,9 @@ 
     {
         // $type may be WORK | HOME
         $key = "URL";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+            $key.= ";$type";
+        }
         $this->properties[$key] = $url;
     }
 

dolibarr/htdocs/core/class/commonstickergenerator.class.php

Indentation +192 added lines, -192 removed lines

@@ -61,226 +61,226 @@
  */
 abstract class CommonStickerGenerator
 {
-	public $code;   // Code of format
+    public $code;   // Code of format
 
-	/**
+    /**
      * @var array format Array with informations
      */
     public $format;
 
-	// protected
-	var $_Avery_Name	= '';	// Nom du format de l'etiquette
-	var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
-	var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
-	var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
-	var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
-	var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
-	var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
-	var $_Width 		= 0;	// Largeur de chaque etiquette
-	var $_Height 		= 0;	// Hauteur de chaque etiquette
-	var $_Char_Size	= 10;	// Hauteur des caracteres
-	var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
-	var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
-	var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
-	var $_COUNTX = 1;
-	var $_COUNTY = 1;
-	var $_First = 1;
-	var $Tformat;
+    // protected
+    var $_Avery_Name	= '';	// Nom du format de l'etiquette
+    var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
+    var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
+    var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
+    var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
+    var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
+    var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
+    var $_Width 		= 0;	// Largeur de chaque etiquette
+    var $_Height 		= 0;	// Hauteur de chaque etiquette
+    var $_Char_Size	= 10;	// Hauteur des caracteres
+    var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
+    var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
+    var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
+    var $_COUNTX = 1;
+    var $_COUNTY = 1;
+    var $_First = 1;
+    var $Tformat;
 
-	/**
-	 *	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
-	/**
-	 *  Function to build PDF on disk, then output on HTTP strem.
-	 *
-	 *  @param	array		$arrayofrecords  	Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
-	 *  @param  Translate	$outputlangs     	Lang object for output language
-	 *  @param	string		$srctemplatepath	Full path of source filename for generator using a template file
-	 *	@param	string		$outputdir			Output directory for pdf file
-	 *  @return int             				1=OK, 0=KO
-	 */
-	abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
+    /**
+     *  Function to build PDF on disk, then output on HTTP strem.
+     *
+     *  @param	array		$arrayofrecords  	Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
+     *  @param  Translate	$outputlangs     	Lang object for output language
+     *  @param	string		$srctemplatepath	Full path of source filename for generator using a template file
+     *	@param	string		$outputdir			Output directory for pdf file
+     *  @return int             				1=OK, 0=KO
+     */
+    abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
     // phpcs:enable
 
-	/**
-	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
-	 *
-	 * @param   PDF         $pdf            PDF reference
-	 * @param   Translate  	$outputlangs    Output langs
-	 * @param   array     	$param          Associative array containing label content and optional parameters
-	 * @return  void
-	 */
-	abstract function addSticker(&$pdf,$outputlangs,$param);
+    /**
+     * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
+     *
+     * @param   PDF         $pdf            PDF reference
+     * @param   Translate  	$outputlangs    Output langs
+     * @param   array     	$param          Associative array containing label content and optional parameters
+     * @return  void
+     */
+    abstract function addSticker(&$pdf,$outputlangs,$param);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Methode qui permet de modifier la taille des caracteres
-	 * Cela modiera aussi l'espace entre chaque ligne
-	 *
-	 * @param    PDF        $pdf   PDF reference
-	 * @param    int        $pt    point
-	 * @return   void
-	 */
-	function Set_Char_Size(&$pdf,$pt)
-	{
+    /**
+     * Methode qui permet de modifier la taille des caracteres
+     * Cela modiera aussi l'espace entre chaque ligne
+     *
+     * @param    PDF        $pdf   PDF reference
+     * @param    int        $pt    point
+     * @return   void
+     */
+    function Set_Char_Size(&$pdf,$pt)
+    {
         // phpcs:enable
-		if ($pt > 3) {
-			$this->_Char_Size = $pt;
-			$this->_Line_Height = $this->_Get_Height_Chars($pt);
-			$pdf->SetFont('','',$pt);
-		}
-	}
+        if ($pt > 3) {
+            $this->_Char_Size = $pt;
+            $this->_Line_Height = $this->_Get_Height_Chars($pt);
+            $pdf->SetFont('','',$pt);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Print dot line
-	 *
-	 * @param	PDF     $pdf                PDF reference
-	 * @param 	int		$x1					X1
-	 * @param 	int		$y1					Y1
-	 * @param 	int		$x2					X2
-	 * @param 	int		$y2					Y2
-	 * @param 	int		$epaisseur			Epaisseur
-	 * @param 	int		$nbPointilles		Nb pointilles
-	 * @return	void
-	 */
+    /**
+     * protected Print dot line
+     *
+     * @param	PDF     $pdf                PDF reference
+     * @param 	int		$x1					X1
+     * @param 	int		$y1					Y1
+     * @param 	int		$x2					X2
+     * @param 	int		$y2					Y2
+     * @param 	int		$epaisseur			Epaisseur
+     * @param 	int		$nbPointilles		Nb pointilles
+     * @return	void
+     */
     function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15)
-	{
+    {
         // phpcs:enable
-		$pdf->SetLineWidth($epaisseur);
-		$length=abs($x1-$x2);
-		$hauteur=abs($y1-$y2);
-		if($length>$hauteur) {
-			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
-		}
-		else {
-			$Pointilles=($hauteur/$nbPointilles)/2;
-		}
-		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($x2-1)) {
-		$pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
-		$pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
-				}
-			}
-		}
-		for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($y2-1)) {
-		$pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
-		$pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
-				}
-			}
-		}
-	}
+        $pdf->SetLineWidth($epaisseur);
+        $length=abs($x1-$x2);
+        $hauteur=abs($y1-$y2);
+        if($length>$hauteur) {
+            $Pointilles=($length/$nbPointilles)/2; // taille des pointilles
+        }
+        else {
+            $Pointilles=($hauteur/$nbPointilles)/2;
+        }
+        for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
+            for($j=$i;$j<=($i+$Pointilles);$j++) {
+                if($j<=($x2-1)) {
+        $pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
+        $pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
+                }
+            }
+        }
+        for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
+            for($j=$i;$j<=($i+$Pointilles);$j++) {
+                if($j<=($y2-1)) {
+        $pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
+        $pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
+                }
+            }
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Function realisant une croix aux 4 coins des cartes
-	 *
-	 * @param PDF   $pdf                PDF reference
-	 * @param int   $x1					X1
-	 * @param int	$y1					Y1
-	 * @param int	$x2					X2
-	 * @param int	$y2					Y2
-	 * @param int	$epaisseur			Epaisseur
-	 * @param int	$taille             Size
-	 * @return void
-	 */
-	function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
-	{
+    /**
+     * protected Function realisant une croix aux 4 coins des cartes
+     *
+     * @param PDF   $pdf                PDF reference
+     * @param int   $x1					X1
+     * @param int	$y1					Y1
+     * @param int	$x2					X2
+     * @param int	$y2					Y2
+     * @param int	$epaisseur			Epaisseur
+     * @param int	$taille             Size
+     * @return void
+     */
+    function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
+    {
         // phpcs:enable
-		$pdf->SetDrawColor(192,192,192);
+        $pdf->SetDrawColor(192,192,192);
 
-		$pdf->SetLineWidth($epaisseur);
-		$lg=$taille/2;
-		// croix haut gauche
-		$pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
-		$pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
-		// croix bas gauche
-		$pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
-		$pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
-		// croix haut droit
-		$pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
-		$pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
-		// croix bas droit
-		$pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
-		$pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
+        $pdf->SetLineWidth($epaisseur);
+        $lg=$taille/2;
+        // croix haut gauche
+        $pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
+        $pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
+        // croix bas gauche
+        $pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
+        $pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
+        // croix haut droit
+        $pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
+        $pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
+        // croix bas droit
+        $pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
+        $pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
 
-		$pdf->SetDrawColor(0,0,0);
-	}
+        $pdf->SetDrawColor(0,0,0);
+    }
 
-	/**
-	 * Convert units (in to mm, mm to in)
-	 * $src and $dest must be 'in' or 'mm'
-	 *
-	 * @param int       $value  value
-	 * @param string    $src    from ('in' or 'mm')
-	 * @param string    $dest   to ('in' or 'mm')
-	 * @return float    value   value after conversion
-	 */
-	private function convertMetric($value, $src, $dest)
-	{
-		if ($src != $dest) {
-			$tab = array(
-				'in'=>39.37008,
-				'mm'=>1000
-			);
-			return $value * $tab[$dest] / $tab[$src];
-		}
+    /**
+     * Convert units (in to mm, mm to in)
+     * $src and $dest must be 'in' or 'mm'
+     *
+     * @param int       $value  value
+     * @param string    $src    from ('in' or 'mm')
+     * @param string    $dest   to ('in' or 'mm')
+     * @return float    value   value after conversion
+     */
+    private function convertMetric($value, $src, $dest)
+    {
+        if ($src != $dest) {
+            $tab = array(
+                'in'=>39.37008,
+                'mm'=>1000
+            );
+            return $value * $tab[$dest] / $tab[$src];
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Give the height for a char size given.
-	 *
-	 * @param  int    $pt    Point
-	 * @return int           Height chars
-	 */
-	function _Get_Height_Chars($pt)
-	{
+    /**
+     * protected Give the height for a char size given.
+     *
+     * @param  int    $pt    Point
+     * @return int           Height chars
+     */
+    function _Get_Height_Chars($pt)
+    {
         // phpcs:enable
-		// Tableau de concordance entre la hauteur des caracteres et de l'espacement entre les lignes
-		$_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10);
-		if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
-			return $_Table_Hauteur_Chars[$pt];
-		} else {
-			return 100; // There is a prob..
-		}
-	}
+        // Tableau de concordance entre la hauteur des caracteres et de l'espacement entre les lignes
+        $_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10);
+        if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
+            return $_Table_Hauteur_Chars[$pt];
+        } else {
+            return 100; // There is a prob..
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Set format
-	 *
-	 * @param    PDF       $pdf     PDF reference
-	 * @param    string    $format  Format
-	 * @return   void
-	 */
-	function _Set_Format(&$pdf, $format)
-	{
+    /**
+     * protected Set format
+     *
+     * @param    PDF       $pdf     PDF reference
+     * @param    string    $format  Format
+     * @return   void
+     */
+    function _Set_Format(&$pdf, $format)
+    {
         // phpcs:enable
-		$this->_Metric = $format['metric'];
-		$this->_Avery_Name = $format['name'];
-		$this->_Avery_Code = $format['code'];
-		$this->_Margin_Left	= $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
-		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
-		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
-		$this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);
-		$this->_X_Number = $format['NX'];
-		$this->_Y_Number = $format['NY'];
-		$this->_Width = $this->convertMetric($format['width'], $this->_Metric, $this->_Metric_Doc);
-		$this->_Height = $this->convertMetric($format['height'], $this->_Metric, $this->_Metric_Doc);
-		$this->Set_Char_Size($pdf, $format['font-size']);
-	}
+        $this->_Metric = $format['metric'];
+        $this->_Avery_Name = $format['name'];
+        $this->_Avery_Code = $format['code'];
+        $this->_Margin_Left	= $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
+        $this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
+        $this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
+        $this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);
+        $this->_X_Number = $format['NX'];
+        $this->_Y_Number = $format['NY'];
+        $this->_Width = $this->convertMetric($format['width'], $this->_Metric, $this->_Metric_Doc);
+        $this->_Height = $this->convertMetric($format['height'], $this->_Metric, $this->_Metric_Doc);
+        $this->Set_Char_Size($pdf, $format['font-size']);
+    }
 }

Spacing +47 added lines, -47 removed lines

@@ -61,7 +61,7 @@ 
  */
 abstract class CommonStickerGenerator
 {
-	public $code;   // Code of format
+	public $code; // Code of format
 
 	/**
      * @var array format Array with informations
@@ -69,19 +69,19 @@ 
     public $format;
 
 	// protected
-	var $_Avery_Name	= '';	// Nom du format de l'etiquette
-	var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
-	var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
-	var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
-	var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
-	var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
-	var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
-	var $_Width 		= 0;	// Largeur de chaque etiquette
-	var $_Height 		= 0;	// Hauteur de chaque etiquette
-	var $_Char_Size	= 10;	// Hauteur des caracteres
-	var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
-	var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
-	var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
+	var $_Avery_Name	= ''; // Nom du format de l'etiquette
+	var $_Margin_Left = 0; // Marge de gauche de l'etiquette
+	var $_Margin_Top	= 0; // marge en haut de la page avant la premiere etiquette
+	var $_X_Space 	= 0; // Espace horizontal entre 2 bandes d'etiquettes
+	var $_Y_Space 	= 0; // Espace vertical entre 2 bandes d'etiquettes
+	var $_X_Number 	= 0; // NX Nombre d'etiquettes sur la largeur de la page
+	var $_Y_Number 	= 0; // NY Nombre d'etiquettes sur la hauteur de la page
+	var $_Width = 0; // Largeur de chaque etiquette
+	var $_Height 		= 0; // Hauteur de chaque etiquette
+	var $_Char_Size	= 10; // Hauteur des caracteres
+	var $_Line_Height	= 10; // Hauteur par defaut d'une ligne
+	var $_Metric 		= 'mm'; // Type of metric.. Will help to calculate good values
+	var $_Metric_Doc 	= 'mm'; // Type of metric for the doc..
 	var $_COUNTX = 1;
 	var $_COUNTY = 1;
 	var $_First = 1;
@@ -107,7 +107,7 @@ 
 	 *	@param	string		$outputdir			Output directory for pdf file
 	 *  @return int             				1=OK, 0=KO
 	 */
-	abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
+	abstract function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');
     // phpcs:enable
 
 	/**
@@ -118,7 +118,7 @@ 
 	 * @param   array     	$param          Associative array containing label content and optional parameters
 	 * @return  void
 	 */
-	abstract function addSticker(&$pdf,$outputlangs,$param);
+	abstract function addSticker(&$pdf, $outputlangs, $param);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	/**
@@ -129,13 +129,13 @@ 
 	 * @param    int        $pt    point
 	 * @return   void
 	 */
-	function Set_Char_Size(&$pdf,$pt)
+	function Set_Char_Size(&$pdf, $pt)
 	{
         // phpcs:enable
 		if ($pt > 3) {
 			$this->_Char_Size = $pt;
 			$this->_Line_Height = $this->_Get_Height_Chars($pt);
-			$pdf->SetFont('','',$pt);
+			$pdf->SetFont('', '', $pt);
 		}
 	}
 
@@ -152,31 +152,31 @@ 
 	 * @param 	int		$nbPointilles		Nb pointilles
 	 * @return	void
 	 */
-    function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15)
+    function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)
 	{
         // phpcs:enable
 		$pdf->SetLineWidth($epaisseur);
-		$length=abs($x1-$x2);
-		$hauteur=abs($y1-$y2);
-		if($length>$hauteur) {
-			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
+		$length = abs($x1 - $x2);
+		$hauteur = abs($y1 - $y2);
+		if ($length > $hauteur) {
+			$Pointilles = ($length / $nbPointilles) / 2; // taille des pointilles
 		}
 		else {
-			$Pointilles=($hauteur/$nbPointilles)/2;
+			$Pointilles = ($hauteur / $nbPointilles) / 2;
 		}
-		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($x2-1)) {
-		$pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
-		$pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
+		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
+			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
+				if ($j <= ($x2 - 1)) {
+		$pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point
+		$pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
-		for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($y2-1)) {
-		$pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
-		$pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
+		for ($i = $y1; $i <= $y2; $i += $Pointilles + $Pointilles) {
+			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
+				if ($j <= ($y2 - 1)) {
+		$pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point
+		$pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
@@ -195,27 +195,27 @@ 
 	 * @param int	$taille             Size
 	 * @return void
 	 */
-	function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
+	function _Croix(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $taille = 4)
 	{
         // phpcs:enable
-		$pdf->SetDrawColor(192,192,192);
+		$pdf->SetDrawColor(192, 192, 192);
 
 		$pdf->SetLineWidth($epaisseur);
-		$lg=$taille/2;
+		$lg = $taille / 2;
 		// croix haut gauche
-		$pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
-		$pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
+		$pdf->Line($x1, $y1 - $lg, $x1, $y1 + $lg);
+		$pdf->Line($x1 - $lg, $y1, $x1 + $lg, $y1);
 		// croix bas gauche
-		$pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
-		$pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
+		$pdf->Line($x1, $y2 - $lg, $x1, $y2 + $lg);
+		$pdf->Line($x1 - $lg, $y2, $x1 + $lg, $y2);
 		// croix haut droit
-		$pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
-		$pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
+		$pdf->Line($x2, $y1 - $lg, $x2, $y1 + $lg);
+		$pdf->Line($x2 - $lg, $y1, $x2 + $lg, $y1);
 		// croix bas droit
-		$pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
-		$pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
+		$pdf->Line($x2, $y2 - $lg, $x2, $y2 + $lg);
+		$pdf->Line($x2 - $lg, $y2, $x2 + $lg, $y2);
 
-		$pdf->SetDrawColor(0,0,0);
+		$pdf->SetDrawColor(0, 0, 0);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 		$this->_Metric = $format['metric'];
 		$this->_Avery_Name = $format['name'];
 		$this->_Avery_Code = $format['code'];
-		$this->_Margin_Left	= $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
+		$this->_Margin_Left = $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
 		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
 		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
 		$this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);

Braces +1 added lines, -2 removed lines

@@ -160,8 +160,7 @@
 		$hauteur=abs($y1-$y2);
 		if($length>$hauteur) {
 			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
-		}
-		else {
+		} else {
 			$Pointilles=($hauteur/$nbPointilles)/2;
 		}
 		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {

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

Braces +15 added lines, -10 removed lines

@@ -79,8 +79,7 @@ 
             $sql.= " WHERE c.active = 1";
             $sql.= " AND c.fk_pays = ".$mysoc->country_id;
             $sql.= " ORDER BY c.libelle ASC";
-        }
-        else
+        } else
         {
             $sql = "SELECT c.id, c.libelle as type";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
@@ -99,25 +98,31 @@ 
             	print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) print '<option value="0">&nbsp;</option>';
+                if ($useempty) {
+                    print '<option value="0">&nbsp;</option>';
+                }
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
-                    if ($obj->id == $selected) print ' selected';
+                    if ($obj->id == $selected) {
+                        print ' selected';
+                    }
                     print '>'.dol_trunc($obj->type,$maxlen);
                     $i++;
                 }
                 print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-                if (! empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
-            }
-            else
+                if ($user->admin && $help) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+                }
+                if (! empty($conf->use_javascript_ajax)) {
+                    print ajax_combobox($htmlname);
+                }
+            } else
             {
                 print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
             }
-        }
-        else
+        } else
         {
             dol_print_error($db,$db->lasterror());
         }