Bug 589: make random selection slightly more random. PHP's

[lhc/web/wiklou.git] / includes / SpecialMovepage.php

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index ee7342a..ebbd79d 100644 (file)
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -1,8 +1,19 @@
 <?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
 require_once( "LinksUpdate.php" );
 
-function wfSpecialMovepage()
-{
+/**
+ * Constructor
+ */
+function wfSpecialMovepage() {
        global $wgUser, $wgOut, $wgRequest, $action, $wgOnlySysopMayMove;
 
        # check rights. We don't want newbies to move pages to prevents possible attack
@@ -23,6 +34,11 @@ function wfSpecialMovepage()
        else { $f->showForm( '' ); }
 }
 
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 class MovePageForm {
        var $oldTitle, $newTitle; # Text input
                
@@ -32,8 +48,7 @@ class MovePageForm {
                $this->newTitle = $wgRequest->getText( 'wpNewTitle' );
        }
        
-       function showForm( $err )
-       {
+       function showForm( $err ) {
                global $wgOut, $wgUser, $wgLang;
 
                $wgOut->setPagetitle( wfMsg( 'movepage' ) );
@@ -101,8 +116,7 @@ class MovePageForm {
 
        }
 
-       function doSubmit()
-       {
+       function doSubmit() {
                global $wgOut, $wgUser, $wgLang;
                global $wgDeferredUpdateList, $wgMessageCache;
                global  $wgUseSquid, $wgRequest;
@@ -115,6 +129,12 @@ class MovePageForm {
                $ot = Title::newFromText( $this->oldTitle );
                $nt = Title::newFromText( $this->newTitle );
 
+               # don't allow moving to pages with # in
+               if ( !$nt || $nt->getFragment() != '' ) {
+                       $this->showForm( wfMsg( "badtitletext" ) );
+                       return;
+               }
+
                $error = $ot->moveTo( $nt );
                if ( $error !== true ) {
                        $this->showForm( wfMsg( $error ) );
@@ -132,11 +152,14 @@ class MovePageForm {
                # moved into article namespace?
                elseif ( $ons != NS_MAIN and $nns == NS_MAIN ) {
                        $u = new SiteStatsUpdate( 0, 1, +1 ); # not viewed, edited, adding
+               } else {
+                       $u = false;
+               }
+               if ( $u !== false ) {
+                       # save it for later update
+                       array_push( $wgDeferredUpdateList, $u );
+                       unset($u);
                }
-               
-               # save it for later update
-               array_push( $wgDeferredUpdateList, $u );
-               unset($u);
                
                # Move talk page if
                # (1) the checkbox says to,
@@ -176,8 +199,7 @@ class MovePageForm {
                $wgOut->redirect( $success );
        }
 
-       function showSuccess()
-       {
+       function showSuccess() {
                global $wgOut, $wgUser, $wgRequest;
 
                $wgOut->setPagetitle( wfMsg( 'movepage' ) );