Dolibarr / dolibarr

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

Indentation +209 added lines, -209 removed lines

@@ -37,7 +37,7 @@ 
 	 *  Constructor
 	 *
 	 *  @param	DoliDB		$db     		Database handler
-     *  @param	int			$type_user		Type of user
+	 *  @param	int			$type_user		Type of user
 	 */
 	function __construct($db, $type_user)
 	{
@@ -60,9 +60,9 @@ 
 	/**
 	 *  Show menu
 	 *
-     *	@param	string	$mode			'top', 'left', 'jmobile'
-     *  @param	array	$moredata		An array with more data to output
-     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+	 *	@param	string	$mode			'top', 'left', 'jmobile'
+	 *  @param	array	$moredata		An array with more data to output
+	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
 	function showmenu($mode, $moredata=null)
 	{
@@ -80,7 +80,7 @@ 
 
 		if ($mode == 'topnb')
 		{
-		    return 1;
+			return 1;
 		}
 
 		if ($mode == 'top')
@@ -92,11 +92,11 @@ 
 			// Show/Hide vertical menu
 			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider &&  empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-			    $showmode=1;
-			    $classname = 'class="tmenu menuhider"';
-			    $idsel='menu';
+				$showmode=1;
+				$classname = 'class="tmenu menuhider"';
+				$idsel='menu';
 
-			    $this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+				$this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 			}
 
 			// Home
@@ -113,9 +113,9 @@ 
 			// 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;
@@ -133,190 +133,190 @@ 
 
 		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
 		{
-		    // Home
-		    $showmode=1;
-		    $classname='class="tmenusel"';
-		    $idsel='home';
-
-		    $this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
-
-
-		    // $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'
-		    {
-		        print '<ul class="ulmenu" data-inset="true">';
-		        print '<li class="lilevel0">';
-
-		        if ($val['enabled'] == 1)
-		        {
-		            $relurl=dol_buildpath($val['url'],1);
-		            $relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
-		            $relurl=preg_replace('/__USERID__/',$user->id,$relurl);
-		            $canonurl=preg_replace('/\?.*$/','',$val['url']);
-
-		            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>';
-
-		            print $val['titre'];
-		            print '</a>'."\n";
-
-		            // Search submenu fot this mainmenu entry
-		            $tmpmainmenu=$val['mainmenu'];
-		            $tmpleftmenu='all';
-		            $submenu=new Menu();
-
-		            $langs->load("admin");  // Load translation file admin.lang
-		            $submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0);
-		            $submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
-		            $submenu->add("/admin/modules.php", $langs->trans("Modules"),1);
-		            $submenu->add("/admin/menus.php", $langs->trans("Menus"),1);
-		            $submenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
-		            $submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
-		            $submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1);
-
-		            $submenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
-		            $submenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
-		            $submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
-		            $submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
-		            $submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
-		            $submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
-		            $submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
-		            $submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"),1);
-		            $submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
-
-		            //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
-		            //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-		            $nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-
-		            $canonrelurl=preg_replace('/\?.*$/','',$relurl);
-		            $canonnexturl=preg_replace('/\?.*$/','',$nexturl);
-		            //var_dump($canonrelurl);
-		            //var_dump($canonnexturl);
-		            print '<ul>'."\n";
-		            if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
-		                || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
-		            {
-		                // 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 (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-		                    else print $langs->trans("Dashboard");
-		                }
-		                else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
-		                print '</a>';
-		                print '</li>'."\n";
-		            }
-
-		            if ($val['level']==0)
-		            {
-		                if ($val['enabled'])
-		                {
-		                    $lastlevel[0]='enabled';
-		                }
-		                else if ($showmenu)                 // Not enabled but visible (so greyed)
-		                {
-		                    $lastlevel[0]='greyed';
-		                }
-		                else
-		                {
-		                    $lastlevel[0]='hidden';
-		                }
-		            }
-
-		            $lastlevel2 = array();
-		            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 at least one parent is not enabled, we do not show any menu of all children
-		                if ($val2['level'] > 0)
-		                {
-		                    $levelcursor = $val2['level']-1;
-		                    while ($levelcursor >= 0)
-		                    {
-		                        if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
-		                        $levelcursor--;
-		                    }
-		                }
-
-		                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='';
-
-		                    $disabled='';
-		                    if (! $val2['enabled'])
-		                    {
-		                        $disabled=" vsmenudisabled";
-		                    }
-
-		                    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
-		                    print $disabled.'">';	 // ui-btn to highlight on clic
-		                    if ($relurl2)
-		                    {
-		                        if ($val2['enabled'])	// Allowed
-		                        {
-		                            print '<a href="'.$relurl2.'"';
-		                            //print ' data-ajax="false"';
-		                            print '>';
-		                            $lastlevel2[$val2['level']]='enabled';
-		                        }
-		                        else					// Not allowed but visible (greyed)
-		                        {
-		                            print '<a href="#" class="vsmenudisabled">';
-		                            $lastlevel2[$val2['level']]='greyed';
-		                        }
-		                    }
-		                    else
-		                    {
-		                        if ($val2['enabled'])	// Allowed
-		                        {
-		                            $lastlevel2[$val2['level']]='enabled';
-		                        }
-		                        else
-		                        {
-		                            $lastlevel2[$val2['level']]='greyed';
-		                        }
-		                    }
-		                    //var_dump($val2['level']);
-		                    //var_dump($lastlevel2);
-		                    print $val2['titre'];
-		                    if ($relurl2)
-		                    {
-		                        if ($val2['enabled'])	// Allowed
-		                            print '</a>';
-		                            else
-		                                print '</a>';
-		                    }
-		                    print '</li>'."\n";
-		                }
-
-
-		            }
-		            //var_dump($submenu);
-		            print '</ul>';
-		        }
-		        if ($val['enabled'] == 2)
-		        {
-		            print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-		        }
-		        print '</li>';
-		        print '</ul>'."\n";
-		    }
+			// Home
+			$showmode=1;
+			$classname='class="tmenusel"';
+			$idsel='home';
+
+			$this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
+
+
+			// $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'
+			{
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
+
+				if ($val['enabled'] == 1)
+				{
+					$relurl=dol_buildpath($val['url'],1);
+					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+					$canonurl=preg_replace('/\?.*$/','',$val['url']);
+
+					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>';
+
+					print $val['titre'];
+					print '</a>'."\n";
+
+					// Search submenu fot this mainmenu entry
+					$tmpmainmenu=$val['mainmenu'];
+					$tmpleftmenu='all';
+					$submenu=new Menu();
+
+					$langs->load("admin");  // Load translation file admin.lang
+					$submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0);
+					$submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
+					$submenu->add("/admin/modules.php", $langs->trans("Modules"),1);
+					$submenu->add("/admin/menus.php", $langs->trans("Menus"),1);
+					$submenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
+					$submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
+					$submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1);
+
+					$submenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
+					$submenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
+					$submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
+					$submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
+					$submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
+					$submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
+					$submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
+					$submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"),1);
+					$submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
+
+					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
+					//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
+					$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+
+					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
+					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>'."\n";
+					if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
+						|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
+					{
+						// 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 (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
+							else print $langs->trans("Dashboard");
+						}
+						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						print '</a>';
+						print '</li>'."\n";
+					}
+
+					if ($val['level']==0)
+					{
+						if ($val['enabled'])
+						{
+							$lastlevel[0]='enabled';
+						}
+						else if ($showmenu)                 // Not enabled but visible (so greyed)
+						{
+							$lastlevel[0]='greyed';
+						}
+						else
+						{
+							$lastlevel[0]='hidden';
+						}
+					}
+
+					$lastlevel2 = array();
+					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 at least one parent is not enabled, we do not show any menu of all children
+						if ($val2['level'] > 0)
+						{
+							$levelcursor = $val2['level']-1;
+							while ($levelcursor >= 0)
+							{
+								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+								$levelcursor--;
+							}
+						}
+
+						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='';
+
+							$disabled='';
+							if (! $val2['enabled'])
+							{
+								$disabled=" vsmenudisabled";
+							}
+
+							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
+							print $disabled.'">';	 // ui-btn to highlight on clic
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									print '<a href="'.$relurl2.'"';
+									//print ' data-ajax="false"';
+									print '>';
+									$lastlevel2[$val2['level']]='enabled';
+								}
+								else					// Not allowed but visible (greyed)
+								{
+									print '<a href="#" class="vsmenudisabled">';
+									$lastlevel2[$val2['level']]='greyed';
+								}
+							}
+							else
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									$lastlevel2[$val2['level']]='enabled';
+								}
+								else
+								{
+									$lastlevel2[$val2['level']]='greyed';
+								}
+							}
+							//var_dump($val2['level']);
+							//var_dump($lastlevel2);
+							print $val2['titre'];
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+									print '</a>';
+									else
+										print '</a>';
+							}
+							print '</li>'."\n";
+						}
+
+
+					}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2)
+				{
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+			}
 		}
 
 		if ($mode == 'left')
@@ -333,7 +333,7 @@ 
 			$this->menu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
 			$this->menu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1);
 
-		    $this->menu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
+			$this->menu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
 			$this->menu->add("/admin/delais.php",$langs->trans("Alerts"),1);
 			$this->menu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
 			$this->menu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
@@ -356,15 +356,15 @@ 
 					$alt++;
 					if (empty($this->menu->liste[$i]['level']))
 					{
-			    		$altok++;
-    					$blockvmenuopened=true;
+						$altok++;
+						$blockvmenuopened=true;
 						$lastopened=true;
-        				for($j = ($i + 1); $j < $num; $j++)
-        				{
-        				    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
+						for($j = ($i + 1); $j < $num; $j++)
+						{
+							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";
@@ -400,10 +400,10 @@ 
 
 					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']));
+						$cssmenu = '';
+						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.'">';
+						print '<div class="menu_contenu'.$cssmenu.'">';
 
 						if ($this->menu->liste[$i]['enabled'])
 						{
@@ -508,7 +508,7 @@ 
  */
 function print_start_menu_array_empty()
 {
-    global $conf;
+	global $conf;
 
 	print '<div class="tmenudiv">';
 	print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Top menu"').'>';

Spacing +125 added lines, -125 removed lines

@@ -26,8 +26,8 @@ 
 class MenuManager
 {
 	var $db;
-	var $type_user=0;					// Put 0 for internal users, 1 for external users
-	var $atarget="";               		// To store default target to use onto links
+	var $type_user = 0; // Put 0 for internal users, 1 for external users
+	var $atarget = ""; // To store default target to use onto links
 
 	var $menu;
 	var $menu_array_after;
@@ -41,8 +41,8 @@ 
 	 */
 	function __construct($db, $type_user)
 	{
-		$this->type_user=$type_user;
-		$this->db=$db;
+		$this->type_user = $type_user;
+		$this->db = $db;
 	}
 
 
@@ -64,18 +64,18 @@ 
      *  @param	array	$moredata		An array with more data to output
      *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
-	function showmenu($mode, $moredata=null)
+	function showmenu($mode, $moredata = null)
 	{
-		global $user,$conf,$langs,$dolibarr_main_db_name;
+		global $user, $conf, $langs, $dolibarr_main_db_name;
 
-		$id='mainmenu';
+		$id = 'mainmenu';
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-		$this->menu=new Menu();
+		$this->menu = new Menu();
 
-		$res='ErrorBadParameterForMode';
+		$res = 'ErrorBadParameterForMode';
 
-		$noout=0;
+		$noout = 0;
 		//if ($mode == 'jmobile') $noout=1;
 
 		if ($mode == 'topnb')
@@ -87,22 +87,22 @@ 
 		{
 			if (empty($noout)) print_start_menu_array_empty();
 
-			$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+			$usemenuhider = (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER));
 
 			// Show/Hide vertical menu
-			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider &&  empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-			    $showmode=1;
+			    $showmode = 1;
 			    $classname = 'class="tmenu menuhider"';
-			    $idsel='menu';
+			    $idsel = 'menu';
 
 			    $this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 			}
 
 			// Home
-			$showmode=1;
-			$classname='class="tmenusel"';
-			$idsel='home';
+			$showmode = 1;
+			$classname = 'class="tmenusel"';
+			$idsel = 'home';
 
 			$this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
 
@@ -111,15 +111,15 @@ 
 			$this->menu->liste = dol_sort_array($this->menu->liste, 'position');
 
 			// Output menu entries
-			foreach($this->menu->liste as $menkey => $menuval)
+			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_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);
+			$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_end_menu_array_empty();
@@ -134,9 +134,9 @@ 
 		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
 		{
 		    // Home
-		    $showmode=1;
-		    $classname='class="tmenusel"';
-		    $idsel='home';
+		    $showmode = 1;
+		    $classname = 'class="tmenusel"';
+		    $idsel = 'home';
 
 		    $this->menu->add('/index.php', $langs->trans("Home"), 0, $showmode, $this->atarget, 'home', '', 10, $id, $idsel, $classname);
 
@@ -145,17 +145,17 @@ 
 		    //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)
 		        {
-		            $relurl=dol_buildpath($val['url'],1);
-		            $relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
-		            $relurl=preg_replace('/__USERID__/',$user->id,$relurl);
-		            $canonurl=preg_replace('/\?.*$/','',$val['url']);
+		            $relurl = dol_buildpath($val['url'], 1);
+		            $relurl = preg_replace('/__LOGIN__/', $user->login, $relurl);
+		            $relurl = preg_replace('/__USERID__/', $user->id, $relurl);
+		            $canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
 		            print '<a class="alilevel0" href="#">';
 
@@ -166,43 +166,43 @@ 
 		            print '</a>'."\n";
 
 		            // Search submenu fot this mainmenu entry
-		            $tmpmainmenu=$val['mainmenu'];
-		            $tmpleftmenu='all';
-		            $submenu=new Menu();
-
-		            $langs->load("admin");  // Load translation file admin.lang
-		            $submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0);
-		            $submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
-		            $submenu->add("/admin/modules.php", $langs->trans("Modules"),1);
-		            $submenu->add("/admin/menus.php", $langs->trans("Menus"),1);
-		            $submenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
-		            $submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
-		            $submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1);
-
-		            $submenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
-		            $submenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
-		            $submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
-		            $submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
-		            $submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
-		            $submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
-		            $submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
-		            $submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"),1);
-		            $submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
+		            $tmpmainmenu = $val['mainmenu'];
+		            $tmpleftmenu = 'all';
+		            $submenu = new Menu();
+
+		            $langs->load("admin"); // Load translation file admin.lang
+		            $submenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"), 0);
+		            $submenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"), 1);
+		            $submenu->add("/admin/modules.php", $langs->trans("Modules"), 1);
+		            $submenu->add("/admin/menus.php", $langs->trans("Menus"), 1);
+		            $submenu->add("/admin/ihm.php", $langs->trans("GUISetup"), 1);
+		            $submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
+		            $submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
+
+		            $submenu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
+		            $submenu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
+		            $submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
+		            $submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
+		            $submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
+		            $submenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);
+		            $submenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);
+		            $submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"), 1);
+		            $submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
 
 		            //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
 		            //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-		            $nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+		            $nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
-		            $canonrelurl=preg_replace('/\?.*$/','',$relurl);
-		            $canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+		            $canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+		            $canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
 		            //var_dump($canonrelurl);
 		            //var_dump($canonnexturl);
 		            print '<ul>'."\n";
-		            if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
-		                || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
+		            if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+		                || (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
 		            {
 		                // We add sub entry
-		                print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+		                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
 		                {
@@ -214,58 +214,58 @@ 
 		                print '</li>'."\n";
 		            }
 
-		            if ($val['level']==0)
+		            if ($val['level'] == 0)
 		            {
 		                if ($val['enabled'])
 		                {
-		                    $lastlevel[0]='enabled';
+		                    $lastlevel[0] = 'enabled';
 		                }
 		                else if ($showmenu)                 // Not enabled but visible (so greyed)
 		                {
-		                    $lastlevel[0]='greyed';
+		                    $lastlevel[0] = 'greyed';
 		                }
 		                else
 		                {
-		                    $lastlevel[0]='hidden';
+		                    $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;
+		                $showmenu = true;
+		                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)
 		                {
-		                    $levelcursor = $val2['level']-1;
+		                    $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)
 		                {
-		                    $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']);
+		                    $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'])
+		                    $disabled = '';
+		                    if (!$val2['enabled'])
 		                    {
-		                        $disabled=" vsmenudisabled";
+		                        $disabled = " vsmenudisabled";
 		                    }
 
-		                    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
-		                    print $disabled.'">';	 // ui-btn to highlight on clic
+		                    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
+		                    print $disabled.'">'; // ui-btn to highlight on clic
 		                    if ($relurl2)
 		                    {
 		                        if ($val2['enabled'])	// Allowed
@@ -273,23 +273,23 @@ 
 		                            print '<a href="'.$relurl2.'"';
 		                            //print ' data-ajax="false"';
 		                            print '>';
-		                            $lastlevel2[$val2['level']]='enabled';
+		                            $lastlevel2[$val2['level']] = 'enabled';
 		                        }
 		                        else					// Not allowed but visible (greyed)
 		                        {
 		                            print '<a href="#" class="vsmenudisabled">';
-		                            $lastlevel2[$val2['level']]='greyed';
+		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
 		                    }
 		                    else
 		                    {
 		                        if ($val2['enabled'])	// Allowed
 		                        {
-		                            $lastlevel2[$val2['level']]='enabled';
+		                            $lastlevel2[$val2['level']] = 'enabled';
 		                        }
 		                        else
 		                        {
-		                            $lastlevel2[$val2['level']]='greyed';
+		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
 		                    }
 		                    //var_dump($val2['level']);
@@ -324,24 +324,24 @@ 
 			// Put here left menu entries
 			// ***** START *****
 
-			$langs->load("admin");  // Load translation file admin.lang
-			$this->menu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0);
-			$this->menu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
-			$this->menu->add("/admin/modules.php", $langs->trans("Modules"),1);
-			$this->menu->add("/admin/menus.php", $langs->trans("Menus"),1);
-			$this->menu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
-			$this->menu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"),1);
-			$this->menu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"),1);
-
-		    $this->menu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
-			$this->menu->add("/admin/delais.php",$langs->trans("Alerts"),1);
-			$this->menu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
-			$this->menu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
-			$this->menu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
-			$this->menu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
-			$this->menu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
-			$this->menu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"),1);
-			$this->menu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
+			$langs->load("admin"); // Load translation file admin.lang
+			$this->menu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"), 0);
+			$this->menu->add("/admin/company.php", $langs->trans("MenuCompanySetup"), 1);
+			$this->menu->add("/admin/modules.php", $langs->trans("Modules"), 1);
+			$this->menu->add("/admin/menus.php", $langs->trans("Menus"), 1);
+			$this->menu->add("/admin/ihm.php", $langs->trans("GUISetup"), 1);
+			$this->menu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
+			$this->menu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
+
+		    $this->menu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
+			$this->menu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
+			$this->menu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
+			$this->menu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
+			$this->menu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
+			$this->menu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1);
+			$this->menu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);
+			$this->menu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"), 1);
+			$this->menu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
 
 			// ***** END *****
 
@@ -349,47 +349,47 @@ 
 
 			if (empty($noout))
 			{
-				$alt=0; $altok=0; $blockvmenuopened=false;
-				$num=count($this->menu->liste);
+				$alt = 0; $altok = 0; $blockvmenuopened = false;
+				$num = count($this->menu->liste);
 				for ($i = 0; $i < $num; $i++)
 				{
 					$alt++;
 					if (empty($this->menu->liste[$i]['level']))
 					{
 			    		$altok++;
-    					$blockvmenuopened=true;
-						$lastopened=true;
-        				for($j = ($i + 1); $j < $num; $j++)
+    					$blockvmenuopened = true;
+						$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
+        				$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))
+						if (($alt % 2 == 0))
 						{
-							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
+							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
 						}
 						else
 						{
-							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened?' blockvmenulast':'').($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
+							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
 						}
 					}
 
 					// Add tabulation
-					$tabstring='';
-					$tabul=($this->menu->liste[$i]['level'] - 1);
+					$tabstring = '';
+					$tabul = ($this->menu->liste[$i]['level'] - 1);
 					if ($tabul > 0)
 					{
-						for ($j=0; $j < $tabul; $j++)
+						for ($j = 0; $j < $tabul; $j++)
 						{
-							$tabstring.='&nbsp; &nbsp;';
+							$tabstring .= '&nbsp; &nbsp;';
 						}
 					}
 
 					if ($this->menu->liste[$i]['level'] == 0) {
 						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";
+							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
 						{
@@ -401,14 +401,14 @@ 
 					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'].'"':'').'>';
+							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>';
@@ -419,12 +419,12 @@ 
 						}
 
 						// 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";
 					}
 
 					// If next is a new block or end
-					if (empty($this->menu->liste[$i+1]['level']))
+					if (empty($this->menu->liste[$i + 1]['level']))
 					{
 						print '<div class="menu_end"></div>'."\n";
 						print "</div>\n";
@@ -511,7 +511,7 @@ 
     global $conf;
 
 	print '<div class="tmenudiv">';
-	print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Top menu"').'>';
+	print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
 }
 
 /**
@@ -522,7 +522,7 @@ 
  * @param	int		$showmode	0 = hide, 1 = allowed or 2 = not allowed
  * @return	void
  */
-function print_start_menu_entry_empty($idsel,$classname,$showmode)
+function print_start_menu_entry_empty($idsel, $classname, $showmode)
 {
 	if ($showmode)
 	{
@@ -545,14 +545,14 @@ 
  */
 function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $classname, $atarget)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 
 	if ($showmode == 1)
 	{
-		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').'>';
+		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
 		print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
-		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').'>';
+		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
 		print '<span class="mainmenuaspan">';
 		print $text;
 		print '</span>';

htdocs/core/menus/standard/auguria.lib.php

Indentation +35 added lines, -35 removed lines

@@ -58,11 +58,11 @@ 
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-	    $showmode=1;
-	    $classname = 'class="tmenu menuhider"';
-	    $idsel='menu';
+		$showmode=1;
+		$classname = 'class="tmenu menuhider"';
+		$idsel='menu';
 
-	    $menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+		$menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
 	$num = count($newTabMenu);
@@ -77,19 +77,19 @@ 
 
 			if (! preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url']))
 			{
-			    $tmp=explode('?',$newTabMenu[$i]['url'],2);
+				$tmp=explode('?',$newTabMenu[$i]['url'],2);
 				$url = $shorturl = $tmp[0];
 				$param = (isset($tmp[1])?$tmp[1]:'');
 
 				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
-			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && ! empty($newTabMenu[$i]['url']))
-			    {
-			        $param.=($param?'&':'').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
-			    }
-			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && empty($newTabMenu[$i]['url']))
-			    {
-			        $param.=($param?'&':'').'leftmenu=';
-			    }
+				if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && ! empty($newTabMenu[$i]['url']))
+				{
+					$param.=($param?'&':'').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
+				}
+				if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && empty($newTabMenu[$i]['url']))
+				{
+					$param.=($param?'&':'').'leftmenu=';
+				}
 				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
 				$url = dol_buildpath($url,1).($param?'?'.$param:'');
 				//$shorturl = $shorturl.($param?'?'.$param:'');
@@ -106,9 +106,9 @@ 
 			// TODO Find a generic solution
 			if (preg_match('/search_project_user=__search_project_user__/', $shorturl))
 			{
-			    $search_project_user = GETPOST('search_project_user','int');
-			    if ($search_project_user) $shorturl=preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
-			    else $shorturl=preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+				$search_project_user = GETPOST('search_project_user','int');
+				if ($search_project_user) $shorturl=preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
+				else $shorturl=preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
 			}
 
 			// Define the class (top menu selected or not)
@@ -127,9 +127,9 @@ 
 	// Output menu entries
 	foreach($menu->liste as $menkey => $menuval)
 	{
-        if (empty($noout)) print_start_menu_entry_auguria($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
-	    if (empty($noout)) print_text_menu_entry_auguria($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_auguria($menuval['enabled']);
+		if (empty($noout)) print_start_menu_entry_auguria($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
+		if (empty($noout)) print_text_menu_entry_auguria($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_auguria($menuval['enabled']);
 	}
 
 	$showmode=1;
@@ -151,7 +151,7 @@ 
  */
 function print_start_menu_array_auguria()
 {
-    global $conf;
+	global $conf;
 
 	print '<div class="tmenudiv">';
 	print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Top menu"').'>';
@@ -293,22 +293,22 @@ 
 
 	if (is_array($moredata) && ! empty($moredata['searchform']))
 	{
-        print "\n";
-        print "<!-- Begin SearchForm -->\n";
-        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
-        print $moredata['searchform'];
-        print '</div>'."\n";
-        print "<!-- End SearchForm -->\n";
+		print "\n";
+		print "<!-- Begin SearchForm -->\n";
+		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
+		print $moredata['searchform'];
+		print '</div>'."\n";
+		print "<!-- End SearchForm -->\n";
 	}
 
 	if (is_array($moredata) && ! empty($moredata['bookmarks']))
 	{
-	    print "\n";
-	    print "<!-- Begin Bookmarks -->\n";
-	    print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
-	    print $moredata['bookmarks'];
-	    print '</div>'."\n";
-	    print "<!-- End Bookmarks -->\n";
+		print "\n";
+		print "<!-- Begin Bookmarks -->\n";
+		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
+		print $moredata['bookmarks'];
+		print '</div>'."\n";
+		print "<!-- End Bookmarks -->\n";
 	}
 
 	// We update newmenu with entries found into database
@@ -318,7 +318,7 @@ 
 	// We update newmenu for special dynamic menus
 	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
 	{
-	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';     // Required for to get Account::TYPE_CASH for example
+		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';     // Required for to get Account::TYPE_CASH for example
 
 		$sql = "SELECT rowid, label, courant, rappro, courant";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
@@ -480,7 +480,7 @@ 
 				$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;
 				}
 				if ($altok % 2 == 0)
 				{
@@ -532,7 +532,7 @@ 
 				}
 				else
 				{
-				    $lastlevel0='hidden';
+					$lastlevel0='hidden';
 				}
 				if ($showmenu)
 				{

Spacing +133 added lines, -133 removed lines

@@ -37,110 +37,110 @@ 
  * @param	string	$mode			'top', 'topnb', 'left', 'jmobile'
  * @return	int						0
  */
-function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode='')
+function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = 0, $mode = '')
 {
-	global $user,$conf,$langs,$dolibarr_main_db_name;
+	global $user, $conf, $langs, $dolibarr_main_db_name;
 
-	$mainmenu=$_SESSION["mainmenu"];
-	$leftmenu=$_SESSION["leftmenu"];
+	$mainmenu = $_SESSION["mainmenu"];
+	$leftmenu = $_SESSION["leftmenu"];
 
-	$id='mainmenu';
-	$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	$id = 'mainmenu';
+	$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
 
 	// Show personalized menus
-	$menuArbo = new Menubase($db,'auguria');
-	$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'auguria',$tabMenu);
+	$menuArbo = new Menubase($db, 'auguria');
+	$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'auguria', $tabMenu);
 
 	if (empty($noout)) print_start_menu_array_auguria();
 
-	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER));
 
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-	    $showmode=1;
+	    $showmode = 1;
 	    $classname = 'class="tmenu menuhider"';
-	    $idsel='menu';
+	    $idsel = 'menu';
 
 	    $menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
 	$num = count($newTabMenu);
-	for($i = 0; $i < $num; $i++)
+	for ($i = 0; $i < $num; $i++)
 	{
-		$idsel=(empty($newTabMenu[$i]['mainmenu'])?'none':$newTabMenu[$i]['mainmenu']);
+		$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
 
-		$showmode=dol_auguria_showmenu($type_user,$newTabMenu[$i],$listofmodulesforexternal);
+		$showmode = dol_auguria_showmenu($type_user, $newTabMenu[$i], $listofmodulesforexternal);
 		if ($showmode == 1)
 		{
 			// $menu_array[$i]['url'] can be a relative url, a full external url or a dynamic value like '$conf->global->APARAM)
 			if (preg_match('/^\$conf->global->([^\?]+)/', $newTabMenu[$i]['url'], $reg))
 			{
-				$keyforsconst=$reg[1];
+				$keyforsconst = $reg[1];
 				$newTabMenu[$i]['url'] = $conf->global->$keyforsconst;
 			}
 
 			$url = $shorturl = $newTabMenu[$i]['url'];
 
-			if (! preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url']))
+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))
 			{
-			    $tmp=explode('?',$newTabMenu[$i]['url'],2);
+			    $tmp = explode('?', $newTabMenu[$i]['url'], 2);
 				$url = $shorturl = $tmp[0];
-				$param = (isset($tmp[1])?$tmp[1]:'');
+				$param = (isset($tmp[1]) ? $tmp[1] : '');
 
 				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
-			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && ! empty($newTabMenu[$i]['url']))
+			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url']))
 			    {
-			        $param.=($param?'&':'').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
+			        $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
 			    }
-			    if ((! preg_match('/mainmenu/i',$param)) && (! preg_match('/leftmenu/i',$param)) && empty($newTabMenu[$i]['url']))
+			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url']))
 			    {
-			        $param.=($param?'&':'').'leftmenu=';
+			        $param .= ($param ? '&' : '').'leftmenu=';
 			    }
 				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
-				$url = dol_buildpath($url,1).($param?'?'.$param:'');
+				$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
 				//$shorturl = $shorturl.($param?'?'.$param:'');
 				$shorturl = $url;
 
-				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/','',$shorturl);
+				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
 			}
 
-			$url=preg_replace('/__LOGIN__/',$user->login,$url);
-			$shorturl=preg_replace('/__LOGIN__/',$user->login,$shorturl);
-			$url=preg_replace('/__USERID__/',$user->id,$url);
-			$shorturl=preg_replace('/__USERID__/',$user->id,$shorturl);
+			$url = preg_replace('/__LOGIN__/', $user->login, $url);
+			$shorturl = preg_replace('/__LOGIN__/', $user->login, $shorturl);
+			$url = preg_replace('/__USERID__/', $user->id, $url);
+			$shorturl = preg_replace('/__USERID__/', $user->id, $shorturl);
 
 			// TODO Find a generic solution
 			if (preg_match('/search_project_user=__search_project_user__/', $shorturl))
 			{
-			    $search_project_user = GETPOST('search_project_user','int');
-			    if ($search_project_user) $shorturl=preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
-			    else $shorturl=preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+			    $search_project_user = GETPOST('search_project_user', 'int');
+			    if ($search_project_user) $shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
+			    else $shorturl = preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
 			}
 
 			// Define the class (top menu selected or not)
-			if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';
-			else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
-			else $classname='class="tmenu"';
+			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
+			else if (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
+			else $classname = 'class="tmenu"';
 		}
-		else if ($showmode == 2) $classname='class="tmenu"';
+		else if ($showmode == 2) $classname = 'class="tmenu"';
 
-		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget), ($newTabMenu[$i]['mainmenu']?$newTabMenu[$i]['mainmenu']:$newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu']?$newTabMenu[$i]['leftmenu']:''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
+		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
 	}
 
 	// Sort on position
 	$menu->liste = dol_sort_array($menu->liste, 'position');
 
 	// Output menu entries
-	foreach($menu->liste as $menkey => $menuval)
+	foreach ($menu->liste as $menkey => $menuval)
 	{
-        if (empty($noout)) print_start_menu_entry_auguria($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
-	    if (empty($noout)) print_text_menu_entry_auguria($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_start_menu_entry_auguria($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
+	    if (empty($noout)) print_text_menu_entry_auguria($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_auguria($menuval['enabled']);
 	}
 
-	$showmode=1;
-	if (empty($noout)) print_start_menu_entry_auguria('','class="tmenuend"',$showmode);
+	$showmode = 1;
+	if (empty($noout)) print_start_menu_entry_auguria('', 'class="tmenuend"', $showmode);
 	if (empty($noout)) print_end_menu_entry_auguria($showmode);
 
 	if (empty($noout)) print_end_menu_array_auguria();
@@ -161,7 +161,7 @@ 
     global $conf;
 
 	print '<div class="tmenudiv">';
-	print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Top menu"').'>';
+	print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
 }
 
 /**
@@ -172,7 +172,7 @@ 
  * @param	int		$showmode	0 = hide, 1 = allowed or 2 = not allowed
  * @return	void
  */
-function print_start_menu_entry_auguria($idsel,$classname,$showmode)
+function print_start_menu_entry_auguria($idsel, $classname, $showmode)
 {
 	if ($showmode)
 	{
@@ -199,10 +199,10 @@ 
 
 	if ($showmode == 1)
 	{
-		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').'>';
+		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
 		print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
-		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget?' target="'.$atarget.'"':'').'>';
+		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
 		print '<span class="mainmenuaspan">';
 		print $text;
 		print '</span>';
@@ -262,31 +262,31 @@ 
  * @param	array		$moredata			An array with more data to output
  * @return	int								Nb of entries
  */
-function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='',$moredata=null)
+function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null)
 {
-	global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
+	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc;
 
 	$newmenu = $menu;
 
-	$mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
-	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
+	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]);
+	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]));
 
-	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER));
 	global $usemenuhider;
 
 	// Show logo company
-	if (empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+	if (empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
-		$mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
-		if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
+		$mysoc->logo_mini = $conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
+		if (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 		{
-			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('thumbs/'.$mysoc->logo_mini);
+			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('thumbs/'.$mysoc->logo_mini);
 		}
 		else
 		{
-			$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
+			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.png';
 		}
-		$title=$langs->trans("GoIntoSetupToChangeLogo");
+		$title = $langs->trans("GoIntoSetupToChangeLogo");
 		print "\n".'<!-- Show logo on menu -->'."\n";
 		print '<div class="blockvmenuimpair blockvmenulogo">'."\n";
 		print '<div class="menu_titre" id="menu_titre_logo"></div>';
@@ -298,7 +298,7 @@ 
 		print '</div>'."\n";
 	}
 
-	if (is_array($moredata) && ! empty($moredata['searchform']))
+	if (is_array($moredata) && !empty($moredata['searchform']))
 	{
         print "\n";
         print "<!-- Begin SearchForm -->\n";
@@ -308,7 +308,7 @@ 
         print "<!-- End SearchForm -->\n";
 	}
 
-	if (is_array($moredata) && ! empty($moredata['bookmarks']))
+	if (is_array($moredata) && !empty($moredata['bookmarks']))
 	{
 	    print "\n";
 	    print "<!-- Begin Bookmarks -->\n";
@@ -319,19 +319,19 @@ 
 	}
 
 	// We update newmenu with entries found into database
-	$menuArbo = new Menubase($db,'auguria');
-	$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu);
+	$menuArbo = new Menubase($db, 'auguria');
+	$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->societe_id ? 1 : 0), 'auguria', $tabMenu);
 
 	// We update newmenu for special dynamic menus
 	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
 	{
-	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';     // Required for to get Account::TYPE_CASH for example
+	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
 
 		$sql = "SELECT rowid, label, courant, rappro, courant";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-		$sql.= " WHERE entity = ".$conf->entity;
-		$sql.= " AND clos = 0";
-		$sql.= " ORDER BY label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
+		$sql .= " WHERE entity = ".$conf->entity;
+		$sql .= " AND clos = 0";
+		$sql .= " ORDER BY label";
 
 		$resql = $db->query($sql);
 		if ($resql)
@@ -339,15 +339,15 @@ 
 			$numr = $db->num_rows($resql);
 			$i = 0;
 
-			if ($numr > 0) 	$newmenu->add('/compta/bank/list.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+			if ($numr > 0) 	$newmenu->add('/compta/bank/list.php', $langs->trans("BankAccounts"), 0, $user->rights->banque->lire);
 
 			while ($i < $numr)
 			{
 				$objp = $db->fetch_object($resql);
-				$newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
+				$newmenu->add('/compta/bank/card.php?id='.$objp->rowid, $objp->label, 1, $user->rights->banque->lire);
 				if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
 				{
-					$newmenu->add('/compta/bank/bankentries_list.php?id='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
+					$newmenu->add('/compta/bank/bankentries_list.php?id='.$objp->rowid, $langs->trans("Conciliate"), 2, $user->rights->banque->consolidate);
 				}
 				$i++;
 			}
@@ -356,16 +356,16 @@ 
 		$db->free($resql);
 	}
 
-	if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account
+	if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account
 	{
-		$newmenu->add('',$langs->trans("Journalization"),0,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy');
+		$newmenu->add('', $langs->trans("Journalization"), 0, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy');
 
 		// Multi journal
 		$sql = "SELECT rowid, code, label, nature";
-		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_journal";
-		$sql.= " WHERE entity = ".$conf->entity;
-		$sql.= " AND active = 1";
-		$sql.= " ORDER BY label DESC";
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+		$sql .= " WHERE entity = ".$conf->entity;
+		$sql .= " AND active = 1";
+		$sql .= " ORDER BY label DESC";
 
 		$resql = $db->query($sql);
 		if ($resql)
@@ -379,25 +379,25 @@ 
 				{
 					$objp = $db->fetch_object($resql);
 
-					$nature='';
+					$nature = '';
 
 					// Must match array $sourceList defined into journals_list.php
-					if ($objp->nature == 2 && ! empty($conf->facture->enabled)) $nature="sells";
-					if ($objp->nature == 3 && ! empty($conf->fournisseur->enabled)) $nature="purchases";
-					if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";
-					if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";
-					if ($objp->nature == 1) $nature="various";
-					if ($objp->nature == 9) $nature="hasnew";
+					if ($objp->nature == 2 && !empty($conf->facture->enabled)) $nature = "sells";
+					if ($objp->nature == 3 && !empty($conf->fournisseur->enabled)) $nature = "purchases";
+					if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
+					if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) $nature = "expensereports";
+					if ($objp->nature == 1) $nature = "various";
+					if ($objp->nature == 9) $nature = "hasnew";
 
 					// To enable when page exists
 					if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 					{
-						if ($nature == 'various' || $nature == 'hasnew') $nature='';
+						if ($nature == 'various' || $nature == 'hasnew') $nature = '';
 					}
 
 					if ($nature)
 					{
-						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/', $leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, dol_trunc($objp->label, 25), 2, $user->rights->accounting->comptarapport->lire);
 					}
 					$i++;
 				}
@@ -405,7 +405,7 @@ 
 			else
 			{
 				// Should not happend. Entries are added
-				$newmenu->add('',$langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
+				$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 			}
 		}
 		else dol_print_error($db);
@@ -444,17 +444,17 @@ 
 
 	if ($conf->ftp->enabled && $mainmenu == 'ftp')	// Entry for FTP
 	{
-		$MAXFTP=20;
-		$i=1;
+		$MAXFTP = 20;
+		$i = 1;
 		while ($i <= $MAXFTP)
 		{
-			$paramkey='FTP_NAME_'.$i;
+			$paramkey = 'FTP_NAME_'.$i;
 			//print $paramkey;
-			if (! empty($conf->global->$paramkey))
+			if (!empty($conf->global->$paramkey))
 			{
-				$link="/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
+				$link = "/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
 
-				$newmenu->add($link, dol_trunc($conf->global->$paramkey,24));
+				$newmenu->add($link, dol_trunc($conf->global->$paramkey, 24));
 			}
 			$i++;
 		}
@@ -464,63 +464,63 @@ 
 	// Build final $menu_array = $menu_array_before +$newmenu->liste + $menu_array_after
 	//var_dump($menu_array_before);exit;
 	//var_dump($menu_array_after);exit;
-	$menu_array=$newmenu->liste;
-	if (is_array($menu_array_before)) $menu_array=array_merge($menu_array_before, $menu_array);
-	if (is_array($menu_array_after))  $menu_array=array_merge($menu_array, $menu_array_after);
+	$menu_array = $newmenu->liste;
+	if (is_array($menu_array_before)) $menu_array = array_merge($menu_array_before, $menu_array);
+	if (is_array($menu_array_after))  $menu_array = array_merge($menu_array, $menu_array_after);
 	//var_dump($menu_array);exit;
-	if (! is_array($menu_array)) return 0;
+	if (!is_array($menu_array)) return 0;
 
 	// Show menu
 	if (empty($noout))
 	{
-		$altok=0; $blockvmenuopened=false; $lastlevel0='';
-		$num=count($menu_array);
+		$altok = 0; $blockvmenuopened = false; $lastlevel0 = '';
+		$num = count($menu_array);
 		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry
 		{
-			$showmenu=true;
-			if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu=false;
+			$showmenu = true;
+			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu = false;
 
 			// Begin of new left menu block
 			if (empty($menu_array[$i]['level']) && $showmenu)
 			{
 				$altok++;
-				$blockvmenuopened=true;
-				$lastopened=true;
-				for($j = ($i + 1); $j < $num; $j++)
+				$blockvmenuopened = true;
+				$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;
 				}
 				if ($altok % 2 == 0)
 				{
-					print '<div class="blockvmenuimpair'.($lastopened?' blockvmenulast':'').($altok == 1 ? ' blockvmenufirst':'').'">'."\n";
+					print '<div class="blockvmenuimpair'.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 				else
 				{
-					print '<div class="blockvmenupair'.($lastopened?' blockvmenulast':'').($altok == 1 ? ' blockvmenufirst':'').'">'."\n";
+					print '<div class="blockvmenupair'.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 			}
 
 			// Add tabulation
-			$tabstring='';
-			$tabul=($menu_array[$i]['level'] - 1);
+			$tabstring = '';
+			$tabul = ($menu_array[$i]['level'] - 1);
 			if ($tabul > 0)
 			{
-				for ($j=0; $j < $tabul; $j++)
+				for ($j = 0; $j < $tabul; $j++)
 				{
-					$tabstring.='&nbsp;&nbsp;&nbsp;';
+					$tabstring .= '&nbsp;&nbsp;&nbsp;';
 				}
 			}
 
 			// Add mainmenu in GET url. This make to go back on correct menu even when using Back on browser.
-			$url=dol_buildpath($menu_array[$i]['url'],1);
-			$url=preg_replace('/__LOGIN__/',$user->login,$url);
-			$url=preg_replace('/__USERID__/',$user->id,$url);
+			$url = dol_buildpath($menu_array[$i]['url'], 1);
+			$url = preg_replace('/__LOGIN__/', $user->login, $url);
+			$url = preg_replace('/__USERID__/', $user->id, $url);
 
-			if (! preg_match('/mainmenu=/i',$menu_array[$i]['url']))
+			if (!preg_match('/mainmenu=/i', $menu_array[$i]['url']))
 			{
-				if (! preg_match('/\?/',$url)) $url.='?';
-				else $url.='&';
-				$url.='mainmenu='.$mainmenu;
+				if (!preg_match('/\?/', $url)) $url .= '?';
+				else $url .= '&';
+				$url .= 'mainmenu='.$mainmenu;
 			}
 
 			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].' -->'."\n";
@@ -530,17 +530,17 @@ 
 			{
 				if ($menu_array[$i]['enabled'])     // Enabled so visible
 				{
-					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>';
-					$lastlevel0='enabled';
+					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>'.$menu_array[$i]['titre'].'</a></div>';
+					$lastlevel0 = 'enabled';
 				}
 				else if ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
-					$lastlevel0='greyed';
+					$lastlevel0 = 'greyed';
 				}
 				else
 				{
-				    $lastlevel0='hidden';
+				    $lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
 				{
@@ -551,18 +551,18 @@ 
 			if ($menu_array[$i]['level'] > 0)
 			{
 				$cssmenu = '';
-				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/','',$menu_array[$i]['url']));
+				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
 
 				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
-					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
+					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
 					else print '<span class="vsmenu">';
 					print $menu_array[$i]['titre'];
 					if ($menu_array[$i]['url']) print '</a>';
 					else print '</span>';
 					// If title is not pure text and contains a table, no carriage return added
-					if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
+					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
 					print '</div>'."\n";
 				}
 				else if ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
@@ -572,15 +572,15 @@ 
 			}
 
 			// If next is a new block or if there is nothing after
-			if (empty($menu_array[$i+1]['level']))               // End menu block
+			if (empty($menu_array[$i + 1]['level']))               // End menu block
 			{
 				if ($showmenu)
 					print '<div class="menu_end"></div>'."\n";
-				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened=false; }
+				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened = false; }
 			}
 		}
 
-		if ($altok) print '<div class="blockvmenuend"></div>';    // End menu block
+		if ($altok) print '<div class="blockvmenuend"></div>'; // End menu block
 	}
 
 	return count($menu_array);
@@ -601,21 +601,21 @@ 
 
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-	if (empty($menuentry['enabled'])) return 0;	// Entry disabled by condition
+	if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition
 	if ($type_user && $menuentry['module'])
 	{
-		$tmploops=explode('|',$menuentry['module']);
-		$found=0;
-		foreach($tmploops as $tmploop)
+		$tmploops = explode('|', $menuentry['module']);
+		$found = 0;
+		foreach ($tmploops as $tmploop)
 		{
 			if (in_array($tmploop, $listofmodulesforexternal)) {
 				$found++; break;
 			}
 		}
-		if (! $found) return 0;	// Entry is for menus all excluded to external users
+		if (!$found) return 0; // Entry is for menus all excluded to external users
 	}
-	if (! $menuentry['perms'] && $type_user) return 0; 											// No permissions and user is external
-	if (! $menuentry['perms'] && ! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0;	// No permissions and option to hide when not allowed, even for internal user, is on
-	if (! $menuentry['perms']) return 2;															// No permissions and user is external
+	if (!$menuentry['perms'] && $type_user) return 0; // No permissions and user is external
+	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0; // No permissions and option to hide when not allowed, even for internal user, is on
+	if (!$menuentry['perms']) return 2; // No permissions and user is external
 	return 1;
 }

Braces +165 added lines, -65 removed lines

@@ -51,7 +51,9 @@ 
 	$menuArbo = new Menubase($db,'auguria');
 	$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'auguria',$tabMenu);
 
-	if (empty($noout)) print_start_menu_array_auguria();
+	if (empty($noout)) {
+		print_start_menu_array_auguria();
+	}
 
 	$usemenuhider = (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
 
@@ -102,7 +104,9 @@ 
 				//$shorturl = $shorturl.($param?'?'.$param:'');
 				$shorturl = $url;
 
-				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/','',$shorturl);
+				if (DOL_URL_ROOT) {
+					$shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT,'/').'/','',$shorturl);
+				}
 			}
 
 			$url=preg_replace('/__LOGIN__/',$user->login,$url);
@@ -114,16 +118,24 @@ 
 			if (preg_match('/search_project_user=__search_project_user__/', $shorturl))
 			{
 			    $search_project_user = GETPOST('search_project_user','int');
-			    if ($search_project_user) $shorturl=preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
-			    else $shorturl=preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+			    if ($search_project_user) {
+			    	$shorturl=preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
+			    } else {
+			    	$shorturl=preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+			    }
 			}
 
 			// Define the class (top menu selected or not)
-			if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';
-			else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
-			else $classname='class="tmenu"';
+			if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) {
+				$classname='class="tmenusel"';
+			} else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) {
+				$classname='class="tmenusel"';
+			} else {
+				$classname='class="tmenu"';
+			}
+		} else if ($showmode == 2) {
+			$classname='class="tmenu"';
 		}
-		else if ($showmode == 2) $classname='class="tmenu"';
 
 		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget), ($newTabMenu[$i]['mainmenu']?$newTabMenu[$i]['mainmenu']:$newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu']?$newTabMenu[$i]['leftmenu']:''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
 	}
@@ -134,16 +146,28 @@ 
 	// Output menu entries
 	foreach($menu->liste as $menkey => $menuval)
 	{
-        if (empty($noout)) print_start_menu_entry_auguria($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
-	    if (empty($noout)) print_text_menu_entry_auguria($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_auguria($menuval['enabled']);
+        if (empty($noout)) {
+        	print_start_menu_entry_auguria($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
+        }
+	    if (empty($noout)) {
+	    	print_text_menu_entry_auguria($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_auguria($menuval['enabled']);
+	    }
 	}
 
 	$showmode=1;
-	if (empty($noout)) print_start_menu_entry_auguria('','class="tmenuend"',$showmode);
-	if (empty($noout)) print_end_menu_entry_auguria($showmode);
+	if (empty($noout)) {
+		print_start_menu_entry_auguria('','class="tmenuend"',$showmode);
+	}
+	if (empty($noout)) {
+		print_end_menu_entry_auguria($showmode);
+	}
 
-	if (empty($noout)) print_end_menu_array_auguria();
+	if (empty($noout)) {
+		print_end_menu_array_auguria();
+	}
 
 	print "\n";
 
@@ -281,8 +305,7 @@ 
 		if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 		{
 			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('thumbs/'.$mysoc->logo_mini);
-		}
-		else
+		} else
 		{
 			$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
 		}
@@ -323,9 +346,12 @@ 
 	$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu);
 
 	// We update newmenu for special dynamic menus
-	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
+	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank') {
+		// Entry for each bank account
 	{
-	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';     // Required for to get Account::TYPE_CASH for example
+	    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+	}
+	// Required for to get Account::TYPE_CASH for example
 
 		$sql = "SELECT rowid, label, courant, rappro, courant";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
@@ -339,26 +365,33 @@ 
 			$numr = $db->num_rows($resql);
 			$i = 0;
 
-			if ($numr > 0) 	$newmenu->add('/compta/bank/list.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+			if ($numr > 0) {
+				$newmenu->add('/compta/bank/list.php',$langs->trans("BankAccounts"),0,$user->rights->banque->lire);
+			}
 
 			while ($i < $numr)
 			{
 				$objp = $db->fetch_object($resql);
 				$newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
-				if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
+				if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos)) {
+					// If not cash account and not closed and can be reconciliate
 				{
 					$newmenu->add('/compta/bank/bankentries_list.php?id='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
 				}
+				}
 				$i++;
 			}
+		} else {
+			dol_print_error($db);
 		}
-		else dol_print_error($db);
 		$db->free($resql);
 	}
 
-	if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account
+	if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy') {
+		// Entry in accountancy journal for each bank account
 	{
 		$newmenu->add('',$langs->trans("Journalization"),0,$user->rights->accounting->comptarapport->lire,'','accountancy','accountancy');
+	}
 
 		// Multi journal
 		$sql = "SELECT rowid, code, label, nature";
@@ -382,33 +415,49 @@ 
 					$nature='';
 
 					// Must match array $sourceList defined into journals_list.php
-					if ($objp->nature == 2 && ! empty($conf->facture->enabled)) $nature="sells";
-					if ($objp->nature == 3 && ! empty($conf->fournisseur->enabled)) $nature="purchases";
-					if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";
-					if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";
-					if ($objp->nature == 1) $nature="various";
-					if ($objp->nature == 9) $nature="hasnew";
+					if ($objp->nature == 2 && ! empty($conf->facture->enabled)) {
+						$nature="sells";
+					}
+					if ($objp->nature == 3 && ! empty($conf->fournisseur->enabled)) {
+						$nature="purchases";
+					}
+					if ($objp->nature == 4 && ! empty($conf->banque->enabled)) {
+						$nature="bank";
+					}
+					if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) {
+						$nature="expensereports";
+					}
+					if ($objp->nature == 1) {
+						$nature="various";
+					}
+					if ($objp->nature == 9) {
+						$nature="hasnew";
+					}
 
 					// To enable when page exists
 					if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 					{
-						if ($nature == 'various' || $nature == 'hasnew') $nature='';
+						if ($nature == 'various' || $nature == 'hasnew') {
+							$nature='';
+						}
 					}
 
 					if ($nature)
 					{
-						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+						if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) {
+							$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid,dol_trunc($objp->label,25),2,$user->rights->accounting->comptarapport->lire);
+						}
 					}
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				// Should not happend. Entries are added
 				$newmenu->add('',$langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 			}
+		} else {
+			dol_print_error($db);
 		}
-		else dol_print_error($db);
 		$db->free($resql);
 
 		/*
@@ -442,9 +491,11 @@ 
 		*/
 	}
 
-	if ($conf->ftp->enabled && $mainmenu == 'ftp')	// Entry for FTP
+	if ($conf->ftp->enabled && $mainmenu == 'ftp') {
+		// Entry for FTP
 	{
 		$MAXFTP=20;
+	}
 		$i=1;
 		while ($i <= $MAXFTP)
 		{
@@ -465,20 +516,30 @@ 
 	//var_dump($menu_array_before);exit;
 	//var_dump($menu_array_after);exit;
 	$menu_array=$newmenu->liste;
-	if (is_array($menu_array_before)) $menu_array=array_merge($menu_array_before, $menu_array);
-	if (is_array($menu_array_after))  $menu_array=array_merge($menu_array, $menu_array_after);
+	if (is_array($menu_array_before)) {
+		$menu_array=array_merge($menu_array_before, $menu_array);
+	}
+	if (is_array($menu_array_after)) {
+		$menu_array=array_merge($menu_array, $menu_array_after);
+	}
 	//var_dump($menu_array);exit;
-	if (! is_array($menu_array)) return 0;
+	if (! is_array($menu_array)) {
+		return 0;
+	}
 
 	// Show menu
 	if (empty($noout))
 	{
 		$altok=0; $blockvmenuopened=false; $lastlevel0='';
 		$num=count($menu_array);
-		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry
+		for ($i = 0; $i < $num; $i++) {
+			// Loop on each menu entry
 		{
 			$showmenu=true;
-			if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu=false;
+		}
+			if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
+				$showmenu=false;
+			}
 
 			// Begin of new left menu block
 			if (empty($menu_array[$i]['level']) && $showmenu)
@@ -488,13 +549,14 @@ 
 				$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;
+				    }
 				}
 				if ($altok % 2 == 0)
 				{
 					print '<div class="blockvmenuimpair'.($lastopened?' blockvmenulast':'').($altok == 1 ? ' blockvmenufirst':'').'">'."\n";
-				}
-				else
+				} else
 				{
 					print '<div class="blockvmenupair'.($lastopened?' blockvmenulast':'').($altok == 1 ? ' blockvmenufirst':'').'">'."\n";
 				}
@@ -518,8 +580,11 @@ 
 
 			if (! preg_match('/mainmenu=/i',$menu_array[$i]['url']))
 			{
-				if (! preg_match('/\?/',$url)) $url.='?';
-				else $url.='&';
+				if (! preg_match('/\?/',$url)) {
+					$url.='?';
+				} else {
+					$url.='&';
+				}
 				$url.='mainmenu='.$mainmenu;
 			}
 
@@ -528,17 +593,19 @@ 
 			// Menu level 0
 			if ($menu_array[$i]['level'] == 0)
 			{
-				if ($menu_array[$i]['enabled'])     // Enabled so visible
+				if ($menu_array[$i]['enabled']) {
+					// Enabled so visible
 				{
 					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>';
-					$lastlevel0='enabled';
 				}
-				else if ($showmenu)                 // Not enabled but visible (so greyed)
+					$lastlevel0='enabled';
+				} else if ($showmenu) {
+					// Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
-					$lastlevel0='greyed';
 				}
-				else
+					$lastlevel0='greyed';
+				} else
 				{
 				    $lastlevel0='hidden';
 				}
@@ -551,36 +618,54 @@ 
 			if ($menu_array[$i]['level'] > 0)
 			{
 				$cssmenu = '';
-				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/','',$menu_array[$i]['url']));
+				if ($menu_array[$i]['url']) {
+					$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/','',$menu_array[$i]['url']));
+				}
 
-				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.
+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {
+					// Enabled so visible, except if parent was not enabled.
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
-					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
-					else print '<span class="vsmenu">';
+				}
+					if ($menu_array[$i]['url']) {
+						print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
+					} else {
+						print '<span class="vsmenu">';
+					}
 					print $menu_array[$i]['titre'];
-					if ($menu_array[$i]['url']) print '</a>';
-					else print '</span>';
+					if ($menu_array[$i]['url']) {
+						print '</a>';
+					} else {
+						print '</span>';
+					}
 					// If title is not pure text and contains a table, no carriage return added
-					if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
+					if (! strstr($menu_array[$i]['titre'],'<table')) {
+						print '<br>';
+					}
 					print '</div>'."\n";
-				}
-				else if ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
+				} else if ($showmenu && $lastlevel0 == 'enabled') {
+					// Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
+				}
 			}
 
 			// If next is a new block or if there is nothing after
-			if (empty($menu_array[$i+1]['level']))               // End menu block
+			if (empty($menu_array[$i+1]['level'])) {
+				// End menu block
 			{
 				if ($showmenu)
 					print '<div class="menu_end"></div>'."\n";
+			}
 				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened=false; }
 			}
 		}
 
-		if ($altok) print '<div class="blockvmenuend"></div>';    // End menu block
+		if ($altok) {
+			print '<div class="blockvmenuend"></div>';
+		}
+		// End menu block
 	}
 
 	return count($menu_array);
@@ -601,7 +686,10 @@ 
 
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-	if (empty($menuentry['enabled'])) return 0;	// Entry disabled by condition
+	if (empty($menuentry['enabled'])) {
+		return 0;
+	}
+	// Entry disabled by condition
 	if ($type_user && $menuentry['module'])
 	{
 		$tmploops=explode('|',$menuentry['module']);
@@ -612,10 +700,22 @@ 
 				$found++; break;
 			}
 		}
-		if (! $found) return 0;	// Entry is for menus all excluded to external users
+		if (! $found) {
+			return 0;
+		}
+		// Entry is for menus all excluded to external users
+	}
+	if (! $menuentry['perms'] && $type_user) {
+		return 0;
+	}
+	// No permissions and user is external
+	if (! $menuentry['perms'] && ! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+		return 0;
+	}
+	// No permissions and option to hide when not allowed, even for internal user, is on
+	if (! $menuentry['perms']) {
+		return 2;
 	}
-	if (! $menuentry['perms'] && $type_user) return 0; 											// No permissions and user is external
-	if (! $menuentry['perms'] && ! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0;	// No permissions and option to hide when not allowed, even for internal user, is on
-	if (! $menuentry['perms']) return 2;															// No permissions and user is external
+	// No permissions and user is external
 	return 1;
 }

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

Indentation +249 added lines, -249 removed lines

@@ -32,292 +32,292 @@
 	var $atarget="";                                // To store default target to use onto links
 	var $name="eldy";
 
-    var $menu_array;
-    var $menu_array_after;
+	var $menu_array;
+	var $menu_array_after;
 
-    var $tabMenu;
+	var $tabMenu;
 
 
-    /**
-     *  Constructor
-     *
+	/**
+	 *  Constructor
+	 *
 	 *  @param	DoliDB		$db     	Database handler
-     *  @param	int			$type_user	Type of user
-     */
-    function __construct($db, $type_user)
-    {
-    	$this->type_user=$type_user;
-        $this->db=$db;
-    }
-
-
-    /**
-     * Load this->tabMenu
-     *
-   	 * @param	string	$forcemainmenu		To force mainmenu to load
-   	 * @param	string	$forceleftmenu		To force leftmenu to load
-     * @return	void
-     */
-    function loadMenu($forcemainmenu='',$forceleftmenu='')
-    {
+	 *  @param	int			$type_user	Type of user
+	 */
+	function __construct($db, $type_user)
+	{
+		$this->type_user=$type_user;
+		$this->db=$db;
+	}
+
+
+	/**
+	 * Load this->tabMenu
+	 *
+	 * @param	string	$forcemainmenu		To force mainmenu to load
+	 * @param	string	$forceleftmenu		To force leftmenu to load
+	 * @return	void
+	 */
+	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"];
 
 		// Read mainmenu and leftmenu that define which menu to show
-        if (isset($_GET["mainmenu"]))
-        {
-        	// On sauve en session le menu principal choisi
-        	$mainmenu=$_GET["mainmenu"];
-        	$_SESSION["mainmenu"]=$mainmenu;
-        	$_SESSION["leftmenuopened"]="";
-        }
-        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 (isset($_GET["leftmenu"]))
-        {
-        	// On sauve en session le menu principal choisi
-        	$leftmenu=$_GET["leftmenu"];
-        	$_SESSION["leftmenu"]=$leftmenu;
-
-        	if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
-        	{
-        		//$leftmenu="";
-        		$_SESSION["leftmenuopened"]="";
-        	}
-        	else
-        	{
-        		$_SESSION["leftmenuopened"]=$leftmenu;
-        	}
-        } else {
-        	// On va le chercher en session si non defini par le lien
-        	$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
-        }
-        if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
-
-        require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
-        $tabMenu=array();
-        $menuArbo = new Menubase($this->db,'eldy');
-        $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
-        $this->tabMenu=$tabMenu;
-
-        //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
-    }
-
-
-    /**
-     *  Show menu
-     *
-     *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
-     *  @param	array	$moredata		An array with more data to output
-     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
-     */
-    function showmenu($mode, $moredata=null)
-    {
-    	global $conf, $langs, $user;
-
-        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
-
-        if ($this->type_user == 1)
-        {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
-        	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
-        }
+		if (isset($_GET["mainmenu"]))
+		{
+			// On sauve en session le menu principal choisi
+			$mainmenu=$_GET["mainmenu"];
+			$_SESSION["mainmenu"]=$mainmenu;
+			$_SESSION["leftmenuopened"]="";
+		}
+		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 (isset($_GET["leftmenu"]))
+		{
+			// On sauve en session le menu principal choisi
+			$leftmenu=$_GET["leftmenu"];
+			$_SESSION["leftmenu"]=$leftmenu;
+
+			if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
+			{
+				//$leftmenu="";
+				$_SESSION["leftmenuopened"]="";
+			}
+			else
+			{
+				$_SESSION["leftmenuopened"]=$leftmenu;
+			}
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
+		}
+		if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
+		$tabMenu=array();
+		$menuArbo = new Menubase($this->db,'eldy');
+		$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
+		$this->tabMenu=$tabMenu;
+
+		//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
+	}
+
+
+	/**
+	 *  Show menu
+	 *
+	 *	@param	string	$mode			'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
+	 *  @param	array	$moredata		An array with more data to output
+	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+	 */
+	function showmenu($mode, $moredata=null)
+	{
+		global $conf, $langs, $user;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
+
+		if ($this->type_user == 1)
+		{
+			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
+			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-        $this->menu=new Menu();
-
-        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
+		$this->menu=new Menu();
+
+		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
 		{
-        	$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);
+			$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 == 'topnb')
 		{
-		    print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);  // no output
-		    return $this->menu->getNbOfVisibleMenuEntries();
+			print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);  // no output
+			return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        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
-
-            // $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'
-        	{
-        		print '<ul class="ulmenu" data-inset="true">';
-        		print '<li class="lilevel0">';
-
-        		if ($val['enabled'] == 1)
-        		{
+		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
+
+			// $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'
+			{
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
+
+				if ($val['enabled'] == 1)
+				{
 					$relurl=dol_buildpath($val['url'],1);
 					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
 					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
 					$canonurl=preg_replace('/\?.*$/','',$val['url']);
 
-        			print '<a class="alilevel0" href="#">';
+					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>';
 
 					print $val['titre'];
-        			print '</a>'."\n";
-
-        			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu=$val['mainmenu'];
-        			$tmpleftmenu='all';
-        			$submenu=new Menu();
-	        		print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);       // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
-        		    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
-                    //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-	        		$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-
-        			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-        			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
-        			//var_dump($canonrelurl);
-        			//var_dump($canonnexturl);
-        			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
-        				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
+					print '</a>'."\n";
+
+					// Search submenu fot this mainmenu entry
+					$tmpmainmenu=$val['mainmenu'];
+					$tmpleftmenu='all';
+					$submenu=new Menu();
+					print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);       // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
+					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
+					//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
+					$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+
+					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
+					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>'."\n";
+					if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
+						|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
+					{
+						// 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 (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
+							else print $langs->trans("Dashboard");
+						}
+						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						print '</a>';
+						print '</li>'."\n";
+					}
+
+					if ($val['level']==0)
 					{
-        				// 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 (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
-        				}
-        				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
-        				print '</a>';
-        				print '</li>'."\n";
-        			}
-
-        			if ($val['level']==0)
-        			{
-        			    if ($val['enabled'])
-        			    {
-        			        $lastlevel[0]='enabled';
-        			    }
-        			    else if ($showmenu)                 // Not enabled but visible (so greyed)
-        			    {
-        			        $lastlevel[0]='greyed';
-        			    }
-        			    else
-        			    {
-        			        $lastlevel[0]='hidden';
-        			    }
-        			}
-
-        			$lastlevel2 = array();
-       				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-       				{
+						if ($val['enabled'])
+						{
+							$lastlevel[0]='enabled';
+						}
+						else if ($showmenu)                 // Not enabled but visible (so greyed)
+						{
+							$lastlevel[0]='greyed';
+						}
+						else
+						{
+							$lastlevel[0]='hidden';
+						}
+					}
+
+					$lastlevel2 = array();
+	   				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 at least one parent is not enabled, we do not show any menu of all children
 						if ($val2['level'] > 0)
 						{
-						    $levelcursor = $val2['level']-1;
-						    while ($levelcursor >= 0)
-						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
-                                $levelcursor--;
-						    }
+							$levelcursor = $val2['level']-1;
+							while ($levelcursor >= 0)
+							{
+								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+								$levelcursor--;
+							}
 						}
 
-       					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='';
-
-	        				$disabled='';
-	        				if (! $val2['enabled'])
-	        				{
-	        				    $disabled=" vsmenudisabled";
-	        				}
-
-	        				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
-	        				print $disabled.'">';	 // ui-btn to highlight on clic
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        					{
-	        						print '<a href="'.$relurl2.'"';
-		        					//print ' data-ajax="false"';
-		        					print '>';
-		        					$lastlevel2[$val2['level']]='enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
-	        					{
-				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']]='greyed';
-	        					}
-	        				}
-	        				else
-	        				{
-	        				    if ($val2['enabled'])	// Allowed
-	        				    {
-	        				        $lastlevel2[$val2['level']]='enabled';
-	        				    }
-	        				    else
-	        				    {
-	        				        $lastlevel2[$val2['level']]='greyed';
-	        				    }
-	        				}
-                            //var_dump($val2['level']);
-	        				//var_dump($lastlevel2);
-                            print $val2['titre'];
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else
-	        						print '</a>';
-	        				}
-	        				print '</li>'."\n";
-       					}
-
-
-       				}
-        			//var_dump($submenu);
-        			print '</ul>';
-        		}
-        		if ($val['enabled'] == 2)
-        		{
-        			print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-        		}
-        		print '</li>';
-        		print '</ul>'."\n";
-        	}
-        }
-
-        unset($this->menu);
-
-        //print 'xx'.$mode;
-        return 0;
-    }
+	   					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='';
+
+							$disabled='';
+							if (! $val2['enabled'])
+							{
+								$disabled=" vsmenudisabled";
+							}
+
+							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
+							print $disabled.'">';	 // ui-btn to highlight on clic
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									print '<a href="'.$relurl2.'"';
+									//print ' data-ajax="false"';
+									print '>';
+									$lastlevel2[$val2['level']]='enabled';
+								}
+								else					// Not allowed but visible (greyed)
+								{
+									print '<a href="#" class="vsmenudisabled">';
+									$lastlevel2[$val2['level']]='greyed';
+								}
+							}
+							else
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									$lastlevel2[$val2['level']]='enabled';
+								}
+								else
+								{
+									$lastlevel2[$val2['level']]='greyed';
+								}
+							}
+							//var_dump($val2['level']);
+							//var_dump($lastlevel2);
+							print $val2['titre'];
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+									print '</a>';
+								else
+									print '</a>';
+							}
+							print '</li>'."\n";
+	   					}
+
+
+	   				}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2)
+				{
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+			}
+		}
+
+		unset($this->menu);
+
+		//print 'xx'.$mode;
+		return 0;
+	}
 
 }
 

Spacing +74 added lines, -74 removed lines

@@ -28,9 +28,9 @@ 
 class MenuManager
 {
 	var $db;
-	var $type_user;									// Put 0 for internal users, 1 for external users
-	var $atarget="";                                // To store default target to use onto links
-	var $name="eldy";
+	var $type_user; // Put 0 for internal users, 1 for external users
+	var $atarget = ""; // To store default target to use onto links
+	var $name = "eldy";
 
     var $menu_array;
     var $menu_array_after;
@@ -46,8 +46,8 @@ 
      */
     function __construct($db, $type_user)
     {
-    	$this->type_user=$type_user;
-        $this->db=$db;
+    	$this->type_user = $type_user;
+        $this->db = $db;
     }
 
 
@@ -58,53 +58,53 @@ 
    	 * @param	string	$forceleftmenu		To force leftmenu to load
      * @return	void
      */
-    function loadMenu($forcemainmenu='',$forceleftmenu='')
+    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"]))
         {
         	// On sauve en session le menu principal choisi
-        	$mainmenu=$_GET["mainmenu"];
-        	$_SESSION["mainmenu"]=$mainmenu;
-        	$_SESSION["leftmenuopened"]="";
+        	$mainmenu = $_GET["mainmenu"];
+        	$_SESSION["mainmenu"] = $mainmenu;
+        	$_SESSION["leftmenuopened"] = "";
         }
         else
        {
         	// On va le chercher en session si non defini par le lien
-        	$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
+        	$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
         }
-        if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
+        if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
 
         if (isset($_GET["leftmenu"]))
         {
         	// On sauve en session le menu principal choisi
-        	$leftmenu=$_GET["leftmenu"];
-        	$_SESSION["leftmenu"]=$leftmenu;
+        	$leftmenu = $_GET["leftmenu"];
+        	$_SESSION["leftmenu"] = $leftmenu;
 
-        	if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
+        	if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
         	{
         		//$leftmenu="";
-        		$_SESSION["leftmenuopened"]="";
+        		$_SESSION["leftmenuopened"] = "";
         	}
         	else
         	{
-        		$_SESSION["leftmenuopened"]=$leftmenu;
+        		$_SESSION["leftmenuopened"] = $leftmenu;
         	}
         } else {
         	// On va le chercher en session si non defini par le lien
-        	$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
+        	$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();
-        $menuArbo = new Menubase($this->db,'eldy');
+        $tabMenu = array();
+        $menuArbo = new Menubase($this->db, 'eldy');
         $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
-        $this->tabMenu=$tabMenu;
+        $this->tabMenu = $tabMenu;
 
         //if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
     }
@@ -117,7 +117,7 @@ 
      *  @param	array	$moredata		An array with more data to output
      *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
      */
-    function showmenu($mode, $moredata=null)
+    function showmenu($mode, $moredata = null)
     {
     	global $conf, $langs, $user;
 
@@ -125,50 +125,50 @@ 
 
         if ($this->type_user == 1)
         {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
-        	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
+        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
+        	$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
         }
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-        $this->menu=new Menu();
+        $this->menu = new Menu();
 
         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);
+        	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);
+        	$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 == 'topnb')
 		{
-		    print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);  // no output
+		    print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode); // no output
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
         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)
         		{
-					$relurl=dol_buildpath($val['url'],1);
-					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
-					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
-					$canonurl=preg_replace('/\?.*$/','',$val['url']);
+					$relurl = dol_buildpath($val['url'], 1);
+					$relurl = preg_replace('/__LOGIN__/', $user->login, $relurl);
+					$relurl = preg_replace('/__USERID__/', $user->id, $relurl);
+					$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
         			print '<a class="alilevel0" href="#">';
 
@@ -179,24 +179,24 @@ 
         			print '</a>'."\n";
 
         			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu=$val['mainmenu'];
-        			$tmpleftmenu='all';
-        			$submenu=new Menu();
-	        		print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);       // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
+        			$tmpmainmenu = $val['mainmenu'];
+        			$tmpleftmenu = 'all';
+        			$submenu = new Menu();
+	        		print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
         		    //if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
                     //if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
-	        		$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+	        		$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
-        			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-        			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+        			$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+        			$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
         			//var_dump($canonrelurl);
         			//var_dump($canonnexturl);
         			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
-        				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
+        			if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+        				|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
 					{
         				// We add sub entry
-        				print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+        				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
         				{
@@ -208,58 +208,58 @@ 
         				print '</li>'."\n";
         			}
 
-        			if ($val['level']==0)
+        			if ($val['level'] == 0)
         			{
         			    if ($val['enabled'])
         			    {
-        			        $lastlevel[0]='enabled';
+        			        $lastlevel[0] = 'enabled';
         			    }
         			    else if ($showmenu)                 // Not enabled but visible (so greyed)
         			    {
-        			        $lastlevel[0]='greyed';
+        			        $lastlevel[0] = 'greyed';
         			    }
         			    else
         			    {
-        			        $lastlevel[0]='hidden';
+        			        $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;
+						$showmenu = true;
+						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)
 						{
-						    $levelcursor = $val2['level']-1;
+						    $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)
        					{
-	        				$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']);
+	        				$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'])
+	        				$disabled = '';
+	        				if (!$val2['enabled'])
 	        				{
-	        				    $disabled=" vsmenudisabled";
+	        				    $disabled = " vsmenudisabled";
 	        				}
 
-	        				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
-	        				print $disabled.'">';	 // ui-btn to highlight on clic
+	        				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
+	        				print $disabled.'">'; // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
 	        					if ($val2['enabled'])	// Allowed
@@ -267,23 +267,23 @@ 
 	        						print '<a href="'.$relurl2.'"';
 		        					//print ' data-ajax="false"';
 		        					print '>';
-		        					$lastlevel2[$val2['level']]='enabled';
+		        					$lastlevel2[$val2['level']] = 'enabled';
 	        					}
 	        					else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']]='greyed';
+				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
 	        				}
 	        				else
 	        				{
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
-	        				        $lastlevel2[$val2['level']]='enabled';
+	        				        $lastlevel2[$val2['level']] = 'enabled';
 	        				    }
 	        				    else
 	        				    {
-	        				        $lastlevel2[$val2['level']]='greyed';
+	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
                             //var_dump($val2['level']);

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

Indentation +207 added lines, -207 removed lines

@@ -39,17 +39,17 @@ 
 	var $tabMenu;
 
 
-    /**
-     *  Constructor
-     *
+	/**
+	 *  Constructor
+	 *
 	 *  @param	DoliDB		$db     	Database handler
-     *  @param	int			$type_user	Type of user
-     */
-    function __construct($db, $type_user)
-    {
-    	$this->type_user=$type_user;
-    	$this->db=$db;
-    }
+	 *  @param	int			$type_user	Type of user
+	 */
+	function __construct($db, $type_user)
+	{
+		$this->type_user=$type_user;
+		$this->db=$db;
+	}
 
 
    	/**
@@ -61,245 +61,245 @@ 
    	 */
    	function loadMenu($forcemainmenu='',$forceleftmenu='')
    	{
-    	global $conf, $user, $langs;
+		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"];
-
-    	// Read mainmenu and leftmenu that define which menu to show
-    	if (isset($_GET["mainmenu"]))
-    	{
-    		// On sauve en session le menu principal choisi
-    		$mainmenu=$_GET["mainmenu"];
-    		$_SESSION["mainmenu"]=$mainmenu;
-    		$_SESSION["leftmenuopened"]="";
-    	}
-    	else
-    	{
-    		// On va le chercher en session si non defini par le lien
-    		$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
-    	}
+		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"]))
+		{
+			// On sauve en session le menu principal choisi
+			$mainmenu=$_GET["mainmenu"];
+			$_SESSION["mainmenu"]=$mainmenu;
+			$_SESSION["leftmenuopened"]="";
+		}
+		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 (isset($_GET["leftmenu"]))
-    	{
-    		// On sauve en session le menu principal choisi
-    		$leftmenu=$_GET["leftmenu"];
-    		$_SESSION["leftmenu"]=$leftmenu;
-
-    		if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
-    		{
-    			//$leftmenu="";
-    			$_SESSION["leftmenuopened"]="";
-    		}
-    		else
-    		{
-    			$_SESSION["leftmenuopened"]=$leftmenu;
-    		}
-    	} else {
-    		// On va le chercher en session si non defini par le lien
-    		$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
-    	}
-    	if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
-
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
-    	$tabMenu=array();
-    	$menuArbo = new Menubase($this->db,'auguria');
-    	$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
-
-    	$this->tabMenu=$tabMenu;
-    }
-
-
-    /**
-     *  Show menu
-     *
-     *	@param	string	$mode		    'top', 'left', 'jmobile' (used to get full xml ul/li menu)
-     *  @param	array	$moredata		An array with more data to output
-     *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
+		if (isset($_GET["leftmenu"]))
+		{
+			// On sauve en session le menu principal choisi
+			$leftmenu=$_GET["leftmenu"];
+			$_SESSION["leftmenu"]=$leftmenu;
+
+			if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
+			{
+				//$leftmenu="";
+				$_SESSION["leftmenuopened"]="";
+			}
+			else
+			{
+				$_SESSION["leftmenuopened"]=$leftmenu;
+			}
+		} else {
+			// On va le chercher en session si non defini par le lien
+			$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
+		}
+		if (! empty($forceleftmenu)) $leftmenu=$forceleftmenu;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
+		$tabMenu=array();
+		$menuArbo = new Menubase($this->db,'auguria');
+		$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
+
+		$this->tabMenu=$tabMenu;
+	}
+
+
+	/**
+	 *  Show menu
+	 *
+	 *	@param	string	$mode		    'top', 'left', 'jmobile' (used to get full xml ul/li menu)
+	 *  @param	array	$moredata		An array with more data to output
+	 *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
 	function showmenu($mode, $moredata=null)
 	{
-    	global $conf, $langs, $user;
+		global $conf, $langs, $user;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
 
-        if ($this->type_user == 1)
-        {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
-	        $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
-        }
+		if ($this->type_user == 1)
+		{
+			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
+			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-        $this->menu=new Menu();
+		$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')
 		{
-		    print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
-		    return $this->menu->getNbOfVisibleMenuEntries();
+			print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
+			return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-        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'
-        	{
-        		print '<ul class="ulmenu" data-inset="true">';
-        		print '<li class="lilevel0">';
-        		if ($val['enabled'] == 1)
-        		{
-        			$relurl=dol_buildpath($val['url'],1);
-        			$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
-        			$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
-        			$canonurl=preg_replace('/\?.*$/','',$val['url']);
-
-        			print '<a class="alilevel0" href="#">';
+		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'
+			{
+				print '<ul class="ulmenu" data-inset="true">';
+				print '<li class="lilevel0">';
+				if ($val['enabled'] == 1)
+				{
+					$relurl=dol_buildpath($val['url'],1);
+					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+					$canonurl=preg_replace('/\?.*$/','',$val['url']);
+
+					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>';
 
 					print $val['titre'];
-        			print '</a>'."\n";
-
-        			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu=$val['mainmenu'];
-        			$tmpleftmenu='all';
-        			$submenu=new Menu();
-        			print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
-        			$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-
-        			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-        			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
-        			//var_dump($canonrelurl);
-        			//var_dump($canonnexturl);
-        			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
-        				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
+					print '</a>'."\n";
+
+					// Search submenu fot this mainmenu entry
+					$tmpmainmenu=$val['mainmenu'];
+					$tmpleftmenu='all';
+					$submenu=new Menu();
+					print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
+					$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+
+					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
+					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>'."\n";
+					if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
+						|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
 					{
 						// 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 (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
-        				    else print $langs->trans("Dashboard");
-        				}
+						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");
 						print '</a>';
 						print '</li>'."\n";
-        			}
+					}
 
-    				if ($val['level']==0)
+					if ($val['level']==0)
 					{
-					    if ($val['enabled'])
-					    {
-					        $lastlevel[0]='enabled';
-					    }
-					    else if ($showmenu)                 // Not enabled but visible (so greyed)
-					    {
-					        $lastlevel[0]='greyed';
-					    }
-					    else
-					    {
-					        $lastlevel[0]='hidden';
-					    }
+						if ($val['enabled'])
+						{
+							$lastlevel[0]='enabled';
+						}
+						else if ($showmenu)                 // Not enabled but visible (so greyed)
+						{
+							$lastlevel[0]='greyed';
+						}
+						else
+						{
+							$lastlevel[0]='hidden';
+						}
 					}
 
 					$lastlevel2 = array();
 					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 at least one parent is not enabled, we do not show any menu of all children
+						// If at least one parent is not enabled, we do not show any menu of all children
 						if ($val2['level'] > 0)
 						{
-						    $levelcursor = $val2['level']-1;
-						    while ($levelcursor >= 0)
-						    {
-                                if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
-                                $levelcursor--;
-						    }
+							$levelcursor = $val2['level']-1;
+							while ($levelcursor >= 0)
+							{
+								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu=false;
+								$levelcursor--;
+							}
 						}
 
 						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='';
-
-	        				$disabled='';
-	        				if (! $val2['enabled'])
-	        				{
-	        				    $disabled=" vsmenudisabled";
-	        				}
-
-	        				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
-	        				print $disabled.'">';	 // ui-btn to highlight on clic
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        					{
-	        						print '<a href="'.$relurl2.'"';
-		        					//print ' data-ajax="false"';
-		        					print '>';
-		        					$lastlevel2[$val2['level']]='enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
-	        					{
-				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']]='greyed';
-	        					}
-	        				}
-	        				else
-	        				{
-	        				    if ($val2['enabled'])	// Allowed
-	        				    {
-	        				        $lastlevel2[$val2['level']]='enabled';
-	        				    }
-	        				    else
-	        				    {
-	        				        $lastlevel2[$val2['level']]='greyed';
-	        				    }
-	        				}
-	        				print $val2['titre'];
-	        				if ($relurl2)
-	        				{
-	        					if ($val2['enabled'])	// Allowed
-	        						print '</a>';
-	        					else
-	        						print '</a>';
-	        				}
-	        				print '</li>'."\n";
-       					}
-        			}
-        			//var_dump($submenu);
-        			print '</ul>';
-        		}
-        		if ($val['enabled'] == 2)
-        		{
-        			print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
-        		}
-        		print '</li>';
-        		print '</ul>'."\n";
-        	}
-        }
-
-        unset($this->menu);
-    }
+	   					{
+							$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='';
+
+							$disabled='';
+							if (! $val2['enabled'])
+							{
+								$disabled=" vsmenudisabled";
+							}
+
+							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
+							print $disabled.'">';	 // ui-btn to highlight on clic
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									print '<a href="'.$relurl2.'"';
+									//print ' data-ajax="false"';
+									print '>';
+									$lastlevel2[$val2['level']]='enabled';
+								}
+								else					// Not allowed but visible (greyed)
+								{
+									print '<a href="#" class="vsmenudisabled">';
+									$lastlevel2[$val2['level']]='greyed';
+								}
+							}
+							else
+							{
+								if ($val2['enabled'])	// Allowed
+								{
+									$lastlevel2[$val2['level']]='enabled';
+								}
+								else
+								{
+									$lastlevel2[$val2['level']]='greyed';
+								}
+							}
+							print $val2['titre'];
+							if ($relurl2)
+							{
+								if ($val2['enabled'])	// Allowed
+									print '</a>';
+								else
+									print '</a>';
+							}
+							print '</li>'."\n";
+	   					}
+					}
+					//var_dump($submenu);
+					print '</ul>';
+				}
+				if ($val['enabled'] == 2)
+				{
+					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
+				}
+				print '</li>';
+				print '</ul>'."\n";
+			}
+		}
+
+		unset($this->menu);
+	}
 }
 

Spacing +72 added lines, -72 removed lines

@@ -29,9 +29,9 @@ 
 class MenuManager
 {
 	var $db;
-	var $type_user;								// Put 0 for internal users, 1 for external users
-	var $atarget="";                            // To store default target to use onto links
-	var $name="auguria";
+	var $type_user; // Put 0 for internal users, 1 for external users
+	var $atarget = ""; // To store default target to use onto links
+	var $name = "auguria";
 
 	var $menu_array;
 	var $menu_array_after;
@@ -47,8 +47,8 @@ 
      */
     function __construct($db, $type_user)
     {
-    	$this->type_user=$type_user;
-    	$this->db=$db;
+    	$this->type_user = $type_user;
+    	$this->db = $db;
     }
 
 
@@ -59,56 +59,56 @@ 
    	 * @param	string	$forceleftmenu		To force leftmenu to load
    	 * @return	void
    	 */
-   	function loadMenu($forcemainmenu='',$forceleftmenu='')
+   	function loadMenu($forcemainmenu = '', $forceleftmenu = '')
    	{
     	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"]))
     	{
     		// On sauve en session le menu principal choisi
-    		$mainmenu=$_GET["mainmenu"];
-    		$_SESSION["mainmenu"]=$mainmenu;
-    		$_SESSION["leftmenuopened"]="";
+    		$mainmenu = $_GET["mainmenu"];
+    		$_SESSION["mainmenu"] = $mainmenu;
+    		$_SESSION["leftmenuopened"] = "";
     	}
     	else
     	{
     		// On va le chercher en session si non defini par le lien
-    		$mainmenu=isset($_SESSION["mainmenu"])?$_SESSION["mainmenu"]:'';
+    		$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
     	}
-		if (! empty($forcemainmenu)) $mainmenu=$forcemainmenu;
+		if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
 
     	if (isset($_GET["leftmenu"]))
     	{
     		// On sauve en session le menu principal choisi
-    		$leftmenu=$_GET["leftmenu"];
-    		$_SESSION["leftmenu"]=$leftmenu;
+    		$leftmenu = $_GET["leftmenu"];
+    		$_SESSION["leftmenu"] = $leftmenu;
 
-    		if ($_SESSION["leftmenuopened"]==$leftmenu)	// To collapse
+    		if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
     		{
     			//$leftmenu="";
-    			$_SESSION["leftmenuopened"]="";
+    			$_SESSION["leftmenuopened"] = "";
     		}
     		else
     		{
-    			$_SESSION["leftmenuopened"]=$leftmenu;
+    			$_SESSION["leftmenuopened"] = $leftmenu;
     		}
     	} else {
     		// On va le chercher en session si non defini par le lien
-    		$leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
+    		$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();
-    	$menuArbo = new Menubase($this->db,'auguria');
+    	$tabMenu = array();
+    	$menuArbo = new Menubase($this->db, 'auguria');
     	$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
 
-    	$this->tabMenu=$tabMenu;
+    	$this->tabMenu = $tabMenu;
     }
 
 
@@ -119,7 +119,7 @@ 
      *  @param	array	$moredata		An array with more data to output
      *  @return int                     0 or nb of top menu entries if $mode = 'topnb'
 	 */
-	function showmenu($mode, $moredata=null)
+	function showmenu($mode, $moredata = null)
 	{
     	global $conf, $langs, $user;
 
@@ -127,40 +127,40 @@ 
 
         if ($this->type_user == 1)
         {
-        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED=1;
-	        $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED=1;
+        	$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
+	        $conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
         }
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
-        $this->menu=new Menu();
+        $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')
 		{
-		    print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1,$mode);
+		    print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
 		    return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
         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);
+        	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)
         		{
-        			$relurl=dol_buildpath($val['url'],1);
-        			$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
-        			$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
-        			$canonurl=preg_replace('/\?.*$/','',$val['url']);
+        			$relurl = dol_buildpath($val['url'], 1);
+        			$relurl = preg_replace('/__LOGIN__/', $user->login, $relurl);
+        			$relurl = preg_replace('/__USERID__/', $user->id, $relurl);
+        			$canonurl = preg_replace('/\?.*$/', '', $val['url']);
 
         			print '<a class="alilevel0" href="#">';
 
@@ -171,22 +171,22 @@ 
         			print '</a>'."\n";
 
         			// Search submenu fot this mainmenu entry
-        			$tmpmainmenu=$val['mainmenu'];
-        			$tmpleftmenu='all';
-        			$submenu=new Menu();
-        			print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
-        			$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-
-        			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-        			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+        			$tmpmainmenu = $val['mainmenu'];
+        			$tmpleftmenu = 'all';
+        			$submenu = new Menu();
+        			print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu);
+        			$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
+
+        			$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
+        			$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
         			//var_dump($canonrelurl);
         			//var_dump($canonnexturl);
         			print '<ul>'."\n";
-        			if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('tools')))
-        				|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/list.php') !== false))
+        			if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
+        				|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
 					{
 						// We add sub entry
-						print str_pad('',1).'<li class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
+						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
         				{
@@ -198,58 +198,58 @@ 
 						print '</li>'."\n";
         			}
 
-    				if ($val['level']==0)
+    				if ($val['level'] == 0)
 					{
 					    if ($val['enabled'])
 					    {
-					        $lastlevel[0]='enabled';
+					        $lastlevel[0] = 'enabled';
 					    }
 					    else if ($showmenu)                 // Not enabled but visible (so greyed)
 					    {
-					        $lastlevel[0]='greyed';
+					        $lastlevel[0] = 'greyed';
 					    }
 					    else
 					    {
-					        $lastlevel[0]='hidden';
+					        $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;
+						$showmenu = true;
+						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)
 						{
-						    $levelcursor = $val2['level']-1;
+						    $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)
        					{
-	        				$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']);
+	        				$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'])
+	        				$disabled = '';
+	        				if (!$val2['enabled'])
 	        				{
-	        				    $disabled=" vsmenudisabled";
+	        				    $disabled = " vsmenudisabled";
 	        				}
 
-	        				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
-	        				print $disabled.'">';	 // ui-btn to highlight on clic
+	        				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
+	        				print $disabled.'">'; // ui-btn to highlight on clic
 	        				if ($relurl2)
 	        				{
 	        					if ($val2['enabled'])	// Allowed
@@ -257,23 +257,23 @@ 
 	        						print '<a href="'.$relurl2.'"';
 		        					//print ' data-ajax="false"';
 		        					print '>';
-		        					$lastlevel2[$val2['level']]='enabled';
+		        					$lastlevel2[$val2['level']] = 'enabled';
 	        					}
 	        					else					// Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
-				        			$lastlevel2[$val2['level']]='greyed';
+				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
 	        				}
 	        				else
 	        				{
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
-	        				        $lastlevel2[$val2['level']]='enabled';
+	        				        $lastlevel2[$val2['level']] = 'enabled';
 	        				    }
 	        				    else
 	        				    {
-	        				        $lastlevel2[$val2['level']]='greyed';
+	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
 	        				print $val2['titre'];

htdocs/core/boxes/box_ficheinter.php

Indentation +8 added lines, -8 removed lines

@@ -51,11 +51,11 @@ 
 	 */
 	function __construct($db,$param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db=$db;
+		$this->db=$db;
 
-	    $this->hidden=! ($user->rights->ficheinter->lire);
+		$this->hidden=! ($user->rights->ficheinter->lire);
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 *
 	 *  @param	int		$max        Maximum number of records to load
 	 *  @return	void
-	*/
+	 */
 	function loadBox($max=10)
 	{
 		global $user, $langs, $db, $conf;
@@ -150,8 +150,8 @@ 
 		else
 		{
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
-			    'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
 	}
@@ -164,8 +164,8 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 

Spacing +34 added lines, -34 removed lines

@@ -31,10 +31,10 @@ 
  */
 class box_ficheinter extends ModeleBoxes
 {
-	var $boxcode="ficheinter";
-	var $boximg="object_intervention";
-	var $boxlabel="BoxFicheInter";
-	var $depends = array("ficheinter");	// conf->contrat->enabled
+	var $boxcode = "ficheinter";
+	var $boximg = "object_intervention";
+	var $boxlabel = "BoxFicheInter";
+	var $depends = array("ficheinter"); // conf->contrat->enabled
 
 	var $db;
 	var $param;
@@ -49,13 +49,13 @@ 
 	 *  @param  DoliDB  $db         Database handler
 	 *  @param  string  $param      More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 	    global $user;
 
-	    $this->db=$db;
+	    $this->db = $db;
 
-	    $this->hidden=! ($user->rights->ficheinter->lire);
+	    $this->hidden = !($user->rights->ficheinter->lire);
 	}
 
 	/**
@@ -64,57 +64,57 @@ 
 	 *  @param	int		$max        Maximum number of records to load
 	 *  @return	void
 	*/
-	function loadBox($max=10)
+	function loadBox($max = 10)
 	{
 		global $user, $langs, $db, $conf;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-		$ficheinterstatic=new Fichinter($db);
+		$ficheinterstatic = new Fichinter($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter", $max));
 
 		if ($user->rights->ficheinter->lire)
 		{
 			$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,";
-			$sql.= " f.datec,";
-			$sql.= " f.date_valid as datev,";
-			$sql.= " f.tms as datem,";
-			$sql.= " s.nom as name, s.rowid as socid, s.client";
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
-			$sql.= " WHERE f.fk_soc = s.rowid ";
-			$sql.= " AND f.entity = ".$conf->entity;
-			if (! $user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
-			$sql.= " ORDER BY f.tms DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " f.datec,";
+			$sql .= " f.date_valid as datev,";
+			$sql .= " f.tms as datem,";
+			$sql .= " s.nom as name, s.rowid as socid, s.client";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
+			$sql .= " WHERE f.fk_soc = s.rowid ";
+			$sql .= " AND f.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id)	$sql .= " AND s.rowid = ".$user->societe_id;
+			$sql .= " ORDER BY f.tms DESC";
+			$sql .= $db->plimit($max, 0);
 
 			dol_syslog(get_class($this).'::loadBox', LOG_DEBUG);
 			$resql = $db->query($sql);
 			if ($resql)
 			{
 				$num = $db->num_rows($resql);
-				$now=dol_now();
+				$now = dol_now();
 
 				$i = 0;
 
 				while ($i < $num)
 				{
 					$objp = $db->fetch_object($resql);
-					$datec=$db->jdate($objp->datec);
+					$datec = $db->jdate($objp->datec);
 
-					$ficheinterstatic->statut=$objp->fk_statut;
-					$ficheinterstatic->id=$objp->rowid;
+					$ficheinterstatic->statut = $objp->fk_statut;
+					$ficheinterstatic->id = $objp->rowid;
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
 					'logo' => $this->boximg,
 					'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][1] = array('td' => '',
-					'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some interventions have no ref
+					'text' => ($objp->ref ? $objp->ref : $objp->rowid), // Some interventions have no ref
 					'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
@@ -122,11 +122,11 @@ 
 					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][3] = array('td' => '',
-					'text' => dol_trunc($objp->name,40),
+					'text' => dol_trunc($objp->name, 40),
 					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][4] = array('td' => 'class="right"',
-					'text' => dol_print_date($datec,'day'));
+					'text' => dol_print_date($datec, 'day'));
 
 					$this->info_box_contents[$i][5] = array('td' => 'align="right" class="nowrap"',
 					'text' => $ficheinterstatic->getLibStatut(6),
@@ -136,13 +136,13 @@ 
 					$i++;
 				}
 
-				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
+				if ($num == 0) $this->info_box_contents[$i][0] = array('td' => 'align="center"', 'text'=>$langs->trans("NoRecordedInterventions"));
 
 				$db->free($resql);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(  'td' => '',
+				$this->info_box_contents[0][0] = array('td' => '',
 				'maxlength'=>500,
 				'text' => ($db->error().' sql='.$sql));
 			}
@@ -164,7 +164,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +14 added lines, -8 removed lines

@@ -83,12 +83,18 @@ 
 			$sql.= " f.tms as datem,";
 			$sql.= " s.nom as name, s.rowid as socid, s.client";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (! $user->rights->societe->client->voir) {
+				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
 			$sql.= " WHERE f.fk_soc = s.rowid ";
 			$sql.= " AND f.entity = ".$conf->entity;
-			if (! $user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
+			if (! $user->rights->societe->client->voir && !$user->societe_id) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if($user->societe_id) {
+				$sql.= " AND s.rowid = ".$user->societe_id;
+			}
 			$sql.= " ORDER BY f.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
@@ -136,18 +142,18 @@ 
 					$i++;
 				}
 
-				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
+				if ($num==0) {
+					$this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
+				}
 
 				$db->free($resql);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][0] = array(  'td' => '',
 				'maxlength'=>500,
 				'text' => ($db->error().' sql='.$sql));
 			}
-		}
-		else
+		} else
 		{
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',

htdocs/core/boxes/box_comptes.php

Indentation +73 added lines, -73 removed lines

@@ -50,7 +50,7 @@ 
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	function __construct($db,$param='')
 	{
@@ -69,7 +69,7 @@ 
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -79,7 +79,7 @@ 
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
 
-        if ($user->rights->banque->lire) {
+		if ($user->rights->banque->lire) {
 			$sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,";
 			$sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix as iban,";
 			$sql.= " domiciliation, proprio, owner_address,";
@@ -92,78 +92,78 @@ 
 			$sql.= " ORDER BY label";
 			$sql.= $db->plimit($max, 0);
 
-            dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
-            $result = $db->query($sql);
-            if ($result) {
-                $num = $db->num_rows($result);
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
 
-                $line = 0;
-                $solde_total = array();
+				$line = 0;
+				$solde_total = array();
 
-                $account_static = new Account($db);
-                while ($line < $num) {
-                    $objp = $db->fetch_object($result);
+				$account_static = new Account($db);
+				while ($line < $num) {
+					$objp = $db->fetch_object($result);
 
-                    $account_static->id = $objp->rowid;
+					$account_static->id = $objp->rowid;
 					$account_static->ref = $objp->ref;
-                    $account_static->label = $objp->label;
-                    $account_static->number = $objp->number;
-                    $solde=$account_static->solde(0);
-
-                    $solde_total[$objp->currency_code] += $solde;
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $account_static->getNomUrl(1),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $objp->number,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
-                    );
-
-                    $line++;
-                }
-
-                // Total
-                foreach ($solde_total as $key=>$solde) {
-                    $this->info_box_contents[$line][] = array(
-                        'tr' => 'class="liste_total"',
-                        'td' => 'align="left" class="liste_total"',
-                        'text' => $langs->trans('Total').' '.$key,
-                    );
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" class="liste_total"',
-                        'text' => '&nbsp;'
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" class="liste_total"',
-                        'text' => price($solde, 0, $langs, 0, -1, -1, $key)
-                    );
-                    $line++;
-                }
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
+					$account_static->label = $objp->label;
+					$account_static->number = $objp->number;
+					$solde=$account_static->solde(0);
+
+					$solde_total[$objp->currency_code] += $solde;
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $account_static->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $objp->number,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
+					);
+
+					$line++;
+				}
+
+				// Total
+				foreach ($solde_total as $key=>$solde) {
+					$this->info_box_contents[$line][] = array(
+						'tr' => 'class="liste_total"',
+						'td' => 'align="left" class="liste_total"',
+						'text' => $langs->trans('Total').' '.$key,
+					);
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" class="liste_total"',
+						'text' => '&nbsp;'
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" class="liste_total"',
+						'text' => price($solde, 0, $langs, 0, -1, -1, $key)
+					);
+					$line++;
+				}
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
 
 	}
 
@@ -175,8 +175,8 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 

Spacing +21 added lines, -21 removed lines

@@ -33,10 +33,10 @@ 
  */
 class box_comptes extends ModeleBoxes
 {
-	var $boxcode="currentaccounts";
-	var $boximg="object_bill";
-	var $boxlabel="BoxCurrentAccounts";
-	var $depends = array("banque");     // Box active if module banque active
+	var $boxcode = "currentaccounts";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxCurrentAccounts";
+	var $depends = array("banque"); // Box active if module banque active
 
 	var $db;
 	var $param;
@@ -52,17 +52,17 @@ 
 	 *  @param  DoliDB	$db      	Database handler
      *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
 		global $conf, $user;
 
 		$this->db = $db;
 
 		// disable module for such cases
-		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('banque',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		if (!in_array('banque', $listofmodulesforexternal) && !empty($user->societe_id)) $this->enabled = 0; // disabled for external users
 
-		$this->hidden = ! ($user->rights->banque->lire);
+		$this->hidden = !($user->rights->banque->lire);
 	}
 
 	/**
@@ -71,26 +71,26 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
 
         if ($user->rights->banque->lire) {
 			$sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,";
-			$sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix as iban,";
-			$sql.= " domiciliation, proprio, owner_address,";
-			$sql.= " account_number, currency_code,";
-			$sql.= " min_allowed, min_desired, comment";
-			$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-			$sql.= " WHERE entity = ".$conf->entity;
-			$sql.= " AND clos = 0";
+			$sql .= " code_banque, code_guichet, cle_rib, bic, iban_prefix as iban,";
+			$sql .= " domiciliation, proprio, owner_address,";
+			$sql .= " account_number, currency_code,";
+			$sql .= " min_allowed, min_desired, comment";
+			$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
+			$sql .= " WHERE entity = ".$conf->entity;
+			$sql .= " AND clos = 0";
 			//$sql.= " AND courant = 1";
-			$sql.= " ORDER BY label";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " ORDER BY label";
+			$sql .= $db->plimit($max, 0);
 
             dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
             $result = $db->query($sql);
@@ -108,7 +108,7 @@ 
 					$account_static->ref = $objp->ref;
                     $account_static->label = $objp->label;
                     $account_static->number = $objp->number;
-                    $solde=$account_static->solde(0);
+                    $solde = $account_static->solde(0);
 
                     $solde_total[$objp->currency_code] += $solde;
 
@@ -175,7 +175,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +4 added lines, -1 removed lines

@@ -60,7 +60,10 @@
 
 		// disable module for such cases
 		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('banque',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+		if (! in_array('banque',$listofmodulesforexternal) && ! empty($user->societe_id)) {
+			$this->enabled=0;
+		}
+		// disabled for external users
 
 		$this->hidden = ! ($user->rights->banque->lire);
 	}

htdocs/core/boxes/box_produits_alerte_stock.php

Indentation +74 added lines, -74 removed lines

@@ -55,9 +55,9 @@ 
 	 */
 	function __construct($db,$param='')
 	{
-	    global $user;
+		global $user;
 
-	    $this->db = $db;
+		$this->db = $db;
 
 		$this->hidden = ! (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire);
 	}
@@ -66,7 +66,7 @@ 
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -90,13 +90,13 @@ 
 			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
 			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
 			// Add where from hooks
-    		if (is_object($hookmanager))
-    		{
-			    $parameters=array('boxproductalertstocklist'=>1);
-    		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-    		    $sql.=$hookmanager->resPrint;
-    		}
-		    $sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
+			if (is_object($hookmanager))
+			{
+				$parameters=array('boxproductalertstocklist'=>1);
+				$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
+				$sql.=$hookmanager->resPrint;
+			}
+			$sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
 			$sql.= " HAVING SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") < p.seuil_stock_alerte";
 			$sql.= $db->order('p.seuil_stock_alerte', 'DESC');
 			$sql.= $db->plimit($max, 0);
@@ -107,7 +107,7 @@ 
 				$langs->load("stocks");
 				$num = $db->num_rows($result);
 				$line = 0;
-                while ($line < $num) {
+				while ($line < $num) {
 					$objp = $db->fetch_object($result);
 					$datem=$db->jdate($objp->tms);
 
@@ -128,34 +128,34 @@ 
 								$objp->label = $objtp->label;
 						}
 					}
-                    $productstatic->id = $objp->rowid;
-                    $productstatic->ref = $objp->ref;
-                    $productstatic->type = $objp->fk_product_type;
-                    $productstatic->label = $objp->label;
+					$productstatic->id = $objp->rowid;
+					$productstatic->ref = $objp->ref;
+					$productstatic->type = $objp->fk_product_type;
+					$productstatic->label = $objp->label;
 					$productstatic->entity = $objp->entity;
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $productstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
-                        'text' => $objp->label,
-                    );
-
-                    if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
-                    {
-                        $price_base_type=$langs->trans($objp->price_base_type);
-                        $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
-	               	{
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $productstatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
+						'text' => $objp->label,
+					);
+
+					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
+					{
+						$price_base_type=$langs->trans($objp->price_base_type);
+						$price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
+					}
+					else //Parse the dynamic price
+				   	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
-	                    $priceparser = new PriceParser($this->db);
-	                    $price_result = $priceparser->parseProduct($productstatic);
-	                    if ($price_result >= 0) {
+						$priceparser = new PriceParser($this->db);
+						$price_result = $priceparser->parseProduct($productstatic);
+						if ($price_result >= 0) {
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type=$langs->trans("HT");
@@ -166,60 +166,60 @@ 
 								$price_base_type=$langs->trans("TTC");
 							}
 							$price=price($price_result);
-	                    }
-	               	}
+						}
+				   	}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => $price,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => $price,
+					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowrap"',
-                        'text' => $price_base_type,
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="nowrap"',
+						'text' => $price_base_type,
+					);
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'align="center"',
-                    'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
+						'td' => 'align="center"',
+					'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
 					'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
 
 					$this->info_box_contents[$line][] = array(
-					    'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
-					    'asis' => 1
+						'td' => 'align="right" width="18"',
+						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
+						'asis' => 1
 					);
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,0).'<span>',
-                        'asis' => 1
-                    );
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,0).'<span>',
+						'asis' => 1
+					);
 
-                    $line++;
-                }
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoTooLowStockProducts"),
-                    );
+					$line++;
+				}
+				if ($num==0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center"',
+						'text'=>$langs->trans("NoTooLowStockProducts"),
+					);
 
 				$db->free($result);
 			}
 			else
 			{
 				$this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
 			}
 		}
 		else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
 		}
 	}
 
@@ -231,9 +231,9 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 
 }

Braces +19 added lines, -15 removed lines

@@ -87,8 +87,12 @@ 
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
 			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element, 1).')';
 			$sql.= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+			if (empty($user->rights->produit->lire)) {
+				$sql.=' AND p.fk_product_type != 0';
+			}
+			if (empty($user->rights->service->lire)) {
+				$sql.=' AND p.fk_product_type != 1';
+			}
 			// Add where from hooks
     		if (is_object($hookmanager))
     		{
@@ -112,9 +116,11 @@ 
 					$datem=$db->jdate($objp->tms);
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (! empty($conf->global->MAIN_MULTILANGS)) {
+						// si l'option est active
 					{
 						$sqld = "SELECT label";
+					}
 						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld.= " WHERE fk_product=".$objp->rowid;
 						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
@@ -124,8 +130,9 @@ 
 						if ($resultd)
 						{
 							$objtp = $db->fetch_object($resultd);
-							if (isset($objtp->label) && $objtp->label != '')
-								$objp->label = $objtp->label;
+							if (isset($objtp->label) && $objtp->label != '') {
+															$objp->label = $objtp->label;
+							}
 						}
 					}
                     $productstatic->id = $objp->rowid;
@@ -149,8 +156,7 @@ 
                     {
                         $price_base_type=$langs->trans($objp->price_base_type);
                         $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -159,8 +165,7 @@ 
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type=$langs->trans("HT");
-							}
-							else
+							} else
 							{
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type=$langs->trans("TTC");
@@ -198,15 +203,15 @@ 
 
                     $line++;
                 }
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoTooLowStockProducts"),
                     );
+                }
 
 				$db->free($result);
-			}
-			else
+			} else
 			{
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
@@ -214,8 +219,7 @@ 
                     'text' => ($db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")

Spacing +39 added lines, -39 removed lines

@@ -35,9 +35,9 @@ 
  */
 class box_produits_alerte_stock extends ModeleBoxes
 {
-	var $boxcode="productsalertstock";
-	var $boximg="object_product";
-	var $boxlabel="BoxProductsAlertStock";
+	var $boxcode = "productsalertstock";
+	var $boximg = "object_product";
+	var $boxlabel = "BoxProductsAlertStock";
 	var $depends = array("produit");
 
 	var $db;
@@ -53,13 +53,13 @@ 
 	 *  @param  DoliDB	$db      	Database handler
 	 *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
 	    global $user;
 
 	    $this->db = $db;
 
-		$this->hidden = ! (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire);
+		$this->hidden = !(($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire);
 	}
 
 	/**
@@ -68,38 +68,38 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf, $hookmanager;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$productstatic=new Product($db);
+		$productstatic = new Product($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleProductsAlertStock",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleProductsAlertStock", $max));
 
 		if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire)
 		{
 			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity,";
-			$sql.= " SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") as total_stock";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
-			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element, 1).')';
-			$sql.= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
-			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
+			$sql .= " SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").") as total_stock";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
+			$sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element, 1).')';
+			$sql .= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
+			if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
+			if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
 			// Add where from hooks
     		if (is_object($hookmanager))
     		{
-			    $parameters=array('boxproductalertstocklist'=>1);
-    		    $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-    		    $sql.=$hookmanager->resPrint;
+			    $parameters = array('boxproductalertstocklist'=>1);
+    		    $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+    		    $sql .= $hookmanager->resPrint;
     		}
-		    $sql.= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
-			$sql.= " HAVING SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") < p.seuil_stock_alerte";
-			$sql.= $db->order('p.seuil_stock_alerte', 'DESC');
-			$sql.= $db->plimit($max, 0);
+		    $sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte, p.entity";
+			$sql .= " HAVING SUM(".$db->ifsql("s.reel IS NULL", "0", "s.reel").") < p.seuil_stock_alerte";
+			$sql .= $db->order('p.seuil_stock_alerte', 'DESC');
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -109,16 +109,16 @@ 
 				$line = 0;
                 while ($line < $num) {
 					$objp = $db->fetch_object($result);
-					$datem=$db->jdate($objp->tms);
+					$datem = $db->jdate($objp->tms);
 
 					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
 					{
 						$sqld = "SELECT label";
-						$sqld.= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld.= " WHERE fk_product=".$objp->rowid;
-						$sqld.= " AND lang='". $langs->getDefaultLang() ."'";
-						$sqld.= " LIMIT 1";
+						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
+						$sqld .= " WHERE fk_product=".$objp->rowid;
+						$sqld .= " AND lang='".$langs->getDefaultLang()."'";
+						$sqld .= " LIMIT 1";
 
 						$resultd = $db->query($sqld);
 						if ($resultd)
@@ -147,8 +147,8 @@ 
 
                     if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
                     {
-                        $price_base_type=$langs->trans($objp->price_base_type);
-                        $price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
+                        $price_base_type = $langs->trans($objp->price_base_type);
+                        $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
 	                }
 	                else //Parse the dynamic price
 	               	{
@@ -158,14 +158,14 @@ 
 	                    if ($price_result >= 0) {
 							if ($objp->price_base_type == 'HT')
 							{
-								$price_base_type=$langs->trans("HT");
+								$price_base_type = $langs->trans("HT");
 							}
 							else
 							{
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
-								$price_base_type=$langs->trans("TTC");
+								$price_base_type = $langs->trans("TTC");
 							}
-							$price=price($price_result);
+							$price = price($price_result);
 	                    }
 	               	}
 
@@ -181,24 +181,24 @@ 
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'align="center"',
-                    'text' => $objp->total_stock . ' / '.$objp->seuil_stock_alerte,
+                    'text' => $objp->total_stock.' / '.$objp->seuil_stock_alerte,
 					'text2'=>img_warning($langs->transnoentitiesnoconv("StockLowerThanLimit", $objp->seuil_stock_alerte)));
 
 					$this->info_box_contents[$line][] = array(
 					    'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell,3,0).'<span>',
+                        'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
 					    'asis' => 1
 					);
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy,3,0).'<span>',
+                        'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
                         'asis' => 1
                     );
 
                     $line++;
                 }
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoTooLowStockProducts"),
@@ -231,7 +231,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

htdocs/core/boxes/box_factures_fourn.php

Indentation +94 added lines, -94 removed lines

@@ -51,18 +51,18 @@ 
 	 */
 	function __construct($db,$param)
 	{
-	    global $user;
+		global $user;
 
-	    $this->db=$db;
+		$this->db=$db;
 
-	    $this->hidden=! ($user->rights->fournisseur->facture->lire);
+		$this->hidden=! ($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -71,10 +71,10 @@ 
 		$this->max=$max;
 
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
-        $facturestatic = new FactureFournisseur($db);
-        $thirdpartytmp = new Fournisseur($db);
+		$facturestatic = new FactureFournisseur($db);
+		$thirdpartytmp = new Fournisseur($db);
 
 		$this->info_box_head = array(
 				'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills",$max)
@@ -83,12 +83,12 @@ 
 		if ($user->rights->fournisseur->facture->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql.= " s.code_fournisseur,";
-            $sql.= " s.logo,";
+			$sql.= " s.code_fournisseur,";
+			$sql.= " s.logo,";
 			$sql.= " f.rowid as facid, f.ref, f.ref_supplier,";
-            $sql.= " f.total_ht,";
-            $sql.= " f.total_tva,";
-            $sql.= " f.total_ttc,";
+			$sql.= " f.total_ht,";
+			$sql.= " f.total_tva,";
+			$sql.= " f.total_ttc,";
 			$sql.= " f.paye, f.fk_statut,";
 			$sql.= ' f.datef as df,';
 			$sql.= ' f.datec as datec,';
@@ -100,8 +100,8 @@ 
 			$sql.= " AND f.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
+			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
+			else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
@@ -112,92 +112,92 @@ 
 				$line = 0;
 				$l_due_date =  $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
-                while ($line < $num) {
+				while ($line < $num) {
 					$objp = $db->fetch_object($result);
 					$datelimite=$db->jdate($objp->datelimite);
 					$date=$db->jdate($objp->df);
 					$datem=$db->jdate($objp->tms);
-                    $facturestatic->id = $objp->facid;
-                    $facturestatic->ref = $objp->ref;
-                    $facturestatic->total_ht = $objp->total_ht;
-                    $facturestatic->total_tva = $objp->total_tva;
-                    $facturestatic->total_ttc = $objp->total_ttc;
-                    $facturestatic->date_echeance = $datelimite;
-                    $facturestatic->statut = $objp->fk_statut;
-                    $thirdpartytmp->id = $objp->socid;
-                    $thirdpartytmp->name = $objp->name;
-                    $thirdpartytmp->fournisseur = 1;
-                    $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
-                    $thirdpartytmp->logo = $objp->logo;
+					$facturestatic->id = $objp->facid;
+					$facturestatic->ref = $objp->ref;
+					$facturestatic->total_ht = $objp->total_ht;
+					$facturestatic->total_tva = $objp->total_tva;
+					$facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->date_echeance = $datelimite;
+					$facturestatic->statut = $objp->fk_statut;
+					$thirdpartytmp->id = $objp->socid;
+					$thirdpartytmp->name = $objp->name;
+					$thirdpartytmp->fournisseur = 1;
+					$thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+					$thirdpartytmp->logo = $objp->logo;
 
 					$late = '';
 
 					if ($facturestatic->hasDelay()) {
-                        $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
-                    }
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $facturestatic->getNomUrl(1),
-                        'text2'=> $late,
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $objp->ref_supplier,
-                        'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref?$objp->ref:$objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
-                        'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
-                    );
-
-                    $fac = new FactureFournisseur($db);
-                    $fac->fetch($objp->facid);
-                    $alreadypaid=$fac->getSommePaiement();
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$alreadypaid,$objp->type),
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoModifiedSupplierBills"),
-                    );
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->transnoentities("ReadPermissionNotAllowed")
-            );
-        }
-    }
+						$late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
+					}
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $facturestatic->getNomUrl(1),
+						'text2'=> $late,
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $objp->ref_supplier,
+						'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref?$objp->ref:$objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
+						'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($date,'day'),
+					);
+
+					$fac = new FactureFournisseur($db);
+					$fac->fetch($objp->facid);
+					$alreadypaid=$fac->getSommePaiement();
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$alreadypaid,$objp->type),
+					);
+
+					$line++;
+				}
+
+				if ($num==0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center"',
+						'text'=>$langs->trans("NoModifiedSupplierBills"),
+					);
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->transnoentities("ReadPermissionNotAllowed")
+			);
+		}
+	}
 
 	/**
 	 *	Method to show box
@@ -207,8 +207,8 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 

Spacing +41 added lines, -41 removed lines

@@ -31,10 +31,10 @@ 
  */
 class box_factures_fourn extends ModeleBoxes
 {
-	var $boxcode="lastsupplierbills";
-	var $boximg="object_bill";
-	var $boxlabel="BoxLastSupplierBills";
-	var $depends = array("facture","fournisseur");
+	var $boxcode = "lastsupplierbills";
+	var $boximg = "object_bill";
+	var $boxlabel = "BoxLastSupplierBills";
+	var $depends = array("facture", "fournisseur");
 
 	var $db;
 	var $param;
@@ -49,13 +49,13 @@ 
 	 *  @param  DoliDB  $db         Database handler
 	 *  @param  string  $param      More parameters
 	 */
-	function __construct($db,$param)
+	function __construct($db, $param)
 	{
 	    global $user;
 
-	    $this->db=$db;
+	    $this->db = $db;
 
-	    $this->hidden=! ($user->rights->fournisseur->facture->lire);
+	    $this->hidden = !($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
@@ -64,11 +64,11 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $conf, $user, $langs, $db;
 
-		$this->max=$max;
+		$this->max = $max;
 
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
         include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
@@ -77,32 +77,32 @@ 
         $thirdpartytmp = new Fournisseur($db);
 
 		$this->info_box_head = array(
-				'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills",$max)
+				'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierBills", $max)
 		);
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
 			$sql = "SELECT s.nom as name, s.rowid as socid,";
-            $sql.= " s.code_fournisseur,";
-            $sql.= " s.logo,";
-			$sql.= " f.rowid as facid, f.ref, f.ref_supplier,";
-            $sql.= " f.total_ht,";
-            $sql.= " f.total_tva,";
-            $sql.= " f.total_ttc,";
-			$sql.= " f.paye, f.fk_statut,";
-			$sql.= ' f.datef as df,';
-			$sql.= ' f.datec as datec,';
-			$sql.= ' f.date_lim_reglement as datelimite, f.tms, f.type';
-			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-			$sql.= " WHERE f.fk_soc = s.rowid";
-			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
-			$sql.= $db->plimit($max, 0);
+            $sql .= " s.code_fournisseur,";
+            $sql .= " s.logo,";
+			$sql .= " f.rowid as facid, f.ref, f.ref_supplier,";
+            $sql .= " f.total_ht,";
+            $sql .= " f.total_tva,";
+            $sql .= " f.total_ttc,";
+			$sql .= " f.paye, f.fk_statut,";
+			$sql .= ' f.datef as df,';
+			$sql .= ' f.datec as datec,';
+			$sql .= ' f.date_lim_reglement as datelimite, f.tms, f.type';
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.entity = ".$conf->entity;
+			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->societe_id) $sql .= " AND s.rowid = ".$user->societe_id;
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+            else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -110,13 +110,13 @@ 
 				$num = $db->num_rows($result);
 
 				$line = 0;
-				$l_due_date =  $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
+				$l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
 
                 while ($line < $num) {
 					$objp = $db->fetch_object($result);
-					$datelimite=$db->jdate($objp->datelimite);
-					$date=$db->jdate($objp->df);
-					$datem=$db->jdate($objp->tms);
+					$datelimite = $db->jdate($objp->datelimite);
+					$date = $db->jdate($objp->df);
+					$datem = $db->jdate($objp->tms);
                     $facturestatic->id = $objp->facid;
                     $facturestatic->ref = $objp->ref;
                     $facturestatic->total_ht = $objp->total_ht;
@@ -133,7 +133,7 @@ 
 					$late = '';
 
 					if ($facturestatic->hasDelay()) {
-                        $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
+                        $late = img_warning(sprintf($l_due_date, dol_print_date($datelimite, 'day')));
                     }
 
                     $this->info_box_contents[$line][] = array(
@@ -146,7 +146,7 @@ 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
                         'text' => $objp->ref_supplier,
-                        'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref?$objp->ref:$objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
+                        'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref ? $objp->ref : $objp->facid).'<br>'.$langs->trans('RefSupplier').': '.$objp->ref_supplier,
                         'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid,
                     );
 
@@ -163,21 +163,21 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'class="right"',
-                        'text' => dol_print_date($date,'day'),
+                        'text' => dol_print_date($date, 'day'),
                     );
 
                     $fac = new FactureFournisseur($db);
                     $fac->fetch($objp->facid);
-                    $alreadypaid=$fac->getSommePaiement();
+                    $alreadypaid = $fac->getSommePaiement();
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3,$alreadypaid,$objp->type),
+                        'text' => $facturestatic->LibStatut($objp->paye, $objp->fk_statut, 3, $alreadypaid, $objp->type),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoModifiedSupplierBills"),
@@ -207,7 +207,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +17 added lines, -7 removed lines

@@ -95,13 +95,22 @@ 
 			$sql.= ' f.date_lim_reglement as datelimite, f.tms, f.type';
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql.= " WHERE f.fk_soc = s.rowid";
 			$sql.= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
-            else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
+			if (!$user->rights->societe->client->voir && !$user->societe_id) {
+				$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			}
+			if($user->societe_id) {
+				$sql.= " AND s.rowid = ".$user->societe_id;
+			}
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) {
+            	$sql.= " ORDER BY f.datef DESC, f.ref DESC ";
+            } else {
+            	$sql.= " ORDER BY f.tms DESC, f.ref DESC ";
+            }
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
@@ -177,11 +186,12 @@ 
                     $line++;
                 }
 
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoModifiedSupplierBills"),
                     );
+                }
 
                 $db->free($result);
             } else {

htdocs/core/boxes/box_members.php

Indentation +54 added lines, -54 removed lines

@@ -49,7 +49,7 @@ 
 	 *  Constructor
 	 *
 	 *  @param  DoliDB	$db      	Database handler
-     *  @param	string	$param		More parameters
+	 *  @param	string	$param		More parameters
 	 */
 	function __construct($db,$param='')
 	{
@@ -68,7 +68,7 @@ 
 	 *  Load data into info_box_contents array to show array later.
 	 *
 	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
+	 *  @return	void
 	 */
 	function loadBox($max=5)
 	{
@@ -77,8 +77,8 @@ 
 
 		$this->max=$max;
 
-        include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-        $memberstatic=new Adherent($db);
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$memberstatic=new Adherent($db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers",$max));
 
@@ -108,7 +108,7 @@ 
 					$memberstatic->lastname=$objp->lastname;
 					$memberstatic->firstname=$objp->firstname;
 					$memberstatic->id = $objp->rowid;
-                    $memberstatic->ref = $objp->rowid;
+					$memberstatic->ref = $objp->rowid;
 
 					if (! empty($objp->fk_soc)) {
 						$memberstatic->socid = $objp->fk_soc;
@@ -118,53 +118,53 @@ 
 						$memberstatic->name=$objp->company;
 					}
 
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $memberstatic->getNomUrl(1),
-                        'asis' => 1,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => '',
-                        'text' => $memberstatic->getFullName($langs),
-                        'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
-                        'text' => dol_print_date($datem, "day"),
-                    );
-
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
-                        'text' => $memberstatic->LibStatut($objp->status,$objp->subscription,$db->jdate($objp->date_end_subscription),3),
-                    );
-
-                    $line++;
-                }
-
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
-                        'text'=>$langs->trans("NoRecordedCustomers"),
-                    );
-
-                $db->free($result);
-            } else {
-                $this->info_box_contents[0][0] = array(
-                    'td' => '',
-                    'maxlength'=>500,
-                    'text' => ($db->error().' sql='.$sql),
-                );
-            }
-        } else {
-            $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
-            );
-        }
-
-    }
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $memberstatic->getNomUrl(1),
+						'asis' => 1,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => '',
+						'text' => $memberstatic->getFullName($langs),
+						'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right"',
+						'text' => dol_print_date($datem, "day"),
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'align="right" width="18"',
+						'text' => $memberstatic->LibStatut($objp->status,$objp->subscription,$db->jdate($objp->date_end_subscription),3),
+					);
+
+					$line++;
+				}
+
+				if ($num==0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'align="center"',
+						'text'=>$langs->trans("NoRecordedCustomers"),
+					);
+
+				$db->free($result);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => '',
+					'maxlength'=>500,
+					'text' => ($db->error().' sql='.$sql),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'align="left" class="nohover opacitymedium"',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+
+	}
 
 	/**
 	 *	Method to show box
@@ -174,8 +174,8 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
-    {
+	function showBox($head = null, $contents = null, $nooutput=0)
+	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
 

Spacing +28 added lines, -28 removed lines

@@ -32,9 +32,9 @@ 
  */
 class box_members extends ModeleBoxes
 {
-	var $boxcode="lastmembers";
-	var $boximg="object_user";
-	var $boxlabel="BoxLastMembers";
+	var $boxcode = "lastmembers";
+	var $boximg = "object_user";
+	var $boxlabel = "BoxLastMembers";
 	var $depends = array("adherent");
 
 	var $db;
@@ -51,17 +51,17 @@ 
 	 *  @param  DoliDB	$db      	Database handler
      *  @param	string	$param		More parameters
 	 */
-	function __construct($db,$param='')
+	function __construct($db, $param = '')
 	{
 		global $conf, $user;
 
 		$this->db = $db;
 
 		// disable module for such cases
-		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('adherent',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->societe_id)) $this->enabled = 0; // disabled for external users
 
-		$this->hidden=! ($user->rights->adherent->lire);
+		$this->hidden = !($user->rights->adherent->lire);
 	}
 
 	/**
@@ -70,28 +70,28 @@ 
 	 *  @param	int		$max        Maximum number of records to load
      *  @return	void
 	 */
-	function loadBox($max=5)
+	function loadBox($max = 5)
 	{
 		global $user, $langs, $db, $conf;
 		$langs->load("boxes");
 
-		$this->max=$max;
+		$this->max = $max;
 
         include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-        $memberstatic=new Adherent($db);
+        $memberstatic = new Adherent($db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers",$max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers", $max));
 
 		if ($user->rights->adherent->lire)
 		{
 			$sql = "SELECT a.rowid, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
-			$sql.= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
-			$sql.= " t.subscription";
-			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql.= " WHERE a.entity = ".$conf->entity;
-			$sql.= " AND a.fk_adherent_type = t.rowid";
-			$sql.= " ORDER BY a.tms DESC";
-			$sql.= $db->plimit($max, 0);
+			$sql .= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
+			$sql .= " t.subscription";
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
+			$sql .= " WHERE a.entity = ".$conf->entity;
+			$sql .= " AND a.fk_adherent_type = t.rowid";
+			$sql .= " ORDER BY a.tms DESC";
+			$sql .= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			if ($result)
@@ -102,20 +102,20 @@ 
 				while ($line < $num)
 				{
 					$objp = $db->fetch_object($result);
-					$datec=$db->jdate($objp->datec);
-					$datem=$db->jdate($objp->tms);
+					$datec = $db->jdate($objp->datec);
+					$datem = $db->jdate($objp->tms);
 
-					$memberstatic->lastname=$objp->lastname;
-					$memberstatic->firstname=$objp->firstname;
+					$memberstatic->lastname = $objp->lastname;
+					$memberstatic->firstname = $objp->firstname;
 					$memberstatic->id = $objp->rowid;
                     $memberstatic->ref = $objp->rowid;
 
-					if (! empty($objp->fk_soc)) {
+					if (!empty($objp->fk_soc)) {
 						$memberstatic->socid = $objp->fk_soc;
 						$memberstatic->fetch_thirdparty();
-						$memberstatic->name=$memberstatic->thirdparty->name;
+						$memberstatic->name = $memberstatic->thirdparty->name;
 					} else {
-						$memberstatic->name=$objp->company;
+						$memberstatic->name = $objp->company;
 					}
 
                     $this->info_box_contents[$line][] = array(
@@ -137,13 +137,13 @@ 
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="right" width="18"',
-                        'text' => $memberstatic->LibStatut($objp->status,$objp->subscription,$db->jdate($objp->date_end_subscription),3),
+                        'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $db->jdate($objp->date_end_subscription), 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0)
+                if ($num == 0)
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedCustomers"),
@@ -174,7 +174,7 @@ 
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
 	 */
-    function showBox($head = null, $contents = null, $nooutput=0)
+    function showBox($head = null, $contents = null, $nooutput = 0)
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}

Braces +7 added lines, -3 removed lines

@@ -59,7 +59,10 @@ 
 
 		// disable module for such cases
 		$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (! in_array('adherent',$listofmodulesforexternal) && ! empty($user->societe_id)) $this->enabled=0;	// disabled for external users
+		if (! in_array('adherent',$listofmodulesforexternal) && ! empty($user->societe_id)) {
+			$this->enabled=0;
+		}
+		// disabled for external users
 
 		$this->hidden=! ($user->rights->adherent->lire);
 	}
@@ -143,11 +146,12 @@ 
                     $line++;
                 }
 
-                if ($num==0)
-                    $this->info_box_contents[$line][0] = array(
+                if ($num==0) {
+                                    $this->info_box_contents[$line][0] = array(
                         'td' => 'align="center"',
                         'text'=>$langs->trans("NoRecordedCustomers"),
                     );
+                }
 
                 $db->free($result);
             } else {