From e0e7df5f02e9aa5f16b2f21c5a3d0f9ec35be6b8 Mon Sep 17 00:00:00 2001
From: Emmanuel Lacour <elacour@easter-eggs.com>
Date: Tue, 21 Jun 2011 15:28:40 +0200
Subject: [PATCH] Remove obsolete "environment" plugin handling that makes this plugin disapear from plugin menu when "environment " is enabled


diff --git a/setup.php b/setup.php
index cc49e35..bbe2850 100755
--- a/setup.php
+++ b/setup.php
@@ -67,49 +67,23 @@ function plugin_init_tlflines() {
 	//if glpi is loaded
 	if (getLoginUserID()) {
 
-		//if environment plugin is installed
-		if (isset($_SESSION["glpi_plugin_environment_installed"]) && $_SESSION["glpi_plugin_environment_installed"]==1) {
-			//init $_SESSION for environment using
-			$_SESSION["glpi_plugin_environment_tlflines"]=1;
-
-			if (plugin_tlflines_haveRight("tlflines","r")) {
-				$PLUGIN_HOOKS['submenu_entry']['environment']['options']['tlflines']['title'] = $LANG['plugin_tlflines'][4];
-				$PLUGIN_HOOKS['submenu_entry']['environment']['options']['tlflines']['page'] = '/plugins/tlflines/front/tlflines.php';
-				$PLUGIN_HOOKS['submenu_entry']['environment']['options']['tlflines']['links']['search'] = '/plugins/tlflines/front/tlflines.php';
-				//add tlflines to items details
-				$PLUGIN_HOOKS['headings']['tlflines'] = 'plugin_get_headings_tlflines';
-				$PLUGIN_HOOKS['headings_action']['tlflines'] = 'plugin_headings_actions_tlflines';
-				$PLUGIN_HOOKS['headings_actionpdf']['tlflines'] = 'plugin_headings_actionpdf_tlflines';
-			}
-
-			if (plugin_tlflines_haveRight("tlflines","w")) {
-				//redirect link to add tlflines
-				$PLUGIN_HOOKS['submenu_entry']['environment']['options']['tlflines']['links']['add'] = '/plugins/tlflines/front/tlfline.form.php';
-				//use massiveaction in the plugin
-				$PLUGIN_HOOKS['use_massive_action']['tlflines']=1;
-
-			}
-		//if environment plugin isn't installed
-		} else {
-
-			// Display a menu entry ?
-			if (plugin_tlflines_haveRight("tlflines","r")) {
-				//menu entry
-				$PLUGIN_HOOKS['menu_entry']['tlflines'] = 'front/tlfline.php';
-				//search link
-				$PLUGIN_HOOKS['submenu_entry']['tlflines']['search'] = 'front/tlfline.php';
-				//add tlflines to items details
-				$PLUGIN_HOOKS['headings']['tlflines'] = 'plugin_get_headings_tlflines';
-				$PLUGIN_HOOKS['headings_action']['tlflines'] = 'plugin_headings_actions_tlflines';
-				$PLUGIN_HOOKS['headings_actionpdf']['tlflines'] = 'plugin_headings_actionpdf_tlflines';
-			}
-
-			if (plugin_tlflines_haveRight("tlflines","w")) {
-				//add link
-				$PLUGIN_HOOKS['submenu_entry']['tlflines']['add'] = 'front/tlfline.form.php';
-				//use massiveaction in the plugin
-				$PLUGIN_HOOKS['use_massive_action']['tlflines']=1;
-			}
+		// Display a menu entry ?
+		if (plugin_tlflines_haveRight("tlflines","r")) {
+			//menu entry
+			$PLUGIN_HOOKS['menu_entry']['tlflines'] = 'front/tlfline.php';
+			//search link
+			$PLUGIN_HOOKS['submenu_entry']['tlflines']['search'] = 'front/tlfline.php';
+			//add tlflines to items details
+			$PLUGIN_HOOKS['headings']['tlflines'] = 'plugin_get_headings_tlflines';
+			$PLUGIN_HOOKS['headings_action']['tlflines'] = 'plugin_headings_actions_tlflines';
+			$PLUGIN_HOOKS['headings_actionpdf']['tlflines'] = 'plugin_headings_actionpdf_tlflines';
+		}
+
+		if (plugin_tlflines_haveRight("tlflines","w")) {
+			//add link
+			$PLUGIN_HOOKS['submenu_entry']['tlflines']['add'] = 'front/tlfline.form.php';
+			//use massiveaction in the plugin
+			$PLUGIN_HOOKS['use_massive_action']['tlflines']=1;
 		}
 
 		// Import from Data_Injection plugin
@@ -164,4 +138,4 @@ function plugin_datainjection_migratetypes_tlflines($types) {
    return $types;
 }
 
-?>
\ No newline at end of file
+?>
-- 
1.7.2.5