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

[cvs at intevation.de]

Author: steffen

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

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

Index: admin.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- admin.php	6 Aug 2004 10:53:29 -0000	1.4
+++ admin.php	12 Aug 2004 10:55:39 -0000	1.5
@@ -174,7 +174,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'] ) ) {

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php	18 Jul 2004 00:30:31 -0000	1.2
+++ index.php	12 Aug 2004 10:55:39 -0000	1.3
@@ -33,7 +33,7 @@
   $maintainers = $ldap->groupMembers( $base_dn, 'admin' );
 
   $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 Administrators (').count($maintainers)._(' Administrators)');
@@ -55,7 +55,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];