From 6b154b447e3ec793eb9f893307fe5ff4fd152413 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Thu, 1 Mar 2001 16:20:48 +0000
Subject: [PATCH] Move global_denied_users list into accounts class, sql is an
 empty array

---
 phpgwapi/inc/class.accounts_ldap.inc.php | 28 ++++++++++++++++++++++++
 phpgwapi/inc/class.accounts_sql.inc.php  |  9 +++++++-
 phpgwapi/inc/functions.inc.php           | 27 -----------------------
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index a7c7b73a6a..ce12107dcc 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -31,6 +31,34 @@
     var $data;
     var $memberships = Array();
     var $members;
+	// Dont know where to put this (seek3r)
+	// This is where it belongs (jengo)
+	// This is where it ended up (milosch)
+	/* Since LDAP will return system accounts, there are a few we don't want to login. */
+	$phpgw_info["server"]["global_denied_users"] = array(
+		'root'     => True,
+		'bin'      => True,
+		'daemon'   => True,
+		'adm'      => True,
+		'lp'       => True,
+		'sync'     => True,
+		'shutdown' => True,
+		'halt'     => True,
+		'mail'     => True,
+		'news'     => True,
+		'uucp'     => True,
+		'operator' => True,
+		'games'    => True,
+		'gopher'   => True,
+		'nobody'   => True,
+		'xfs'      => True,
+		'pgsql'    => True,
+		'mysql'    => True,
+		'postgres' => True,
+		'ftp'      => True,
+		'gdm'      => True,
+		'named'    => True
+	);
 
     function accounts_()
     {
diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index 3bb422ab8c..39e0a2d597 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -31,7 +31,14 @@
     var $data;
     var $memberships;
     var $members;
-    
+
+	// Dont know where to put this (seek3r)
+	// This is where it belongs (jengo)
+	// This is where it ended up (milosch)
+	/* Since LDAP will return system accounts, there are a few we don't want to login. */
+	// it is here as an empty array to avoid some errors, hopefully
+	$phpgw_info["server"]["global_denied_users"] = array();
+
     function accounts()
     {
        global $phpgw;
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 7ba6375bb2..c8c5fb272a 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -163,33 +163,6 @@
 
 	print_debug('domain: '.$phpgw_info["user"]["domain"]);
 
-	// Dont know where to put this (seek3r)
-	// This is where it belongs (jengo)
-	/* Since LDAP will return system accounts, there are a few we don't want to login. */
-	$phpgw_info["server"]["global_denied_users"] = array('root'     => True,
-		'bin'      => True,
-		'daemon'   => True,
-		'adm'      => True,
-		'lp'       => True,
-		'sync'     => True,
-		'shutdown' => True,
-		'halt'     => True,
-		'mail'     => True,
-		'news'     => True,
-		'uucp'     => True,
-		'operator' => True,
-		'games'    => True,
-		'gopher'   => True,
-		'nobody'   => True,
-		'xfs'      => True,
-		'pgsql'    => True,
-		'mysql'    => True,
-		'postgres' => True,
-		'ftp'      => True,
-		'gdm'      => True,
-		'named'    => True
-	);
-
 	/****************************************************************************\
 	* These lines load up the API, fill up the $phpgw_info array, etc            *
 	\****************************************************************************/