Dolibarr / dolibarr

htdocs/core/filemanagerdol/connectors/php/util.php

Braces +2 added lines, -4 removed lines

@@ -87,8 +87,7 @@ 
 	if ( defined('PHP_OS') )
 	{
 		$os = PHP_OS ;
-	}
-	else
+	} else
 	{
 		$os = php_uname();
 	}
@@ -96,8 +95,7 @@ 
 	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
 	{
 		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else
+	} else
 	{
 		return (htmlspecialchars($value));
 	}

htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

Braces +8 added lines, -9 removed lines

@@ -46,13 +46,15 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->blockedlog->enabled)) {
+        	return 0;
+        }
+        // Module not active, we do nothing
 
 		if($action==='BILL_VALIDATE' || $action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 				|| $action === 'BILL_SENTBYMAIL' || $action === 'DOC_DOWNLOAD' || $action === 'DOC_PREVIEW') {
 			$amounts=  (double) $object->total_ttc;
-		}
-		else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
+		} else if($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_ADD_TO_BANK') {
 			$amounts = 0;
 			if(!empty($object->amounts)) {
 				foreach($object->amounts as $amount) {
@@ -61,11 +63,9 @@ 
 			}
 
 
-		}
-		else if(strpos($action,'PAYMENT')!==false) {
+		} else if(strpos($action,'PAYMENT')!==false) {
 			$amounts= (double) $object->amount;
-		}
-		else {
+		} else {
 			return 0; // not implemented action log
 		}
 
@@ -80,8 +80,7 @@ 
 			setEventMessage($b->error,'errors');
 
 			return -1;
-		}
-		else {
+		} else {
 
 			return 1;
 		}

htdocs/core/triggers/interface_20_all_Logevents.class.php

Braces +22 added lines, -18 removed lines

@@ -49,13 +49,22 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-    	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0;	// Log events is disabled (hidden features)
+    	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) {
+    		return 0;
+    	}
+    	// Log events is disabled (hidden features)
 
     	$key='MAIN_LOGEVENTS_'.$action;
     	//dol_syslog("xxxxxxxxxxx".$key);
-    	if (empty($conf->global->$key)) return 0;				// Log events not enabled for this action
+    	if (empty($conf->global->$key)) {
+    		return 0;
+    	}
+    	// Log events not enabled for this action
 
-    	if (empty($conf->entity)) $conf->entity = $entity;  // forcing of the entity if it's not defined (ex: in login form)
+    	if (empty($conf->entity)) {
+    		$conf->entity = $entity;
+    	}
+    	// forcing of the entity if it's not defined (ex: in login form)
 
         $date = dol_now();
 
@@ -96,8 +105,7 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("NewUserCreated",$object->login);
             $desc=$langs->transnoentities("NewUserCreated",$object->login);
-		}
-        elseif ($action == 'USER_MODIFY')
+		} elseif ($action == 'USER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -105,8 +113,7 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("EventUserModified",$object->login);
             $desc=$langs->transnoentities("EventUserModified",$object->login);
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
+        } elseif ($action == 'USER_NEW_PASSWORD')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -114,8 +121,7 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("NewUserPassword",$object->login);
             $desc=$langs->transnoentities("NewUserPassword",$object->login);
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
+        } elseif ($action == 'USER_ENABLEDISABLE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -130,8 +136,7 @@ 
 				$text=$langs->transnoentities("UserDisabled",$object->login);
 				$desc=$langs->transnoentities("UserDisabled",$object->login);
 			}
-        }
-        elseif ($action == 'USER_DELETE')
+        } elseif ($action == 'USER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -148,16 +153,14 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("NewGroupCreated",$object->name);
             $desc=$langs->transnoentities("NewGroupCreated",$object->name);
-		}
-        elseif ($action == 'GROUP_MODIFY')
+		} elseif ($action == 'GROUP_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("GroupModified",$object->name);
             $desc=$langs->transnoentities("GroupModified",$object->name);
-		}
-        elseif ($action == 'GROUP_DELETE')
+		} elseif ($action == 'GROUP_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -176,7 +179,9 @@ 
 */
 
 		// Add more information into desc from the context property
-		if (! empty($desc) && ! empty($object->context['audit'])) $desc.=' - '.$object->context['audit'];
+		if (! empty($desc) && ! empty($object->context['audit'])) {
+			$desc.=' - '.$object->context['audit'];
+		}
 		
         // Add entry in event table
 		include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
@@ -192,8 +197,7 @@ 
         if ($result > 0)
         {
             return 1;
-        }
-        else
+        } else
         {
             $error ="Failed to insert security event: ".$event->error;
             $this->error=$error;

htdocs/core/triggers/interface_50_modNotification_Notification.class.php

Braces +25 added lines, -10 removed lines

@@ -61,12 +61,17 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->notification->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->notification->enabled)) {
+			return 0;
+		}
+		// Module not active, we do nothing
 
 		require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
 		$notify = new Notify($this->db);
 
-		if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
+		if (! in_array($action, $notify->arrayofnotifsupported)) {
+			return 0;
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -102,7 +107,9 @@ 
 
                 $qualified=0;
                 // Check is this event is supported by notification module
-                if (in_array($obj->code,$this->listofmanagedevents)) $qualified=1;
+                if (in_array($obj->code,$this->listofmanagedevents)) {
+                	$qualified=1;
+                }
                 // Check if module for this event is active
                 if ($qualified)
                 {
@@ -110,12 +117,19 @@ 
                     $element=$obj->elementtype;
 
                     // Exclude events if related module is disabled
-                    if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-                    elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-                    elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
-                    elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
-                    elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
-                    elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member')) && empty($conf->$element->enabled)) $qualified=0;
+                    if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) {
+                    	$qualified=0;
+                    } elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) {
+                    	$qualified=0;
+                    } elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) {
+                    	$qualified=0;
+                    } elseif ($element == 'shipping' && empty($conf->expedition->enabled)) {
+                    	$qualified=0;
+                    } elseif ($element == 'member' && empty($conf->adherent->enabled)) {
+                    	$qualified=0;
+                    } elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member')) && empty($conf->$element->enabled)) {
+                    	$qualified=0;
+                    }
                 }
 
                 if ($qualified)
@@ -125,8 +139,9 @@ 
 
                 $i++;
             }
+        } else {
+        	dol_print_error($this->db);
         }
-        else dol_print_error($this->db);
 
         return $ret;
     }

htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php

Braces +20 added lines, -18 removed lines

@@ -49,7 +49,10 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->mailmanspip->enabled)) {
+        	return 0;
+        }
+        // Module not active, we do nothing
 
         if ($action == 'CATEGORY_LINK')
         {
@@ -61,15 +64,13 @@ 
     			$this->error=$object->linkto->error;
     			$this->errors=$object->linkto->errors;
     			$return=-1;
-    		}
-			else
+    		} else
 			{
 				$return=1;
 			}
 
         	return $return;
-        }
-        elseif ($action == 'CATEGORY_UNLINK')
+        } elseif ($action == 'CATEGORY_UNLINK')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -79,8 +80,7 @@ 
     			$this->error=$object->unlinkoff->error;
         		$this->errors=$object->unlinkoff->errors;
         		$return=-1;
-        	}
-        	else
+        	} else
         	{
         		$return=1;
         	}
@@ -95,17 +95,18 @@ 
 
 			$return=0;
             // Add user into some linked tools (mailman, spip, etc...)
-			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))	// TODO Do del/add also if type change
+			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid)) {
+				// TODO Do del/add also if type change
 			{
 				if (is_object($object->oldcopy) && ($object->oldcopy->email != $object->email))    // If email has changed we delete mailman subscription for old email
 				{
 					if ($object->oldcopy->del_to_abo() < 0)
 					{
 						if (! empty($object->oldcopy->error)) $this->error=$object->oldcopy->error;
+			}
 						$this->errors=$object->oldcopy->errors;
 						$return=-1;
-					}
-					else
+					} else
 					{
 						$return=1;
 					}
@@ -113,19 +114,19 @@ 
     			// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
     			if ($object->add_to_abo() < 0)
     			{
-    				 if (! empty($object->error)) $this->error=$object->error;
+    				 if (! empty($object->error)) {
+    				 	$this->error=$object->error;
+    				 }
     				 $this->errors=$object->errors;
     				 $return=-1;
-    			}
-				else
+    			} else
 				{
 					$return=1;
 				}
 			}
 
 			return $return;
-        }
-        elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
+        } elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -133,11 +134,12 @@ 
             // Remove from external tools (mailman, spip, etc...)
         	if ($object->del_to_abo() < 0)
 			{
-				if (! empty($object->error)) $this->error=$object->error;
+				if (! empty($object->error)) {
+					$this->error=$object->error;
+				}
 				$this->errors=$object->errors;
 				$return=-1;
-			}
-			else
+			} else
 			{
 				$return=1;
 			}

htdocs/core/tools.php

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 
 // Security check
 $socid=0;
-if ($user->societe_id > 0) $socid=$user->societe_id;
+if ($user->societe_id > 0) {
+	$socid=$user->societe_id;
+}
 
 
 

htdocs/core/menus/standard/empty.php

Braces +97 added lines, -46 removed lines

@@ -85,7 +85,9 @@ 
 
 		if ($mode == 'top')
 		{
-			if (empty($noout)) print_start_menu_array_empty();
+			if (empty($noout)) {
+				print_start_menu_array_empty();
+			}
 
 			$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 
@@ -113,16 +115,28 @@ 
 			// Output menu entries
 			foreach($this->menu->liste as $menkey => $menuval)
 			{
-			    if (empty($noout)) print_start_menu_entry_empty($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
-			    if (empty($noout)) print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url']!='#'?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
-			    if (empty($noout)) print_end_menu_entry_empty($menuval['enabled']);
+			    if (empty($noout)) {
+			    	print_start_menu_entry_empty($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
+			    }
+			    if (empty($noout)) {
+			    	print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url']!='#'?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
+			    }
+			    if (empty($noout)) {
+			    	print_end_menu_entry_empty($menuval['enabled']);
+			    }
 			}
 
 			$showmode=1;
-			if (empty($noout)) print_start_menu_entry_empty('','class="tmenuend"',$showmode);
-			if (empty($noout)) print_end_menu_entry_empty($showmode);
+			if (empty($noout)) {
+				print_start_menu_entry_empty('','class="tmenuend"',$showmode);
+			}
+			if (empty($noout)) {
+				print_end_menu_entry_empty($showmode);
+			}
 
-			if (empty($noout)) print_end_menu_array_empty();
+			if (empty($noout)) {
+				print_end_menu_array_empty();
+			}
 
 			if ($mode == 'jmobile')
 			{
@@ -131,10 +145,12 @@ 
 			}
 		}
 
-		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
+		if ($mode == 'jmobile') {
+			// Used to get menu in xml ul/li
 		{
 		    // Home
 		    $showmode=1;
+		}
 		    $classname='class="tmenusel"';
 		    $idsel='home';
 
@@ -145,9 +161,11 @@ 
 		    //var_dump($this->menu->liste);exit;
 		    $lastlevel = array();
 		    print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-		    foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+		    foreach($this->menu->liste as $key => $val) {
+		    	// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 		    {
 		        print '<ul class="ulmenu" data-inset="true">';
+		    }
 		        print '<li class="lilevel0">';
 
 		        if ($val['enabled'] == 1)
@@ -160,7 +178,9 @@ 
 		            print '<a class="alilevel0" href="#">';
 
 		            // Add font-awesome
-		            if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+		            if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+		            	print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+		            }
 
 		            print $val['titre'];
 		            print '</a>'."\n";
@@ -204,12 +224,16 @@ 
 		                // We add sub entry
 		                print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
 		                print '<a href="'.$relurl.'">';
-		                if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+		                if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {
+		                	// No translation
 		                {
 		                    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-		                    else print $langs->trans("Dashboard");
+		                } else {
+		                    	print $langs->trans("Dashboard");
+		                    }
+		                } else {
+		                	print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 		                }
-		                else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 		                print '</a>';
 		                print '</li>'."\n";
 		            }
@@ -219,22 +243,26 @@ 
 		                if ($val['enabled'])
 		                {
 		                    $lastlevel[0]='enabled';
-		                }
-		                else if ($showmenu)                 // Not enabled but visible (so greyed)
+		                } else if ($showmenu) {
+		                	// Not enabled but visible (so greyed)
 		                {
 		                    $lastlevel[0]='greyed';
 		                }
-		                else
+		                } else
 		                {
 		                    $lastlevel[0]='hidden';
 		                }
 		            }
 
 		            $lastlevel2 = array();
-		            foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+		            foreach($submenu->liste as $key2 => $val2) {
+		            	// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 		            {
 		                $showmenu=true;
-		                if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
+		            }
+		                if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+		                	$showmenu=false;
+		                }
 
 		                // If at least one parent is not enabled, we do not show any menu of all children
 		                if ($val2['level'] > 0)
@@ -242,19 +270,25 @@ 
 		                    $levelcursor = $val2['level']-1;
 		                    while ($levelcursor >= 0)
 		                    {
-		                        if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+		                        if ($lastlevel2[$levelcursor] != 'enabled') {
+		                        	$showmenu=false;
+		                        }
 		                        $levelcursor--;
 		                    }
 		                }
 
-		                if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+		                if ($showmenu) {
+		                	// Visible (option to hide when not allowed is off or allowed)
 		                {
 		                    $relurl2=dol_buildpath($val2['url'],1);
+		                }
 		                    $relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
 		                    $relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
 		                    $canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 		                    //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-		                    if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
+		                    if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) {
+		                    	$relurl2='';
+		                    }
 
 		                    $disabled='';
 		                    if (! $val2['enabled'])
@@ -264,30 +298,34 @@ 
 
 		                    print str_pad('',$val2['level']+1);
 		                    print '<li class="lilevel'.($val2['level']+1);
-		                    if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+		                    if ($val2['level']==0) {
+		                    	print ' ui-btn-icon-right ui-btn';
+		                    }
+		                    // ui-btn to highlight on clic
 		                    print $disabled.'">';	 // ui-btn to highlight on clic
 		                    if ($relurl2)
 		                    {
-		                        if ($val2['enabled'])	// Allowed
+		                        if ($val2['enabled']) {
+		                        	// Allowed
 		                        {
 		                            print '<a href="'.$relurl2.'"';
+		                        }
 		                            //print ' data-ajax="false"';
 		                            print '>';
 		                            $lastlevel2[$val2['level']]='enabled';
-		                        }
-		                        else					// Not allowed but visible (greyed)
+		                        } else					// Not allowed but visible (greyed)
 		                        {
 		                            print '<a href="#" class="vsmenudisabled">';
 		                            $lastlevel2[$val2['level']]='greyed';
 		                        }
-		                    }
-		                    else
+		                    } else
 		                    {
-		                        if ($val2['enabled'])	// Allowed
+		                        if ($val2['enabled']) {
+		                        	// Allowed
 		                        {
 		                            $lastlevel2[$val2['level']]='enabled';
 		                        }
-		                        else
+		                        } else
 		                        {
 		                            $lastlevel2[$val2['level']]='greyed';
 		                        }
@@ -297,10 +335,12 @@ 
 		                    print $val2['titre'];
 		                    if ($relurl2)
 		                    {
-		                        if ($val2['enabled'])	// Allowed
+		                        if ($val2['enabled']) {
+		                        	// Allowed
 		                            print '</a>';
-		                            else
-		                                print '</a>';
+		                        } else {
+		                            		                                print '</a>';
+		                            }
 		                    }
 		                    print '</li>'."\n";
 		                }
@@ -361,15 +401,16 @@ 
 						$lastopened=true;
         				for($j = ($i + 1); $j < $num; $j++)
         				{
-        				    if (empty($menu_array[$j]['level'])) $lastopened=false;
+        				    if (empty($menu_array[$j]['level'])) {
+        				    	$lastopened=false;
+        				    }
         				}
         				$alt = 0;   // For menu manager "empty", we force to not have blockvmenufirst defined
         				$lastopened = 1; // For menu manager "empty", we force to not have blockvmenulast defined
 						if (($alt%2==0))
 						{
 							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
-						}
-						else
+						} else
 						{
 							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
 						}
@@ -390,8 +431,7 @@ 
 						if ($this->menu->liste[$i]['enabled'])
 						{
 							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'],1).'"'.($this->menu->liste[$i]['target']?' target="'.$this->menu->liste[$i]['target'].'"':'').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
-						}
-						else
+						} else
 						{
 							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
 						}
@@ -401,25 +441,34 @@ 
 					if ($this->menu->liste[$i]['level'] > 0)
 					{
         				$cssmenu = '';
-        				if ($this->menu->liste[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/','',$this->menu->liste[$i]['url']));
+        				if ($this->menu->liste[$i]['url']) {
+        					$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/','',$this->menu->liste[$i]['url']));
+        				}
 
 					    print '<div class="menu_contenu'.$cssmenu.'">';
 
 						if ($this->menu->liste[$i]['enabled'])
 						{
 							print $tabstring;
-							if ($this->menu->liste[$i]['url']) print '<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'],1).'"'.($this->menu->liste[$i]['target']?' target="'.$this->menu->liste[$i]['target'].'"':'').'>';
-							else print '<span class="vsmenu">';
-							if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].'</a>';
-							else print '</span>';
-						}
-						else
+							if ($this->menu->liste[$i]['url']) {
+								print '<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'],1).'"'.($this->menu->liste[$i]['target']?' target="'.$this->menu->liste[$i]['target'].'"':'').'>';
+							} else {
+								print '<span class="vsmenu">';
+							}
+							if ($this->menu->liste[$i]['url']) {
+								print $this->menu->liste[$i]['titre'].'</a>';
+							} else {
+								print '</span>';
+							}
+						} else
 						{
 							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';
 						}
 
 						// If title is not pure text and contains a table, no carriage return added
-						if (! strstr($this->menu->liste[$i]['titre'],'<table')) print '<br>';
+						if (! strstr($this->menu->liste[$i]['titre'],'<table')) {
+							print '<br>';
+						}
 						print '</div>'."\n";
 					}
 
@@ -431,7 +480,9 @@ 
 					}
 				}
 
-				if ($altok) print '<div class="blockvmenuend"></div>';
+				if ($altok) {
+					print '<div class="blockvmenuend"></div>';
+				}
 			}
 
 			if ($mode == 'jmobile')

htdocs/core/menus/standard/eldy_menu.php

Braces +82 added lines, -40 removed lines

@@ -61,8 +61,12 @@ 
     function loadMenu($forcemainmenu='',$forceleftmenu='')
     {
 		// On sauve en session le menu principal choisi
-		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
-		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
+		if (isset($_GET["mainmenu"])) {
+			$_SESSION["mainmenu"]=$_GET["mainmenu"];
+		}
+		if (isset($_GET["idmenu"])) {
+			$_SESSION["idmenu"]=$_GET["idmenu"];
+		}
 
 		// Read mainmenu and leftmenu that define which menu to show
         if (isset($_GET["mainmenu"]))
@@ -71,13 +75,14 @@ 
         	$mainmenu=$_GET["mainmenu"];
         	$_SESSION["mainmenu"]=$mainmenu;
         	$_SESSION["leftmenuopened"]="";
-        }
-        else
+        } else
        {
         	// On va le chercher en session si non defini par le lien
         	$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
         }
-        if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
+        if (! empty($forcemainmenu)) {
+        	$mainmenu=$forcemainmenu;
+        }
 
         if (isset($_GET["leftmenu"]))
         {
@@ -85,12 +90,13 @@ 
         	$leftmenu=$_GET["leftmenu"];
         	$_SESSION["leftmenu"]=$leftmenu;
 
-        	if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
+        	if ($_SESSION["leftmenuopened"]==$leftmenu) {
+        		// To collapse
         	{
         		//$leftmenu="";
         		$_SESSION["leftmenuopened"]="";
         	}
-        	else
+        	} else
         	{
         		$_SESSION["leftmenuopened"]=$leftmenu;
         	}
@@ -98,7 +104,9 @@ 
         	// On va le chercher en session si non defini par le lien
         	$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
         }
-        if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
+        if (! empty($forceleftmenu)) {
+        	$leftmenu=$forceleftmenu;
+        }
 
         require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
         $tabMenu=array();
@@ -134,14 +142,21 @@ 
 
         if (empty($conf->global->MAIN_MENU_INVERT))
         {
-        	if ($mode == 'top')  print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
-        	if ($mode == 'left') print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
-        }
-        else
+        	if ($mode == 'top') {
+        		print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+        	}
+        	if ($mode == 'left') {
+        		print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
+        	}
+        } else
 		{
         	$conf->global->MAIN_SHOW_LOGO=0;
-        	if ($mode == 'top')  print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
-        	if ($mode == 'left') print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+        	if ($mode == 'top') {
+        		print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
+        	}
+        	if ($mode == 'left') {
+        		print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+        	}
 		}
 
 		if ($mode == 'topnb')
@@ -150,17 +165,22 @@ 
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
+        if ($mode == 'jmobile') {
+        	// Used to get menu in xml ul/li
         {
-            print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);      // Fill this->menu that is empty with top menu
+            print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
+        }
+        // Fill this->menu that is empty with top menu
 
             // $this->menu->liste is top menu
             //var_dump($this->menu->liste);exit;
             $lastlevel = array();
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-        	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+        	foreach($this->menu->liste as $key => $val) {
+        		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
         		print '<ul class="ulmenu" data-inset="true">';
+        	}
         		print '<li class="lilevel0">';
 
         		if ($val['enabled'] == 1)
@@ -173,7 +193,9 @@ 
         			print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+						print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					}
 
 					print $val['titre'];
         			print '</a>'."\n";
@@ -198,12 +220,16 @@ 
         				// We add sub entry
         				print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
         				print '<a href="'.$relurl.'">';
-        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+        				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {
+        					// No translation
         				{
         				    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
+        				} else {
+        				    	print $langs->trans("Dashboard");
+        				    }
+        				} else {
+        					print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				}
-        				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				print '</a>';
         				print '</li>'."\n";
         			}
@@ -213,22 +239,26 @@ 
         			    if ($val['enabled'])
         			    {
         			        $lastlevel[0]='enabled';
-        			    }
-        			    else if ($showmenu)                 // Not enabled but visible (so greyed)
+        			    } else if ($showmenu) {
+        			    	// Not enabled but visible (so greyed)
         			    {
         			        $lastlevel[0]='greyed';
         			    }
-        			    else
+        			    } else
         			    {
         			        $lastlevel[0]='hidden';
         			    }
         			}
 
         			$lastlevel2 = array();
-       				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+       				foreach($submenu->liste as $key2 => $val2) {
+       					// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
        				{
 						$showmenu=true;
-						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
+       				}
+						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+							$showmenu=false;
+						}
 
 						// If at least one parent is not enabled, we do not show any menu of all children
 						if ($val2['level'] > 0)
@@ -236,19 +266,25 @@ 
 						    $levelcursor = $val2['level']-1;
 						    while ($levelcursor >= 0)
 						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+                                if ($lastlevel2[$levelcursor] != 'enabled') {
+                                	$showmenu=false;
+                                }
                                 $levelcursor--;
 						    }
 						}
 
-       					if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+       					if ($showmenu) {
+       						// Visible (option to hide when not allowed is off or allowed)
        					{
 	        				$relurl2=dol_buildpath($val2['url'],1);
+       					}
 		        			$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
 	    	    			$relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
 	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
+	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) {
+	        					$relurl2='';
+	        				}
 
 	        				$disabled='';
 	        				if (! $val2['enabled'])
@@ -258,30 +294,34 @@ 
 
 	        				print str_pad('',$val2['level']+1);
 	        				print '<li class="lilevel'.($val2['level']+1);
-	        				if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+	        				if ($val2['level']==0) {
+	        					print ' ui-btn-icon-right ui-btn';
+	        				}
+	        				// ui-btn to highlight on clic
 	        				print $disabled.'">';	 // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
-	        					if ($val2['enabled'])	// Allowed
+	        					if ($val2['enabled']) {
+	        						// Allowed
 	        					{
 	        						print '<a href="'.$relurl2.'"';
+	        					}
 		        					//print ' data-ajax="false"';
 		        					print '>';
 		        					$lastlevel2[$val2['level']]='enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
+	        					} else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']]='greyed';
 	        					}
-	        				}
-	        				else
+	        				} else
 	        				{
-	        				    if ($val2['enabled'])	// Allowed
+	        				    if ($val2['enabled']) {
+	        				    	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']]='enabled';
 	        				    }
-	        				    else
+	        				    } else
 	        				    {
 	        				        $lastlevel2[$val2['level']]='greyed';
 	        				    }
@@ -291,10 +331,12 @@ 
                             print $val2['titre'];
 	        				if ($relurl2)
 	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else
+	        					if ($val2['enabled']) {
+	        						// Allowed
 	        						print '</a>';
+	        					} else {
+	        						        						print '</a>';
+	        					}
 	        				}
 	        				print '</li>'."\n";
        					}

htdocs/core/menus/standard/auguria_menu.php

Braces +74 added lines, -36 removed lines

@@ -64,8 +64,12 @@ 
     	global $conf, $user, $langs;
 
    		// On sauve en session le menu principal choisi
-    	if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
-    	if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
+    	if (isset($_GET["mainmenu"])) {
+    		$_SESSION["mainmenu"]=$_GET["mainmenu"];
+    	}
+    	if (isset($_GET["idmenu"])) {
+    		$_SESSION["idmenu"]=$_GET["idmenu"];
+    	}
 
     	// Read mainmenu and leftmenu that define which menu to show
     	if (isset($_GET["mainmenu"]))
@@ -74,13 +78,14 @@ 
     		$mainmenu=$_GET["mainmenu"];
     		$_SESSION["mainmenu"]=$mainmenu;
     		$_SESSION["leftmenuopened"]="";
-    	}
-    	else
+    	} else
     	{
     		// On va le chercher en session si non defini par le lien
     		$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
     	}
-		if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
+		if (! empty($forcemainmenu)) {
+			$mainmenu=$forcemainmenu;
+		}
 
     	if (isset($_GET["leftmenu"]))
     	{
@@ -88,12 +93,13 @@ 
     		$leftmenu=$_GET["leftmenu"];
     		$_SESSION["leftmenu"]=$leftmenu;
 
-    		if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
+    		if ($_SESSION["leftmenuopened"]==$leftmenu) {
+    			// To collapse
     		{
     			//$leftmenu="";
     			$_SESSION["leftmenuopened"]="";
     		}
-    		else
+    		} else
     		{
     			$_SESSION["leftmenuopened"]=$leftmenu;
     		}
@@ -101,7 +107,9 @@ 
     		// On va le chercher en session si non defini par le lien
     		$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
     	}
-    	if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
+    	if (! empty($forceleftmenu)) {
+    		$leftmenu=$forceleftmenu;
+    	}
 
     	require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
     	$tabMenu=array();
@@ -134,8 +142,12 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
         $this->menu=new Menu();
 
-        if ($mode == 'top')  print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
-        if ($mode == 'left') print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
+        if ($mode == 'top') {
+        	print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0,$mode);
+        }
+        if ($mode == 'left') {
+        	print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
+        }
 
 		if ($mode == 'topnb')
 		{
@@ -143,17 +155,21 @@ 
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        if ($mode == 'jmobile')     // Used to get menu in xml ul/li
+        if ($mode == 'jmobile') {
+        	// Used to get menu in xml ul/li
         {
         	print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
+        }
 
             // $this->menu->liste is top menu
             //var_dump($this->menu->liste);exit;
         	$lastlevel = array();
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-        	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+        	foreach($this->menu->liste as $key => $val) {
+        		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
         		print '<ul class="ulmenu" data-inset="true">';
+        	}
         		print '<li class="lilevel0">';
         		if ($val['enabled'] == 1)
         		{
@@ -165,7 +181,9 @@ 
         			print '<a class="alilevel0" href="#">';
         			
 					// Add font-awesome
-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+						print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					}
         			
 					print $val['titre'];
         			print '</a>'."\n";
@@ -188,12 +206,16 @@ 
 						// We add sub entry
 						print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
-					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
+					    if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {
+					    	// No translation
         				{
         				    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
-        				}
-						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+					    } else {
+        				    	print $langs->trans("Dashboard");
+        				    }
+        				} else {
+							print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						}
 						print '</a>';
 						print '</li>'."\n";
         			}
@@ -203,22 +225,26 @@ 
 					    if ($val['enabled'])
 					    {
 					        $lastlevel[0]='enabled';
-					    }
-					    else if ($showmenu)                 // Not enabled but visible (so greyed)
+					    } else if ($showmenu) {
+					    	// Not enabled but visible (so greyed)
 					    {
 					        $lastlevel[0]='greyed';
 					    }
-					    else
+					    } else
 					    {
 					        $lastlevel[0]='hidden';
 					    }
 					}
 
 					$lastlevel2 = array();
-					foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+					foreach($submenu->liste as $key2 => $val2) {
+						// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         			{
 						$showmenu=true;
-						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false;
+					}
+						if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+							$showmenu=false;
+						}
 
         				// If at least one parent is not enabled, we do not show any menu of all children
 						if ($val2['level'] > 0)
@@ -226,19 +252,25 @@ 
 						    $levelcursor = $val2['level']-1;
 						    while ($levelcursor >= 0)
 						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+                                if ($lastlevel2[$levelcursor] != 'enabled') {
+                                	$showmenu=false;
+                                }
                                 $levelcursor--;
 						    }
 						}
 
-						if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
+						if ($showmenu) {
+							// Visible (option to hide when not allowed is off or allowed)
        					{
 	        				$relurl2=dol_buildpath($val2['url'],1);
+						}
 		        			$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
 	    	    			$relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
 	        				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
 	        				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
+	        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) {
+	        					$relurl2='';
+	        				}
 
 	        				$disabled='';
 	        				if (! $val2['enabled'])
@@ -248,30 +280,34 @@ 
 
 	        				print str_pad('',$val2['level']+1);
 	        				print '<li class="lilevel'.($val2['level']+1);
-	        				if ($val2['level']==0) print ' ui-btn-icon-right ui-btn';  // ui-btn to highlight on clic
+	        				if ($val2['level']==0) {
+	        					print ' ui-btn-icon-right ui-btn';
+	        				}
+	        				// ui-btn to highlight on clic
 	        				print $disabled.'">';	 // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
-	        					if ($val2['enabled'])	// Allowed
+	        					if ($val2['enabled']) {
+	        						// Allowed
 	        					{
 	        						print '<a href="'.$relurl2.'"';
+	        					}
 		        					//print ' data-ajax="false"';
 		        					print '>';
 		        					$lastlevel2[$val2['level']]='enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
+	        					} else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']]='greyed';
 	        					}
-	        				}
-	        				else
+	        				} else
 	        				{
-	        				    if ($val2['enabled'])	// Allowed
+	        				    if ($val2['enabled']) {
+	        				    	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']]='enabled';
 	        				    }
-	        				    else
+	        				    } else
 	        				    {
 	        				        $lastlevel2[$val2['level']]='greyed';
 	        				    }
@@ -279,10 +315,12 @@ 
 	        				print $val2['titre'];
 	        				if ($relurl2)
 	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else
+	        					if ($val2['enabled']) {
+	        						// Allowed
 	        						print '</a>';
+	        					} else {
+	        						        						print '</a>';
+	        					}
 	        				}
 	        				print '</li>'."\n";
        					}