summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2007-03-23 14:17:00 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2007-03-23 14:17:00 (GMT)
commit37b52d5c5fcdf8eb7fd0578b065bee01bc4821b2 (patch)
treead6bf1a731b6621386400d01baeaff27a34036cf
parent41f4888a612dc3e76f2aa4975aee683f17058fd8 (diff)
downloadkolab-webadmin-37b52d5c5fcdf8eb7fd0578b065bee01bc4821b2.tar.gz
* www/admin/domainmaintainer/domainmaintainer.php.in:
Fixed update of the domain name after modification of a domain maintainer. Fixes kolab/issue1670 (https://intevation.de/roundup/kolab/issue1670)
-rw-r--r--ChangeLog10
-rw-r--r--www/admin/domainmaintainer/domainmaintainer.php.in11
2 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fe601b5..bb3ca31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-03-23 Gunnar Wrobel <p@rdus.de>
+
+ * www/admin/domainmaintainer/domainmaintainer.php.in:
+
+ Fixed update of the domain name after modification of a domain
+ maintainer.
+
+ Fixes
+ kolab/issue1670 (https://intevation.de/roundup/kolab/issue1670)
+
2007-03-21 Gunnar Wrobel <p@rdus.de>
* www/admin/domainmaintainer/domainmaintainer.php.in:
diff --git a/www/admin/domainmaintainer/domainmaintainer.php.in b/www/admin/domainmaintainer/domainmaintainer.php.in
index fa7de46..f6ba885 100644
--- a/www/admin/domainmaintainer/domainmaintainer.php.in
+++ b/www/admin/domainmaintainer/domainmaintainer.php.in
@@ -217,11 +217,9 @@ switch( $action ) {
if( !$errors ) {
if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) {
- if( !$errors ) {
- $domains = $ldap->domainsForMaintainerDn($dn);
- $ldap->removeFromDomainGroups( $dn, $domains );
- $ldap->addToDomainGroups( $newdn, $_POST['domains'] );
- }
+ $domains = $ldap->domainsForMaintainerDn($dn);
+ $ldap->removeFromDomainGroups( $dn, $domains );
+ $ldap->addToDomainGroups( $newdn, $_POST['domains'] );
}
}
$dn = $newdn;
@@ -249,6 +247,9 @@ switch( $action ) {
}
$form->entries['uid']['attrs'] = 'readonly';
$form->entries['action']['value'] = 'save';
+ $form->entries['dn'] = array( 'name' => 'dn',
+ 'type' => 'hidden',
+ 'value' => $dn );
} else {
// firstsave
if (!$errors) {