From 64245e96428942a98cabeb8af2dcfce4ee3c1f65 Mon Sep 17 00:00:00 2001
From: "terry%mozilla.org"
 <terry%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 24 Jan 2000 05:41:40 +0000
Subject: [PATCH] New email code wasn't sending to people who had voted for a
 bug. Added "My votes" link to footer.  Other minor voting-related fixes.

git-svn-id: svn://10.0.0.236/trunk@58462 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/CGI.pl             |  6 ++++++
 mozilla/webtools/bugzilla/changepassword.cgi | 16 ++++++++++++----
 mozilla/webtools/bugzilla/editproducts.cgi   |  2 +-
 mozilla/webtools/bugzilla/globals.pl         |  5 +++++
 mozilla/webtools/bugzilla/processmail        |  9 ++++++++-
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/mozilla/webtools/bugzilla/CGI.pl b/mozilla/webtools/bugzilla/CGI.pl
index 8770da7489d..93c5d544f04 100644
--- a/mozilla/webtools/bugzilla/CGI.pl
+++ b/mozilla/webtools/bugzilla/CGI.pl
@@ -846,6 +846,12 @@ sub GetCommandMenu {
         my $mybugstemplate = Param("mybugstemplate");
         my %substs;
         $substs{'userid'} = $::COOKIE{"Bugzilla_login"};
+        if (!defined $::anyvotesallowed) {
+            GetVersionTable();
+        }
+        if ($::anyvotesallowed) {
+            $html .= qq{ | <A HREF="showvotes.cgi">My votes</A>};
+        }
         my $mybugsurl = PerformSubsts($mybugstemplate, \%substs);
         $html = $html . " | <a href='$mybugsurl'>My bugs</a>";
     }
diff --git a/mozilla/webtools/bugzilla/changepassword.cgi b/mozilla/webtools/bugzilla/changepassword.cgi
index 5922a1e03a1..ca533b1eeb1 100755
--- a/mozilla/webtools/bugzilla/changepassword.cgi
+++ b/mozilla/webtools/bugzilla/changepassword.cgi
@@ -22,10 +22,18 @@
 
 require "CGI.pl";
 
+
+sub sillyness {
+    my $zz;
+    $zz = $::anyvotesallowed;
+}
+
 confirm_login();
 
 print "Content-type: text/html\n\n";
 
+GetVersionTable();
+
 if (! defined $::FORM{'pwd1'}) {
     PutHeader("Preferences", "Change your password and<br>other preferences",
               $::COOKIE{'Bugzilla_login'});
@@ -98,10 +106,10 @@ risk any bugs), check here.</td>
 <hr>
 <input type=submit value=Submit>
 </form>
-<hr>
-<a href=\"showvotes.cgi\">Review your votes</a>
-<hr>
-";
+<hr>";
+    if ($::anyvotesallowed) {
+        print qq{<a href="showvotes.cgi">Review your votes</a><hr>\n};
+    }
     PutFooter();
     exit;
 }
diff --git a/mozilla/webtools/bugzilla/editproducts.cgi b/mozilla/webtools/bugzilla/editproducts.cgi
index f3c1bbabd89..e9c5f9f354a 100755
--- a/mozilla/webtools/bugzilla/editproducts.cgi
+++ b/mozilla/webtools/bugzilla/editproducts.cgi
@@ -689,9 +689,9 @@ if ($action eq 'update') {
                  SET program='$product'
                  WHERE program=" . SqlQuote($productold));
 
-        unlink "data/versioncache";
         print "Updated product name.<BR>\n";
     }
+    unlink "data/versioncache";
     SendSQL("UNLOCK TABLES");
 
     PutTrailer($localtrailer);
diff --git a/mozilla/webtools/bugzilla/globals.pl b/mozilla/webtools/bugzilla/globals.pl
index 0eab73d63d8..b8f390537bb 100644
--- a/mozilla/webtools/bugzilla/globals.pl
+++ b/mozilla/webtools/bugzilla/globals.pl
@@ -280,6 +280,7 @@ sub GenerateVersionTable {
 
     my $mpart = $dotargetmilestone ? ", milestoneurl" : "";
     SendSQL("select product, description, votesperuser, disallownew$mpart from products");
+    $::anyvotesallowed = 0;
     while (@line = FetchSQLData()) {
         my ($p, $d, $votesperuser, $dis, $u) = (@line);
         $::proddesc{$p} = $d;
@@ -293,6 +294,9 @@ sub GenerateVersionTable {
             $::milestoneurl{$p} = $u;
         }
         $::prodmaxvotes{$p} = $votesperuser;
+        if ($votesperuser > 0) {
+            $::anyvotesallowed = 1;
+        }
     }
             
 
@@ -345,6 +349,7 @@ sub GenerateVersionTable {
     }
     print FID GenerateCode('%::proddesc');
     print FID GenerateCode('%::prodmaxvotes');
+    print FID GenerateCode('$::anyvotesallowed');
 
     if ($dotargetmilestone) {
         my $last = Param("nummilestones");
diff --git a/mozilla/webtools/bugzilla/processmail b/mozilla/webtools/bugzilla/processmail
index 7441232efe2..d814107083a 100755
--- a/mozilla/webtools/bugzilla/processmail
+++ b/mozilla/webtools/bugzilla/processmail
@@ -357,7 +357,13 @@ sub NewProcessOneBug {
     }
     my ($start, $end) = (@row);
     $values{'cc'} = ShowCcList($id);
-
+    
+    my @voterlist;
+    SendSQL("SELECT profiles.login_name FROM votes, profiles " .
+            "WHERE votes.bug_id = $id AND profiles.userid = votes.who");
+    while (MoreSQLData()) {
+        push(@voterlist, FetchOneColumn());
+    }
 
     $values{'assigned_to'} = DBID_to_name($values{'assigned_to'});
     $values{'reporter'} = DBID_to_name($values{'reporter'});
@@ -453,6 +459,7 @@ sub NewProcessOneBug {
     my $count = 0;
     for my $person ($values{'assigned_to'}, $values{'reporter'},
                     split(/,/, $values{'cc'}),
+                    @voterlist,
                     @forcecc) {
         $count++;
         if ($seen{$person}) {