From 7d785d6878a48eb5d0272ebf5a3648399042c607 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 20 Feb 2011 00:53:58 +0000
Subject: [PATCH] Qual: Removed deprecated code

---
 htdocs/admin/modules.php                   |  3 ---
 htdocs/core/class/html.formadmin.class.php | 13 +++++++++----
 htdocs/lib/admin.lib.php                   |  3 ---
 htdocs/lib/functions.lib.php               |  1 -
 htdocs/public/demo/index.php               |  3 ---
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index f4113472f51..462b86f8516 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -115,9 +115,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->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)
 					$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
 					if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index dd215a8f0cd..e615e7d086e 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -155,8 +155,10 @@ class FormAdmin
     	                        if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
     	                    	$filelib=preg_replace('/\.php$/i','',$file);
     	        				$prefix='';
-    	        				if (preg_match('/^eldy|^smartphone/i',$file)) $prefix='0';	// 0=Recommanded, 1=Experimental, 2=Other
-    	        				else $prefix='2';
+    	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
+    	        				if (preg_match('/^eldy/i',$file)) $prefix='0';
+                                else if (preg_match('/^smartphone/i',$file)) $prefix='2';
+    	        				else $prefix='3';
 
     	                        if ($file == $selected)
     	                        {
@@ -182,13 +184,16 @@ class FormAdmin
 		{
 			$tab=explode('_',$key);
 			$newprefix=$tab[0];
+			if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
+			if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
 			if (! empty($conf->browser->firefox) && $newprefix != $oldprefix)	// Add separators
 			{
 				// Affiche titre
 				print '<option value="-1" disabled="disabled">';
 				if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
-				if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
-				if ($newprefix=='2') print '-- '.$langs->trans("Other").' --';
+                if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
+				if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
+				if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
 				print '</option>';
 				$oldprefix=$newprefix;
 			}
diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
index 9d501447a0d..563cdc8461b 100644
--- a/htdocs/lib/admin.lib.php
+++ b/htdocs/lib/admin.lib.php
@@ -759,9 +759,6 @@ function complete_dictionnary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsq
 
                         $modulequalified=1;
 
-                        // We discard modules that does not respect constraint on menu handlers
-                        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)
                         $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
                         if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index d737c9a134d..8f524770f26 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -2096,7 +2096,6 @@ function dol_print_error($db='',$error='')
         $out.="<br>\n";
 		$out.="<b>".$langs->trans("RequestedUrl").":</b> ".$_SERVER["REQUEST_URI"]."<br>\n";;
         $out.="<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"])?$_SERVER["HTTP_REFERER"]:'')."<br>\n";;
-		//$out.="<b>".$langs->trans("MenuManager").":</b> ".$conf->top_menu.($conf->top_menu||$conf->left_menu?'/':'').$conf->left_menu."<br>\n";
 		$out.="<b>".$langs->trans("MenuManager").":</b> ".$conf->top_menu."<br>\n";
 		$out.="<br>\n";
 		$syslog.="url=".$_SERVER["REQUEST_URI"];
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 8c68fd61450..792a972da37 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -113,9 +113,6 @@ foreach ($dirlist as $dirroot)
 
                     $modulequalified=1;
 
-                    // We discard modules that does not respect constraint on menu handlers
-                    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)
                     $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod)));
                     if ($objMod->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;