alxarafe / alixar

Base/FormOther.php

Spacing +223 added lines, -223 removed lines

@@ -68,14 +68,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)

         {

@@ -120,13 +120,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)

         {

@@ -169,19 +169,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.'">';

@@ -228,26 +228,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)

@@ -255,19 +255,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

@@ -291,27 +291,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;

     }

@@ -329,7 +329,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;

@@ -338,7 +338,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"

@@ -349,30 +349,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;

     }

@@ -390,44 +390,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);

@@ -436,34 +436,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);

         }

@@ -471,7 +471,7 @@ 
         {

             dol_print_error($this->db);

         }

-        $out.='</select>';

+        $out .= '</select>';

 

         return $out;

     }

@@ -491,21 +491,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>';

 

@@ -529,14 +529,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)

             {

@@ -552,7 +552,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))

                         {

@@ -565,22 +565,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.'"';

@@ -598,7 +598,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;";

                     }

@@ -622,13 +622,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;

@@ -647,7 +647,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);

@@ -665,25 +665,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: {

@@ -721,15 +721,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,

@@ -739,15 +739,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;

@@ -764,7 +764,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;

@@ -772,25 +772,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);

     }

 

@@ -803,7 +803,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;

@@ -851,17 +851,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>';

@@ -898,10 +898,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);

     }

 

     /**

@@ -918,41 +918,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;

     }

@@ -969,10 +969,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")

@@ -990,9 +990,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

@@ -1012,72 +1012,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) {

@@ -1091,7 +1091,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

 	        	{

@@ -1113,11 +1113,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\',

@@ -1142,80 +1142,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);

     }

 

 

@@ -1232,7 +1232,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;

@@ -1240,8 +1240,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);

@@ -1251,7 +1251,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>';

Base/AlixarView.php

Spacing +92 added lines, -92 removed lines

@@ -116,7 +116,7 @@ 
 // html header
         $this->top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-        print '<body id="mainbody"' . ($morecssonbody ? ' class="' . $morecssonbody . '"' : '') . '>' . "\n";
+        print '<body id="mainbody"'.($morecssonbody ? ' class="'.$morecssonbody.'"' : '').'>'."\n";
 
 // top menu and left menu area
         if (empty(Globals::$conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) {
@@ -124,7 +124,7 @@ 
         }
 
         if (empty(Globals::$conf->dol_hide_leftmenu)) {
-            $this->left_menu('', $help_url, '', '', 1, $title, 1);  // $menumanager is retreived with a global $menumanager inside this function
+            $this->left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function
         }
 
 // main area
@@ -175,13 +175,13 @@ 
          * Top menu
          */
         if ((empty(Globals::$conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
-            print "\n" . '<!-- Start top horizontal -->' . "\n";
+            print "\n".'<!-- Start top horizontal -->'."\n";
 
-            print '<div class="side-nav-vert' . (DolUtils::GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '') . '"><div id="id-top">';  // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
+            print '<div class="side-nav-vert'.(DolUtils::GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 // Show menu entries
-            print '<div id="tmenu_tooltip' . (empty(Globals::$conf->global->MAIN_MENU_INVERT) ? '' : 'invert') . '" class="tmenu">' . "\n";
+            print '<div id="tmenu_tooltip'.(empty(Globals::$conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
             $this->menumanager->atarget = $target;
-            $this->menumanager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks));      // This contains a \n
+            $this->menumanager->showmenu('top', array('searchform' => $searchform, 'bookmarks' => $bookmarks)); // This contains a \n
             print "</div>\n";
 
 // Define link to login card
@@ -189,34 +189,34 @@ 
             if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                 $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
 if (preg_match('/\d\.\d/', $appli)) {
-                    if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                        $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                    if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli))
+                        $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
                 } else
-                    $appli .= " " . DOL_VERSION;
+                    $appli .= " ".DOL_VERSION;
             } else
-                $appli .= " " . DOL_VERSION;
+                $appli .= " ".DOL_VERSION;
 
             if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+                $appli .= "<br>".Globals::$langs->trans("LevelOfFeature").': '.Globals::$conf->global->MAIN_FEATURES_LEVEL;
 
 $logouttext = '';
             if (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 //$logouthtmltext=$appli.'<br>';
                 if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {
-                    $logouthtmltext .= Globals::$langs->trans("Logout") . '<br>';
+                    $logouthtmltext .= Globals::$langs->trans("Logout").'<br>';
 
 //$logouttext .='<a accesskey="l" href="'.DOL_BASE_URI.'/user/logout.php">';
-                    $logouttext .= '<a accesskey="l" href="' . BASE_URI . '?controller=user&method=logout">';
+                    $logouttext .= '<a accesskey="l" href="'.BASE_URI.'?controller=user&method=logout">';
 //$logouttext .= img_picto(Globals::$langs->trans('Logout').":".Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
                     $logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
                     $logouttext .= '</a>';
                 } else {
                     $logouthtmltext .= Globals::$langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
-                    $logouttext .= img_picto(Globals::$langs->trans('Logout') . ":" . Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+                    $logouttext .= img_picto(Globals::$langs->trans('Logout').":".Globals::$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 }
             }
 
-            print '<div class="login_block">' . "\n";
+            print '<div class="login_block">'."\n";
 
 // Add login user link
             $toprightmenu .= '<div class="login_block_user">';
@@ -227,18 +227,18 @@ 
             $toprightmenu .= Globals::$user->getNomUrl($mode, '', 1, 0, 11, 0, (Globals::$user->firstname ? 'firstname' : -1), 'atoplogin');
             $toprightmenu .= '</div></div>';
 
-            $toprightmenu .= '</div>' . "\n";
+            $toprightmenu .= '</div>'."\n";
 
             $toprightmenu .= '<div class="login_block_other">';
 
 // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
             $parameters = array();
-            $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $result = Globals::$hookManager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
             if (is_numeric($result)) {
                 if ($result == 0)
-                    $toprightmenu .= Globals::$hookManager->resPrint;  // add
+                    $toprightmenu .= Globals::$hookManager->resPrint; // add
                 else
-                    $toprightmenu = Globals::$hookManager->resPrint;      // replace
+                    $toprightmenu = Globals::$hookManager->resPrint; // replace
             }
             else {
                 $toprightmenu .= $result; // For backward compatibility
@@ -247,7 +247,7 @@ 
 // Link to module builder
             if (!empty(Globals::$conf->modulebuilder->enabled)) {
 //$text = '<a href="' . DOL_BASE_URI . '/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
-                $text = '<a href="' . BASE_URI . '?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+                $text = '<a href="'.BASE_URI.'?controller=modulebuilder&method=index&mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 //$text.= img_picto(":".Globals::$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
                 $text .= '<span class="fa fa-bug atoplogin"></span>';
                 $text .= '</a>';
@@ -261,12 +261,12 @@ 
                 if (is_array($_POST)) {
                     foreach ($_POST as $key => $value) {
                         if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
-                            $qs .= '&' . $key . '=' . urlencode($value);
+                            $qs .= '&'.$key.'='.urlencode($value);
                         }
                     }
                 }
-                $qs .= (($qs && $morequerystring) ? '&' : '') . $morequerystring;
-                $text = '<a href="' . dol_escape_htmltag($_SERVER["PHP_SELF"]) . '?' . $qs . ($qs ? '&' : '') . 'optioncss=print" target="_blank">';
+                $qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
+                $text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
 //$text.= img_picto(":".Globals::$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
                 $text .= '<span class="fa fa-print atoplogin"></span>';
                 $text .= '</a>';
@@ -295,12 +295,12 @@ 
                     $text = '';
                     if (!empty(Globals::$conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
                         Globals::$langs->load('admin');
-$appli .= '<br>' . Globals::$langs->trans("Database") . ': ' . $db->database_name;
+$appli .= '<br>'.Globals::$langs->trans("Database").': '.$db->database_name;
 }
-                    $title = $appli . '<br>';
+                    $title = $appli.'<br>';
                     $title .= Globals::$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
                     if ($mode == 'wiki') {
-                        $title .= ' - ' . Globals::$langs->trans("PageWiki") . ' &quot;' . dol_escape_htmltag(strtr($helppage, '_', ' ')) . '&quot;';
+                        $title .= ' - '.Globals::$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
                     }
                     $text .= '<a class="help" target="_blank" rel="noopener" href="';
                     if ($mode == 'wiki') {
@@ -326,7 +326,7 @@ 
 
             print $toprightmenu;
 
-            print "</div>\n";  // end div class="login_block"
+            print "</div>\n"; // end div class="login_block"
 
             print '</div></div>';
 
@@ -335,7 +335,7 @@ 
         }
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '<!-- Begin div id-container --><div id="id-container" class="id-container' . ($morecss ? ' ' . $morecss : '') . '">';
+            print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss ? ' '.$morecss : '').'">';
     }
 
     /**
@@ -367,7 +367,7 @@ 
 // Instantiate hooks of thirdparty module
             Globals::$hookManager->initHooks(array('searchform', 'leftblock'));
 
-            print "\n" . '<!-- Begin side-nav id-left -->' . "\n" . '<div class="side-nav"><div id="id-left">' . "\n";
+            print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
             if (Globals::$conf->browser->layout == 'phone')
                 Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
@@ -379,7 +379,7 @@ 
             }
             $selected = -1;
             $usedbyinclude = 1;
-            include_once DOL_BASE_PATH . '/core/ajax/selectsearchbox.php'; // This set $arrayresult
+            include_once DOL_BASE_PATH.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
             if (Globals::$conf->use_javascript_ajax && empty(Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
 //$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_BASE_URI.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, Globals::$langs->trans("Search"), 1);
@@ -394,7 +394,7 @@ 
 // Execute hook printSearchForm
             $parameters = array('searchform' => $searchform);
 
-            $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
             if (empty($reshook)) {
                 $searchform .= Globals::$hookManager->resPrint;
             } else
@@ -402,10 +402,10 @@ 
 
 // Force special value for $searchform
             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty(Globals::$conf->use_javascript_ajax)) {
-                $urltosearch = DOL_BASE_URI . '/core/search_page.php?showtitlebefore=1';
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="' . $urltosearch . '" alt="' . dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")) . '">' . Globals::$langs->trans("Search") . '...</a></div></div>';
-            } elseif (Globals::$conf->use_javascript_ajax &&!empty(Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="' . dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")) . '">' . Globals::$langs->trans("Search") . '...</a></div><div id="divsearchforms2" style="display: none">' . $searchform . '</div>';
+                $urltosearch = DOL_BASE_URI.'/core/search_page.php?showtitlebefore=1';
+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" alt="'.dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")).'">'.Globals::$langs->trans("Search").'...</a></div></div>';
+            } elseif (Globals::$conf->use_javascript_ajax && !empty(Globals::$conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
+$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag(Globals::$langs->trans("ShowSearchFields")).'">'.Globals::$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
 $searchform .= '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
@@ -418,16 +418,16 @@ 
 
 // Define $bookmarks
             if (!empty(Globals::$conf->bookmark->enabled) && Globals::$user->rights->bookmark->lire) {
-                include_once DOL_BASE_PATH . '/bookmarks/bookmarks.lib.php';
+                include_once DOL_BASE_PATH.'/bookmarks/bookmarks.lib.php';
                 Globals::$langs->load("bookmarks");
 
                 $bookmarks = printBookmarksList($db, Globals::$langs);
 }
 
 // Left column
-            print '<!-- Begin left menu -->' . "\n";
+            print '<!-- Begin left menu -->'."\n";
 
-            print '<div class="vmenu"' . (empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"') . '>' . "\n\n";
+            print '<div class="vmenu"'.(empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
 
 // Show left menu with other forms
             $this->menumanager->menu_array = $menu_array_before;
@@ -436,7 +436,7 @@ 
 // Dolibarr version + help + bug report link
             print "\n";
             print "<!-- Begin Help Block-->\n";
-            print '<div id="blockvmenuhelp" class="blockvmenuhelp">' . "\n";
+            print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
 // Version
             if (empty(Globals::$conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
@@ -458,15 +458,15 @@ 
                     $appli = Globals::$conf->global->MAIN_APPLICATION_TITLE;
 $doliurl = '';
                     if (preg_match('/\d\.\d/', $appli)) {
-                        if (!preg_match('/' . preg_quote(DOL_VERSION) . '/', $appli))
-                            $appli .= " (" . DOL_VERSION . ")"; // If new title contains a version that is different than core
+                        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli))
+                            $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
                     } else
-                        $appli .= " " . DOL_VERSION;
+                        $appli .= " ".DOL_VERSION;
                 } else
-                    $appli .= " " . DOL_VERSION;
+                    $appli .= " ".DOL_VERSION;
                 print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
                 if ($doliurl)
-                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+                    print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
                 else
                     print '<span class="help">';
                 print $appli;
@@ -474,12 +474,12 @@ 
                     print '</a>';
                 else
                     print '</span>';
-                print '</div>' . "\n";
+                print '</div>'."\n";
             }
 
 // Link to bugtrack
             if (!empty(Globals::$conf->global->MAIN_BUGTRACK_ENABLELINK)) {
-                require_once DOL_BASE_PATH . '/core/lib/functions2.lib.php';
+                require_once DOL_BASE_PATH.'/core/lib/functions2.lib.php';
 
                 $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
                 $bugbaseurl .= '?title=';
@@ -488,16 +488,16 @@ 
                 $bugbaseurl .= urlencode("# Bug\n");
                 $bugbaseurl .= urlencode("\n");
                 $bugbaseurl .= urlencode("## Environment\n");
-                $bugbaseurl .= urlencode("- **Version**: " . DOL_VERSION . "\n");
-                $bugbaseurl .= urlencode("- **OS**: " . php_uname('s') . "\n");
-                $bugbaseurl .= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-                $bugbaseurl .= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-                $bugbaseurl .= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-                $bugbaseurl .= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
+                $bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+                $bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+                $bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+                $bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+                $bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+                $bugbaseurl .= urlencode("- **URL**: ".$_SERVER["REQUEST_URI"]."\n");
                 $bugbaseurl .= urlencode("\n");
                 $bugbaseurl .= urlencode("## Report\n");
                 print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
-                print '<a class="help" target="_blank" rel="noopener" href="' . $bugbaseurl . '">' . Globals::$langs->trans("FindBug") . '</a>';
+                print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.Globals::$langs->trans("FindBug").'</a>';
                 print '</div>';
             }
 
@@ -511,14 +511,14 @@ 
 
 // Execute hook printLeftBlock
             $parameters = array();
-            $reshook = Globals::$hookManager->executeHooks('printLeftBlock', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $reshook = Globals::$hookManager->executeHooks('printLeftBlock', $parameters); // Note that $action and $object may have been modified by some hooks
             print Globals::$hookManager->resPrint;
 
             print '</div></div> <!-- End side-nav id-left -->'; // End div id="side-nav" div id="id-left"
         }
 
         print "\n";
-        print '<!-- Begin right area -->' . "\n";
+        print '<!-- Begin right area -->'."\n";
 
         if (empty($leftmenuwithoutmainarea))
             main_area($title);
@@ -539,7 +539,7 @@ 
 
         print "\n";
 
-        print '<!-- Begin div class="fiche" -->' . "\n" . '<div class="fiche">' . "\n";
+        print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
         if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED))
             print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
@@ -605,17 +605,17 @@ 
         // global Globals::$conf, Globals::$langs, Globals::$user;
 
         $ret = '';
-        $ret .= '<form action="' . $urlaction . '" method="post" class="searchform">';
-        $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+        $ret .= '<form action="'.$urlaction.'" method="post" class="searchform">';
+        $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         $ret .= '<input type="hidden" name="mode" value="search">';
-        $ret .= '<input type="hidden" name="savelogin" value="' . dol_escape_htmltag(Globals::$user->login) . '">';
+        $ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag(Globals::$user->login).'">';
         if ($showtitlebefore)
-            $ret .= $title . ' ';
-        $ret .= '<input type="text" class="flat ' . $htmlmorecss . '"';
-        $ret .= ' style="text-indent: 22px; background-image: url(\'' . $img . '\'); background-repeat: no-repeat; background-position: 3px;"';
-        $ret .= ($accesskey ? ' accesskey="' . $accesskey . '"' : '');
-        $ret .= ' placeholder="' . strip_tags($title) . '"';
-        $ret .= ' name="' . $htmlinputname . '" id="' . $prefhtmlinputname . $htmlinputname . '" />';
+            $ret .= $title.' ';
+        $ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
+        $ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+        $ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
+        $ret .= ' placeholder="'.strip_tags($title).'"';
+        $ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
 //$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.Globals::$langs->trans("Go").'">';
         $ret .= '<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
         $ret .= '<span class="fa fa-search"></span>';
@@ -640,7 +640,7 @@ 
         // global $delayedhtmlcontent;
         // global $contextpage, $page, $limit;
 
-        $ext = 'layout=' . Globals::$conf->browser->layout . '&version=' . urlencode(DOL_VERSION);
+        $ext = 'layout='.Globals::$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
 
 // Global html output events ($mesgs, $errors, $warnings)
         dol_htmloutput_events($disabledoutputofmessages);
@@ -650,15 +650,15 @@ 
         if (is_object(Globals::$user) && !empty(Globals::$user->lastsearch_values_tmp) && is_array(Globals::$user->lastsearch_values_tmp)) {
 // Clean and save data
             foreach (Globals::$user->lastsearch_values_tmp as $key => $val) {
-                unset($_SESSION['lastsearch_values_tmp_' . $key]);   // Clean array to rebuild it just after
+                unset($_SESSION['lastsearch_values_tmp_'.$key]); // Clean array to rebuild it just after
                 if (count($val) && empty($_POST['button_removefilter'])) { // If there is search criteria to save and we did not click on 'Clear filter' button
                     if (empty($val['sortfield']))
                         unset($val['sortfield']);
                     if (empty($val['sortorder']))
                         unset($val['sortorder']);
-                    dol_syslog('Save lastsearch_values_tmp_' . $key . '=' . json_encode($val, 0) . " (systematic recording of last search criterias)");
-                    $_SESSION['lastsearch_values_tmp_' . $key] = json_encode($val);
-                    unset($_SESSION['lastsearch_values_' . $key]);
+                    dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
+                    $_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
+                    unset($_SESSION['lastsearch_values_'.$key]);
                 }
             }
         }
@@ -667,37 +667,37 @@ 
         $relativepathstring = $_SERVER["PHP_SELF"];
 // Clean $relativepathstring
         if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+            $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_BASE_URI'), '/').'/', '', $relativepathstring);
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
         if (preg_match('/list\.php$/', $relativepathstring)) {
-            unset($_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
             if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+                $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
             if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+                $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
             if (!empty($limit) && $limit != Globals::$conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+                $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
 
-            unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_page_' . $relativepathstring]);
-            unset($_SESSION['lastsearch_limit_' . $relativepathstring]);
+            unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_page_'.$relativepathstring]);
+            unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
         }
 
 // Core error message
         if (!empty(Globals::$conf->global->MAIN_CORE_ERROR)) {
 // Ajax version
             if (Globals::$conf->use_javascript_ajax) {
-                $title = img_warning() . ' ' . Globals::$langs->trans('CoreErrorTitle');
+                $title = img_warning().' '.Globals::$langs->trans('CoreErrorTitle');
 print ajax_dialog($title, Globals::$langs->trans('CoreErrorMessage'));
 }
 // html version
             else {
-                $msg = img_warning() . ' ' . Globals::$langs->trans('CoreErrorMessage');
-                print '<div class="error">' . $msg . '</div>';
+                $msg = img_warning().' '.Globals::$langs->trans('CoreErrorMessage');
+                print '<div class="error">'.$msg.'</div>';
             }
 
 //define("MAIN_CORE_ERROR",0);      // Constant was defined and we can't change value of a constant
@@ -705,17 +705,17 @@ 
 
         print "\n\n";
 
-        print '</div> <!-- End div class="fiche" -->' . "\n"; // End div fiche
+        print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
         if (empty(Globals::$conf->dol_hide_leftmenu))
-            print '</div> <!-- End div id-right -->' . "\n"; // End div id-right
+            print '</div> <!-- End div id-right -->'."\n"; // End div id-right
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile))
-            print '</div> <!-- End div id-container -->' . "\n"; // End div container
+            print '</div> <!-- End div id-container -->'."\n"; // End div container
 
         print "\n";
         if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+            print '<!-- '.$comment.' -->'."\n";
 
         printCommonFooter($zone);
 
@@ -723,8 +723,8 @@ 
             print $delayedhtmlcontent;
 
         if (!empty(Globals::$conf->use_javascript_ajax)) {
-            print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";
-            print '<script type="text/javascript" src="' . BASE_URI . '?controller=core/js/&method=lib_foot.js&lang=' . Globals::$langs->defaultlang . ($ext ? '&' . $ext : '') . '"></script>' . "\n";
+            print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+            print '<script type="text/javascript" src="'.BASE_URI.'?controller=core/js/&method=lib_foot.js&lang='.Globals::$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
         }
 
 // Wrapper to add log when clicking on download or preview
@@ -736,7 +736,7 @@ 
                 <script type="text/javascript">
                     jQuery(document).ready(function () {
                         $('a.documentpreview').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -745,7 +745,7 @@ 
                             );
                         });
                         $('a.documentdownload').click(function () {
-                            $.post('<?php echo DOL_BASE_URI . "/blockedlog/ajax/block-add.php" ?>'
+                            $.post('<?php echo DOL_BASE_URI."/blockedlog/ajax/block-add.php" ?>'
                                     , {
                                         id:<?php echo $object->id; ?>
                                         , element: '<?php echo $object->element ?>'
@@ -761,7 +761,7 @@ 
 
 // A div for the address popup
         print "\n<!-- A div to allow dialog popup -->\n";
-        print '<div id="dialogforpopup" style="display: none;"></div>' . "\n";
+        print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
         print "</body>\n";