steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.15, 1.16

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv21496/kolab-webadmin/kolab-webadmin/php/admin/include

Modified Files:
	ldap.class.php 
Log Message:
Move system user to internal subtree. Fix for Issue324

Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ldap.class.php	13 Aug 2004 10:46:08 -0000	1.15
+++ ldap.class.php	20 Aug 2004 02:10:00 -0000	1.16
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 KlarÃ��¿½ï¿½Â¤lvdalens Datakonsult AB
+ *  Copyright (c) 2004 KlarÃ��¿½ï¿½Â¿Â½Ã¯Â¿Â½Ã��¤lvdalens Datakonsult AB
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
@@ -236,9 +236,9 @@
     if ($dn) {
       $group = 'user';
       $filter = '(member='.$this->escape($dn).')';
-      $result = $this->search( 'cn=maintainer,'.$_SESSION['base_dn'], $filter);
+      $result = $this->search( 'cn=maintainer,cn=internal,'.$_SESSION['base_dn'], $filter);
       if (ldap_count_entries($this->connection, $result) > 0) $group = 'maintainer';
-      $result = $this->search( 'cn=admin,'.$_SESSION["base_dn"], $filter);
+      $result = $this->search( 'cn=admin,cn=internal,'.$_SESSION["base_dn"], $filter);
       if (ldap_count_entries($this->connection, $result) > 0) $group = 'admin';
       if ($result) $this->freeSearchResult();
     }