steffen: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer index.php, 1.2, 1.3 maintainer.php, 1.5, 1.6

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	index.php maintainer.php 
Log Message:
*BOMB*. Changes to support the new schema

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php	18 Jul 2004 01:15:51 -0000	1.2
+++ index.php	12 Aug 2004 10:55:39 -0000	1.3
@@ -40,7 +40,7 @@
   $maintainers = $ldap->groupMembers( $base_dn, 'maintainer' );
 
   $filter = "(&(cn=*)(objectclass=inetOrgPerson)(uid=*)(sn=*))";
-  $result = ldap_list($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'deleteflag' ));
+  $result = ldap_list($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
 
   if( $result ) {
 	$title = _('Manage Maintainers (').count($maintainers)._(' Maintainers)');
@@ -62,7 +62,7 @@
 	  while( $entry ) {
 		$attrs = ldap_get_attributes($ldap->connection, $entry);
 		$dn = ldap_get_dn($ldap->connection,$entry);
-		$deleted = array_key_exists('deleteflag',$attrs)?$attrs['deleteflag'][0]:"FALSE";
+		$deleted = array_key_exists('kolabdeleteflag',$attrs)?$attrs['kolabdeleteflag'][0]:"FALSE";
         $userid = $attrs['uid'][0];
         $sn = $attrs['sn'][0];
         $cn = $attrs['cn'][0];

Index: maintainer.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- maintainer.php	9 Aug 2004 10:42:35 -0000	1.5
+++ maintainer.php	12 Aug 2004 10:55:39 -0000	1.6
@@ -193,7 +193,7 @@
      } else {
        debug("Process...");
        $ldap_object = array();
-       $ldap_object['objectClass'] = 'kInetOrgPerson';
+       $ldap_object['objectClass'] = 'kolabinetorgperson';
        $ldap_object['sn'] = trim($_POST['lastname']);
        $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
        if( !empty( $_POST['password_0'] ) ) {
@@ -327,7 +327,7 @@
 		 .ldap_error($ldap->connection);
 	 }
 	 if( !$errors ) {
-	   $delete_template['deleteflag'] = 'TRUE';
+	   $delete_template['kolabdeleteflag'] = 'TRUE';
 	   if( !$ldap->deleteObject($dn)) {
 		 array_push($errors, _("LDAP Error: could not mark $dn for deletion ")
 					.ldap_error($ldap->connection));