From 09d24127b078bd453b1ccde2bb0a40537a263707 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Tue, 14 May 2002 13:43:34 +0000
Subject: [PATCH] Add more exclusions to applist

---
 setup/ldapimport.php | 18 ++++++++++++------
 setup/ldapmodify.php | 18 ++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/setup/ldapimport.php b/setup/ldapimport.php
index 0782e04813..7568ef2eb7 100644
--- a/setup/ldapimport.php
+++ b/setup/ldapimport.php
@@ -128,8 +128,7 @@
 		$group_info = array();
 	}
 
-	$GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM phpgw_applications WHERE app_enabled != '0' AND app_enabled != '3' AND "
-		. "app_name != 'administration' ORDER BY app_title",__LINE__,__FILE__);
+	$GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY app_title",__LINE__,__FILE__);
 	while ($GLOBALS['phpgw_setup']->db->next_record())
 	{
 		$apps[$GLOBALS['phpgw_setup']->db->f('app_name')] = $GLOBALS['phpgw_setup']->db->f('app_title');
@@ -441,15 +440,22 @@
 			. '</option>';
 	}
 
-	while (list($apptitle,$appname) = each($apps))
+	while(list($appname,$apptitle) = each($apps))
 	{
-		if ($apptitle != 'admin')
+		if($appname == 'admin' ||
+			$appname == 'skel' ||
+			$appname == 'backup' ||
+			$appname == 'netsaint' ||
+			$appname == 'developer_tools' ||
+			$appname == 'phpsysinfo' ||
+			$appname == 'eldaptir' ||
+			$appname == 'qmailldap')
 		{
-			$app_list .= '<option value="' . $apptitle . '" selected>' . $appname . '</option>';
+			$app_list .= '<option value="' . $appname . '">' . $apptitle . '</option>';
 		}
 		else
 		{
-			$app_list .= '<option value="' . $apptitle . '">' . $appname . '</option>';
+			$app_list .= '<option value="' . $appname . '" selected>' . $apptitle . '</option>';
 		}
 	}
 
diff --git a/setup/ldapmodify.php b/setup/ldapmodify.php
index fe8cb2da4e..1a02a12d40 100644
--- a/setup/ldapmodify.php
+++ b/setup/ldapmodify.php
@@ -110,8 +110,7 @@
 		$group_info = array();
 	}
 
-	$GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM phpgw_applications WHERE app_enabled != '0' AND app_enabled != '3' AND "
-		. "app_name != 'administration' ORDER BY app_title",__LINE__,__FILE__);
+	$GLOBALS['phpgw_setup']->db->query("SELECT app_name,app_title FROM phpgw_applications WHERE app_enabled!='0' AND app_enabled!='3' ORDER BY app_title",__LINE__,__FILE__);
 	while ($GLOBALS['phpgw_setup']->db->next_record())
 	{
 		$apps[$GLOBALS['phpgw_setup']->db->f('app_name')] = $GLOBALS['phpgw_setup']->db->f('app_title');
@@ -377,15 +376,22 @@
 		$group_list .= '<option value="' . $group['gidnumber'][0] . '">' . $group['cn'][0]  . '</option>';
 	}
 
-	while (list($apptitle,$appname) = each($apps))
+	while(list($appname,$apptitle) = each($apps))
 	{
-		if ($apptitle != 'admin')
+		if($appname == 'admin' ||
+			$appname == 'skel' ||
+			$appname == 'backup' ||
+			$appname == 'netsaint' ||
+			$appname == 'developer_tools' ||
+			$appname == 'phpsysinfo' ||
+			$appname == 'eldaptir' ||
+			$appname == 'qmailldap')
 		{
-			$app_list .= '<option value="' . $apptitle . '" selected>' . $appname . '</option>';
+			$app_list .= '<option value="' . $appname . '">' . $apptitle . '</option>';
 		}
 		else
 		{
-			$app_list .= '<option value="' . $apptitle . '">' . $appname . '</option>';
+			$app_list .= '<option value="' . $appname . '" selected>' . $apptitle . '</option>';
 		}
 	}