X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSpecialMovepage.php;h=f3a25fe48abefae2340d2932094372fa2de57d3f;hb=c5d47384c01bd5d7b8519e92900a7cdfe82bb959;hp=245d53704ee737b8f0beb023db6fa7eb4217fd3e;hpb=75ec13ba750d6f55e55b18506112a601575b1a26;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php index 245d53704e..f3a25fe48a 100644 --- a/includes/SpecialMovepage.php +++ b/includes/SpecialMovepage.php @@ -1,8 +1,9 @@ -getID() or $wgUser->isBlocked() ) { $wgOut->errorpage( "movenologin", "movenologintext" ); @@ -12,86 +13,88 @@ function wfSpecialMovepage() $wgOut->readOnlyPage(); return; } - $fields = array( "wpNewTitle", "wpOldTitle" ); - wfCleanFormFields( $fields ); $f = new MovePageForm(); if ( "success" == $action ) { $f->showSuccess(); } - else if ( "submit" == $action ) { $f->doSubmit(); } + else if ( "submit" == $action && $wgRequest->wasPosted() ) { $f->doSubmit(); } else { $f->showForm( "" ); } } class MovePageForm { - - var $ot, $nt; # Old, new Title objects - var $ons, $nns; # Namespaces - var $odt, $ndt; # Pagenames (dbkey form) - var $oft, $nft; # Full page titles (DBkey form) - var $ofx, $nfx; # Full page titles (Text form) - var $oldid, $newid; # "cur_id" field (yes, both from "cur") - var $talkmoved = 0; + var $oldTitle, $newTitle; # Text input + + function MovePageForm() { + global $wgRequest; + $this->oldTitle = $wgRequest->getText( 'wpOldTitle', $wgRequest->getVal( 'target' ) ); + $this->newTitle = $wgRequest->getText( 'wpNewTitle' ); + } function showForm( $err ) { global $wgOut, $wgUser, $wgLang; - global $wpNewTitle, $wpOldTitle, $wpMovetalk, $target; $wgOut->setPagetitle( wfMsg( "movepage" ) ); - if ( ! $wpOldTitle ) { - $target = wfCleanQueryVar( $target ); - if ( "" == $target ) { - $wgOut->errorpage( "notargettitle", "notargettext" ); - return; - } - $wpOldTitle = $target; + if ( empty( $this->oldTitle ) ) { + $wgOut->errorpage( "notargettitle", "notargettext" ); + return; } - $ot = Title::newFromURL( $wpOldTitle ); + + $encOldTitle = htmlspecialchars( $this->oldTitle ); + $encNewTitle = htmlspecialchars( $this->newTitle ); + $ot = Title::newFromURL( $this->oldTitle ); $ott = $ot->getPrefixedText(); $wgOut->addWikiText( wfMsg( "movepagetext" ) ); - if ( ! Namespace::isTalk( $ot->getNamespace() ) ) - $wgOut->addWikiText( "\n\n" . wfMsg( "movepagetalktext" ) ); + if ( ! Namespace::isTalk( $ot->getNamespace() ) ) { + $wgOut->addWikiText( wfMsg( "movepagetalktext" ) ); + } $ma = wfMsg( "movearticle" ); $newt = wfMsg( "newtitle" ); $mpb = wfMsg( "movepagebtn" ); $movetalk = wfMsg( "movetalk" ); - $action = wfLocalUrlE( $wgLang->specialPage( "Movepage" ), - "action=submit" ); + $titleObj = Title::makeTitle( NS_SPECIAL, "Movepage" ); + $action = $titleObj->escapeLocalURL( "action=submit" ); if ( "" != $err ) { $wgOut->setSubtitle( wfMsg( "formerror" ) ); $wgOut->addHTML( "

{$err}\n" ); } - $wgOut->addHTML( "

+ $wgOut->addHTML( "

- - - - - - -" ); +
{$ma}:{$ott}
{$newt}: - - -
+ + + + + + + + " ); if ( ! Namespace::isTalk( $ot->getNamespace() ) ) { - $wgOut->addHTML( -" - -" ); + $wgOut->addHTML( " + + + + " ); } - $wgOut->addHTML( -" -
{$ma}:{$ott}
{$newt}: + + +
- -{$movetalk}
+ + {$movetalk}
  - -
+ $wgOut->addHTML( " + +   + + + + +
\n" ); } @@ -99,103 +102,54 @@ class MovePageForm { function doSubmit() { global $wgOut, $wgUser, $wgLang; - global $wpNewTitle, $wpOldTitle, $wpMovetalk, $target; - global $wgDeferredUpdateList; + global $wgDeferredUpdateList, $wgMessageCache; + global $wgUseSquid; $fname = "MovePageForm::doSubmit"; - $this->ot = Title::newFromText( $wpOldTitle ); - $this->nt = Title::newFromText( $wpNewTitle ); - $this->ons = $this->ot->getNamespace(); - $this->nns = $this->nt->getNamespace(); - $this->odt = wfStrencode( $this->ot->getDBkey() ); - $this->ndt = wfStrencode( $this->nt->getDBkey() ); - $this->oft = wfStrencode( $this->ot->getPrefixedDBkey() ); - $this->nft = wfStrencode( $this->nt->getPrefixedDBkey() ); - $this->ofx = $this->ot->getPrefixedText(); - $this->nfx = $this->nt->getPrefixedText(); - - $this->oldid = $this->ot->getArticleID(); - $this->newid = $this->nt->getArticleID(); + $ot = Title::newFromText( $this->oldTitle ); + $nt = Title::newFromText( $this->newTitle ); - if ( strlen( trim( $this->ndt ) ) < 1 ) { - $this->showForm( wfMsg( "articleexists" ) ); - return; - } - if ( ( ! Namespace::isMovable( $this->ons ) ) || - ( "" == $this->odt ) || - ( "" != $this->ot->getInterwiki() ) || - ( ! Namespace::isMovable( $nns ) ) || - ( "" == $this->ndt ) || - ( "" != $this->nt->getInterwiki() ) ) { - $this->showForm( wfMsg( "badarticleerror" ) ); + $error = $ot->moveTo( $nt ); + if ( $error !== true ) { + $this->showForm( wfMsg( $error ) ); return; } - # The move is allowed only if (1) the target doesn't exist, or - # (2) the target is a redirect to the source, and has no history - # (so we can undo bad moves right after they're done). - - if ( 0 != $this->newid ) { # Target exists; check for validity - if ( ! $this->isValidTarget() ) { - $this->showForm( wfMsg( "articleexists" ) ); - return; - } - $this->moveOverExistingRedirect(); - } else { # Target didn't exist, do normal move. - $this->moveToNewTitle(); - } - - $this->updateWatchlists(); - - $u = new SearchUpdate( $this->oldid, $this->nt->getPrefixedDBkey() ); - $u->doUpdate(); - $u = new SearchUpdate( $this->newid, $this->ot->getPrefixedDBkey(), "" ); - $u->doUpdate(); - - # Move talk page if (1) the checkbox says to, (2) the source - # and target namespaces are identical, (3) the namespaces are not - # themselves talk namespaces, and of course (4) it exists. - - if ( ( 1 == $wpMovetalk ) && - ( ! Namespace::isTalk( $this->ons ) ) && - ( $this->ons == $this->nns ) ) { - - $this->ons = $this->nns = Namespace::getTalk( $this->ons ); - - $this->ot = Title::newFromText( Title::makeName( - $this->ons, $wpOldTitle ) ); - $this->nt = Title::newFromText( Title::makeName( - $this->nns, $wpNewTitle ) ); - - # odt, ndt, ofx, nfx remain the same - - $this->oft = wfStrencode( $this->ot->getPrefixedDBkey() ); - $this->nft = wfStrencode( $this->nt->getPrefixedDBkey() ); - - $this->oldid = $this->ot->getArticleID(); - $this->newid = $this->nt->getArticleID(); + + # Move talk page if + # (1) the checkbox says to, + # (2) the namespaces are not themselves talk namespaces, and of course + # (3) it exists. - if ( 0 != $this->oldid ) { - if ( 0 != $this->newid ) { - if ( $this->isValidTarget() ) { - $this->moveOverExistingRedirect(); - $this->talkmoved = 1; - } else { - $this->talkmoved = 'invalid'; - } - } else { - $this->moveToNewTitle(); - $this->talkmoved = 1; - } - $u = new SearchUpdate( $this->oldid, $this->nt->getPrefixedDBkey() ); - $u->doUpdate(); - $u = new SearchUpdate( $this->newid, $this->ot->getPrefixedDBkey(), "" ); - $u->doUpdate(); + $ons = $ot->getNamespace(); + $nns = $nt->getNamespace(); + + if ( ( 1 == $_REQUEST['wpMovetalk'] ) && + ( ! Namespace::isTalk( $ons ) ) && + ( ! Namespace::isTalk( $nns ) ) ) { + + # get old talk page namespace + $ons = Namespace::getTalk( $ons ); + # get new talk page namespace + $nns = Namespace::getTalk( $nns ); + + # make talk page title objects + $ott = Title::makeTitle( $ons, $ot->getDBkey() ); + $ntt = Title::makeTitle( $nns, $nt->getDBkey() ); + + # Attempt the move + $error = $ott->moveTo( $ntt ); + if ( $error === true ) { + $talkmoved = 1; + } else { + $talkmoved = $error; } } - $success = wfLocalUrl( $wgLang->specialPage( "Movepage" ), - "action=success&oldtitle=" . wfUrlencode( $this->ofx ) . - "&newtitle=" . wfUrlencode( $this->nfx ) . - "&talkmoved={$this->talkmoved}" ); + + $titleObj = Title::makeTitle( NS_SPECIAL, "Movepage" ); + $success = $titleObj->getFullURL( + "action=success&oldtitle=" . wfUrlencode( $ot->getPrefixedText() ) . + "&newtitle=" . wfUrlencode( $nt->getPrefixedText() ) . + "&talkmoved={$talkmoved}" ); $wgOut->redirect( $success ); } @@ -203,222 +157,24 @@ class MovePageForm { function showSuccess() { global $wgOut, $wgUser; - global $newtitle, $oldtitle, $talkmoved; $wgOut->setPagetitle( wfMsg( "movepage" ) ); $wgOut->setSubtitle( wfMsg( "pagemovedsub" ) ); - - $fields = array( "oldtitle", "newtitle" ); - wfCleanFormFields( $fields ); - - $text = str_replace( "$1", $oldtitle, wfMsg( "pagemovedtext" ) ); - $text = str_replace( "$2", $newtitle, $text ); + + $text = wfMsg( "pagemovedtext", $_REQUEST['oldtitle'], $_REQUEST['newtitle'] ); $wgOut->addWikiText( $text ); + $talkmoved = $_REQUEST['talkmoved']; if ( 1 == $talkmoved ) { - $wgOut->addHTML( "\n

" . wfMsg( "talkpagemoved" ) ); - } elseif( 'invalid' == $talkmoved ) { - $wgOut->addHTML( "\n

" . wfMsg( "talkexists" ) . "" ); + $wgOut->addHTML( "\n

" . wfMsg( "talkpagemoved" ) . "

\n" ); + } elseif( 'articleexists' == $talkmoved ) { + $wgOut->addHTML( "\n

" . wfMsg( "talkexists" ) . "

\n" ); } else { - $ot = Title::newFromURL( $oldtitle ); + $ot = Title::newFromURL( $_REQUEST['oldtitle'] ); if ( ! Namespace::isTalk( $ot->getNamespace() ) ) { - $wgOut->addHTML( "\n

" . wfMsg( "talkpagenotmoved" ) ); - } - } - } - - # Is the the existing target title valid? - - function isValidTarget() - { - $fname = "MovePageForm::isValidTarget"; - - $sql = "SELECT cur_is_redirect,cur_text FROM cur " . - "WHERE cur_id={$this->newid}"; - $res = wfQuery( $sql, $fname ); - $obj = wfFetchObject( $res ); - - if ( 0 == $obj->cur_is_redirect ) { return false; } - - if ( preg_match( "/\\[\\[\\s*([^\\]]*)]]/", $obj->cur_text, $m ) ) { - $rt = Title::newFromText( $m[1] ); - if ( 0 != strcmp( wfStrencode( $rt->getPrefixedDBkey() ), - $this->oft ) ) { - return false; - } - } - $sql = "SELECT old_id FROM old WHERE old_namespace={$this->nns} " . - "AND old_title='{$this->ndt}'"; - $res = wfQuery( $sql, $fname ); - if ( 0 != wfNumRows( $res ) ) { return false; } - - return true; - } - - # Move page to title which is presently a redirect to the source - # page. Handling link tables here is tricky. - - function moveOverExistingRedirect() - { - global $wgUser; - $fname = "MovePageForm::moveOverExistingRedirect"; - $mt = wfMsg( "movedto" ); - - $now = wfTimestampNow(); - $sql = "UPDATE cur SET cur_touched='{$now}'," . - "cur_namespace={$this->nns},cur_title='{$this->ndt}' " . - "WHERE cur_id={$this->oldid}"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE cur SET cur_touched='{$now}'," . - "cur_namespace={$this->ons},cur_title='{$this->odt}'," . - "cur_text='#REDIRECT [[{$this->nft}]]\n',cur_comment='" . - "{$mt} \\\"{$this->nft}\\\"',cur_user='" . $wgUser->getID() . - "',cur_minor_edit=0,cur_counter=0,cur_restrictions=''," . - "cur_user_text='" . wfStrencode( $wgUser->getName() ) . "'," . - "cur_is_redirect=1,cur_is_new=0 WHERE cur_id={$this->newid}"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE old SET " . - "old_namespace={$this->nns},old_title='{$this->ndt}' WHERE " . - "old_namespace={$this->ons} AND old_title='{$this->odt}'"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE recentchanges SET ". - "rc_namespace={$this->nns}, rc_title='{$this->ndt}' WHERE ". - "rc_cur_id={$this->oldid}"; - wfQuery( $sql, $fname ); - - $sql = "INSERT INTO recentchanges (rc_namespace,rc_title, - rc_comment,rc_user,rc_user_text,rc_timestamp, - rc_cur_time,rc_cur_id,rc_new) - VALUES ({$this->ons},'{$this->odt}'," . - "'{$mt} \\\"{$this->nft}\\\"','" . - $wgUser->getID() . "','" . wfStrencode( $wgUser->getName() ) . - "','{$now}','{$now}',{$this->newid},1)"; - wfQuery( $sql, $fname ); - - # The only link from here should be the old redirect - - $sql = "DELETE FROM links WHERE l_from='{$this->nft}'"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE links SET l_from='{$this->nft}' WHERE l_from='{$this->oft}'"; - wfQuery( $sql, $fname ); - - # Swap links. Using MAXINT as a temp; if there's ever an article - # with id 4294967295, this will fail, but I think that's pretty safe - - $sql = "UPDATE links SET l_to=4294967295 WHERE l_to={$this->oldid}"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE links SET l_to={$this->oldid} WHERE l_to={$this->newid}"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE links SET l_to={$this->newid} WHERE l_to=4294967295"; - wfQuery( $sql, $fname ); - - # Note: the insert below must be after the updates above! - - $sql = "INSERT INTO links (l_from,l_to) VALUES ('{$this->oft}',{$this->oldid})"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE imagelinks SET il_from='{$this->nft}' WHERE il_from='{$this->oft}'"; - wfQuery( $sql, $fname ); - } - - # Move page to non-existing title. - - function moveToNewTitle() - { - global $wgUser; - $fname = "MovePageForm::moveToNewTitle"; - $mt = wfMsg( "movedto" ); - - $now = wfTimestampNow(); - $won = wfInvertTimestamp( $now ); - $sql = "UPDATE cur SET cur_touched='{$now}'," . - "cur_namespace={$this->nns},cur_title='{$this->ndt}' " . - "WHERE cur_id={$this->oldid}"; - wfQuery( $sql, $fname ); - - $common = "{$this->ons},'{$this->odt}'," . - "'{$mt} \\\"{$this->nft}\\\"','" . - $wgUser->getID() . "','" . wfStrencode( $wgUser->getName() ) . - "','{$now}'"; - $sql = "INSERT INTO cur (cur_namespace,cur_title," . - "cur_comment,cur_user,cur_user_text,cur_timestamp,inverse_timestamp," . - "cur_touched,cur_text,cur_is_redirect,cur_is_new) " . - "VALUES ({$common},'{$won}','{$now}','#REDIRECT [[{$this->nft}]]\n',1,1)"; - wfQuery( $sql, $fname ); - $this->newid = wfInsertId(); - - $sql = "UPDATE old SET " . - "old_namespace={$this->nns},old_title='{$this->ndt}' WHERE " . - "old_namespace={$this->ons} AND old_title='{$this->odt}'"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE recentchanges SET ". - "rc_namespace={$this->nns}, rc_title='{$this->ndt}' WHERE ". - "rc_namespace={$this->ons} AND rc_title='{$this->odt}'"; - wfQuery( $sql, $fname ); - - $sql = "INSERT INTO recentchanges (rc_namespace,rc_title, - rc_comment,rc_user,rc_user_text,rc_timestamp, - rc_cur_time,rc_cur_id,rc_new) - VALUES ({$common},'{$now}',{$this->newid},1)"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE links SET l_from='{$this->nft}' WHERE l_from='{$this->oft}'"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE links SET l_to={$this->newid} WHERE l_to={$this->oldid}"; - wfQuery( $sql, $fname ); - - $sql = "INSERT INTO links (l_from,l_to) VALUES ('{$this->oft}',{$this->oldid})"; - wfQuery( $sql, $fname ); - - # Non-existent target may have had broken links to it; these must - # now be removed and made into good links. - - $sql = "SELECT bl_from FROM brokenlinks WHERE bl_to='{$this->nft}'"; - $res = wfQuery( $sql, $fname ); - - while ( $rec = wfFetchObject( $res ) ) { - $lid = $rec->bl_from; - $lt = wfStrencode( Article::nameOf( $lid ) ); - $sql = "INSERT INTO links (l_from,l_to) VALUES ('{$lt}',$this->oldid)"; - wfQuery( $sql, $fname ); - } - $sql = "DELETE FROM brokenlinks WHERE bl_to='{$this->nft}'"; - wfQuery( $sql, $fname ); - - $sql = "UPDATE imagelinks SET il_from='{$this->nft}' WHERE il_from='{$this->oft}'"; - wfQuery( $sql, $fname ); - } - - function updateWatchlists() - { - $oldnamespace = $this->ons & ~1; - $newnamespace = $this->nns & ~1; - $oldtitle = $this->odt; - $newtitle = $this->ndt; - - if( $oldnamespace == $newnamespace and $oldtitle == $newtitle ) - return; - - $sql = "SELECT wl_user FROM watchlist - WHERE wl_namespace={$oldnamespace} AND wl_title='{$oldtitle}'"; - $res = wfQuery( $sql, $fname ); - if( $s = wfFetchObject( $res ) ) { - $sql = "REPLACE INTO watchlist (wl_user,wl_namespace,wl_title) - VALUES ({$s->wl_user},{$newnamespace},'{$newtitle}')"; - while( $s = wfFetchObject( $res ) ) { - $sql .= ",({$s->wl_user},{$newnamespace},'{$newtitle}')"; + $wgOut->addHTML( "\n

" . wfMsg( "talkpagenotmoved", wfMsg( $talkmoved ) ) . "

\n" ); } - wfQuery( $sql, $fname ); } } - } ?>