From 19d7b1bd9205df68a0051db2f5611d0f3af474dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 26 Jun 2010 13:24:38 +0000
Subject: [PATCH] Fix: Fix in css usage.

---
 htdocs/includes/menus/barre_left/auguria.lib.php |  9 +++++----
 htdocs/includes/menus/barre_left/eldy.lib.php    | 10 ++++------
 htdocs/includes/menus/barre_left/empty.php       | 15 +++++++++------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/htdocs/includes/menus/barre_left/auguria.lib.php b/htdocs/includes/menus/barre_left/auguria.lib.php
index 7490b8ccec7..a13163ac341 100644
--- a/htdocs/includes/menus/barre_left/auguria.lib.php
+++ b/htdocs/includes/menus/barre_left/auguria.lib.php
@@ -119,7 +119,7 @@ function print_left_auguria_menu($db,$menu_array)
 		for ($i = 0 ; $i < sizeof($menu_array) ; $i++)
 		{
 			$alt++;
-			if ($menu_array[$i]['level']==0)
+			if (empty($menu_array[$i]['level']))
 			{
 				if (($alt%2==0))
 				{
@@ -181,12 +181,13 @@ function print_left_auguria_menu($db,$menu_array)
 				}
 			}
 
-			if ($i == (sizeof($menu_array)-1) || $menu_array[$i+1]['level']==0)  {
+			// If next is a new block or end
+			if (empty($menu_array[$i+1]['level']))
+			{
+				print '<div class="menu_fin"></div>'."\n";
 				print "</div>\n";
 			}
-
 		}
-		if ($contenu == 1) print '<div class="menu_fin"></div>'."\n";
 	}
 
 	return sizeof($menu_array);
diff --git a/htdocs/includes/menus/barre_left/eldy.lib.php b/htdocs/includes/menus/barre_left/eldy.lib.php
index bf1388df6af..dc0ed5069d0 100644
--- a/htdocs/includes/menus/barre_left/eldy.lib.php
+++ b/htdocs/includes/menus/barre_left/eldy.lib.php
@@ -876,7 +876,7 @@ function print_left_eldy_menu($db,$menu_array)
 		for ($i = 0 ; $i < sizeof($menu_array) ; $i++)
 		{
 			$alt++;
-			if ($menu_array[$i]['level']==0)
+			if (empty($menu_array[$i]['level']))
 			{
 				if (($alt%2==0))
 				{
@@ -902,7 +902,6 @@ function print_left_eldy_menu($db,$menu_array)
 			// Menu niveau 0
 			if ($menu_array[$i]['level'] == 0)
 			{
-				if ($contenu == 1) print '<div class="menu_fin"></div>'."\n";
 				if ($menu_array[$i]['enabled'])
 				{
 					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$menu_array[$i]['url'].'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>'."\n";
@@ -915,7 +914,6 @@ function print_left_eldy_menu($db,$menu_array)
 			// Menu niveau > 0
 			if ($menu_array[$i]['level'] > 0)
 			{
-				if ($menu_array[$i]['level']==1) $contenu = 1;
 				if ($menu_array[$i]['enabled'])
 				{
 					print '<div class="menu_contenu">';
@@ -935,13 +933,13 @@ function print_left_eldy_menu($db,$menu_array)
 				}
 			}
 
-
-			if ($i == (sizeof($menu_array)-1) || $menu_array[$i+1]['level']==0)
+			// If next is a new block or end
+			if (empty($menu_array[$i+1]['level']))
 			{
+				print '<div class="menu_fin"></div>'."\n";
 				print "</div>\n";
 			}
 		}
-		if ($contenu == 1) print '<div class="menu_fin"></div>'."\n";
 	}
 
 	return sizeof($menu_array);
diff --git a/htdocs/includes/menus/barre_left/empty.php b/htdocs/includes/menus/barre_left/empty.php
index 8d96f07f83a..87570ff7733 100644
--- a/htdocs/includes/menus/barre_left/empty.php
+++ b/htdocs/includes/menus/barre_left/empty.php
@@ -79,7 +79,8 @@ class MenuLeft {
         for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++)
         {
             $alt++;
-            if ($this->menu_array[$i]['level']==0) {
+            if (empty($menu_array[$i]['level']))
+            {
                 if (($alt%2==0))
                 {
                     print '<div class="blockvmenuimpair">'."\n";
@@ -115,11 +116,13 @@ class MenuLeft {
                     print '&nbsp; &nbsp; &nbsp; &nbsp; <font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
             }
 
-            if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0)  {
-                print "</div>\n";
-            }
-        }
-
+			// If next is a new block or end
+			if (empty($menu_array[$i+1]['level']))
+			{
+				print '<div class="menu_fin"></div>'."\n";
+				print "</div>\n";
+			}
+		}
     }
 
 }