From a5370c0f5aad81a7a766db3267d85b4536f8bc0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 26 Aug 2010 12:39:22 +0000
Subject: [PATCH] Fix: die error with php 4

---
 .../menus/barre_left/auguria_backoffice.php   | 17 ++--
 .../menus/barre_left/auguria_frontoffice.php  | 16 ++--
 .../menus/barre_left/eldy_backoffice.php      | 18 ++--
 .../menus/barre_left/eldy_frontoffice.php     | 18 ++--
 htdocs/includes/menus/barre_left/empty.php    | 84 +++++++++++--------
 5 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/htdocs/includes/menus/barre_left/auguria_backoffice.php b/htdocs/includes/menus/barre_left/auguria_backoffice.php
index 57874b9f9d5..2bf68a977a8 100644
--- a/htdocs/includes/menus/barre_left/auguria_backoffice.php
+++ b/htdocs/includes/menus/barre_left/auguria_backoffice.php
@@ -39,16 +39,23 @@ class MenuLeft {
 
 	var $require_top=array("auguria_backoffice");     // Si doit etre en phase avec un gestionnaire de menu du haut particulier
 
+	var $db;
+    var $menu_array;
+    var $menu_array_after;
+
 
 	/**
-	 *    \brief      Constructeur
-	 *    \param      db            Handler d'acces base de donnee
-	 *    \param      menu_array    Tableau des entree de menu defini dans les fichier pre.inc.php
+	 *  \brief      Constructor
+	 *  \param      db                  Database handler
+     *  \param      menu_array          Table of menu entries to show before entries of menu handler
+     *  \param      menu_array_after    Table of menu entries to show after entries of menu handler
+	 *
 	 */
-	function MenuLeft($db,&$menu_array='')
+	function MenuLeft($db,&$menu_array,&$menu_array_after)
 	{
 		$this->db=$db;
 		$this->menu_array=$menu_array;
+        $this->menu_array_after=$menu_array_after;
 	}
 
 
@@ -60,7 +67,7 @@ class MenuLeft {
 	{
 		require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/auguria.lib.php');
 
-		$res=print_left_auguria_menu($this->db,$this->menu_array);
+		$res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after);
 
 		return $res;
 	}
diff --git a/htdocs/includes/menus/barre_left/auguria_frontoffice.php b/htdocs/includes/menus/barre_left/auguria_frontoffice.php
index 33d8c3037a7..ae1a3e64db6 100644
--- a/htdocs/includes/menus/barre_left/auguria_frontoffice.php
+++ b/htdocs/includes/menus/barre_left/auguria_frontoffice.php
@@ -39,16 +39,22 @@ class MenuLeft {
 
     var $require_top=array("auguria_frontoffice");     // Si doit etre en phase avec un gestionnaire de menu du haut particulier
 
+    var $db;
+    var $menu_array;
+    var $menu_array_after;
+
 
     /**
-     *    \brief      Constructeur
-     *    \param      db            Handler d'acces base de donnee
-     *    \param      menu_array    Tableau des entree de menu defini dans les fichier pre.inc.php
+     *  \brief      Constructor
+     *  \param      db                  Database handler
+     *  \param      menu_array          Table of menu entries to show before entries of menu handler
+     *  \param      menu_array_after    Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array='')
+    function MenuLeft($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
+        $this->menu_array_after=$menu_array_after;
     }
 
 
@@ -60,7 +66,7 @@ class MenuLeft {
     {
 		require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/auguria.lib.php');
 
-		$res=print_left_auguria_menu($this->db,$this->menu_array);
+		$res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after);
 
 		$conf->global->MAIN_SEARCHFORM_SOCIETE=0;
 		$conf->global->MAIN_SEARCHFORM_CONTACT=0;
diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php
index 5081c433ff3..4f428df15b0 100644
--- a/htdocs/includes/menus/barre_left/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php
@@ -37,20 +37,24 @@
  */
 class MenuLeft {
 
-	var $db;
-	var $menu_array;
 	var $require_top=array("eldy_backoffice");     // Si doit etre en phase avec un gestionnaire de menu du haut particulier
 
+    var $db;
+    var $menu_array;
+    var $menu_array_after;
+
 
 	/**
-	 *    \brief      Constructeur
-	 *    \param      db            Handler d'acces base de donnee
-	 *    \param      menu_array    Tableau des entree de menu defini dans les fichier pre.inc.php
+     *  \brief      Constructor
+     *  \param      db                  Database handler
+     *  \param      menu_array          Table of menu entries to show before entries of menu handler
+     *  \param      menu_array_after    Table of menu entries to show after entries of menu handler
 	 */
-	function MenuLeft($db,&$menu_array='')
+	function MenuLeft($db,&$menu_array,&$menu_array_after)
 	{
 		$this->db=$db;
 		$this->menu_array=$menu_array;
+		$this->menu_array_after=$menu_array_after;
 	}
 
 
@@ -62,7 +66,7 @@ class MenuLeft {
 	{
 		require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/eldy.lib.php');
 
-		$res=print_left_eldy_menu($this->db,$this->menu_array);
+		$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after);
 
 		return $res;
 	}
diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
index 51dd929c25d..e4b89bbbb8a 100644
--- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php
@@ -36,20 +36,24 @@
  */
 class MenuLeft {
 
-	var $db;
-	var $menu_array;
 	var $require_top=array("eldy_frontoffice");     // Si doit etre en phase avec un gestionnaire de menu du haut particulier
 
+    var $db;
+    var $menu_array;
+    var $menu_array_after;
+
 
 	/**
-	 *    \brief      Constructeur
-	 *    \param      db            Handler d'acces base de donnee
-	 *    \param      menu_array    Tableau des entree de menu defini dans les fichier pre.inc.php
+     *  \brief      Constructor
+     *  \param      db                  Database handler
+     *  \param      menu_array          Table of menu entries to show before entries of menu handler
+     *  \param      menu_array_after    Table of menu entries to show after entries of menu handler
 	 */
-	function MenuLeft($db,&$menu_array='')
+	function MenuLeft($db,&$menu_array,&$menu_array_after)
 	{
 		$this->db=$db;
 		$this->menu_array=$menu_array;
+		$this->menu_array_after=$menu_array_after;
 	}
 
 
@@ -61,7 +65,7 @@ class MenuLeft {
 	{
 		require_once(DOL_DOCUMENT_ROOT.'/includes/menus/barre_left/eldy.lib.php');
 
-		$res=print_left_eldy_menu($this->db,$this->menu_array);
+		$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after);
 
 		$conf->global->MAIN_SEARCHFORM_SOCIETE=0;
 		$conf->global->MAIN_SEARCHFORM_CONTACT=0;
diff --git a/htdocs/includes/menus/barre_left/empty.php b/htdocs/includes/menus/barre_left/empty.php
index 8d96f07f83a..dc098eb8b88 100644
--- a/htdocs/includes/menus/barre_left/empty.php
+++ b/htdocs/includes/menus/barre_left/empty.php
@@ -30,16 +30,22 @@ class MenuLeft {
 
     var $require_top=array("empty");     // If this top menu handler must be used with a particular left menu handler
 
+    var $db;
+    var $menu_array;
+    var $menu_array_after;
+
 
     /**
-     *    \brief      Constructor
-     *    \param      db      		Dabatase handler
-     *    \param      menu_array    Menu array that you will override in showmenu() function
+     *  \brief      Constructor
+     *  \param      db                  Database handler
+     *  \param      menu_array          Table of menu entries to show before entries of menu handler
+     *  \param      menu_array_after    Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array='')
+    function MenuLeft($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
+        $this->menu_array_after=$menu_array_after;
     }
 
 
@@ -55,7 +61,7 @@ class MenuLeft {
 	    // ***** START *****
 
 		$langs->load("admin");	// Load translation file admin.lang
-		$newmenu->add(DOL_URL_ROOT."/admin/index.php?leftmenu=setup", $langs->trans("Setup"));
+		$newmenu->add(DOL_URL_ROOT."/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0);
 		$newmenu->add(DOL_URL_ROOT."/admin/company.php", $langs->trans("MenuCompanySetup"),1);
 		$newmenu->add(DOL_URL_ROOT."/admin/modules.php", $langs->trans("Modules"),1);
 		$newmenu->add(DOL_URL_ROOT."/admin/menus.php", $langs->trans("Menus"),1);
@@ -79,7 +85,8 @@ class MenuLeft {
         for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++)
         {
             $alt++;
-            if ($this->menu_array[$i]['level']==0) {
+            if (empty($this->menu_array[$i]['level']))
+            {
                 if (($alt%2==0))
                 {
                     print '<div class="blockvmenuimpair">'."\n";
@@ -90,36 +97,47 @@ class MenuLeft {
                 }
             }
 
-            if ($this->menu_array[$i]['level']==0) {
-                if ($this->menu_array[$i]['enabled'])
-                    print '<a class="vmenu" href="'.$this->menu_array[$i]['url'].'">'.$this->menu_array[$i]['titre'].'</a><br>';
-                else
-                    print '<font class="vmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
-            }
-            if ($this->menu_array[$i]['level']==1) {
-                if ($this->menu_array[$i]['enabled'])
-                    print '<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'">'.$this->menu_array[$i]['titre'].'</a><br>';
-                else
-                    print '<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
-            }
-            if ($this->menu_array[$i]['level']==2) {
-                if ($this->menu_array[$i]['enabled'])
-                    print '&nbsp; &nbsp; <a class="vsmenu" href="'.$this->menu_array[$i]['url'].'">'.$this->menu_array[$i]['titre'].'</a><br>';
-                else
-                    print '&nbsp; &nbsp; <font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
-            }
-            if ($this->menu_array[$i]['level']==3) {
-                if ($this->menu_array[$i]['enabled'])
-                    print '&nbsp; &nbsp; &nbsp; &nbsp; <a class="vsmenu" href="'.$this->menu_array[$i]['url'].'">'.$this->menu_array[$i]['titre'].'</a><br>';
-                else
-                    print '&nbsp; &nbsp; &nbsp; &nbsp; <font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
+        	// Place tabulation
+			$tabstring='';
+			$tabul=($this->menu_array[$i]['level'] - 1);
+			if ($tabul > 0)
+			{
+				for ($j=0; $j < $tabul; $j++)
+				{
+					$tabstring.='&nbsp; &nbsp;';
+				}
+			}
+
+			if ($this->menu_array[$i]['level'] == 0) {
+				if ($this->menu_array[$i]['enabled'])
+				{
+					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>'."\n";
+				}
+				else
+				{
+					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>'."\n";
+				}
+				print '<div class="menu_top"></div>'."\n";
             }
 
-            if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0)  {
-                print "</div>\n";
-            }
-        }
+            if ($this->menu_array[$i]['level'] > 0) {
+				print '<div class="menu_contenu">';
 
+            	if ($this->menu_array[$i]['enabled'])
+                    print $tabstring.'<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'">'.$this->menu_array[$i]['titre'].'</a><br>';
+                else
+                    print $tabstring.'<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
+
+				print '</div>'."\n";
+            }
+
+			// If next is a new block or end
+			if (empty($this->menu_array[$i+1]['level']))
+			{
+				print '<div class="menu_end"></div>'."\n";
+				print "</div>\n";
+			}
+		}
     }
 
 }