alxarafe / alixar

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

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

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

Spacing +479 added lines, -479 removed lines

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

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

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

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

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

dolibarr/htdocs/core/class/stats.class.php

Spacing +113 added lines, -113 removed lines

@@ -30,8 +30,8 @@ 
 abstract class Stats
 {
 	protected $db;
-	var $_lastfetchdate=array();	// Dates of cache file read by methods
-	var $cachefilesuffix='';		// Suffix to add to name of cache file (to avoid file name conflicts)
+	var $_lastfetchdate = array(); // Dates of cache file read by methods
+	var $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)
 
 	/**
 	 * Return nb of elements by month for several years
@@ -42,35 +42,35 @@ 
      *	@param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 * @return 	array					Array of values
 	 */
-	function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay=0, $format=0)
+	function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
 	    if ($startyear > $endyear) return -1;
 
-		$datay=array();
+		$datay = array();
 
 		// Search into cache
-		if (! empty($cachedelay))
+		if (!empty($cachedelay))
 	    {
 	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	    	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 	    }
 
-		$newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-		$newmask='0644';
+		$newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+		$newmask = '0644';
 
 		$nowgmt = dol_now();
 
-		$foundintocache=0;
+		$foundintocache = 0;
 		if ($cachedelay > 0)
 		{
-			$filedate=dol_filemtime($newpathofdestfile);
+			$filedate = dol_filemtime($newpathofdestfile);
 			if ($filedate >= ($nowgmt - $cachedelay))
 			{
-				$foundintocache=1;
+				$foundintocache = 1;
 
-				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+				$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
 			}
 			else
 			{
@@ -85,7 +85,7 @@ 
 		}
 		else
 		{
-			$year=$startyear;
+			$year = $startyear;
 			while ($year <= $endyear)
 			{
 				$datay[$year] = $this->getNbByMonth($year, $format);
@@ -94,13 +94,13 @@ 
 
 			$data = array();
 
-			for ($i = 0 ; $i < 12 ; $i++)
+			for ($i = 0; $i < 12; $i++)
 			{
-				$data[$i][]=$datay[$endyear][$i][0];
-				$year=$startyear;
-				while($year <= $endyear)
+				$data[$i][] = $datay[$endyear][$i][0];
+				$year = $startyear;
+				while ($year <= $endyear)
 				{
-					$data[$i][]=$datay[$year][$i][1];
+					$data[$i][] = $datay[$year][$i][1];
 					$year++;
 				}
 			}
@@ -110,14 +110,14 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+			if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 			@chmod($newpathofdestfile, octdec($newmask));
 
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
 		// return array(array('Month',val1,val2,val3),...)
@@ -136,35 +136,35 @@ 
      * @param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 * @return 	array					Array of values
 	 */
-	function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay=0, $format=0)
+	function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
         if ($startyear > $endyear) return -1;
 
-        $datay=array();
+        $datay = array();
 
         // Search into cache
-        if (! empty($cachedelay))
+        if (!empty($cachedelay))
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
         }
 
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask='0644';
+        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+        $newmask = '0644';
 
         $nowgmt = dol_now();
 
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0)
         {
-        	$filedate=dol_filemtime($newpathofdestfile);
+        	$filedate = dol_filemtime($newpathofdestfile);
         	if ($filedate >= ($nowgmt - $cachedelay))
         	{
-        		$foundintocache=1;
+        		$foundintocache = 1;
 
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
         	}
         	else
         	{
@@ -180,8 +180,8 @@ 
         }
         else
 		{
-			$year=$startyear;
-			while($year <= $endyear)
+			$year = $startyear;
+			while ($year <= $endyear)
 			{
 				$datay[$year] = $this->getAmountByMonth($year, $format);
 				$year++;
@@ -189,13 +189,13 @@ 
 
 			$data = array();
 			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for ($i = 0 ; $i < 12 ; $i++)
+			for ($i = 0; $i < 12; $i++)
 			{
-				$data[$i][]=$datay[$endyear][$i][0];	// set label
-				$year=$startyear;
-				while($year <= $endyear)
+				$data[$i][] = $datay[$endyear][$i][0]; // set label
+				$year = $startyear;
+				while ($year <= $endyear)
 				{
-					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
+					$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
 					$year++;
 				}
 			}
@@ -205,17 +205,17 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
 			else dol_syslog("Failed to write cache file", LOG_ERR);
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
 		return $data;
@@ -228,14 +228,14 @@ 
 	 * @param	int		$startyear		End year
 	 * @return 	array					Array of values
 	 */
-	function getAverageByMonthWithPrevYear($endyear,$startyear)
+	function getAverageByMonthWithPrevYear($endyear, $startyear)
 	{
         if ($startyear > $endyear) return -1;
 
-        $datay=array();
+        $datay = array();
 
-		$year=$startyear;
-		while($year <= $endyear)
+		$year = $startyear;
+		while ($year <= $endyear)
 		{
 			$datay[$year] = $this->getAverageByMonth($year);
 			$year++;
@@ -243,13 +243,13 @@ 
 
 		$data = array();
 
-		for ($i = 0 ; $i < 12 ; $i++)
+		for ($i = 0; $i < 12; $i++)
 		{
-			$data[$i][]=$datay[$endyear][$i][0];
-			$year=$startyear;
-			while($year <= $endyear)
+			$data[$i][] = $datay[$endyear][$i][0];
+			$year = $startyear;
+			while ($year <= $endyear)
 			{
-				$data[$i][]=$datay[$year][$i][1];
+				$data[$i][] = $datay[$year][$i][1];
 				$year++;
 			}
 		}
@@ -264,33 +264,33 @@ 
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
 	 * @return 	array					Array of values
 	 */
-	function getAllByProductEntry($year,$cachedelay=0)
+	function getAllByProductEntry($year, $cachedelay = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-        $datay=array();
+        $datay = array();
 
         // Search into cache
-        if (! empty($cachedelay))
+        if (!empty($cachedelay))
         {
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
         }
 
-        $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
-        $newmask='0644';
+        $newpathofdestfile = $conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix) ? '' : $this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache';
+        $newmask = '0644';
 
         $nowgmt = dol_now();
 
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0)
         {
-        	$filedate=dol_filemtime($newpathofdestfile);
+        	$filedate = dol_filemtime($newpathofdestfile);
         	if ($filedate >= ($nowgmt - $cachedelay))
         	{
-        		$foundintocache=1;
+        		$foundintocache = 1;
 
-        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$filedate;
+        		$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
         	}
         	else
         	{
@@ -306,7 +306,7 @@ 
         }
         else
 		{
-			$data=$this->getAllByProduct($year);
+			$data = $this->getAllByProduct($year);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
 
@@ -314,16 +314,16 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
-			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
+			$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
 		return $data;
@@ -344,7 +344,7 @@ 
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -374,7 +374,7 @@ 
 		$result = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -384,16 +384,16 @@ 
 				$row = $this->db->fetch_object($resql);
 				$result[$i]['year'] = $row->year;
 				$result[$i]['nb'] = $row->nb;
-				if($i>0 && $row->nb) $result[$i-1]['nb_diff'] = ($result[$i-1]['nb'] - $row->nb) / $row->nb * 100;
+				if ($i > 0 && $row->nb) $result[$i - 1]['nb_diff'] = ($result[$i - 1]['nb'] - $row->nb) / $row->nb * 100;
 				$result[$i]['total'] = $row->total;
-				if($i>0 && $row->total) $result[$i-1]['total_diff'] = ($result[$i-1]['total'] - $row->total) / $row->total * 100;
+				if ($i > 0 && $row->total) $result[$i - 1]['total_diff'] = ($result[$i - 1]['total'] - $row->total) / $row->total * 100;
 				$result[$i]['avg'] = $row->avg;
-				if($i>0 && $row->avg) $result[$i-1]['avg_diff'] = ($result[$i-1]['avg'] - $row->avg) / $row->avg * 100;
+				if ($i > 0 && $row->avg) $result[$i - 1]['avg_diff'] = ($result[$i - 1]['avg'] - $row->avg) / $row->avg * 100;
 				// For some $sql only
 				if (isset($row->weighted))
 				{
 				    $result[$i]['weighted'] = $row->weighted;
-				    if($i>0 && $row->weighted) $result[$i-1]['avg_weighted'] = ($result[$i-1]['weighted'] - $row->weighted) / $row->weighted * 100;
+				    if ($i > 0 && $row->weighted) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
 				}
 				$i++;
 			}
@@ -413,15 +413,15 @@ 
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
      *     @return	array				Array of nb each month
 	 */
-	function _getNbByMonth($year, $sql, $format=0)
+	function _getNbByMonth($year, $sql, $format = 0)
 	{
 		global $langs;
 
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -440,22 +440,22 @@ 
 			dol_print_error($this->db);
 		}
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$res[$i] = (isset($result[$i])?$result[$i]:0);
+			$res[$i] = (isset($result[$i]) ? $result[$i] : 0);
 		}
 
 		$data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			$month = 'unknown';
+			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			elseif ($format == 1) $month = $i;
+			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
+			$data[$i - 1] = array($month, $res[$i]);
 		}
 
 		return $data;
@@ -470,16 +470,16 @@ 
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 *     @return	array
 	 */
-	function _getAmountByMonth($year, $sql, $format=0)
+	function _getAmountByMonth($year, $sql, $format = 0)
 	{
 		global $langs;
 
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -495,22 +495,22 @@ 
 		}
         else dol_print_error($this->db);
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$res[$i] = (int) round((isset($result[$i])?$result[$i]:0));
+			$res[$i] = (int) round((isset($result[$i]) ? $result[$i] : 0));
 		}
 
 		$data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			$month = 'unknown';
+			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			elseif ($format == 1) $month = $i;
+			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
+			$data[$i - 1] = array($month, $res[$i]);
 		}
 
 		return $data;
@@ -524,15 +524,15 @@ 
      *     @param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 *     @return	array
 	 */
-	function _getAverageByMonth($year, $sql, $format=0)
+	function _getAverageByMonth($year, $sql, $format = 0)
 	{
 		global $langs;
 
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -548,22 +548,22 @@ 
 		}
         else dol_print_error($this->db);
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$res[$i] = (isset($result[$i])?$result[$i]:0);
+			$res[$i] = (isset($result[$i]) ? $result[$i] : 0);
 		}
 
 		$data = array();
 
-		for ($i = 1 ; $i < 13 ; $i++)
+		for ($i = 1; $i < 13; $i++)
 		{
-			$month='unknown';
-			if ($format == 0) $month=$langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month=$i;
-			elseif ($format == 2) $month=$langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			$month = 'unknown';
+			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			elseif ($format == 1) $month = $i;
+			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
-			$data[$i-1] = array($month, $res[$i]);
+			$data[$i - 1] = array($month, $res[$i]);
 		}
 
 		return $data;
@@ -577,27 +577,27 @@ 
      *     @param	int		$limit		Limit
      *     @return	array
 	 */
-	function _getAllByProduct($sql, $limit=10)
+	function _getAllByProduct($sql, $limit = 10)
 	{
 		global $langs;
 
-		$result=array();
-		$res=array();
+		$result = array();
+		$res = array();
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
-			$i = 0; $other=0;
+			$i = 0; $other = 0;
 			while ($i < $num)
 			{
 		  		$row = $this->db->fetch_row($resql);
-		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0],$row[1]);	// Ref of product, nb
+		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0], $row[1]); // Ref of product, nb
 		  		else $other += $row[1];
 		  		$i++;
 		  	}
-		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"),$other);
+		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
 		  	$this->db->free($resql);
 		}
         else dol_print_error($this->db);

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

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;

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

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

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

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

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