# Note: edit user interface and cache support functions have been
# moved to separate EditPage and CacheManager classes.
+/* CHECK MERGE @@@
+ TEST THIS @@@
+
+ * s/\$wgTitle/\$this->mTitle/ performed, many replacements
+ * mTitle variable added to class
+*/
+
include_once( "CacheManager.php" );
class Article {
/* private */ var $mUser, $mTimestamp, $mUserText;
/* private */ var $mCounter, $mComment, $mCountAdjustment;
/* private */ var $mMinorEdit, $mRedirectedFrom;
- /* private */ var $mTouched, $mFileCache;
-
+ /* private */ var $mTouched, $mFileCache, $mTitle;
+ /* private */ var $mId, $mTable;
+
function Article( &$title ) {
$this->mTitle =& $title;
$this->clear();
}
-
+
/* private */ function clear()
{
$this->mContentLoaded = false;
- $this->mUser = $this->mCounter = -1; # Not loaded
+ $this->mCurID = $this->mUser = $this->mCounter = -1; # Not loaded
$this->mRedirectedFrom = $this->mUserText =
$this->mTimestamp = $this->mComment = $this->mFileCache = "";
$this->mCountAdjustment = 0;
$this->mTouched = "19700101000000";
}
+ /* static */ function getRevisionText( $row, $prefix = "old_" ) {
+ # Deal with optional compression of archived pages.
+ # This can be done periodically via maintenance/compressOld.php, and
+ # as pages are saved if $wgCompressRevisions is set.
+ $text = $prefix . "text";
+ $flags = $prefix . "flags";
+ if( isset( $row->$flags ) && (false !== strpos( $row->$flags, "gzip" ) ) ) {
+ return gzinflate( $row->$text );
+ }
+ if( isset( $row->$text ) ) {
+ return $row->$text;
+ }
+ return false;
+ }
+
+ /* static */ function compressRevisionText( &$text ) {
+ global $wgCompressRevisions;
+ if( !$wgCompressRevisions ) {
+ return "";
+ }
+ if( !function_exists( "gzdeflate" ) ) {
+ wfDebug( "Article::compressRevisionText() -- no zlib support, not compressing\n" );
+ return "";
+ }
+ $text = gzdeflate( $text );
+ return "gzip";
+ }
+
# Note that getContent/loadContent may follow redirects if
- # not told otherwise, and so may cause a change to wgTitle.
+ # not told otherwise, and so may cause a change to mTitle.
+ # Return the text of this revision
function getContent( $noredir = false )
{
global $action,$section,$count; # From query string
- wfProfileIn( "Article::getContent" );
+ $fname = "Article::getContent";
+ wfProfileIn( $fname );
if ( 0 == $this->getID() ) {
if ( "edit" == $action ) {
+ wfProfileOut( $fname );
return ""; # was "newarticletext", now moved above the box)
}
- wfProfileOut();
+ wfProfileOut( $fname );
return wfMsg( "noarticletext" );
} else {
$this->loadContent( $noredir );
- wfProfileOut();
if(
# check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
$action=="view"
)
{
+ wfProfileOut( $fname );
return $this->mContent . "\n" .wfMsg("anontalkpagetext"); }
else {
if($action=="edit") {
if($section!="") {
- if($section=="new") { return ""; }
+ if($section=="new") {
+ wfProfileOut( $fname );
+ return "";
+ }
$secs=preg_split("/(^=+.*?=+|^<h[1-6].*?>.*?<\/h[1-6].*?>)/mi",
$this->mContent, -1,
PREG_SPLIT_DELIM_CAPTURE);
if($section==0) {
+ wfProfileOut( $fname );
return trim($secs[0]);
} else {
+ wfProfileOut( $fname );
return trim($secs[$section*2-1] . $secs[$section*2]);
}
}
}
+ wfProfileOut( $fname );
return $this->mContent;
}
}
}
-
+
+ # Load the revision (including cur_text) into this object
function loadContent( $noredir = false )
{
global $wgOut, $wgMwRedir;
if ( $this->mContentLoaded ) return;
$fname = "Article::loadContent";
-
- # Pre-fill content with error message so that if something
- # fails we'll have something telling us what we intended.
-
- $t = $this->mTitle->getPrefixedText();
- if ( $oldid ) { $t .= ",oldid={$oldid}"; }
- if ( $redirect ) { $t .= ",redirect={$redirect}"; }
- $this->mContent = str_replace( "$1", $t, wfMsg( "missingarticle" ) );
-
+ $success = true;
+
if ( ! $oldid ) { # Retrieve current version
$id = $this->getID();
if ( 0 == $id ) return;
$sql = "SELECT " .
"cur_text,cur_timestamp,cur_user,cur_counter,cur_restrictions,cur_touched " .
"FROM cur WHERE cur_id={$id}";
+ wfDebug( "$sql\n" );
$res = wfQuery( $sql, DB_READ, $fname );
- if ( 0 == wfNumRows( $res ) ) { return; }
+ if ( 0 == wfNumRows( $res ) ) {
+ return;
+ }
$s = wfFetchObject( $res );
-
# If we got a redirect, follow it (unless we've been told
# not to by either the function parameter or the query
if ( ( "no" != $redirect ) && ( false == $noredir ) &&
if ( preg_match( "/\\[\\[([^\\]\\|]+)[\\]\\|]/",
$s->cur_text, $m ) ) {
$rt = Title::newFromText( $m[1] );
-
- # Gotta hand redirects to special pages differently:
- # Fill the HTTP response "Location" header and ignore
- # the rest of the page we're on.
-
- if ( $rt->getInterwiki() != "" ) {
- $wgOut->redirect( $rt->getFullURL() ) ;
- return;
- }
- if ( $rt->getNamespace() == Namespace::getSpecial() ) {
- $wgOut->redirect( wfLocalUrl(
- $rt->getPrefixedURL() ) );
- return;
- }
- $rid = $rt->getArticleID();
- if ( 0 != $rid ) {
- $sql = "SELECT cur_text,cur_timestamp,cur_user," .
- "cur_counter,cur_touched FROM cur WHERE cur_id={$rid}";
- $res = wfQuery( $sql, DB_READ, $fname );
-
- if ( 0 != wfNumRows( $res ) ) {
- $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
- $this->mTitle = $rt;
- $s = wfFetchObject( $res );
+ if( $rt ) {
+ # Gotta hand redirects to special pages differently:
+ # Fill the HTTP response "Location" header and ignore
+ # the rest of the page we're on.
+
+ if ( $rt->getInterwiki() != "" ) {
+ $wgOut->redirect( $rt->getFullURL() ) ;
+ return;
+ }
+ if ( $rt->getNamespace() == Namespace::getSpecial() ) {
+ $wgOut->redirect( wfLocalUrl(
+ $rt->getPrefixedURL() ) );
+ return;
+ }
+ $rid = $rt->getArticleID();
+ if ( 0 != $rid ) {
+ $sql = "SELECT cur_text,cur_timestamp,cur_user," .
+ "cur_counter,cur_restrictions,cur_touched FROM cur WHERE cur_id={$rid}";
+ $res = wfQuery( $sql, DB_READ, $fname );
+
+ if ( 0 != wfNumRows( $res ) ) {
+ $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
+ $this->mTitle = $rt;
+ $s = wfFetchObject( $res );
+ }
}
}
}
}
+
$this->mContent = $s->cur_text;
$this->mUser = $s->cur_user;
$this->mCounter = $s->cur_counter;
$this->mTitle->mRestrictionsLoaded = true;
wfFreeResult( $res );
} else { # oldid set, retrieve historical version
- $sql = "SELECT old_text,old_timestamp,old_user FROM old " .
+ $sql = "SELECT old_text,old_timestamp,old_user,old_flags FROM old " .
"WHERE old_id={$oldid}";
$res = wfQuery( $sql, DB_READ, $fname );
if ( 0 == wfNumRows( $res ) ) { return; }
$s = wfFetchObject( $res );
- $this->mContent = $s->old_text;
+ $this->mContent = Article::getRevisionText( $s );
$this->mUser = $s->old_user;
$this->mCounter = 0;
$this->mTimestamp = $s->old_timestamp;
wfFreeResult( $res );
}
+
+ # Return error message :P
+ # Horrible, confusing UI and data. I think this should return false on error -- TS
+ if ( !$success ) {
+ $t = $this->mTitle->getPrefixedText();
+ if ( isset( $oldid ) ) {
+ $oldid = IntVal( $oldid );
+ $t .= ",oldid={$oldid}";
+ }
+ if ( isset( $redirect ) ) {
+ $redirect = ($redirect == "no") ? "no" : "yes";
+ $t .= ",redirect={$redirect}";
+ }
+ $this->mContent = wfMsg( "missingarticle", $t );
+ }
+
$this->mContentLoaded = true;
}
- function getID() { return $this->mTitle->getArticleID(); }
+ function getID() {
+ if( $this->mTitle ) {
+ return $this->mTitle->getArticleID();
+ } else {
+ return 0;
+ }
+ }
function getCount()
{
return 1;
}
- # Load the field related to the last edit time of the article.
+ # Loads everything from cur except cur_text
# This isn't necessary for all uses, so it's only done if needed.
/* private */ function loadLastEdit()
{
global $wgUser, $wgOut, $wgLang;
global $oldid, $diff; # From query
- global $wgLinkCache;
- wfProfileIn( "Article::view" );
+ global $wgLinkCache, $IP;
+ $fname = "Article::view";
+ wfProfileIn( $fname );
$wgOut->setArticleFlag( true );
$wgOut->setRobotpolicy( "index,follow" );
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
$de = new DifferenceEngine( $oldid, $diff );
$de->showDiffPage();
- wfProfileOut();
+ wfProfileOut( $fname );
return;
}
- $text = $this->getContent(); # May change wgTitle!
+
+ if ( !isset( $oldid ) and $this->checkTouched() ) {
+ if( $wgOut->checkLastModified( $this->mTouched ) ){
+ return;
+ } else if ( $this->tryFileCache() ) {
+ # tell wgOut that output is taken care of
+ $wgOut->disable();
+ $this->viewUpdates();
+ return;
+ }
+ }
+
+ $text = $this->getContent(); # May change mTitle
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
$wgOut->setHTMLTitle( $this->mTitle->getPrefixedText() .
" - " . wfMsg( "wikititlesuffix" ) );
$sk = $wgUser->getSkin();
$redir = $sk->makeKnownLink( $this->mRedirectedFrom, "",
"redirect=no" );
- $s = str_replace( "$1", $redir, wfMsg( "redirectedfrom" ) );
+ $s = wfMsg( "redirectedfrom", $redir );
$wgOut->setSubtitle( $s );
}
- $wgOut->checkLastModified( $this->mTouched );
- $this->tryFileCache();
+
$wgLinkCache->preFill( $this->mTitle );
$wgOut->addWikiText( $text );
$this->viewUpdates();
- wfProfileOut();
+ wfProfileOut( $fname );
}
# Theoretically we could defer these whole insert and update
/* private */ function insertNewArticle( $text, $summary, $isminor, $watchthis )
{
global $wgOut, $wgUser, $wgLinkCache, $wgMwRedir;
+
$fname = "Article::insertNewArticle";
+ $this->mCountAdjustment = $this->isCountable( $text );
+
$ns = $this->mTitle->getNamespace();
$ttl = $this->mTitle->getDBkey();
$text = $this->preSaveTransform( $text );
$won = wfInvertTimestamp( $now );
wfSeedRandom();
$rand = number_format( mt_rand() / mt_getrandmax(), 12, ".", "" );
+ $isminor = ( $isminor && $wgUser->getID() ) ? 1 : 0;
$sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text," .
"cur_comment,cur_user,cur_timestamp,cur_minor_edit,cur_counter," .
"cur_restrictions,cur_user_text,cur_is_redirect," .
wfStrencode( $text ) . "', '" .
wfStrencode( $summary ) . "', '" .
$wgUser->getID() . "', '{$now}', " .
- ( $isminor ? 1 : 0 ) . ", 0, '', '" .
+ $isminor . ", 0, '', '" .
wfStrencode( $wgUser->getName() ) . "', $redir, 1, $rand, '{$now}', '{$won}')";
$res = wfQuery( $sql, DB_WRITE, $fname );
$newid = wfInsertId();
$this->mTitle->resetArticleID( $newid );
- $sql = "INSERT INTO recentchanges (rc_timestamp,rc_cur_time," .
- "rc_namespace,rc_title,rc_new,rc_minor,rc_cur_id,rc_user," .
- "rc_user_text,rc_comment,rc_this_oldid,rc_last_oldid,rc_bot) VALUES (" .
- "'{$now}','{$now}',{$ns},'" . wfStrencode( $ttl ) . "',1," .
- ( $isminor ? 1 : 0 ) . ",{$newid}," . $wgUser->getID() . ",'" .
- wfStrencode( $wgUser->getName() ) . "','" .
- wfStrencode( $summary ) . "',0,0," .
- ( $wgUser->isBot() ? 1 : 0 ) . ")";
- wfQuery( $sql, DB_WRITE, $fname );
+ Article::onArticleCreate( $this->mTitle, $text );
+ RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
+
if ($watchthis) {
if(!$this->mTitle->userIsWatching()) $this->watch();
} else {
}
}
+ # The talk page isn't in the regular link tables, so we need to update manually:
+ $talkns = $ns ^ 1; # talk -> normal; normal -> talk
+ $sql = "UPDATE cur set cur_touched='$now' WHERE cur_namespace=$talkns AND cur_title='" . wfStrencode( $ttl ) . "'";
+ wfQuery( $sql, DB_WRITE );
+
$this->showArticle( $text, wfMsg( "newarticle" ) );
}
- function updateArticle( $text, $summary, $minor, $watchthis, $section="" )
+ function updateArticle( $text, $summary, $minor, $watchthis, $section = "", $forceBot = false )
{
global $wgOut, $wgUser, $wgLinkCache;
global $wgDBtransactions, $wgMwRedir;
}
}
if ( $this->mMinorEdit ) { $me1 = 1; } else { $me1 = 0; }
- if ( $minor ) { $me2 = 1; } else { $me2 = 0; }
+ if ( $minor && $wgUser->getID() ) { $me2 = 1; } else { $me2 = 0; }
if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ")[^\\n]+)/i", $text, $m ) ) {
$redir = 1;
$text = $m[1] . "\n"; # Remove all content but redirect
return false;
}
+ # This overwrites $oldtext if revision compression is on
+ $flags = Article::compressRevisionText( $oldtext );
+
$sql = "INSERT INTO old (old_namespace,old_title,old_text," .
"old_comment,old_user,old_user_text,old_timestamp," .
- "old_minor_edit,inverse_timestamp) VALUES (" .
+ "old_minor_edit,inverse_timestamp,old_flags) VALUES (" .
$this->mTitle->getNamespace() . ", '" .
wfStrencode( $this->mTitle->getDBkey() ) . "', '" .
wfStrencode( $oldtext ) . "', '" .
$this->getUser() . ", '" .
wfStrencode( $this->getUserText() ) . "', '" .
$this->getTimestamp() . "', " . $me1 . ", '" .
- wfInvertTimestamp( $this->getTimestamp() ) . "')";
+ wfInvertTimestamp( $this->getTimestamp() ) . "','$flags')";
$res = wfQuery( $sql, DB_WRITE, $fname );
$oldid = wfInsertID( $res );
- $sql = "INSERT INTO recentchanges (rc_timestamp,rc_cur_time," .
- "rc_namespace,rc_title,rc_new,rc_minor,rc_bot,rc_cur_id,rc_user," .
- "rc_user_text,rc_comment,rc_this_oldid,rc_last_oldid) VALUES (" .
- "'{$now}','{$now}'," . $this->mTitle->getNamespace() . ",'" .
- wfStrencode( $this->mTitle->getDBkey() ) . "',0,{$me2}," .
- ( $wgUser->isBot() ? 1 : 0 ) . "," .
- $this->getID() . "," . $wgUser->getID() . ",'" .
- wfStrencode( $wgUser->getName() ) . "','" .
- wfStrencode( $summary ) . "',0,{$oldid})";
- wfQuery( $sql, DB_WRITE, $fname );
-
- $sql = "UPDATE recentchanges SET rc_this_oldid={$oldid} " .
- "WHERE rc_namespace=" . $this->mTitle->getNamespace() . " AND " .
- "rc_title='" . wfStrencode( $this->mTitle->getDBkey() ) . "' AND " .
- "rc_timestamp='" . $this->getTimestamp() . "'";
- wfQuery( $sql, DB_WRITE, $fname );
-
- $sql = "UPDATE recentchanges SET rc_cur_time='{$now}' " .
- "WHERE rc_cur_id=" . $this->getID();
- wfQuery( $sql, DB_WRITE, $fname );
+ $bot = (int)($wgUser->isBot() || $forceBot);
+ RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary,
+ $oldid, $this->getTimestamp(), $bot );
+ Article::onArticleEdit( $this->mTitle );
}
+
if( $wgDBtransactions ) {
$sql = "COMMIT";
wfQuery( $sql, DB_WRITE );
function showArticle( $text, $subtitle )
{
- global $wgOut, $wgUser, $wgLinkCache, $wgUseBetterLinksUpdate;
+ global $wgOut, $wgUser, $wgLinkCache;
global $wgMwRedir;
$wgLinkCache = new LinkCache();
# Get old version of link table to allow incremental link updates
- if ( $wgUseBetterLinksUpdate ) {
- $wgLinkCache->preFill( $this->mTitle );
- $wgLinkCache->clear();
- }
+ $wgLinkCache->preFill( $this->mTitle );
+ $wgLinkCache->clear();
# Now update the link cache by parsing the text
$wgOut = new OutputPage();
$wgOut->addWikiText( $text );
- $this->editUpdates( $text );
+ # Every 1000th edit, prune the recent changes table.
+ wfSeedRandom();
+ if ( 0 == mt_rand( 0, 999 ) ) {
+ $cutoff = wfUnix2Timestamp( time() - ( 7 * 86400 ) );
+ $sql = "DELETE FROM recentchanges WHERE rc_timestamp < '{$cutoff}'";
+ wfQuery( $sql, DB_WRITE );
+ }
+
if( $wgMwRedir->matchStart( $text ) )
$r = "redirect=no";
else
$this->watch( false );
}
- # This shares a lot of issues (and code) with Recent Changes
-
- function history()
- {
- global $wgUser, $wgOut, $wgLang, $offset, $limit;
-
- # If page hasn't changed, client can cache this
-
- $wgOut->checkLastModified( $this->getTimestamp() );
- wfProfileIn( "Article::history" );
-
- $wgOut->setPageTitle( $this->mTitle->getPRefixedText() );
- $wgOut->setSubtitle( wfMsg( "revhistory" ) );
- $wgOut->setArticleFlag( false );
- $wgOut->setRobotpolicy( "noindex,nofollow" );
-
- if( $this->mTitle->getArticleID() == 0 ) {
- $wgOut->addHTML( wfMsg( "nohistory" ) );
- wfProfileOut();
- return;
- }
-
- $offset = (int)$offset;
- $limit = (int)$limit;
- if( $limit == 0 ) $limit = 50;
- $namespace = $this->mTitle->getNamespace();
- $title = $this->mTitle->getText();
- $sql = "SELECT old_id,old_user," .
- "old_comment,old_user_text,old_timestamp,old_minor_edit ".
- "FROM old USE INDEX (name_title_timestamp) " .
- "WHERE old_namespace={$namespace} AND " .
- "old_title='" . wfStrencode( $this->mTitle->getDBkey() ) . "' " .
- "ORDER BY inverse_timestamp LIMIT $offset, $limit";
- $res = wfQuery( $sql, DB_READ, "Article::history" );
-
- $revs = wfNumRows( $res );
- if( $this->mTitle->getArticleID() == 0 ) {
- $wgOut->addHTML( wfMsg( "nohistory" ) );
- wfProfileOut();
- return;
- }
-
- $sk = $wgUser->getSkin();
- $numbar = wfViewPrevNext(
- $offset, $limit,
- $this->mTitle->getPrefixedText(),
- "action=history" );
- $s = $numbar;
- $s .= $sk->beginHistoryList();
-
- if($offset == 0 )
- $s .= $sk->historyLine( $this->getTimestamp(), $this->getUser(),
- $this->getUserText(), $namespace,
- $title, 0, $this->getComment(),
- ( $this->getMinorEdit() > 0 ) );
-
- $revs = wfNumRows( $res );
- while ( $line = wfFetchObject( $res ) ) {
- $s .= $sk->historyLine( $line->old_timestamp, $line->old_user,
- $line->old_user_text, $namespace,
- $title, $line->old_id,
- $line->old_comment, ( $line->old_minor_edit > 0 ) );
- }
- $s .= $sk->endHistoryList();
- $s .= $numbar;
- $wgOut->addHTML( $s );
- wfProfileOut();
- }
-
function protect( $limit = "sysop" )
{
global $wgUser, $wgOut;
"cur_restrictions='{$limit}' WHERE cur_id={$id}";
wfQuery( $sql, DB_WRITE, "Article::protect" );
+ $log = new LogPage( wfMsg( "protectlogpage" ), wfMsg( "protectlogtext" ) );
+ if ( $limit === "" ) {
+ $log->addEntry( wfMsg( "unprotectedarticle", $this->mTitle->getPrefixedText() ), "" );
+ } else {
+ $log->addEntry( wfMsg( "protectedarticle", $this->mTitle->getPrefixedText() ), "" );
+ }
$wgOut->redirect( wfLocalUrl( $this->mTitle->getPrefixedURL() ) );
}
function delete()
{
- global $wgUser, $wgOut;
+ global $wgUser, $wgOut, $wgMessageCache;
global $wpConfirm, $wpReason, $image, $oldimage;
- # Anybody can delete old revisions of images; only sysops
- # can delete articles and current images
-
- if ( ( ! $oldimage ) && ( ! $wgUser->isSysop() ) ) {
+ # This code desperately needs to be totally rewritten
+
+ if ( ( ! $wgUser->isSysop() ) ) {
$wgOut->sysopRequired();
return;
}
return;
}
+ # Can't delete cached MediaWiki namespace (i.e. vital messages)
+ if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI && $wgMessageCache->isCacheable( $this->mTitle->getDBkey() ) ) {
+ $wgOut->fatalError( wfMsg( "cannotdelete" ) );
+ return;
+ }
+
# Better double-check that it hasn't been deleted yet!
$wgOut->setPagetitle( wfMsg( "confirmdelete" ) );
if ( ( "" == trim( $this->mTitle->getText() ) )
return;
}
+ if ( $_POST["wpConfirm"] ) {
+ $this->doDelete();
+ return;
+ }
+
# determine whether this page has earlier revisions
# and insert a warning if it does
# we select the text because it might be useful below
- $sql="SELECT old_text FROM old WHERE old_namespace=0 and old_title='" . wfStrencode($this->mTitle->getPrefixedDBkey())."' ORDER BY inverse_timestamp LIMIT 1";
- $res=wfQuery($sql, DB_READ, $fname);
+ $ns = $this->mTitle->getNamespace();
+ $title = $this->mTitle->getDBkey();
+ $etitle = wfStrencode( $title );
+ $sql = "SELECT old_text,old_flags FROM old WHERE old_namespace=$ns and old_title='$etitle' ORDER BY inverse_timestamp LIMIT 1";
+ $res = wfQuery( $sql, DB_READ, $fname );
if( ($old=wfFetchObject($res)) && !$wpConfirm ) {
$skin=$wgUser->getSkin();
$wgOut->addHTML("<B>".wfMsg("historywarning"));
$wgOut->addHTML( $skin->historyLink() ."</B><P>");
}
- $sql="SELECT cur_text FROM cur WHERE cur_namespace=0 and cur_title='" . wfStrencode($this->mTitle->getPrefixedDBkey())."'";
+ $sql="SELECT cur_text FROM cur WHERE cur_namespace=$ns and cur_title='$etitle'";
$res=wfQuery($sql, DB_READ, $fname);
if( ($s=wfFetchObject($res))) {
$text=$s->cur_text;
} else {
if($old) {
- $text=$old->old_text;
+ $text = Article::getRevisionText( $old );
$blanked=1;
}
function confirmDelete( $par = "" )
{
global $wgOut;
+ global $wpReason;
+
+ wfDebug( "Article::confirmDelete\n" );
$sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
$wgOut->setSubtitle( wfMsg( "deletesub", $sub ) );
<form id=\"deleteconfirm\" method=\"post\" action=\"{$formaction}\">
<table border=0><tr><td align=right>
{$delcom}:</td><td align=left>
-<input type=text size=60 name=\"wpReason\" value=\"{$wpReason}\">
+<input type=text size=60 name=\"wpReason\" value=\"" . htmlspecialchars( $wpReason ) . "\">
</td></tr><tr><td> </td></tr>
<tr><td align=right>
<input type=checkbox name=\"wpConfirm\" value='1' id=\"wpConfirm\">
global $wgOut, $wgUser, $wgLang;
global $wpReason;
$fname = "Article::doDelete";
+ wfDebug( "$fname\n" );
$this->doDeleteArticle( $this->mTitle );
$deleted = $this->mTitle->getPrefixedText();
Namespace::getWikipedia() ) .
":" . wfMsg( "dellogpage" ), wfMsg( "deletionlog" ) );
- $text = str_replace( "$1" , $deleted, wfMsg( "deletedtext" ) );
- $text = str_replace( "$2", $loglink, $text );
+ $text = wfMsg( "deletedtext", $deleted, $loglink );
$wgOut->addHTML( "<p>" . $text );
$wgOut->returnToMain( false );
global $wgUser, $wgOut, $wgLang, $wpReason, $wgDeferredUpdateList;
$fname = "Article::doDeleteArticle";
+ wfDebug( "$fname\n" );
+
$ns = $title->getNamespace();
$t = wfStrencode( $title->getDBkey() );
$id = $title->getArticleID();
$sql = "DELETE FROM recentchanges WHERE rc_namespace={$ns} AND " .
"rc_title='{$t}'";
- wfQuery( $sql, DB_WRITE, $fname );
+ wfQuery( $sql, DB_WRITE, $fname );
# Finally, clean up the link tables
if ( 0 != $id ) {
+
$t = wfStrencode( $title->getPrefixedDBkey() );
+
+ Article::onArticleDelete( $title );
+
$sql = "SELECT l_from FROM links WHERE l_to={$id}";
$res = wfQuery( $sql, DB_READ, $fname );
$sql = "INSERT INTO brokenlinks (bl_from,bl_to) VALUES ";
- $now = wfTimestampNow();
+ $now = wfTimestampNow();
$sql2 = "UPDATE cur SET cur_touched='{$now}' WHERE cur_id IN (";
$first = true;
$log = new LogPage( wfMsg( "dellogpage" ), wfMsg( "dellogpagetext" ) );
$art = $title->getPrefixedText();
$wpReason = wfCleanQueryVar( $wpReason );
- $log->addEntry( str_replace( "$1", $art, wfMsg( "deletedarticle" ) ), $wpReason );
+ $log->addEntry( wfMsg( "deletedarticle", $art ), $wpReason );
# Clear the cached article id so the interface doesn't act like we exist
$this->mTitle->resetArticleID( 0 );
$wgOut->sysopRequired();
return;
}
-
+ if ( wfReadOnly() ) {
+ $wgOut->readOnlyPage( $this->getContent() );
+ return;
+ }
+
+ # Enhanced rollback, marks edits rc_bot=1
+ $bot = !!$_REQUEST['bot'];
+
# Replace all this user's current edits with the next one down
$tt = wfStrencode( $this->mTitle->getDBKey() );
$n = $this->mTitle->getNamespace();
$wgOut->addHTML(
wfMsg("editcomment",
htmlspecialchars( $s->cur_comment ) ) );
- }
+ }
return;
}
# Get the last edit not by this guy
- $sql = "SELECT old_text,old_user,old_user_text
+ $sql = "SELECT old_text,old_user,old_user_text,old_timestamp,old_flags
FROM old USE INDEX (name_title_timestamp)
WHERE old_namespace={$n} AND old_title='{$tt}'
AND (old_user <> {$uid} OR old_user_text <> '{$ut}')
return;
}
$s = wfFetchObject( $res );
-
+
+ if ( $bot ) {
+ # Mark all reverted edits as bot
+ $sql = "UPDATE recentchanges SET rc_bot=1 WHERE
+ rc_cur_id=$pid AND rc_user=$uid AND rc_timestamp > '{$s->old_timestamp}'";
+ wfQuery( $sql, DB_WRITE, $fname );
+ }
+
# Save it!
- $newcomment = str_replace( "$1", $s->old_user_text, wfMsg( "revertpage" ) );
+ $newcomment = wfMsg( "revertpage", $s->old_user_text, $from );
$wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
$wgOut->setRobotpolicy( "noindex,nofollow" );
$wgOut->addHTML( "<h2>" . $newcomment . "</h2>\n<hr>\n" );
- $this->updateArticle( $s->old_text, $newcomment, 1, $this->mTitle->userIsWatching() );
-
+ $this->updateArticle( Article::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), "", $bot );
+
+ Article::onArticleEdit( $this->mTitle );
$wgOut->returnToMain( false );
}
/* private */ function viewUpdates()
{
global $wgDeferredUpdateList;
-
if ( 0 != $this->getID() ) {
- $u = new ViewCountUpdate( $this->getID() );
- array_push( $wgDeferredUpdateList, $u );
- $u = new SiteStatsUpdate( 1, 0, 0 );
- array_push( $wgDeferredUpdateList, $u );
-
+ global $wgDisableCounters;
+ if( !$wgDisableCounters ) {
+ Article::incViewCount( $this->getID() );
+ $u = new SiteStatsUpdate( 1, 0, 0 );
+ array_push( $wgDeferredUpdateList, $u );
+ }
$u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(),
$this->mTitle->getDBkey() );
array_push( $wgDeferredUpdateList, $u );
}
}
- # Do standard deferred updates after page edit.
- # Every 1000th edit, prune the recent changes table.
- /* private */ function editUpdates( $text )
- {
- global $wgDeferredUpdateList;
-
- wfSeedRandom();
- if ( 0 == mt_rand( 0, 999 ) ) {
- $cutoff = wfUnix2Timestamp( time() - ( 7 * 86400 ) );
- $sql = "DELETE FROM recentchanges WHERE rc_timestamp < '{$cutoff}'";
- wfQuery( $sql, DB_WRITE );
- }
- $id = $this->getID();
- $title = $this->mTitle->getPrefixedDBkey();
- $adj = $this->mCountAdjustment;
-
- if ( 0 != $id ) {
- $u = new LinksUpdate( $id, $title );
- array_push( $wgDeferredUpdateList, $u );
- $u = new SiteStatsUpdate( 0, 1, $adj );
- array_push( $wgDeferredUpdateList, $u );
- $u = new SearchUpdate( $id, $title, $text );
- array_push( $wgDeferredUpdateList, $u );
-
- $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(),
- $this->mTitle->getDBkey() );
- array_push( $wgDeferredUpdateList, $u );
- }
- }
/* private */ function setOldSubtitle()
{
global $wgLang, $wgOut;
$td = $wgLang->timeanddate( $this->mTimestamp, true );
- $r = str_replace( "$1", "{$td}", wfMsg( "revisionasof" ) );
+ $r = wfMsg( "revisionasof", $td );
$wgOut->setSubtitle( "({$r})" );
}
#
$tc = "[&;%\\-,.\\(\\)' _0-9A-Za-z\\/:\\x80-\\xff]";
$np = "[&;%\\-,.' _0-9A-Za-z\\/:\\x80-\\xff]"; # No parens
+ $namespacechar = '[ _0-9A-Za-z\x80-\xff]'; # Namespaces can use non-ascii!
$conpat = "/^({$np}+) \\(({$tc}+)\\)$/";
$p1 = "/\[\[({$np}+) \\(({$np}+)\\)\\|]]/"; # [[page (context)|]]
$p2 = "/\[\[\\|({$tc}+)]]/"; # [[|page]]
- $p3 = "/\[\[([A-Za-z _]+):({$np}+)\\|]]/"; # [[namespace:page|]]
- $p4 = "/\[\[([A-Aa-z _]+):({$np}+) \\(({$np}+)\\)\\|]]/";
+ $p3 = "/\[\[($namespacechar+):({$np}+)\\|]]/"; # [[namespace:page|]]
+ $p4 = "/\[\[($namespacechar+):({$np}+) \\(({$np}+)\\)\\|]]/";
# [[ns:page (cont)|]]
$context = "";
$t = $this->mTitle->getText();
} else {
$text = preg_replace( $p2, "[[\\1 ({$context})|\\1]]", $text );
}
-
+
+ # {{SUBST:xxx}} variables
+ #
+ $mw =& MagicWord::get( MAG_SUBST );
+ $text = $mw->substituteCallback( $text, "wfReplaceSubstVar" );
+
+/* Experimental:
+ # Trim trailing whitespace
+ # MAG_END (__END__) tag allows for trailing
+ # whitespace to be deliberately included
+ $text = rtrim( $text );
+ $mw =& MagicWord::get( MAG_END );
+ $mw->matchAndRemove( $text );
+*/
return $text;
}
/* Caching functions */
-
+
+ # checkLastModified returns true iff it has taken care of all
+ # output to the client that is necessary for this request.
+ # (that is, it has sent a cached version of the page)
function tryFileCache() {
+ static $called = false;
+ if( $called ) {
+ wfDebug( " tryFileCache() -- called twice!?\n" );
+ return;
+ }
+ $called = true;
if($this->isFileCacheable()) {
$touched = $this->mTouched;
- if( strpos( $this->mContent, "{{" ) !== false ) {
- # Expire pages with variable replacements in an hour
+ if( $this->mTitle->getPrefixedDBkey() == wfMsg( "mainpage" ) ) {
+ # Expire the main page quicker
$expire = wfUnix2Timestamp( time() - 3600 );
$touched = max( $expire, $touched );
}
$cache = new CacheManager( $this->mTitle );
if($cache->isFileCacheGood( $touched )) {
+ global $wgOut;
wfDebug( " tryFileCache() - about to load\n" );
$cache->loadFromFileCache();
- exit;
+ return true;
} else {
wfDebug( " tryFileCache() - starting buffer\n" );
- if($cache->useGzip() && wfClientAcceptsGzip()) {
- /* For some reason, adding this header line over in
- CacheManager::saveToFileCache() fails on my test
- setup at home, though it works on the live install.
- Make double-sure... --brion */
- header( "Content-Encoding: gzip" );
- }
ob_start( array(&$cache, 'saveToFileCache' ) );
}
} else {
and ($this->getID() != 0)
and ($wgUser->getId() == 0)
and (!$wgUser->getNewtalk())
- and ($this->mTitle->getNamespace != Namespace::getSpecial())
+ and ($this->mTitle->getNamespace() != Namespace::getSpecial())
and ($action == "view")
and (!isset($oldid))
and (!isset($diff))
and (!isset($redirect))
and (!isset($printable))
and (!$this->mRedirectedFrom);
-
}
+ function checkTouched() {
+ $id = $this->getID();
+ $sql = "SELECT cur_touched,cur_is_redirect FROM cur WHERE cur_id=$id";
+ $res = wfQuery( $sql, DB_READ, "Article::checkTouched" );
+ if( $s = wfFetchObject( $res ) ) {
+ $this->mTouched = $s->cur_touched;
+ return !$s->cur_is_redirect;
+ } else {
+ return false;
+ }
+ }
+
+ /* static */ function incViewCount( $id )
+ {
+ $id = intval( $id );
+ global $wgHitcounterUpdateFreq;
+
+ if( $wgHitcounterUpdateFreq <= 1 ){ //
+ wfQuery("UPDATE cur SET cur_counter = cur_counter + 1 " .
+ "WHERE cur_id = $id", DB_WRITE);
+ return;
+ }
+
+ # Not important enough to warrant an error page in case of failure
+ $oldignore = wfIgnoreSQLErrors( true );
+
+ wfQuery("INSERT INTO hitcounter (hc_id) VALUES ({$id})", DB_WRITE);
+
+ $checkfreq = intval( $wgHitcounterUpdateFreq/25 + 1 );
+ if( (rand() % $checkfreq != 0) or (wfLastErrno() != 0) ){
+ # Most of the time (or on SQL errors), skip row count check
+ wfIgnoreSQLErrors( $oldignore );
+ return;
+ }
+
+ $res = wfQuery("SELECT COUNT(*) as n FROM hitcounter", DB_WRITE);
+ $row = wfFetchObject( $res );
+ $rown = intval( $row->n );
+ if( $rown >= $wgHitcounterUpdateFreq ){
+ wfProfileIn( "Article::incViewCount-collect" );
+ $old_user_abort = ignore_user_abort( true );
+
+ wfQuery("LOCK TABLES hitcounter WRITE", DB_WRITE);
+ wfQuery("CREATE TEMPORARY TABLE acchits TYPE=HEAP ".
+ "SELECT hc_id,COUNT(*) AS hc_n FROM hitcounter ".
+ "GROUP BY hc_id", DB_WRITE);
+ wfQuery("DELETE FROM hitcounter", DB_WRITE);
+ wfQuery("UNLOCK TABLES", DB_WRITE);
+ wfQuery("UPDATE cur,acchits SET cur_counter=cur_counter + hc_n ".
+ "WHERE cur_id = hc_id", DB_WRITE);
+ wfQuery("DROP TABLE acchits", DB_WRITE);
+
+ ignore_user_abort( $old_user_abort );
+ wfProfileOut( "Article::incViewCount-collect" );
+ }
+ wfIgnoreSQLErrors( $oldignore );
+ }
+
+ # The onArticle*() functions are supposed to be a kind of hooks
+ # which should be called whenever any of the specified actions
+ # are done.
+ #
+ # This is a good place to put code to clear caches, for instance.
+
+ /* static */ function onArticleCreate($title_obj,$text=''){
+ global $wgEnablePersistentLC, $wgEnableParserCache, $wgUseSquid;
+ global $wgDeferredUpdateList, $wgDBname, $wgMemc;
+ global $wgMessageCache, $wgInternalServer;
+ # Do standard deferred updates after page edit.
+ $id = $title_obj->getArticleID();
+ $title = $title_obj->getPrefixedDBkey();
+ $shortTitle = $title_obj->getDBkey();
+
+ $adj = $this->mCountAdjustment;
+
+ if ( 0 != $id ) {
+ $u = new LinksUpdate( $id, $title );
+ array_push( $wgDeferredUpdateList, $u );
+ $u = new SiteStatsUpdate( 0, 1, $adj );
+ array_push( $wgDeferredUpdateList, $u );
+ $u = new SearchUpdate( $id, $title, $text );
+ array_push( $wgDeferredUpdateList, $u );
+
+ $u = new UserTalkUpdate( 1, $title_obj->getNamespace(), $shortTitle );
+ array_push( $wgDeferredUpdateList, $u );
+
+ if ( $title_obj->getNamespace() == NS_MEDIAWIKI ) {
+ $wgMessageCache->replace( $shortTitle, $text );
+ }
+ }
+ if ( $wgEnablePersistentLC ) {
+ LinkCache::linksccClearBrokenLinksTo( $title );
+ }
+ if ( $wgEnableParserCache ) {
+ OutputPage::parsercacheClearBrokenLinksTo( $title );
+ }
+ if ( $wgUseSquid ) {
+ $urlArr = Array(
+ $wgInternalServer.wfLocalUrl( $title_obj->getPrefixedURL())
+ );
+ wfPurgeSquidServers($urlArr);
+ /* this needs to be done after LinksUpdate */
+ $u = new SquidUpdate($title_obj);
+ array_push( $wgDeferredUpdateList, $u );
+ }
+ }
+
+ /* static */ function onArticleDelete($title_obj,$text=''){
+ global $wgEnablePersistentLC, $wgEnableParserCache, $wgUseSquid, $wgDeferredUpdateList;
+ global $wgDeferredUpdateList, $wgDBname, $wgMemc;
+ global $wgMessageCache, $wgInternalServer;
+
+ $id = $title_obj->getArticleID();
+ $title = $title_obj->getPrefixedDBkey();
+ $shortTitle = $title_obj->getDBkey();
+
+ if ( $wgEnablePersistentLC ) {
+ LinkCache::linksccClearLinksTo( $id );
+ }
+ if ( $wgEnableParserCache ) {
+ OutputPage::parsercacheClearLinksTo( $id );
+ }
+ if ( $wgUseSquid ) {
+ $urlArr = Array(
+ $wgInternalServer.wfLocalUrl( $title_obj->getPrefixedURL())
+ );
+ wfPurgeSquidServers($urlArr);
+
+ /* prepare the list of urls to purge */
+ $sql = "SELECT l_from FROM links WHERE l_to={$id}" ;
+ $res = wfQuery ( $sql, DB_READ ) ;
+ while ( $BL = wfFetchObject ( $res ) )
+ {
+ $t = Title::newFromDBkey( $BL->l_from) ;
+ $blurlArr[] = $wgInternalServer.wfLocalUrl( $t->getPrefixedURL() );
+ }
+ wfFreeResult ( $res ) ;
+ $u = new SquidUpdate( $title_obj, $blurlArr );
+ array_push( $wgDeferredUpdateList, $u );
+
+ }
+ }
+
+ /* static */ function onArticleEdit($title_obj,$text=''){
+ global $wgEnablePersistentLC, $wgEnableParserCache, $wgUseSquid;
+ global $wgDeferredUpdateList, $wgDBname, $wgMemc;
+ global $wgMessageCache, $wgInternalServer;
+
+ $id = $title_obj->getArticleID();
+ $title = $title_obj->getPrefixedDBkey();
+ $shortTitle = $title_obj->getDBkey();
+
+ $adj = $this->mCountAdjustment;
+
+ if ( 0 != $id ) {
+ $u = new LinksUpdate( $id, $title );
+ array_push( $wgDeferredUpdateList, $u );
+ $u = new SiteStatsUpdate( 0, 1, $adj );
+ array_push( $wgDeferredUpdateList, $u );
+ $u = new SearchUpdate( $id, $title, $text );
+ array_push( $wgDeferredUpdateList, $u );
+
+ $u = new UserTalkUpdate( 1, $title_obj->getNamespace(), $shortTitle );
+ array_push( $wgDeferredUpdateList, $u );
+
+ if ( $title_obj->getNamespace() == NS_MEDIAWIKI ) {
+ $wgMessageCache->replace( $shortTitle, $text );
+ }
+ }
+ if ( $wgEnablePersistentLC ) {
+ LinkCache::linksccClearPage( $id );
+ }
+ if ( $wgEnableParserCache ) {
+ OutputPage::parsercacheClearPage( $id );
+ }
+ if ( $wgUseSquid ) {
+ $urlArr = Array(
+ $wgInternalServer.wfLocalUrl( $title_obj->getPrefixedURL()),
+ );
+ wfPurgeSquidServers($urlArr);
+ }
+ }
+}
+function wfReplaceSubstVar( $matches ) {
+ return wfMsg( $matches[1] );
}
?>
dépôts / lhc / web / wiklou.git / blobdiff