alxarafe / alixar

Base/AlixarController.php

Braces +3 added lines, -2 removed lines

@@ -307,8 +307,9 @@
                         Globals::$hookManager->initHooks(array('login'));
                         $parameters = array('dol_authmode' => $this->dol_authmode, 'dol_loginmesg' => $_SESSION["dol_loginmesg"]);
                         $reshook = Globals::$hookManager->executeHooks('afterLoginFailed', $parameters, Globals::$user, $action);    // Note that $action and $object may have been modified by some hooks
-                        if ($reshook < 0)
-                            $error++;
+                        if ($reshook < 0) {
+                                                    $error++;
+                        }
 
 // Note: exit is done later
                     }

Base/FormOther.php

Braces +149 added lines, -87 removed lines

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

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

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

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

+		if (!empty($fk_user)) {
+		    $sql.=" AND fk_user=".$fk_user;
+		}
         $sql.= " ORDER BY rowid";

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

         if ($result)

@@ -93,8 +95,7 @@ 
                 if ($selected == $obj->rowid)

                 {

                     print '<option value="'.$obj->rowid.'" selected>';

-                }

-                else

+                } else

                 {

                     print '<option value="'.$obj->rowid.'">';

                 }

@@ -103,8 +104,7 @@ 
                 $i++;

             }

             print "</select>";

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -144,8 +144,7 @@ 
                 if ($selected == $obj->rowid)

                 {

                     print '<option value="'.$obj->rowid.'" selected>';

-                }

-                else

+                } else

                 {

                     print '<option value="'.$obj->rowid.'">';

                 }

@@ -154,8 +153,7 @@ 
                 $i++;

             }

             print "</select>";

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -196,8 +194,7 @@ 
                     if ($selected && $selected == $obj->rowid)

                     {

                         print '<option value="'.$obj->rowid.'" selected>';

-                    }

-                    else

+                    } else

                     {

                         print '<option value="'.$obj->rowid.'">';

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

@@ -210,8 +207,7 @@ 
             }

             print '</select>';

             return 0;

-        }

-        else

+        } else

         {

             dol_print_error($this->db);

             return 1;

@@ -256,8 +252,7 @@ 
     				if (($selected && $selected == $obj->taux) || $num == 1)

     				{

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

-    				}

-    				else

+    				} else

     				{

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

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

@@ -269,8 +264,7 @@ 
     		}

     		$out.='</select>';

     		return $out;

-    	}

-    	else

+    	} else

     	{

     		dol_print_error($this->db);

     		return '';

@@ -295,15 +289,16 @@ 
     {

         // phpcs:enable

         $return = '<select class="flat" name="'.$htmlname.'" '.($disabled?'disabled':'').'>';

-        if ($showempty) $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';

+        if ($showempty) {
+            $return.='<option value="-1"'.(($selected == -1 || $selected == '')?' selected':'').'>&nbsp;</option>';
+        }
 

         for ($i = $start ; $i <= $end ; $i += $increment)

         {

             if ($selected != '' && (int) $selected == $i)

             {

                 $return.= '<option value="'.$i.'" selected>';

-            }

-            else

+            } else

             {

                 $return.= '<option value="'.$i.'">';

             }

@@ -356,14 +351,19 @@ 
 

         // Print a select with each of them

         $moreforfilter.='<select class="flat minwidth100'.($morecss?' '.$morecss:'').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';

-        if ($showempty) $moreforfilter.='<option value="0">&nbsp;</option>';	// Should use -1 to say nothing

+        if ($showempty) {
+            $moreforfilter.='<option value="0">&nbsp;</option>';
+        }
+        // Should use -1 to say nothing

 

         if (is_array($tab_categs))

         {

             foreach ($tab_categs as $categ)

             {

                 $moreforfilter.='<option value="'.$categ['id'].'"';

-                if ($categ['id'] == $selected) $moreforfilter.=' selected';

+                if ($categ['id'] == $selected) {
+                    $moreforfilter.=' selected';
+                }
                 $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';

             }

         }

@@ -410,14 +410,20 @@ 
         }

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

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

-        if ($showempty) $out.='<option value="0">&nbsp;</option>';

+        if ($showempty) {
+            $out.='<option value="0">&nbsp;</option>';
+        }
 

         // Get list of users allowed to be viewed

         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";

         $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u";

         $sql_usr.= " WHERE u.entity IN (0,".$conf->entity.")";

-        if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.rowid = ".$user->id;

-        if (! empty($user->societe_id)) $sql_usr.=" AND u.fk_soc = ".$user->societe_id;

+        if (empty($user->rights->user->user->lire)) {
+            $sql_usr.=" AND u.rowid = ".$user->id;
+        }
+        if (! empty($user->societe_id)) {
+            $sql_usr.=" AND u.fk_soc = ".$user->societe_id;
+        }
         // Add existing sales representatives of thirdparty of external user

         if (empty($user->rights->user->user->lire) && $user->societe_id)

         {

@@ -438,7 +444,9 @@ 
 

                 $out.='<option value="'.$obj_usr->rowid.'"';

 

-                if ($obj_usr->rowid == $selected) $out.=' selected';

+                if ($obj_usr->rowid == $selected) {
+                    $out.=' selected';
+                }
 

                 $out.='>';

                 $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);

@@ -466,8 +474,7 @@ 
                 $out.='</option>';

             }

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

-        }

-        else

+        } else

         {

             dol_print_error($this->db);

         }

@@ -503,15 +510,16 @@ 
         if ($tasksarray)

         {

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

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

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

             $level=0;

             $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);

             print '</select>';

 

             print ajax_combobox($htmlname);

-        }

-        else

+        } else

         {

             print '<div class="warning">'.$langs->trans("NoProject").'</div>';

         }

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

 

                 // Break on a new project

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

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

                 {

                     if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project

                     {

-                        if ($i > 0) print '<option value="0" disabled>----------</option>';

+                        if ($i > 0) print '<option value="0" disabled>----------</option>';
+                }
                         print '<option value="'.$lines[$i]->fk_project.'_0"';

-                        if ($selectedproject == $lines[$i]->fk_project) print ' selected';

+                        if ($selectedproject == $lines[$i]->fk_project) {
+                            print ' selected';
+                        }
                         print '>';	// Project -> Task

                         print $langs->trans("Project").' '.$lines[$i]->projectref;

                         if (empty($lines[$i]->public))

                         {

                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';

-                        }

-                        else

+                        } else

                         {

                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';

                         }

@@ -573,31 +584,41 @@ 
                 $newdisablechildoftaskid=$disablechildoftaskid;

 

                 // Print task

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

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

                 {

                 	// Check if we must disable entry

-                	$disabled=0;

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

                 	{

                			$disabled++;

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

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

                 	}

 

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

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

-                    if ($disabled) print ' disabled';

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

                     print $langs->trans("Project").' '.$lines[$i]->projectref;

                     print ' '.$lines[$i]->projectlabel;

                     if (empty($lines[$i]->public))

                     {

                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';

-                    }

-                    else

+                    } else

                     {

                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';

                     }

-                    if ($lines[$i]->id) print ' > ';

+                    if ($lines[$i]->id) {
+                        print ' > ';
+                    }
                     for ($k = 0 ; $k < $level ; $k++)

                     {

                         print "&nbsp;&nbsp;&nbsp;";

@@ -607,7 +628,9 @@ 
                 }

 

                 $level++;

-                if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);

+                if ($lines[$i]->id) {
+                    $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+                }
                 $level--;

             }

         }

@@ -626,12 +649,17 @@ 
     {

     	$textcolor='FFF';

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

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

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

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

 

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

-		else print $textifnotdefined;

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

 

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

@@ -722,8 +750,7 @@ 
 	             </script>';

             }

             $out.= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss?' '.$morecss:'').'" type="text" value="'.$set_color.'" />';

-        }

-        else  // In most cases, this is not used. We used instead function with no specific list of colors

+        } else  // In most cases, this is not used. We used instead function with no specific list of colors

         {

             if (empty($conf->dol_use_jmobile))

             {

@@ -744,7 +771,9 @@ 
             foreach ($arrayofcolors as $val)

             {

                 $out.= '<option value="'.$val.'"';

-                if ($set_color == $val) $out.= ' selected';

+                if ($set_color == $val) {
+                    $out.= ' selected';
+                }
                 $out.= '>'.$val.'</option>';

             }

             $out.= '</select>';

@@ -828,8 +857,7 @@ 
             if ($selected == $key)

             {

                 $select_week .= '<option value="'.$key.'" selected>';

-            }

-            else

+            } else

             {

                 $select_week .= '<option value="'.$key.'">';

             }

@@ -858,8 +886,13 @@ 
 

         require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

 

-        if ($longlabel) $montharray = monthArray($langs, 0);	// Get array

-        else $montharray = monthArray($langs, 1);

+        if ($longlabel) {
+            $montharray = monthArray($langs, 0);
+        }
+        // Get array

+        else {
+            $montharray = monthArray($langs, 1);
+        }
 

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

         if ($useempty)

@@ -871,8 +904,7 @@ 
             if ($selected == $key)

             {

                 $select_month .= '<option value="'.$key.'" selected>';

-            }

-            else

+            } else

             {

                 $select_month .= '<option value="'.$key.'">';

             }

@@ -925,13 +957,17 @@ 
         $currentyear = date("Y")+$offset;

         $max_year = $currentyear+$max_year;

         $min_year = $currentyear-$min_year;

-        if(empty($selected) && empty($useempty)) $selected = $currentyear;

+        if(empty($selected) && empty($useempty)) {
+            $selected = $currentyear;
+        }
 

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

         if($useempty)

         {

         	$selected_html='';

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

+            if ($selected == '') {
+                $selected_html = ' selected';
+            }
             $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';

         }

         if (! $invert)

@@ -939,16 +975,19 @@ 
             for ($y = $max_year; $y >= $min_year; $y--)

             {

                 $selected_html='';

-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';

+                if ($selected > 0 && $y == $selected) {
+                    $selected_html = ' selected';
+                }
                 $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

             }

-        }

-        else

+        } else

         {

             for ($y = $min_year; $y <= $max_year; $y++)

             {

                 $selected_html='';

-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';

+                if ($selected > 0 && $y == $selected) {
+                    $selected_html = ' selected';
+                }
                 $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';

             }

         }

@@ -985,8 +1024,7 @@ 
             $langs->load("companies");

             print ' &nbsp; <a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$socid.'&action=create&origin='.$origin.'&originid='.$originid.'>'.$langs->trans("AddAddress").'</a>';

             print '</form>';

-        }

-        else

+        } else

         {

             if ($selected)

             {

@@ -994,8 +1032,7 @@ 
                 $address=new Address($this->db);

                 $result=$address->fetch_address($selected);

                 print '<a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$address->socid.'&id='.$address->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$address->label.'</a>';

-            }

-            else

+            } else

             {

                 print "&nbsp;";

             }

@@ -1029,7 +1066,10 @@ 
         $boxidactivatedforuser=array();

         foreach($boxactivated as $box)

         {

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

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

         }

 

         // Define selectboxlist

@@ -1040,7 +1080,10 @@ 
         	$langs->load("boxes");	// Load label of boxes

         	foreach($boxactivated as $box)

         	{

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

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

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

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

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

@@ -1051,7 +1094,9 @@ 
         	}

             foreach($boxidactivatedforuser as $boxid)

         	{

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

+       			if (empty($boxorder)) {
+       			    $boxorder.='A:';
+       			}
   				$boxorder.=$boxid.',';

         	}

 

@@ -1065,7 +1110,9 @@ 
 			$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';

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

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

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

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

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

             {

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

 	                }

 	        	});';

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

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

 

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

@@ -1159,16 +1208,25 @@ 
 

             // Define $box_max_lines

             $box_max_lines=5;

-            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;

+            if (! empty($conf->global->MAIN_BOXES_MAXLINES)) {
+                $box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
+            }
 

             $ii=0;

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

             {

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

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

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

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

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

                 {

-                    $ii++;

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

                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

                     // Show box

@@ -1191,11 +1249,18 @@ 
             $ii=0;

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

             {

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

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

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

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

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

                 {

-                    $ii++;

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

                     //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';

                     // Show box

@@ -1263,8 +1328,7 @@ 
                     if ($selected == $obj->rowid || $selected == $obj->$keyfield)

                     {

                         print '<option value="'.$obj->$keyfield.'" selected>';

-                    }

-                    else

+                    } else

                     {

                         print '<option value="'.$obj->$keyfield.'">';

                     }

@@ -1273,13 +1337,11 @@ 
                     $i++;

                 }

                 print "</select>";

-            }

-            else

+            } else

 			{

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

             }

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

Base/AlixarView.php

Braces +124 added lines, -81 removed lines

@@ -189,15 +189,20 @@ 
             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
-                } else
-                    $appli .= " " . DOL_VERSION;
-            } else
-                $appli .= " " . DOL_VERSION;
+                    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;
+                }
+            } else {
+                            $appli .= " " . DOL_VERSION;
+            }
 
-            if (!empty(Globals::$conf->global->MAIN_FEATURES_LEVEL))
-                $appli .= "<br>" . Globals::$langs->trans("LevelOfFeature") . ': ' . Globals::$conf->global->MAIN_FEATURES_LEVEL;
+            if (!empty(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)) {
@@ -235,12 +240,15 @@ 
             $parameters = array();
             $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
-                else
-                    $toprightmenu = Globals::$hookManager->resPrint;      // replace
-            }
-            else {
+                if ($result == 0) {
+                                    $toprightmenu .= Globals::$hookManager->resPrint;
+                }
+                // add
+                else {
+                                    $toprightmenu = Globals::$hookManager->resPrint;
+                }
+                // replace
+            } else {
                 $toprightmenu .= $result; // For backward compatibility
             }
 
@@ -334,8 +342,9 @@ 
             print "<!-- End top horizontal menu -->\n\n";
         }
 
-        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 : '') . '">';
+        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 : '') . '">';
+        }
     }
 
     /**
@@ -360,8 +369,9 @@ 
         $searchform = '';
         $bookmarks = '';
 
-        if (!empty($menu_array_before))
-            dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+        if (!empty($menu_array_before)) {
+                    dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+        }
 
         if (empty(Globals::$conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
 // Instantiate hooks of thirdparty module
@@ -369,8 +379,10 @@ 
 
             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 ?
+            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 ?
 
 print "\n";
 
@@ -397,8 +409,9 @@ 
             $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
-                $searchform = Globals::$hookManager->resPrint;
+            } else {
+                            $searchform = Globals::$hookManager->resPrint;
+            }
 
 // Force special value for $searchform
             if (!empty(Globals::$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty(Globals::$conf->use_javascript_ajax)) {
@@ -442,38 +455,49 @@ 
             if (empty(Globals::$conf->global->MAIN_HIDE_VERSION)) {    // Version is already on help picto and on login page.
                 $doliurl = 'https://www.dolibarr.org';
 //local communities
-                if (preg_match('/fr/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.fr';
-                if (preg_match('/es/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.es';
-                if (preg_match('/de/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.de';
-                if (preg_match('/it/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.it';
-                if (preg_match('/gr/i', Globals::$langs->defaultlang))
-                    $doliurl = 'https://www.dolibarr.gr';
+                if (preg_match('/fr/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.fr';
+                }
+                if (preg_match('/es/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.es';
+                }
+                if (preg_match('/de/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.de';
+                }
+                if (preg_match('/it/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.it';
+                }
+                if (preg_match('/gr/i', Globals::$langs->defaultlang)) {
+                                    $doliurl = 'https://www.dolibarr.gr';
+                }
 
                 $appli = constant('DOL_APPLICATION_TITLE');
                 if (!empty(Globals::$conf->global->MAIN_APPLICATION_TITLE)) {
                     $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
-                    } else
-                        $appli .= " " . DOL_VERSION;
-                } else
-                    $appli .= " " . DOL_VERSION;
+                        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;
+                    }
+                } else {
+                                    $appli .= " " . DOL_VERSION;
+                }
                 print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-                if ($doliurl)
-                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
-                else
-                    print '<span class="help">';
+                if ($doliurl) {
+                                    print '<a class="help" target="_blank" rel="noopener" href="' . $doliurl . '">';
+                } else {
+                                    print '<span class="help">';
+                }
                 print $appli;
-                if ($doliurl)
-                    print '</a>';
-                else
-                    print '</span>';
+                if ($doliurl) {
+                                    print '</a>';
+                } else {
+                                    print '</span>';
+                }
                 print '</div>' . "\n";
             }
 
@@ -520,8 +544,9 @@ 
         print "\n";
         print '<!-- Begin right area -->' . "\n";
 
-        if (empty($leftmenuwithoutmainarea))
-            main_area($title);
+        if (empty($leftmenuwithoutmainarea)) {
+                    main_area($title);
+        }
     }
 
     /**
@@ -534,16 +559,18 @@ 
     {
 // global Globals::$conf, Globals::$langs;
 
-        if (empty(Globals::$conf->dol_hide_leftmenu))
-    print '<div id="id-right">';
+        if (empty(Globals::$conf->dol_hide_leftmenu)) {
+            print '<div id="id-right">';
+        }
 
         print "\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));
-}
+        if (!empty(Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+                    print info_admin(Globals::$langs->trans("WarningYouAreInMaintenanceMode", Globals::$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+        }
+        }
 
     /**
      *  Return helpbaseurl, helppage and mode
@@ -567,18 +594,21 @@ 
 // If WIKI URL
             if (preg_match('/^es/i', Globals::$langs->defaultlang)) {
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/ES:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             if (preg_match('/^fr/i', Globals::$langs->defaultlang)) {
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/FR:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             if (empty($helppage)) { // If help page not already found
                 $helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-                if (preg_match('/EN:([^|]+)/i', $helppagename, $reg))
-                    $helppage = $reg[1];
+                if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) {
+                                    $helppage = $reg[1];
+                }
             }
             $mode = 'wiki';
         }
@@ -609,8 +639,9 @@ 
         $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) . '">';
-        if ($showtitlebefore)
-            $ret .= $title . ' ';
+        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 . '"' : '');
@@ -652,10 +683,12 @@ 
             foreach (Globals::$user->lastsearch_values_tmp as $key => $val) {
                 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']);
+                    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]);
@@ -666,8 +699,9 @@ 
 
         $relativepathstring = $_SERVER["PHP_SELF"];
 // Clean $relativepathstring
-        if (constant('DOL_BASE_URI'))
-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring);
+        if (constant('DOL_BASE_URI')) {
+                    $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)) {
@@ -675,12 +709,15 @@ 
             unset($_SESSION['lastsearch_page_tmp_' . $relativepathstring]);
             unset($_SESSION['lastsearch_limit_tmp_' . $relativepathstring]);
 
-            if (!empty($contextpage))
-                $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
-            if (!empty($page) && $page > 1)
-                $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
-            if (!empty($limit) && $limit != Globals::$conf->limit)
-                $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            if (!empty($contextpage)) {
+                            $_SESSION['lastsearch_contextpage_tmp_' . $relativepathstring] = $contextpage;
+            }
+            if (!empty($page) && $page > 1) {
+                            $_SESSION['lastsearch_page_tmp_' . $relativepathstring] = $page;
+            }
+            if (!empty($limit) && $limit != Globals::$conf->limit) {
+                            $_SESSION['lastsearch_limit_tmp_' . $relativepathstring] = $limit;
+            }
 
             unset($_SESSION['lastsearch_contextpage_' . $relativepathstring]);
             unset($_SESSION['lastsearch_page_' . $relativepathstring]);
@@ -707,20 +744,26 @@ 
 
         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
+        if (empty(Globals::$conf->dol_hide_leftmenu)) {
+                    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
+        if (empty(Globals::$conf->dol_hide_leftmenu) && empty(Globals::$conf->dol_use_jmobile)) {
+                    print '</div> <!-- End div id-container -->' . "\n";
+        }
+        // End div container
 
         print "\n";
-        if ($comment)
-            print '<!-- ' . $comment . ' -->' . "\n";
+        if ($comment) {
+                    print '<!-- ' . $comment . ' -->' . "\n";
+        }
 
         printCommonFooter($zone);
 
-        if (!empty($delayedhtmlcontent))
-            print $delayedhtmlcontent;
+        if (!empty($delayedhtmlcontent)) {
+                    print $delayedhtmlcontent;
+        }
 
         if (!empty(Globals::$conf->use_javascript_ajax)) {
             print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";