gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php.in, 1.18, 1.19

cvs at kolab.org cvs at kolab.org
Mon May 28 21:24:12 CEST 2007


Author: gunnar

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

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


Index: user.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- user.php.in	24 May 2007 09:31:04 -0000	1.18
+++ user.php.in	28 May 2007 19:24:10 -0000	1.19
@@ -481,11 +481,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']);
 }
 
 if( $auth->group() == 'user' ) {
@@ -505,6 +509,7 @@
        $content = $form->outputForm();
      } else {
        $ldap_object = array();
+       $ldap_object['objectClass'] = $oc;
        $ldap_object['sn'] = trim($_POST['sn']);
        $ldap_object['cn'] = trim($_POST['givenname']).' '.$ldap_object['sn'];
 	   $ldap_object['givenName'] = trim($_POST['givenname']);





More information about the commits mailing list