gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer maintainer.php.in, 1.7, 1.8

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	maintainer.php.in 
Log Message:
Corrected fix for kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)


Index: maintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- maintainer.php.in	24 May 2007 09:31:05 -0000	1.7
+++ maintainer.php.in	28 May 2007 19:24:10 -0000	1.8
@@ -160,11 +160,15 @@
 $entries['action'] = array( 'name' => 'action',
 			    'type' => 'hidden' );
 
+$oc = array('top', 'inetOrgPerson','kolabInetOrgPerson');
+
 if( $dn ) {
   $ldap_object = $ldap->read( $dn );
   if( !$ldap_object ) {
     array_push($errors, sprintf(_("LDAP Error: No such dn: %s: %s"), $dn, ldap_error($ldap->connection)));
   }
+  $oc = $ldap_object['objectClass'];
+  unset($oc['count']);
 }
 
 $form =& new KolabForm( 'maintainer', 'createmaintainer.tpl', $entries );
@@ -182,6 +186,7 @@
      } else {
        debug("Process...");
        $ldap_object = array();
+       $ldap_object['objectClass'] = $oc;
        $ldap_object['sn'] = trim($_POST['lastname']);
        $ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
        if( !empty( $_POST['password_0'] ) ) {