changes from jake@acutex.net to make it possible to toggle the default value of newemailtech for new profiles, this is set by default to be turned on (the old default was off) ; r=dmose@mozilla.org. changes from me to make newemailtech the default in all new installations, and update the verbiage in various spots to make it clear that newemailtech is now considered the one true way and the old tech will be going away. r=endico@mozilla.org,cyeh@bluemartini.com

3 files changed, 25 insertions, 13 deletions

diff --git a/defparams.pl b/defparams.pl
index cc47f4eb5..d182fd562 100644
--- a/defparams.pl
+++ b/defparams.pl
@@ -21,6 +21,8 @@
 #                 Dawn Endico <endico@mozilla.org>
 #                 Dan Mosedale <dmose@mozilla.org>
 #                 Joe Robins <jmrobins@tgix.com>
+#                 Jake <jake@acutex.net>
+#
 
 # This file defines all the parameters that we have a GUI to edit within
 # Bugzilla.
@@ -390,13 +392,20 @@ Subject: [Bug %bugid%] %neworchanged% - %summary%
 %diffs%");
 
 DefParam("newemailtech",
-q{There is now experimental code in Bugzilla to do the email diffs in a 
-new and exciting way.  But this stuff is not very cooked yet.  So, right
-now, to use it, the maintainer has to turn on this checkbox, and each user
-has to then turn on the "New email tech" preference.},
+q{The way that email diffs are constructed by Bugzilla.  You can revert to
+the old technology by turning this off, but this is not advised, as the old 
+email tech will probably disappear in the next version of Bugzilla.  Some
+features (watches, server side mail filtering) depend on newemailtech being
+set to on.},
     "b",
-    0);
+    1);
 
+DefParam("newemailtechdefault",
+q{Make "newemailtech" the default for all new accounts created.  This will
+not change any existing accounts nor will it remove a users ability to go
+back to the oldmail system (requires "newemailtech" to be on as well).},
+    "b",
+    1);
 
 DefParam("newchangedmail",
 q{The same as 'changedmail', but used for the newemailtech stuff.},
diff --git a/globals.pl b/globals.pl
index 8cce0c78f..34f6b3cf5 100644
--- a/globals.pl
+++ b/globals.pl
@@ -19,6 +19,7 @@
 #
 # Contributor(s): Terry Weissman <terry@mozilla.org>
 #                 Dan Mosedale <dmose@mozilla.org>
+#                 Jake <jake@acutex.net>
 
 # Contains some global variables and routines used throughout bugzilla.
 
@@ -582,6 +583,8 @@ sub InsertNewUser {
     for (my $i=0 ; $i<8 ; $i++) {
         $password .= substr("abcdefghijklmnopqrstuvwxyz", int(rand(26)), 1);
     }
+    my $usenewemailtech = Param('newemailtech') & Param('newemailtechdefault');
+
     SendSQL("select bit, userregexp from groups where userregexp != ''");
     my $groupset = "0";
     while (MoreSQLData()) {
@@ -599,7 +602,7 @@ sub InsertNewUser {
             
     $username = SqlQuote($username);
     $realname = SqlQuote($realname);
-    SendSQL("insert into profiles (login_name, realname, password, cryptpassword, groupset) values ($username, $realname, '$password', encrypt('$password'), $groupset)");
+    SendSQL("insert into profiles (login_name, realname, password, cryptpassword, groupset, newemailtech) values ($username, $realname, '$password', encrypt('$password'), $groupset, $usenewemailtech)");
     return $password;
 }
 
diff --git a/userprefs.cgi b/userprefs.cgi
index c6362a143..d2b5e0db1 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -127,15 +127,15 @@ On which of these bugs would you like email notification of changes?
         my $checkedpart = $newemailtech ? "CHECKED" : "";
         print qq{
 <TR><TD COLSPAN="2"><HR></TD></TR>
-<TR><TD COLSPAN="2"><FONT COLOR="red">New!</FONT>
-Bugzilla has a new email 
-notification scheme.  It is <b>experimental and bleeding edge</b> and will 
-hopefully evolve into a brave new happy world where all the spam and ugliness
-of the old notifications will go away.  If you wish to sign up for this (and 
-risk any bugs), check here.
+<TR><TD COLSPAN="2"><FONT COLOR="red">Updated!</FONT>
+Bugzilla's new standard email notification scheme allows for the use of 
+features such as watching other users and selecting which bug changes you get 
+mail about.  You can revert to the old notification scheme by unchecking this
+box, but this isn't recommended, because the old scheme is no longer
+supported and will be going away in an upcoming version of Bugzilla.
 </TD></TR>
 };
-        EmitEntry("Check here to sign up (and risk any bugs)",
+        EmitEntry("Uncheck here to revert",
                   qq{<INPUT TYPE="checkbox" NAME="newemailtech" $checkedpart>New email tech});
     }