enable registration confirmation by web only [SF#1381675]

Author: Richard Jones

CHANGES.txt

@@ -13,6 +13,7 @@ Feature:
   (sf rfe 1379447)
 - Roundup installation document includes configuration example
   for Exim Internet Mailer (sf bug 1393860)
+- enable registration confirmation by web only (sf bug 1381675)
 
 Fixed:
 - MySQL now creates String columns using the TEXT column type

roundup/cgi/actions.py

@@ -1,4 +1,4 @@
-#$Id: actions.py,v 1.51 2006-01-13 03:50:03 richard Exp $
+#$Id: actions.py,v 1.52 2006-01-13 03:56:36 richard Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random, csv
 
@@ -817,9 +817,10 @@ def handle(self):
         # send the email
         tracker_name = self.db.config.TRACKER_NAME
         tracker_email = self.db.config.TRACKER_EMAIL
-        subject = 'Complete your registration to %s -- key %s'%(tracker_name,
+        if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']:
+            subject = 'Complete your registration to %s -- key %s'%(tracker_name,
                                                                   otk)
-        body = """To complete your registration of the user "%(name)s" with
+            body = """To complete your registration of the user "%(name)s" with
 %(tracker)s, please do one of the following:
 
 - send a reply to %(tracker_email)s and maintain the subject line as is (the
@@ -831,8 +832,17 @@ def handle(self):
 
 """ % {'name': user_props['username'], 'tracker': tracker_name,
         'url': self.base, 'otk': otk, 'tracker_email': tracker_email}
+        else:
+            subject = 'Complete your registration to %s'%(tracker_name)
+            body = """To complete your registration of the user "%(name)s" with
+%(tracker)s, please visit the following URL:
+
+%(url)s?@action=confrego&otk=%(otk)s
+
+""" % {'name': user_props['username'], 'tracker': tracker_name,
+        'url': self.base, 'otk': otk}
         if not self.client.standard_message([user_props['address']], subject,
-                body, (tracker_name, tracker_email)):
+                body):
             return
 
         # commit changes to the database

roundup/configuration.py

@@ -1,6 +1,6 @@
 # Roundup Issue Tracker configuration support
 #
-# $Id: configuration.py,v 1.30 2006-01-09 09:11:43 a1s Exp $
+# $Id: configuration.py,v 1.31 2006-01-13 03:56:35 richard Exp $
 #
 __docformat__ = "restructuredtext"
 
@@ -448,6 +448,8 @@ class NullableFilePathOption(NullableOption, FilePathOption):
         (BooleanOption, "instant_registration", "no",
             "Register new users instantly, or require confirmation via\n"
             "email?"),
+        (BooleanOption, "email_registration_confirmation", "yes",
+            "Offer registration confirmation by email or only through the web?"),
     )),
     ("tracker", (
         (Option, "name", "Roundup issue tracker",

roundup/mailgw.py

@@ -72,7 +72,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 
-$Id: mailgw.py,v 1.168 2005-10-07 04:42:13 richard Exp $
+$Id: mailgw.py,v 1.169 2006-01-13 03:56:36 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -605,15 +605,16 @@ def handle_message(self, message):
 
         # check for registration OTK
         # or fallback on the default class
-        otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
-        otk = otk_re.search(subject)
-        if otk:
-            self.db.confirm_registration(otk.group('otk'))
-            subject = 'Your registration to %s is complete' % \
-                      config['TRACKER_NAME']
-            sendto = [from_list[0][1]]
-            self.mailer.standard_message(sendto, subject, '')
-            return
+        if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']:
+            otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
+            otk = otk_re.search(m.group('title'))
+            if otk:
+                self.db.confirm_registration(otk.group('otk'))
+                subject = 'Your registration to %s is complete' % \
+                          config['TRACKER_NAME']
+                sendto = [from_list[0][1]]
+                self.mailer.standard_message(sendto, subject, '')
+                return
 
         # XXX Don't enable. This doesn't work yet.
 #  "[^A-z.]tracker\+(?P<classname>[^\d\s]+)(?P<nodeid>\d+)\@some.dom.ain[^A-z.]"