Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / plugins / DomainStatusNetwork / scripts / installforemail.php

diff --git a/plugins/DomainStatusNetwork/scripts/installforemail.php b/plugins/DomainStatusNetwork/scripts/installforemail.php
index 037e0cad1f1ce95eede293f2ab8e70c992460d94..f773094a74c426e9ccc023b43468d08e5a61cef2 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;
 
@@ -38,33 +39,24 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 
 $email = $args[0];
 
-$domain = DomainStatusNetworkPlugin::toDomain($email);
+$sendWelcome = have_option('w', 'welcome');
 
-$sn = DomainStatusNetworkPlugin::siteForDomain($domain);
+if ($sendWelcome && have_option('t', 'template')) {
+    $template = get_option_value('t', 'template');
+}
 
-if (empty($sn)) {
-    $installer = new DomainStatusNetworkInstaller($domain);
+try {
 
-    $installer->verbose = have_option('v', 'verbose');
+    $confirm = DomainStatusNetworkPlugin::registerEmail($email);
 
-    // Do the thing
-    $installer->main();
+    if ($sendWelcome) {
+        EmailRegistrationPlugin::sendConfirmEmail($confirm, $template);
+    }
 
-    $sn = $installer->getStatusNetwork();
+    $confirmUrl = common_local_url('register', array('code' => $confirm->code));
 
-    $config = $installer->getConfig();
+    print $confirmUrl."\n";
 
-    Status_network::$wildcard = $config['WILDCARD'];
+} catch (Exception $e) {
+    print "ERROR: " . $e->getMessage() . "\n";
 }
-
-StatusNet::switchSite($sn->nickname);
-
-$confirm = EmailRegistrationPlugin::registerEmail($email);
-
-if (have_option('w', 'welcome')) {
-    EmailRegistrationPlugin::sendConfirmEmail($confirm);
-}
-
-$confirmUrl = common_local_url('register', array('code' => $confirm->code));
-
-print $confirmUrl."\n";