summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-07-27 06:19:17 +0200
committerByron Jones <glob@mozilla.com>2015-07-27 06:19:17 +0200
commita8ef3e105b01d4a7f765edbe53b7af53ed179020 (patch)
treecf9340948a7944b6d0755f2de514d7c3a4936882 /Bugzilla
parent1e3288184f015700e109ead8e21c1383152e340b (diff)
downloadbugzilla-a8ef3e105b01d4a7f765edbe53b7af53ed179020.tar.gz
bugzilla-a8ef3e105b01d4a7f765edbe53b7af53ed179020.tar.xz
Bug 1186788 - disabling an account should always disable bugmail
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Install/DB.pm7
-rw-r--r--Bugzilla/User.pm21
2 files changed, 21 insertions, 7 deletions
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 92015f22f..0892d3293 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -732,6 +732,8 @@ sub update_table_definitions {
_add_attach_size();
+ _fix_disable_mail();
+
################################################################
# New --TABLE-- changes should go *** A B O V E *** this point #
################################################################
@@ -3847,6 +3849,11 @@ sub _add_attach_size {
");
}
+sub _fix_disable_mail {
+ # you can no longer have disabled accounts with enabled mail
+ Bugzilla->dbh->do("UPDATE profiles SET disable_mail = 1 WHERE is_enabled = 0");
+}
+
1;
__END__
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index cf366d6d9..a749aaaf2 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -276,7 +276,11 @@ sub update {
# Validators
################################################################################
-sub _check_disable_mail { return $_[1] ? 1 : 0; }
+sub _check_disable_mail {
+ return 1 unless $_[0]->is_enabled;
+ return $_[1] ? 1 : 0;
+}
+
sub _check_disabledtext { return trim($_[1]) || ''; }
# Check whether the extern_id is unique.
@@ -362,8 +366,10 @@ sub set_name {
sub set_password { $_[0]->set('cryptpassword', $_[1]); }
sub set_disabledtext {
- $_[0]->set('disabledtext', $_[1]);
- $_[0]->set('is_enabled', $_[1] ? 0 : 1);
+ my ($self, $text) = @_;
+ $self->set('disabledtext', $text);
+ $self->set('is_enabled', trim($text) eq '' ? 0 : 1);
+ $self->set('disable_mail', 1) if !$self->is_enabled;
}
sub set_groups {
@@ -504,8 +510,8 @@ sub email { $_[0]->login . Bugzilla->params->{'emailsuffix'}; }
sub disabledtext { $_[0]->{'disabledtext'}; }
sub is_enabled { $_[0]->{'is_enabled'} ? 1 : 0; }
sub showmybugslink { $_[0]->{showmybugslink}; }
-sub email_disabled { $_[0]->{disable_mail}; }
-sub email_enabled { !($_[0]->{disable_mail}); }
+sub email_disabled { $_[0]->{disable_mail} || !$_[0]->{is_enabled}; }
+sub email_enabled { !$_[0]->email_disabled; }
sub last_seen_date { $_[0]->{last_seen_date}; }
sub cryptpassword {
my $self = shift;
@@ -2973,11 +2979,12 @@ Params: login_name - B<Required> The login name for the new user.
Even though the name says "crypt", you should just specify
a plain-text password. If you specify '*', the user will not
be able to log in using DB authentication.
- disabledtext - The disable-text for the new user. If given, the user
+ disabledtext - The disable-text for the new user. If given, the user
will be disabled, meaning he cannot log in. Defaults to an
empty string.
- disable_mail - If 1, bug-related mail will not be sent to this user;
+ disable_mail - If 1, bug-related mail will not be sent to this user;
if 0, mail will be sent depending on the user's email preferences.
+ disable_mail is always 1 for disabled users.
=item C<check>