steffen: server/kolab-webadmin/kolab-webadmin/www/admin/administrator admin.php, 1.6, 1.7 index.php, 1.3, 1.4

[cvs at intevation.de]

Author: steffen

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

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

Index: admin.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- admin.php	13 Aug 2004 11:59:13 -0000	1.6
+++ admin.php	20 Aug 2004 02:10:00 -0000	1.7
@@ -189,7 +189,7 @@
 	   
        if ($action == "save") {
 		 if (!$errors) {
-		   if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$domain_dn;
+		   if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
 		   else $newdn = $dn;
 		   if (!$visible && !strstr($newdn,$dn_add)) {
 			 list($cn,$rest) = split(',', $newdn, 2); 
@@ -209,7 +209,7 @@
 			   }
 			   if( !$errors ) {
 				 // Update admin group
-				 $groupdn = 'cn=admin,'.$domain_dn;
+				 $groupdn = 'cn=admin,cn=internal,'.$domain_dn;
 				 if( !ldap_mod_delete($ldap->connection,$groupdn,
 									  array( 'member' => $dn ) ) ) {
 				   $errors[] = _("LDAP Error: Could not remove old group entry $dn: ")
@@ -241,14 +241,14 @@
        } else {
 		 // firstsave
 		 if (!$errors) {
-		   $dn = "cn=".$ldap_object['cn'].",".$domain_dn;
+		   $dn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
 		   debug("Calling ldap_add with dn=$dn");
 		   // Add object to db
 		   if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) 
 			 array_push($errors, _("LDAP Error: could not add object $dn: ").ldap_error($ldap->connection));
 
 		   // Add object to admin group
-		   if( $dn && !ldap_mod_add($ldap->connection, 'cn=admin,'.$domain_dn, 
+		   if( $dn && !ldap_mod_add($ldap->connection, 'cn=admin,cn=internal,'.$domain_dn, 
 									array( 'member' => $dn ) ) ) {
 			 array_push($errors, _("LDAP Error: could not add object $dn to maintainer group: ").ldap_error($ldap->connection));
 		   }
@@ -303,7 +303,7 @@
      array_push($errors, _("Error: you need administrative permissions to delete administrators"));
    
    if (!$errors) {
-	 if(!ldap_mod_del($ldap->connection, 'cn=admin,'.domain_dn(), array('member' => $dn ) )) {
+	 if(!ldap_mod_del($ldap->connection, 'cn=admin,cn=internal,'.domain_dn(), array('member' => $dn ) )) {
 	   $errors[] = _("LDAP Error: Could not remove $dn from admin group: ")
 		 .ldap_error($ldap->connection);
 	 }

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php	12 Aug 2004 10:55:39 -0000	1.3
+++ index.php	20 Aug 2004 02:10:00 -0000	1.4
@@ -30,10 +30,10 @@
   if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
   else $base_dn = 'k=kolab';
 
-  $maintainers = $ldap->groupMembers( $base_dn, 'admin' );
+  $maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'admin' );
 
   $filter = "(&(cn=*)(objectclass=inetOrgPerson)(uid=*)(sn=*))";
-  $result = ldap_list($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
+  $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
 
   if( $result ) {
 	$title = _('Manage Administrators (').count($maintainers)._(' Administrators)');