From a54f3f23447038f15de353b3a8642701325b00ec Mon Sep 17 00:00:00 2001 From: "travis%sedsystems.ca" <> Date: Wed, 16 Mar 2005 00:10:17 +0000 Subject: Bug 280517 : Let me know who is watching my account Patch by Frederic Buclin r=myk a=myk --- template/en/default/account/prefs/email.html.tmpl | 15 +++++++++++++++ userprefs.cgi | 13 +++++++++++++ 2 files changed, 28 insertions(+) diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index ded4d30e3..ba07fb155 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -24,6 +24,8 @@ [%# INTERFACE: # watchedusers: string. # Comma-separated list of email addresses this user watches. + # watchers: array. + # Array of users watching this user's account. # excludeself: boolean. # True if user is not receiving self-generated mail. # : Multiple hashes, one for each rolename (e.g. owner; see @@ -63,6 +65,19 @@ value="[% watchedusers FILTER html %]"> + + + Users watching you: + + [% IF watchers.size %] + [% FOREACH watcher = watchers %] + [% watcher FILTER html %]
+ [% END %] + [% ELSE %] + Nobody is currently watching your account. + [% END %] + + [% END %] diff --git a/userprefs.cgi b/userprefs.cgi index 3331d5b91..d369660e2 100755 --- a/userprefs.cgi +++ b/userprefs.cgi @@ -182,6 +182,19 @@ sub DoEmail { . " WHERE watcher = ? AND watch.watched = profiles.userid", undef, $userid); $vars->{'watchedusers'} = join(',', @$watched_ref); + + my $watcher_ids = $dbh->selectcol_arrayref( + "SELECT watcher FROM watch WHERE watched = ?", + undef, $userid); + + my @watchers; + foreach my $watcher_id (@$watcher_ids) { + my $watcher = new Bugzilla::User($watcher_id); + push (@watchers, Bugzilla::User::identity($watcher)); + } + + @watchers = sort { lc($a) cmp lc($b) } @watchers; + $vars->{'watchers'} = \@watchers; } SendSQL("SELECT emailflags FROM profiles WHERE userid = $userid"); -- cgit v1.2.3-24-g4f1b