Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php

As with deleteuser.php, can pass -y to bypass the prompt if you're sure.

diff --git a/actions/deleteaccount.php b/actions/deleteaccount.php
index dd587d04453b9c2370ea6db5d7f26baca6c7770a..614519d47430590f0b5b499de6155ef842edce3d 100644 (file)
--- a/actions/deleteaccount.php
+++ b/actions/deleteaccount.php
@@ -161,7 +161,7 @@ class DeleteaccountAction extends Action
         if ($this->trimmed('iamsure') != $iamsure ) {
             // TRANS: Notification for user about the text that must be input to be able to delete a user account.
             // TRANS: %s is the text that needs to be input.
-            $this->_error = sprintf(_('You must write  "%s" exactly in the box.', $iamsure));
+            $this->_error = sprintf(_('You must write "%s" exactly in the box.'), $iamsure);
             $this->showPage();
             return;
         }

diff --git a/scripts/moveuser.php b/scripts/moveuser.php
index cf8fd2e0bef9c799bc82e9cab3d0b59bef17a75c..17b3e0fb678e5e06c207f95476d0929e3d169bd6 100644 (file)
--- a/scripts/moveuser.php
+++ b/scripts/moveuser.php
@@ -19,7 +19,7 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'i:n:r:w:';
+$shortoptions = 'i:n:r:w:y';
 $longoptions = array('id=', 'nickname=', 'remote=', 'password=');
 
 $helptext = <<<END_OF_MOVEUSER_HELP
@@ -30,6 +30,7 @@ Move a local user to a remote account.
   -n --nickname nickname of the user to move
   -r --remote   Full ID of remote users
   -w --password Password of remote user
+  -y --yes      do not wait for confirmation
 
 Remote user identity must be a Webfinger (nickname@example.com) or 
 an HTTP or HTTPS URL (http://example.com/social/site/user/nickname).
@@ -51,6 +52,17 @@ try {
 
     $password = get_option_value('w', 'password');
 
+    if (!have_option('y', 'yes')) {
+        print "WARNING: EXPERIMENTAL FEATURE! Moving accounts will delete data from the source site.\n";
+        print "\n";
+        print "About to PERMANENTLY move user '{$user->nickname}' to $remote. Are you sure? [y/N] ";
+        $response = fgets(STDIN);
+        if (strtolower(trim($response)) != 'y') {
+            print "Aborting.\n";
+            exit(0);
+        }
+    }
+
     $qm = QueueManager::get();
 
     $qm->enqueue(array($user, $remote, $password), 'acctmove');