gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer domainmaintainer.php.in, 1.9, 1.10
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/domainmaintainer
In directory doto:/tmp/cvs-serv4849/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer
Modified Files:
domainmaintainer.php.in
Log Message:
Corrected fix for kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
Index: domainmaintainer.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/domainmaintainer/domainmaintainer.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- domainmaintainer.php.in 24 May 2007 09:31:05 -0000 1.9
+++ domainmaintainer.php.in 28 May 2007 19:24:10 -0000 1.10
@@ -146,11 +146,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 );
@@ -167,6 +171,7 @@
$content = $form->outputForm();
} else {
$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'] ) ) {
More information about the commits
mailing list