Fix: Pb in auguria menu handler

htdocs/core/menubase.class.php

@@ -338,10 +338,12 @@ class Menubase
 		$sql.= " FROM " . MAIN_DB_PREFIX . "menu as m";
 		$sql.= " WHERE m.mainmenu = '".$this->mainmenu."'";
 		$sql.= " AND m.menu_handler= '".$this->menu_handler."'";
+		$sql.= " AND type = 'top'";
 		$result = $this->db->query($sql);
-		$menuTop = $this->db->fetch_object($result);
+		$menutop = $this->db->fetch_object($result);
+		$menutopid=$menutop->rowid;
 		
-		$data[] = array ($menutop->rowid,-1,$this->mainmenu);
+		$data[] = array ($menutopid,-1,$this->mainmenu);
 
 		$sql = "SELECT m.rowid, m.fk_menu, m.url, m.titre, m.langs, m.perms, m.target, m.mainmenu, m.leftmenu";
 		$sql.= " FROM " . MAIN_DB_PREFIX . "menu as m";
@@ -359,6 +361,7 @@ class Menubase
 			while ($menu = $this->db->fetch_array($res))
 			{
 				if (! empty($menu['langs'])) $langs->load($menu['langs']);
+
 				$titre = $langs->trans($menu['titre']);
 				$rights = $this->verifRights($menu['right']);
 				$data[] = array (
@@ -373,20 +376,30 @@ class Menubase
 				$i++;
 
 			}
-
 		}
 		else
 		{
 			dolibarr_print_error($this->db);
 		}
 		
-		$this->recur($data, $menuTop->rowid, 1);
+		$this->recur($data, $menutopid, 1);
 
 		return $this->newmenu;
 
 	}
 
-	function recur($tab, $pere, $rang) {
+	/**
+	 * Complete this->newmenu with menu entry found in $tab
+	 *
+	 * @param string $tab
+	 * @param string $pere
+	 * @param string $rang
+	 */
+	function recur($tab, $pere, $rang) 
+	{
+		global $leftmenu, $leftmenuConstraint;	// To be exported in dol_eval function
+		
+		//print "xx".$pere;
 		$leftmenu = $this->leftmenu;
 		//ballayage du tableau
 		for ($x = 0; $x < count($tab); $x++) {
@@ -398,17 +411,21 @@ class Menubase
 
 				if ($this->verifConstraint($tab[$x][0], $tab[$x][6], $tab[$x][7]) != 0) {
 
-					if ($tab[$x][6]) {
+					if ($tab[$x][6]) 
-
+					{
 						$leftmenuConstraint = false;
-						$str = "if(" . $tab[$x][6] . ") \$leftmenuConstraint = true;";
+						$str = 'if(' . $tab[$x][6] . ') $leftmenuConstraint = true;';
-
+						//print $str."<br>\n";
-						dol_eval ($str);
+						//eval ($str);
-						if ($leftmenuConstraint == true) {
+						dol_eval($str);
+						if ($leftmenuConstraint == true) 
+						{
 							$this->newmenu->add_submenu(DOL_URL_ROOT . $tab[$x][2], $tab[$x][3], $rang -1, $tab[$x][4], $tab[$x][5]);
 							$this->recur($tab, $tab[$x][0], $rang +1);
 						}
-					} else {
+					}
+					else
+					{
 						$this->newmenu->add_submenu(DOL_URL_ROOT . $tab[$x][2], $tab[$x][3], $rang -1, $tab[$x][4], $tab[$x][5]);
 						$this->recur($tab, $tab[$x][0], $rang +1);
 					}
@@ -421,6 +438,7 @@ class Menubase
 	function verifConstraint($rowid, $mainmenu = "", $leftmenu = "") 
 	{
 		global $user, $conf, $user;
+		global $constraint;	// To export to dol_eval function
 		
 		include_once(DOL_DOCUMENT_ROOT.'/lib/admin.lib.php');	// Because later some eval try to run dynamic call to dolibarr_get_const
 		$constraint = true;
@@ -438,9 +456,8 @@ class Menubase
 			while (($i < $num) && $constraint == true) 
 			{
 				$obj = $this->db->fetch_object($result);
-				$strconstraint = "if(!(" . $obj->action . ")) { \$constraint = false; }";
+				$strconstraint = 'if(!(' . $obj->action . ')) { $constraint = false; }';
-
+				dol_eval($strconstraint);
-				dol_eval ($strconstraint);
 				$i++;
 			}
 		}
@@ -455,19 +472,24 @@ class Menubase
 	function verifRights($strRights) {
 
 		global $user,$conf,$user;
+		global $rights;	// To export to dol_eval function
 		
-		if ($strRights != "") {
+		if ($strRights != "")
+		{
 			$rights = true;
 
 			$tab_rights = explode(" || ", $strRights);
 			$i = 0;
 			while (($i < count($tab_rights)) && ($rights == true)) {
-				$str = "if(!(" . $strRights . ")) { \$rights = false;}";
+				$str = 'if(!(' . $strRights . ')) { $rights = false; }';
 				dol_eval ($str);
 				$i++;
 			}
-		} else
+		}
+		else
+		{
 			$rights = true;
+		}
 		
 		return $rights;
 	}
@@ -500,6 +522,7 @@ class Menubase
 	function menutopCharger($type_user, $mainmenu, $menu_handler)
 	{
 		global $langs, $user, $conf;
+		global $rights;	// To export to dol_eval function
 		
 		$sql = "SELECT m.rowid, m.mainmenu, m.titre, m.url, m.langs, m.perms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
@@ -533,10 +556,10 @@ class Menubase
 		            $chaine="";
 
 		            // Define $right
-		        	$right = true;
+		        	$rights = true;
 		        	if ($objm->perms)
 		        	{
-		        		$str = "if(!(".$objm->perms.")) \$right = false;";
+		        		$str = 'if(!('.$objm->perms.')) { $rights = false; }';
 		        		dol_eval($str);
 		        	}
 		        	
@@ -567,7 +590,7 @@ class Menubase
 		        	$tabMenu[$b]['url'] = $objm->url;
 		        	$tabMenu[$b]['atarget'] = $this->atarget;
 		        	$tabMenu[$b]['class'] = $class;
-		        	$tabMenu[$b]['right'] = $right;
+		        	$tabMenu[$b]['right'] = $rights;
 		        	
 					$b++;
 					
@@ -588,9 +611,15 @@ class Menubase
 
 function dol_eval($s)
 {
+	// To get and return to caller
+	global $leftmenu, $leftmenuConstraint, $constraint, $rights, $user;
+	
+	//print $s."<br>\n";
+	eval($s);
+	
 	// \todo
 	// Warning. We must add code to exclude test if it contains = (affectation) that is not == (compare)
-	return eval($s);
+	return 1; 
 }
 
 ?>

htdocs/includes/menus/barre_left/auguria_backoffice.php

@@ -73,8 +73,6 @@ class MenuLeft {
         global $user,$conf,$langs,$dolibarr_main_db_name;
         
         
-        
-        
         if (! session_id()) {
             session_name("DOLSESSID_".$dolibarr_main_db_name);
             session_start();    // En mode authentification PEAR, la session a déjà été ouverte
@@ -92,9 +90,9 @@ class MenuLeft {
         }
 
         if (isset($_GET["leftmenu"])) {
-            // On sauve en session le menu principal choisi
+        	// On sauve en session le menu principal choisi
-            $this->leftmenu=$_GET["leftmenu"];
+        	$this->leftmenu=$_GET["leftmenu"];
-            $_SESSION["leftmenu"]=$this->leftmenu;
+        	$_SESSION["leftmenu"]=$this->leftmenu;
             if ($_SESSION["leftmenuopened"]==$this->leftmenu) {
                 //$leftmenu="";
                 $_SESSION["leftmenuopened"]="";
@@ -107,8 +105,6 @@ class MenuLeft {
             $this->leftmenu=isset($_SESSION["leftmenu"])?$_SESSION["leftmenu"]:'';
         }
         
-        
-        
         /**
          * On definit newmenu en fonction de mainmenu et leftmenu
          * ------------------------------------------------------
@@ -119,7 +115,6 @@ class MenuLeft {
         	
 			$this->newmenu = $this->menuArbo->menuCharger($mainmenu, $this->newmenu,0,$this->leftmenu);
 			
-
             /*
              * Menu AUTRES (Pour les menus du haut qui ne serait pas gérés)
              */