From ad2b5f6449d0ffc034a51fafeb4a93008c8fafe1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 2 Nov 2010 12:03:47 +0000
Subject: [PATCH] Fix: Restore backward compatibility with old modules

---
 htdocs/admin/modules.php                  | 1 -
 htdocs/admin/system/dolibarr.php          | 2 --
 htdocs/compta/bank/pre.inc.php            | 3 ++-
 htdocs/compta/paiement/cheque/pre.inc.php | 3 ++-
 htdocs/ftp/pre.inc.php                    | 3 ++-
 htdocs/public/demo/index.php              | 1 -
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index f875f05aadf..9f21022aaac 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -256,7 +256,6 @@ foreach ($conf->file->dol_document_root as $dirroot)
 					$modulequalified=1;
 
 					// We discard modules that does not respect constraint on menu handlers
-					//if (! empty($objMod->needleftmenu) && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
 					if (! empty($objMod->needtopmenu)  && sizeof($objMod->needtopmenu)  && ! in_array($conf->top_menu,$objMod->needtopmenu))   $modulequalified=0;
 
 					// We discard modules according to features level (PS: if module is activated we always show it)
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 51a3b0e8230..5efd560e31d 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -90,8 +90,6 @@ $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentTheme").'</td><td colspan="2">'.$conf->theme."</td></tr>\n";
 $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentMenuHandler").'</td><td colspan="2">'.$conf->top_menu."</td></tr>\n";
-//$var=!$var;
-//print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentLeftMenuHandler").'</td><td colspan="2">'.$conf->left_menu."</td></tr>\n";
 print '</table>';
 print '<br>';
 
diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php
index 558664d0c89..ce41573d46b 100644
--- a/htdocs/compta/bank/pre.inc.php
+++ b/htdocs/compta/bank/pre.inc.php
@@ -84,6 +84,7 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
 		$db->free($resql);
 	}
 
-	left_menu('', $help_url, '', $menu->liste);
+	left_menu('', $help_url, '', $menu->liste, 1);
+    main_area();
 }
 ?>
diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php
index 9017e0b6171..8ea35412484 100644
--- a/htdocs/compta/paiement/cheque/pre.inc.php
+++ b/htdocs/compta/paiement/cheque/pre.inc.php
@@ -96,7 +96,8 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
 		$db->free($resql);
 	}
 
-	left_menu('', $help_url, '', $menu->liste);
+	left_menu('', $help_url, '', $menu->liste, 1);
+	main_area();
 }
 
 ?>
diff --git a/htdocs/ftp/pre.inc.php b/htdocs/ftp/pre.inc.php
index fa6d25abc1c..9ed8671bfd9 100644
--- a/htdocs/ftp/pre.inc.php
+++ b/htdocs/ftp/pre.inc.php
@@ -53,6 +53,7 @@ function llxHeader($head = '', $title='', $help_url='', $morehtml='')
 	}
 
 
-	left_menu($menu->liste, $help_url, $morehtml, '');
+	left_menu($menu->liste, $help_url, $morehtml, '', 1);
+	main_area();
 }
 ?>
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index e267fd1faac..260c248c028 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -105,7 +105,6 @@ foreach ($dirlist as $dirroot)
                 $modulequalified=1;
 
                 // We discard modules that does not respect constraint on menu handlers
-                //if ($objMod->needleftmenu && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
                 if ($objMod->needtopmenu  && sizeof($objMod->needtopmenu)  && ! in_array($conf->top_menu,$objMod->needtopmenu))   $modulequalified=0;
 
                 // We discard modules according to features level (PS: if module is activated we always show it)