ApiMove.php: fix copyright symbol, spacing & coding style tweaks, more braces

diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index 2aa20b4..3b2fe99 100644 (file)
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -1,10 +1,10 @@
 <?php
 
-/*
+/**
  * Created on Oct 31, 2007
  * API for MediaWiki 1.8+
  *
- * Copyright (C) 2007 Roan Kattouw <Firstname>.<Lastname>@home.nl
+ * Copyright © 2007 Roan Kattouw <Firstname>.<Lastname>@home.nl
  *
  * 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
@@ -24,49 +24,51 @@
 
 if ( !defined( 'MEDIAWIKI' ) ) {
        // Eclipse helper - will be ignored in production
-       require_once ( "ApiBase.php" );
+       require_once( "ApiBase.php" );
 }
 
-
 /**
  * @ingroup API
  */
 class ApiMove extends ApiBase {
 
        public function __construct( $main, $action ) {
-               parent :: __construct( $main, $action );
+               parent::__construct( $main, $action );
        }
 
        public function execute() {
                global $wgUser;
                $params = $this->extractRequestParams();
-               if ( is_null( $params['reason'] ) )
+               if ( is_null( $params['reason'] ) ) {
                        $params['reason'] = '';
+               }
 
                $this->requireOnlyOneParameter( $params, 'from', 'fromid' );
-               if ( !isset( $params['to'] ) )
+               if ( !isset( $params['to'] ) ) {
                        $this->dieUsageMsg( array( 'missingparam', 'to' ) );
+               }
 
-               if ( isset( $params['from'] ) )
-               {
+               if ( isset( $params['from'] ) ) {
                        $fromTitle = Title::newFromText( $params['from'] );
-                       if ( !$fromTitle )
+                       if ( !$fromTitle ) {
                                $this->dieUsageMsg( array( 'invalidtitle', $params['from'] ) );
-               }
-               else if ( isset( $params['fromid'] ) )
-               {
+                       }
+               } elseif ( isset( $params['fromid'] ) ) {
                        $fromTitle = Title::newFromID( $params['fromid'] );
-                       if ( !$fromTitle )
+                       if ( !$fromTitle ) {
                                $this->dieUsageMsg( array( 'nosuchpageid', $params['fromid'] ) );
+                       }
                }
 
-               if ( !$fromTitle->exists() )
+               if ( !$fromTitle->exists() ) {
                        $this->dieUsageMsg( array( 'notanarticle' ) );
+               }
                $fromTalk = $fromTitle->getTalkPage();
 
                $toTitle = Title::newFromText( $params['to'] );
-               if ( !$toTitle )
+               if ( !$toTitle ) {
                        $this->dieUsageMsg( array( 'invalidtitle', $params['to'] ) );
+               }
                $toTalk = $toTitle->getTalkPage();
 
                if ( $toTitle->getNamespace() == NS_FILE
@@ -83,25 +85,25 @@ class ApiMove extends ApiBase {
                // Move the page
                $hookErr = null;
                $retval = $fromTitle->moveTo( $toTitle, true, $params['reason'], !$params['noredirect'] );
-               if ( $retval !== true )
+               if ( $retval !== true ) {
                        $this->dieUsageMsg( reset( $retval ) );
+               }
 
                $r = array( 'from' => $fromTitle->getPrefixedText(), 'to' => $toTitle->getPrefixedText(), 'reason' => $params['reason'] );
                if ( !$params['noredirect'] || !$wgUser->isAllowed( 'suppressredirect' ) )
+               {
                        $r['redirectcreated'] = '';
+               }
 
                // Move the talk page
                if ( $params['movetalk'] && $fromTalk->exists() && !$fromTitle->isTalkPage() )
                {
                        $retval = $fromTalk->moveTo( $toTalk, true, $params['reason'], !$params['noredirect'] );
-                       if ( $retval === true )
-                       {
+                       if ( $retval === true ) {
                                $r['talkfrom'] = $fromTalk->getPrefixedText();
                                $r['talkto'] = $toTalk->getPrefixedText();
-                       }
-                       // We're not gonna dieUsage() on failure, since we already changed something
-                       else
-                       {
+                       } else {
+                               // We're not gonna dieUsage() on failure, since we already changed something
                                $parsed = $this->parseMsg( reset( $retval ) );
                                $r['talkmove-error-code'] = $parsed['code'];
                                $r['talkmove-error-info'] = $parsed['info'];
@@ -109,13 +111,11 @@ class ApiMove extends ApiBase {
                }
 
                // Move subpages
-               if ( $params['movesubpages'] )
-               {
+               if ( $params['movesubpages'] ) {
                        $r['subpages'] = $this->moveSubpages( $fromTitle, $toTitle,
                                        $params['reason'], $params['noredirect'] );
                        $this->getResult()->setIndexedTagName( $r['subpages'], 'subpage' );
-                       if ( $params['movetalk'] )
-                       {
+                       if ( $params['movetalk'] ) {
                                $r['subpages-talk'] = $this->moveSubpages( $fromTalk, $toTalk,
                                        $params['reason'], $params['noredirect'] );
                                $this->getResult()->setIndexedTagName( $r['subpages-talk'], 'subpage' );
@@ -123,37 +123,32 @@ class ApiMove extends ApiBase {
                }
 
                // Watch pages
-               if ( $params['watch'] || $wgUser->getOption( 'watchmoves' ) )
-               {
+               if ( $params['watch'] || $wgUser->getOption( 'watchmoves' ) ) {
                        $wgUser->addWatch( $fromTitle );
                        $wgUser->addWatch( $toTitle );
-               }
-               else if ( $params['unwatch'] )
-               {
+               } elseif ( $params['unwatch'] ) {
                        $wgUser->removeWatch( $fromTitle );
                        $wgUser->removeWatch( $toTitle );
                }
                $this->getResult()->addValue( null, $this->getModuleName(), $r );
        }
 
-       public function moveSubpages( $fromTitle, $toTitle, $reason, $noredirect )
-       {
+       public function moveSubpages( $fromTitle, $toTitle, $reason, $noredirect ) {
                $retval = array();
                $success = $fromTitle->moveSubpages( $toTitle, true, $reason, !$noredirect );
-               if ( isset( $success[0] ) )
+               if ( isset( $success[0] ) ) {
                        return array( 'error' => $this->parseMsg( $success ) );
-               else
-               {
+               } else {
                        // At least some pages could be moved
                        // Report each of them separately
-                       foreach ( $success as $oldTitle => $newTitle )
-                       {
+                       foreach ( $success as $oldTitle => $newTitle ) {
                                $r = array( 'from' => $oldTitle );
-                               if ( is_array( $newTitle ) )
+                               if ( is_array( $newTitle ) ) {
                                        $r['error'] = $this->parseMsg( reset( $newTitle ) );
-                               else
+                               } else {
                                        // Success
                                        $r['to'] = $newTitle;
+                               }
                                $retval[] = $r;
                        }
                }
@@ -169,7 +164,7 @@ class ApiMove extends ApiBase {
        }
 
        public function getAllowedParams() {
-               return array (
+               return array(
                        'from' => null,
                        'fromid' => array(
                                ApiBase::PARAM_TYPE => 'integer'
@@ -187,7 +182,7 @@ class ApiMove extends ApiBase {
        }
 
        public function getParamDescription() {
-               return array (
+               return array(
                        'from' => 'Title of the page you want to move. Cannot be used together with fromid.',
                        'fromid' => 'Page ID of the page you want to move. Cannot be used together with from.',
                        'to' => 'Title you want to rename the page to.',
@@ -207,7 +202,7 @@ class ApiMove extends ApiBase {
                        'Move a page.'
                );
        }
-       
+
        public function getPossibleErrors() {
                return array_merge( parent::getPossibleErrors(), array(
                        array( 'missingparam', 'to' ),
@@ -224,7 +219,7 @@ class ApiMove extends ApiBase {
        }
 
        protected function getExamples() {
-               return array (
+               return array(
                        'api.php?action=move&from=Exampel&to=Example&token=123ABC&reason=Misspelled%20title&movetalk&noredirect'
                );
        }