steffen: server/kolab-webadmin/kolab-webadmin/www/admin/administrator admin.php, 1.8, 1.9
cvs at intevation.de
cvs at intevation.de
Tue Oct 26 04:51:11 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator
In directory doto:/tmp/cvs-serv18130/kolab-webadmin/www/admin/administrator
Modified Files:
admin.php
Log Message:
fix for issue487 (Changing firstname for admin and maintainer means trouble)
Index: admin.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/administrator/admin.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- admin.php 25 Oct 2004 09:10:51 -0000 1.8
+++ admin.php 26 Oct 2004 02:51:09 -0000 1.9
@@ -207,6 +207,8 @@
($entry=ldap_first_entry($ldap->connection,$result)) &&
($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
$ldap_object['uid'] = $oldattrs['uid'][0];
+ if( empty($ldap_object['userPassword']) )
+ $ldap_object['userPassword'] = $oldattrs['userPassword'][0];
if (!ldap_add($ldap->connection,$newdn, $ldap_object) )
array_push($errors, _("LDAP Error: could not rename $dn to $newdn: ").ldap_error($ldap->connection));
if( !$errors ) {
@@ -217,16 +219,16 @@
if( !$errors ) {
// Update admin group
$groupdn = 'cn=admin,cn=internal,'.$domain_dn;
- if( !ldap_mod_delete($ldap->connection,$groupdn,
- array( 'member' => $dn ) ) ) {
- $errors[] = _("LDAP Error: Could not remove old group entry $dn: ")
- .ldap_error($ldap->connection());
- }
- if( !$errors && ldap_mod_add( $ldap->connection,
+ if( !ldap_mod_add( $ldap->connection,
$groupdn,
array( 'member' => $newdn ) ) ) {
$errors[] = _("LDAP Error: Could not add new group entry $newdn: ")
- .ldap_error($ldap->connection());
+ .ldap_error($ldap->connection);
+ }
+ if( !$errors && !ldap_mod_del($ldap->connection,$groupdn,
+ array( 'member' => $dn ) ) ) {
+ $errors[] = _("LDAP Error: Could not remove old group entry $dn: ")
+ .ldap_error($ldap->connection);
}
}
$dn = $newdn;
More information about the commits
mailing list