Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / EmailRegistration / scripts / registeremailuser.php

diff --git a/plugins/EmailRegistration/scripts/registeremailuser.php b/plugins/EmailRegistration/scripts/registeremailuser.php
old mode 100644 (file)
new mode 100755 (executable)
index a9eff9a..a785a76
--- a/plugins/EmailRegistration/scripts/registeremailuser.php
+++ b/plugins/EmailRegistration/scripts/registeremailuser.php
@@ -20,20 +20,21 @@
 
 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.
 
 END_OF_REGISTEREMAILUSER_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 if (count($args) == 0) {
     show_help();
@@ -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));