diff options
| author | karl.kornel%mindspeed.com <> | 2006-07-30 10:50:24 +0000 |
|---|---|---|
| committer | karl.kornel%mindspeed.com <> | 2006-07-30 10:50:24 +0000 |
| commit | ddddaf2b67207056ebb407ea68f9e0e6a697a37e (patch) | |
| tree | 3c6f037aed9ba5afb9e7459c8d11a59fd6b07928 | |
| parent | cd9cf6add14c1d76c571eeb99331631d74d209d9 (diff) | |
| download | bugs-ddddaf2b67207056ebb407ea68f9e0e6a697a37e.tar bugs-ddddaf2b67207056ebb407ea68f9e0e6a697a37e.tar.gz bugs-ddddaf2b67207056ebb407ea68f9e0e6a697a37e.tar.bz2 bugs-ddddaf2b67207056ebb407ea68f9e0e6a697a37e.tar.xz bugs-ddddaf2b67207056ebb407ea68f9e0e6a697a37e.zip | |
Bug 100953: Move data/nomail into the DB and implement a UI to edit it
Patch by A. Karl Kornel <karl@kornel.name> r=wurblzap a=justdave
| -rw-r--r-- | Bugzilla/BugMail.pm | 17 | ||||
| -rw-r--r-- | Bugzilla/DB/Schema.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/User.pm | 23 | ||||
| -rwxr-xr-x | checksetup.pl | 48 | ||||
| -rwxr-xr-x | editusers.cgi | 18 | ||||
| -rw-r--r-- | template/en/default/admin/users/userdata.html.tmpl | 18 | ||||
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 6 | ||||
| -rwxr-xr-x | whine.pl | 10 | ||||
| -rwxr-xr-x | whineatnews.pl | 1 |
9 files changed, 108 insertions, 35 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 1b2fb5429..dd92cd3b4 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -57,20 +57,6 @@ use constant REL_NAMES => { REL_VOTER , "Voter" }; -sub _read_nomail { - my $nomail = Bugzilla->request_cache->{bugmail_nomail}; - return $nomail if $nomail; - if (open(NOMAIL, '<', bz_locations->{'datadir'} . "/nomail")) { - while (<NOMAIL>) { - $nomail->{trim($_)} = 1; - } - close(NOMAIL); - } - Bugzilla->request_cache->{bugmail_nomail} = $nomail; - return $nomail; -} - - sub FormatTriple { my ($a, $b, $c) = (@_); $^A = ""; @@ -465,8 +451,7 @@ sub ProcessOneBug { # Make sure the user isn't in the nomail list, and the insider and # dep checks passed. - my $nomail = _read_nomail(); - if ((!$nomail->{$user->login}) && + if ($user->email_enabled && $insider_ok && $dep_ok) { diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm index 5396a3d20..9f4670845 100644 --- a/Bugzilla/DB/Schema.pm +++ b/Bugzilla/DB/Schema.pm |