Merge "Make variant selection menu toggleable by keyboard"

[lhc/web/wiklou.git] / maintenance / undelete.php

diff --git a/maintenance/undelete.php b/maintenance/undelete.php
index 55b7c9d..c890c69 100644 (file)
--- a/maintenance/undelete.php
+++ b/maintenance/undelete.php
@@ -2,26 +2,41 @@
 /**
  * Undelete a page by fetching it from the archive table
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 class Undelete extends Maintenance {
        public function __construct() {
                parent::__construct();
                $this->mDescription = "Undelete a page";
-               $this->addOption( 'u', 'The user to perform the undeletion', false, true );
-               $this->addOption( 'r', 'The reason to undelete', false, true );
+               $this->addOption( 'user', 'The user to perform the undeletion', false, true, 'u' );
+               $this->addOption( 'reason', 'The reason to undelete', false, true, 'r' );
                $this->addArg( 'pagename', 'Page to undelete' );
        }
 
        public function execute() {
                global $wgUser;
 
-               $user = $this->getOption( 'u', 'Command line script' );
-               $reason = $this->getOption( 'r', '' );
+               $user = $this->getOption( 'user', 'Command line script' );
+               $reason = $this->getOption( 'reason', '' );
                $pageName = $this->getArg();
 
                $title = Title::newFromText( $pageName );
@@ -29,6 +44,9 @@ class Undelete extends Maintenance {
                        $this->error( "Invalid title", true );
                }
                $wgUser = User::newFromName( $user );
+               if ( !$wgUser ) {
+                       $this->error( "Invalid username", true );
+               }
                $archive = new PageArchive( $title );
                $this->output( "Undeleting " . $title->getPrefixedDBkey() . '...' );
                $archive->undelete( array(), $reason );
@@ -37,4 +55,4 @@ class Undelete extends Maintenance {
 }
 
 $maintClass = "Undelete";
-require_once( DO_MAINTENANCE );
+require_once RUN_MAINTENANCE_IF_MAIN;