Fix for bug 71808: Can't set email preferences for voters (which caused voters to get OldEmailTech notifications.

Patch by jake@acutex.net
r= justdave

1 files changed, 16 insertions, 2 deletions

diff --git a/userprefs.cgi b/userprefs.cgi
index 0d890499d..d0b97f33c 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -45,7 +45,8 @@ my @emailGroups = (
         'Owner',        'the Bug Owner',
         'Reporter',     'the Reporter',
         'QAcontact',    'the QA contact',
-        'CClist',       'on the CC list'
+        'CClist',       'on the CC list',
+        'Voter',        'a Voter'
         );
 
 my @emailFlags = (
@@ -95,8 +96,16 @@ my $defaultEmailFlagString =
         'emailCClistResolved~'       . 'on~' .
         'emailCClistKeywords~'       . 'on~' .
         'emailCClistCC~'             . 'on~' .
-        'emailCClistOther~'          . 'on' ;
+        'emailCClistOther~'          . 'on~' .
 
+        'emailVoterRemoveme~'        . 'on~' .
+        'emailVoterComments~'        . 'on~' .
+        'emailVoterAttachemnts~'     . 'on~' .
+        'emailVoterStatus~'          . 'on~' .
+        'emailVoterResolved~'        . 'on~' .
+        'emailVoterKeywords~'        . 'on~' .
+        'emailVoterCC~'              . 'on~' .
+        'emailVoterOther~'           . 'on' ;
 
 sub EmitEntry {
     my ($description, $entry) = (@_);
@@ -409,6 +418,11 @@ sub printEmailOption ($$\%) {
         $value = 'CHECKED';
     }
 
+    # **** Kludge ... also mark on if the value in $$refCurrentFlags in undef
+    if (!defined($$refCurrentFlags{"email$optionName"})) {
+        $value = 'CHECKED';
+    }
+
     print qq{
         <tr><td width=320></td>
         <td><input type="checkbox" name="email$optionName" VALUE="on" $value>