Option for custom template for confirmation email

diff --git a/plugins/DomainStatusNetwork/scripts/installforemail.php b/plugins/DomainStatusNetwork/scripts/installforemail.php
index 037e0cad1f1ce95eede293f2ab8e70c992460d94..98ce620c28cb24fcfa1fd50d7cf145eacaf32a8c 100644 (file)
--- a/plugins/DomainStatusNetwork/scripts/installforemail.php
+++ b/plugins/DomainStatusNetwork/scripts/installforemail.php
@@ -22,15 +22,16 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 
-$shortoptions = 'w';
-$longoptions = array('welcome');
+$shortoptions = 'wt::';
+$longoptions = array('welcome', 'template=');
 
 $helptext = <<<END_OF_INSTALLFOREMAIL_HELP
 
 installforemail.php [options] <email address>
 Create a new account and, if necessary, a new network for the given email address
 
--w --welcome  Send a welcome email
+-w --welcome   Send a welcome email
+-t --template= Use this email template
 
 END_OF_INSTALLFOREMAIL_HELP;
 
@@ -62,7 +63,13 @@ StatusNet::switchSite($sn->nickname);
 $confirm = EmailRegistrationPlugin::registerEmail($email);
 
 if (have_option('w', 'welcome')) {
-    EmailRegistrationPlugin::sendConfirmEmail($confirm);
+    if (have_option('t', 'template')) {
+        // use the provided template
+        EmailRegistrationPlugin::sendConfirmEmail($confirm, get_option_value('t', 'template'));
+    } else {
+        // use the default template
+        EmailRegistrationPlugin::sendConfirmEmail($confirm);
+    }
 }
 
 $confirmUrl = common_local_url('register', array('code' => $confirm->code));

diff --git a/plugins/EmailRegistration/scripts/registeremailuser.php b/plugins/EmailRegistration/scripts/registeremailuser.php
index a9eff9a848356c4dc3d7e008881d6785eb0ce38b..02915240d32d2e57b3abbff7f280e6dfd9256921 100644 (file)
--- a/plugins/EmailRegistration/scripts/registeremailuser.php
+++ b/plugins/EmailRegistration/scripts/registeremailuser.php
@@ -20,14 +20,15 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 
-$shortoptions = 'w';
-$longoptions = array('welcome');
+$shortoptions = 'wt::';
+$longoptions = array('welcome', 'template=');
 
 $helptext = <<<END_OF_REGISTEREMAILUSER_HELP
 registeremailuser.php [options] <email address>
 
 Options:
--w --welcome  Send a welcome email
+-w --welcome   Send a welcome email
+-t --template= Use this email template
 
 register a new user by email address.
 
@@ -44,7 +45,13 @@ $email = $args[0];
 $confirm = EmailRegistrationPlugin::registerEmail($email);
 
 if (have_option('w', 'welcome')) {
-    EmailRegistrationPlugin::sendConfirmEmail($confirm);
+    if (have_option('t', 'template')) {
+        // use the provided template
+        EmailRegistrationPlugin::sendConfirmEmail($confirm, get_option_value('t', 'template'));
+    } else {
+        // use the default template
+        EmailRegistrationPlugin::sendConfirmEmail($confirm);
+    }
 }
 
 $confirmUrl = common_local_url('register', array('code' => $confirm->code));