alxarafe / alixar

Base/FormOther.php

Indentation +146 added lines, -146 removed lines

@@ -41,9 +41,9 @@ 
     // private $db;

 

     /**

-	 * @var string Error code (or message)

-	 */

-	public $error;

+     * @var string Error code (or message)

+     */

+    public $error;

 

 

     /**

@@ -74,7 +74,7 @@ 
         $sql = "SELECT rowid, label";

         $sql.= " FROM ".MAIN_DB_PREFIX."export_model";

         $sql.= " WHERE type = '".$type."'";

-		if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;

+        if (!empty($fk_user)) $sql.=" AND fk_user=".$fk_user;

         $sql.= " ORDER BY rowid";

         $result = $this->db->query($sql);

         if ($result)

@@ -180,7 +180,7 @@ 
         $sql.= " WHERE e.active = 1 AND e.fk_pays = c.rowid";

         $sql.= " ORDER BY country, e.organization ASC, e.code ASC";

 

-    	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);

+        dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);

         $resql=$this->db->query($sql);

         if ($resql)

         {

@@ -231,50 +231,50 @@ 
     function select_revenue_stamp($selected='', $htmlname='revenuestamp', $country_code='')

     {

         // phpcs:enable

-    	global $langs;

-

-    	$out='';

-

-    	$sql = "SELECT r.taux, r.revenuestamp_type";

-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";

-    	$sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

-    	$sql.= " AND c.code = '".$country_code."'";

-

-    	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);

-    	$resql=$this->db->query($sql);

-    	if ($resql)

-    	{

-    		$out.='<select class="flat" name="'.$htmlname.'">';

-    		$num = $this->db->num_rows($resql);

-    		$i = 0;

-    		$out.='<option value="0">&nbsp;</option>'."\n";

-    		if ($num)

-    		{

-    			while ($i < $num)

-    			{

-    				$obj = $this->db->fetch_object($resql);

-    				if (($selected && $selected == $obj->taux) || $num == 1)

-    				{

-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

-    				}

-    				else

-    				{

-    					$out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

-    					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

-    				}

-    				$out.=$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

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

-    				$i++;

-    			}

-    		}

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

-    		return $out;

-    	}

-    	else

-    	{

-    		dol_print_error($this->db);

-    		return '';

-    	}

+        global $langs;

+

+        $out='';

+

+        $sql = "SELECT r.taux, r.revenuestamp_type";

+        $sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";

+        $sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";

+        $sql.= " AND c.code = '".$country_code."'";

+

+        dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);

+        $resql=$this->db->query($sql);

+        if ($resql)

+        {

+            $out.='<select class="flat" name="'.$htmlname.'">';

+            $num = $this->db->num_rows($resql);

+            $i = 0;

+            $out.='<option value="0">&nbsp;</option>'."\n";

+            if ($num)

+            {

+                while ($i < $num)

+                {

+                    $obj = $this->db->fetch_object($resql);

+                    if (($selected && $selected == $obj->taux) || $num == 1)

+                    {

+                        $out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';

+                    }

+                    else

+                    {

+                        $out.='<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';

+                        //print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';

+                    }

+                    $out.=$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');

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

+                    $i++;

+                }

+            }

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

+            return $out;

+        }

+        else

+        {

+            dol_print_error($this->db);

+            return '';

+        }

     }

 

 

@@ -369,8 +369,8 @@ 
         }

         if ($nocateg)

         {

-        	$langs->load("categories");

-        	$moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected':'').'>- '.$langs->trans("NotCategorized").' -</option>';

+            $langs->load("categories");

+            $moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected':'').'>- '.$langs->trans("NotCategorized").' -</option>';

         }

         $moreforfilter.='</select>';

 

@@ -405,7 +405,7 @@ 
             $comboenhancement = ajax_combobox($htmlname);

             if ($comboenhancement)

             {

-            	$out.=$comboenhancement;

+                $out.=$comboenhancement;

             }

         }

         // Select each sales and print them in a select input

@@ -427,7 +427,7 @@ 
             $sql_usr.= " WHERE u2.entity IN (0,".$conf->entity.")";

             $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;

         }

-	    $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.

+        $sql_usr.= " ORDER BY statut DESC, lastname ASC";  // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.

         //print $sql_usr;exit;

 

         $resql_usr = $this->db->query($sql_usr);

@@ -451,18 +451,18 @@ 
                 }

                 if ($showstatus >= 0)

                 {

-					if ($obj_usr->statut == 1 && $showstatus == 1)

-					{

-						$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');

-	                	$moreinfo++;

-					}

-					if ($obj_usr->statut == 0)

-					{

-						$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');

-                		$moreinfo++;

-					}

-				}

-				$out.=($moreinfo?')':'');

+                    if ($obj_usr->statut == 1 && $showstatus == 1)

+                    {

+                        $out.=($moreinfo?' - ':' (').$langs->trans('Enabled');

+                        $moreinfo++;

+                    }

+                    if ($obj_usr->statut == 0)

+                    {

+                        $out.=($moreinfo?' - ':' (').$langs->trans('Disabled');

+                        $moreinfo++;

+                    }

+                }

+                $out.=($moreinfo?')':'');

                 $out.='</option>';

             }

             $this->db->free($resql_usr);

@@ -487,7 +487,7 @@ 
      * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists

      *  @param  int		$useempty       		0=Allow empty values

      *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id

-	 *  @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated status)

+     *  @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated status)

      *  @param	string	$morecss				More css

      *  @return	void

      */

@@ -502,7 +502,7 @@ 
         $tasksarray=$task->getTasksArray($modetask?$user:0, $modeproject?$user:0, $projectid, 0, $mode, '', $filteronprojstatus);

         if ($tasksarray)

         {

-        	print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

+            print '<select class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" id="'.$htmlname.'">';

             if ($useempty) print '<option value="0">&nbsp;</option>';

             $j=0;

             $level=0;

@@ -538,11 +538,11 @@ 
         $numlines=count($lines);

         for ($i = 0 ; $i < $numlines ; $i++)

         {

-        	if ($lines[$i]->fk_parent == $parent)

+            if ($lines[$i]->fk_parent == $parent)

             {

                 $var = !$var;

 

-				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines

+                //var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines

 

                 // Break on a new project

                 if ($parent == 0)	// We are on a task at first level

@@ -575,13 +575,13 @@ 
                 // Print task

                 if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0

                 {

-                	// Check if we must disable entry

-                	$disabled=0;

-                	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))

-                	{

-               			$disabled++;

-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too

-                	}

+                    // Check if we must disable entry

+                    $disabled=0;

+                    if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))

+                    {

+                            $disabled++;

+                            if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid=$lines[$i]->id;	// If task is child of a disabled parent, we will propagate id to disable next child too

+                    }

 

                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';

                     if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';

@@ -624,14 +624,14 @@ 
      */

     static function showColor($color, $textifnotdefined='')

     {

-    	$textcolor='FFF';

-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

-    	if(colorIsLight($color)) $textcolor='000';

+        $textcolor='FFF';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

+        if(colorIsLight($color)) $textcolor='000';

 

-    	$color = colorArrayToHex(colorStringToArray($color,array()),'');

+        $color = colorArrayToHex(colorStringToArray($color,array()),'');

 

-		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';

-		else print $textifnotdefined;

+        if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';

+        else print $textifnotdefined;

     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -650,7 +650,7 @@ 
     function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')

     {

         // phpcs:enable

-    	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);

+        print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);

     }

 

     /**

@@ -667,10 +667,10 @@ 
      */

     static function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')

     {

-	    // Deprecation warning

-	    if ($form_name) {

-		    dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);

-	    }

+        // Deprecation warning

+        if ($form_name) {

+            dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);

+        }

 

         global $langs,$conf;

 

@@ -681,9 +681,9 @@ 
             $langs->load("other");

             if (empty($conf->dol_use_jmobile))

             {

-	            $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

-	            $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

-	            $out.= '<script type="text/javascript">

+                $out.= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';

+                $out.= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';

+                $out.= '<script type="text/javascript">

 	             jQuery(document).ready(function(){

 	                $(\'#colorpicker'.$prefix.'\').jPicker( {

 	                window: {

@@ -727,9 +727,9 @@ 
         {

             if (empty($conf->dol_use_jmobile))

             {

-	        	$out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

-	            $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

-	            $out.= '<script type="text/javascript">

+                $out.= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';

+                $out.= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';

+                $out.= '<script type="text/javascript">

 	             jQuery(document).ready(function(){

 	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({

 	                     size: 14,

@@ -930,7 +930,7 @@ 
         $out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';

         if($useempty)

         {

-        	$selected_html='';

+            $selected_html='';

             if ($selected == '') $selected_html = ' selected';

             $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';

         }

@@ -1029,55 +1029,55 @@ 
         $boxidactivatedforuser=array();

         foreach($boxactivated as $box)

         {

-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user

+            if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id]=$box->id;	// We keep only boxes to show for user

         }

 

         // Define selectboxlist

         $arrayboxtoactivatelabel=array();

         if (! empty($user->conf->$confuserzone))

         {

-        	$boxorder='';

-        	$langs->load("boxes");	// Load label of boxes

-        	foreach($boxactivated as $box)

-        	{

-        		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user

-        		$label=$langs->transnoentitiesnoconv($box->boxlabel);

-        		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';

-        		if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')

-        		{

-        			$label=$label.' <span class="fa fa-bar-chart"></span>';

-        		}

-        		$arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list

-        	}

+            $boxorder='';

+            $langs->load("boxes");	// Load label of boxes

+            foreach($boxactivated as $box)

+            {

+                if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user

+                $label=$langs->transnoentitiesnoconv($box->boxlabel);

+                //if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';

+                if (preg_match('/graph/',$box->class) && $conf->browser->layout != 'phone')

+                {

+                    $label=$label.' <span class="fa fa-bar-chart"></span>';

+                }

+                $arrayboxtoactivatelabel[$box->id]=$label;			// We keep only boxes not shown for user, to show into combo list

+            }

             foreach($boxidactivatedforuser as $boxid)

-        	{

-       			if (empty($boxorder)) $boxorder.='A:';

-  				$boxorder.=$boxid.',';

-        	}

-

-        	//var_dump($boxidactivatedforuser);

-

-        	// Class Form must have been already loaded

-        	$selectboxlist.='<!-- Form with select box list -->'."\n";

-			$selectboxlist.='<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';

-			$selectboxlist.='<input type="hidden" name="addbox" value="addbox">';

-			$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';

-			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';

-			$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';

-			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

+            {

+                    if (empty($boxorder)) $boxorder.='A:';

+                    $boxorder.=$boxid.',';

+            }

+

+            //var_dump($boxidactivatedforuser);

+

+            // Class Form must have been already loaded

+            $selectboxlist.='<!-- Form with select box list -->'."\n";

+            $selectboxlist.='<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';

+            $selectboxlist.='<input type="hidden" name="addbox" value="addbox">';

+            $selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';

+            $selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';

+            $selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';

+            $selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);

             if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';

             $selectboxlist.='</form>';

             if (! empty($conf->use_javascript_ajax))

             {

-            	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-            	$selectboxlist.=ajax_combobox("boxcombo");

+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                $selectboxlist.=ajax_combobox("boxcombo");

             }

         }

 

         // Javascript code for dynamic actions

         if (! empty($conf->use_javascript_ajax))

         {

-	        $selectboxlist.='<script type="text/javascript" language="javascript">

+            $selectboxlist.='<script type="text/javascript" language="javascript">

 

 	        // To update list of activated boxes

 	        function updateBoxOrder(closing) {

@@ -1116,8 +1116,8 @@ 
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu","aZ09").'&leftmenu='.GETPOST('leftmenu',"aZ09").'&action=addbox&boxid=\'+boxid;

 	                }

 	        	});';

-	        	if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';

-	        	$selectboxlist.='

+                if (! count($arrayboxtoactivatelabel)) $selectboxlist.='jQuery("#boxcombo").hide();';

+                $selectboxlist.='

 

 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({

 	    	    	handle: \'.boxhandle\',

@@ -1142,7 +1142,7 @@ 
 

         	});'."\n";

 

-	        $selectboxlist.='</script>'."\n";

+            $selectboxlist.='</script>'."\n";

         }

 

         // Define boxlista and boxlistb

@@ -1150,10 +1150,10 @@ 
 

         if ($nbboxactivated)

         {

-        	// Load translation files required by the page

+            // Load translation files required by the page

             $langs->loadLangs(array("boxes","projects"));

 

-        	$emptybox=new ModeleBoxes($db);

+            $emptybox=new ModeleBoxes($db);

 

             $boxlista.="\n<!-- Box left container -->\n";

 

@@ -1164,9 +1164,9 @@ 
             $ii=0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^A/i',$box->box_order)) // column A

+                if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+                if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='A'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

+                if (preg_match('/^A/i',$box->box_order)) // column A

                 {

                     $ii++;

                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

@@ -1179,10 +1179,10 @@ 
 

             if ($conf->browser->layout != 'phone')

             {

-            	$emptybox->box_id='A';

-            	$emptybox->info_box_head=array();

-            	$emptybox->info_box_contents=array();

-            	$boxlista.= $emptybox->outputBox(array(),array());

+                $emptybox->box_id='A';

+                $emptybox->info_box_head=array();

+                $emptybox->info_box_contents=array();

+                $boxlista.= $emptybox->outputBox(array(),array());

             }

             $boxlista.= "<!-- End box left container -->\n";

 

@@ -1191,9 +1191,9 @@ 
             $ii=0;

             foreach ($boxactivated as $key => $box)

             {

-            	if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

-            	if (preg_match('/^B/i',$box->box_order)) // colonne B

+                if ((! empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;

+                if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order='B'.sprintf("%02d",($ii+1));	// When box_order was not yet set to Axx or Bxx and is still 0

+                if (preg_match('/^B/i',$box->box_order)) // colonne B

                 {

                     $ii++;

                     //print 'box_id '.$boxactivated[$ii]->box_id.' ';

@@ -1206,10 +1206,10 @@ 
 

             if ($conf->browser->layout != 'phone')

             {

-            	$emptybox->box_id='B';

-            	$emptybox->info_box_head=array();

-            	$emptybox->info_box_contents=array();

-            	$boxlistb.= $emptybox->outputBox(array(),array());

+                $emptybox->box_id='B';

+                $emptybox->info_box_head=array();

+                $emptybox->info_box_contents=array();

+                $boxlistb.= $emptybox->outputBox(array(),array());

             }

 

             $boxlistb.= "<!-- End box right container -->\n";

@@ -1275,7 +1275,7 @@ 
                 print "</select>";

             }

             else

-			{

+            {

                 print $langs->trans("DictionaryEmpty");

             }

         }