steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.20, 1.21
cvs at intevation.de
cvs at intevation.de
Fri Aug 6 13:40:39 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv3453/kolab-webadmin/www/admin/user
Modified Files:
user.php
Log Message:
fix for issue281
Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- user.php 4 Aug 2004 00:58:07 -0000 1.20
+++ user.php 6 Aug 2004 11:40:37 -0000 1.21
@@ -372,6 +372,7 @@
}
if ($count > 0) $ldap_object[$attr] = $args;
elseif (!empty($_POST[$key])) $ldap_object[$attr] = $_POST[$key];
+ else $ldap_object[$attr] = array();
}
$dn_add = "";
@@ -421,9 +422,9 @@
$ldap_object['uid'] = $oldattrs['uid'][0];
$ldap_object['mail'] = $oldattrs['mail'][0];
if( !$ldap_object['userPassword'] ) $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
- if( $ldap_object['userquota'] == array() ) unset( $ldap_object['userquota'] );
- if( $ldap_object['delegate'] == array() ) unset( $ldap_object['delegate'] );
- if( $ldap_object['alias'] == array() ) unset( $ldap_object['alias'] );
+ foreach( $ldap_object as $k => $v ) {
+ if( $v == array() ) unset($ldap_object[$k]);
+ }
if ( !$errors && !ldap_add($ldap->connection,$newdn, $ldap_object) ) {
array_push($errors, _("LDAP Error: Could not rename $dn to $newdn: ")
.ldap_error($ldap->connection));
@@ -478,7 +479,9 @@
// firstsave
if (!$errors) {
$dn = "cn=".$ldap_object['cn'].$dn_add.",".$domain_dn;
- if( $ldap_object['userquota'] == array() ) unset( $ldap_object['userquota'] );
+ foreach( $ldap_object as $k => $v ) {
+ if( $v == array() ) unset($ldap_object[$k]);
+ }
debug("Calling ldap_add with dn=$dn");
if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object))
array_push($errors, _("LDAP Error: could not add object $dn: ").ldap_error($ldap->connection));
More information about the commits
mailing list