More fixes by Bas van den Heuvel

diff --git a/ldap-useradmin/edit_user.cgi b/ldap-useradmin/edit_user.cgi
index 1bdd5ef..0323292 100755 (executable)
--- a/ldap-useradmin/edit_user.cgi
+++ b/ldap-useradmin/edit_user.cgi
@@ -57,7 +57,7 @@ else {
        foreach $oc ($uinfo->get_value('objectClass')) {
                $oclass{$oc} = 1;
                }
-       @alias = $uinfo->get_value('alias');
+       @alias = $uinfo->get_value($config{'maillocaladdress'} || 'alias');
        %uinfo = &dn_to_hash($uinfo);
        &can_edit_user(\%uinfo) || &error($text{'uedit_eedit'});
        &ui_print_header(undef, $text{'uedit_title'}, "");

diff --git a/ldap-useradmin/ldap-useradmin-lib.pl b/ldap-useradmin/ldap-useradmin-lib.pl
index f3e5364..9e5d396 100644 (file)
--- a/ldap-useradmin/ldap-useradmin-lib.pl
+++ b/ldap-useradmin/ldap-useradmin-lib.pl
@@ -888,7 +888,7 @@ else {
        $rv->{'Status'} eq 'ok' ||
                &imap_error($text{'usave_eiacl'}, $rv);
 
-       if (defined($quota)) {
+       if (defined($quota) && $config{'quota_support'}) {
                # Set his IMAP quota
                $rv = $imap->setquota("user".$config{'imap_foldersep'}.$user->{'user'},
                                      "STORAGE", $quota);

diff --git a/ldap-useradmin/save_user.cgi b/ldap-useradmin/save_user.cgi
index 1831f61..e383cc8 100755 (executable)
--- a/ldap-useradmin/save_user.cgi
+++ b/ldap-useradmin/save_user.cgi
@@ -600,7 +600,7 @@ else {
                        }
                elsif ($in{'cyrus'} && $wascyrus) {
                        # Changing IMAP support
-                       if (!$in{'quota_def'}) {
+                       if (!$in{'quota_def'} && $config{'quota_support'}) {
                                &set_imap_quota(\%uhash, $in{'quota'});
                                }
                        }