X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FChangesList.php;h=8732e6f636aab1414fdc5f1be117d8143cc99422;hb=2c9cfd7cce6ba9de336cff9f9917385e5901b0c4;hp=ee5611d4a953a4a5e30f50b6d84462e95c213a7f;hpb=b6e0df246f8dda61643d9aba36d9f9e802c909ec;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ChangesList.php b/includes/ChangesList.php index ee5611d4a9..8732e6f636 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -1,4 +1,12 @@ mAttribs = $rc->mAttribs; @@ -17,16 +30,16 @@ class RCCacheEntry extends RecentChange { } /** - * Class to show various lists of changes: - * - what links here - * - related changes - * - recent changes + * Base class for all changes lists */ class ChangesList { - # Called by history lists and recent changes + + /** + * @var Skin + */ public $skin; protected $watchlist = false; - + /** * Changeslist contructor * @param $skin Skin @@ -43,12 +56,14 @@ class ChangesList { * @param $user User to fetch the list class for * @return ChangesList derivative */ - public static function newFromUser( &$user ) { + public static function newFromUser( $user ) { + global $wgRequest; + $sk = $user->getSkin(); $list = null; - if( wfRunHooks( 'FetchChangesList', array( &$user, &$sk, &$list ) ) ) { - return $user->getOption( 'usenewrc' ) ? - new EnhancedChangesList( $sk ) : new OldChangesList( $sk ); + if( wfRunHooks( 'FetchChangesList', array( $user, &$sk, &$list ) ) ) { + $new = $wgRequest->getBool( 'enhanced', $user->getOption( 'usenewrc' ) ); + return $new ? new EnhancedChangesList( $sk ) : new OldChangesList( $sk ); } else { return $list; } @@ -75,21 +90,19 @@ class ChangesList { } } - /** * Returns the appropriate flags for new page, minor change and patrolling - * @param $new Boolean - * @param $minor Boolean - * @param $patrolled Boolean + * @param $flags Array Associative array of 'flag' => Bool * @param $nothing String to use for empty space - * @param $bot Boolean * @return String */ - protected function recentChangesFlags( $new, $minor, $patrolled, $nothing = ' ', $bot = false ) { - $f = $new ? self::flag( 'newpage' ) : $nothing; - $f .= $minor ? self::flag( 'minor' ) : $nothing; - $f .= $bot ? self::flag( 'bot' ) : $nothing; - $f .= $patrolled ? self::flag( 'unpatrolled' ) : $nothing; + protected function recentChangesFlags( $flags, $nothing = ' ' ) { + $f = ''; + foreach( array( 'newpage', 'minor', 'bot', 'unpatrolled' ) as $flag ){ + $f .= isset( $flags[$flag] ) && $flags[$flag] + ? self::flag( $flag ) + : $nothing; + } return $f; } @@ -102,66 +115,33 @@ class ChangesList { * @param $key String: 'newpage', 'unpatrolled', 'minor', or 'bot' * @return String: Raw HTML */ - public static function flag( $key ) { + public static function flag( $flag ) { static $messages = null; if ( is_null( $messages ) ) { - foreach ( explode( ' ', 'minoreditletter boteditletter newpageletter ' . - 'unpatrolledletter recentchanges-label-minor recentchanges-label-bot ' . - 'recentchanges-label-newpage recentchanges-label-unpatrolled' ) as $msg ) { - $messages[$msg] = wfMsgExt( $msg, 'escapenoentities' ); - } - } - # Inconsistent naming, bleh - if ( $key == 'newpage' || $key == 'unpatrolled' ) { - $key2 = $key; - } else { - $key2 = $key . 'edit'; - } - return "" - . $messages["${key2}letter"] - . ''; - } - - /** - * Some explanatory wrapper text for the given flag, to be used in a legend - * explaining what the flags mean. For instance, "N - new page". See - * also flag(). - * - * @param $key String: 'newpage', 'unpatrolled', 'minor', or 'bot' - * @return String: Raw HTML - */ - private static function flagLine( $key ) { - return wfMsgExt( "recentchanges-legend-$key", array( 'escapenoentities', - 'replaceafter' ), self::flag( $key ) ); - } - - /** - * A handy legend to tell users what the little "m", "b", and so on mean. - * - * @return String: Raw HTML - */ - public static function flagLegend() { - global $wgGroupPermissions, $wgLang; - - $flags = array( self::flagLine( 'newpage' ), - self::flagLine( 'minor' ) ); - - # Don't show info on bot edits unless there's a bot group of some kind - foreach ( $wgGroupPermissions as $rights ) { - if ( isset( $rights['bot'] ) && $rights['bot'] ) { - $flags[] = self::flagLine( 'bot' ); - break; + $messages = array( + 'newpage' => array( 'newpageletter', 'recentchanges-label-newpage' ), + 'minoredit' => array( 'minoreditletter', 'recentchanges-label-minor' ), + 'botedit' => array( 'boteditletter', 'recentchanges-label-bot' ), + 'unpatrolled' => array( 'unpatrolledletter', 'recentchanges-label-unpatrolled' ), + ); + foreach( $messages as &$value ) { + $value[0] = wfMsgExt( $value[0], 'escapenoentities' ); + $value[1] = wfMsgExt( $value[1], 'escapenoentities' ); } } - if ( self::usePatrol() ) { - $flags[] = self::flagLine( 'unpatrolled' ); - } + # Inconsistent naming, bleh + $map = array( + 'newpage' => 'newpage', + 'minor' => 'minoredit', + 'bot' => 'botedit', + 'unpatrolled' => 'unpatrolled', + 'minoredit' => 'minoredit', + 'botedit' => 'botedit', + ); + $flag = $map[$flag]; - return '
' . - wfMsgExt( 'recentchanges-label-legend', 'parseinline', - $wgLang->commaList( $flags ) ) . '
'; + return "" . $messages[$flag][0] . ''; } /** @@ -225,7 +205,12 @@ class ChangesList { } } - protected function insertMove( &$s, $rc ) { + /** + * @param $s + * @param $rc RecentChange + * @return void + */ + public function insertMove( &$s, $rc ) { # Diff $s .= '(' . $this->message['diff'] . ') ('; # Hist @@ -257,7 +242,7 @@ class ChangesList { ); } - protected function insertDateHeader( &$s, $rc_timestamp ) { + public function insertDateHeader( &$s, $rc_timestamp ) { global $wgLang; # Make date header if necessary $date = $wgLang->date( $rc_timestamp, true, true ); @@ -271,7 +256,7 @@ class ChangesList { } } - protected function insertLog( &$s, $title, $logtype ) { + public function insertLog( &$s, $title, $logtype ) { $logname = LogPage::logName( $logtype ); $s .= '(' . $this->skin->link( $title, @@ -282,7 +267,13 @@ class ChangesList { ) . ')'; } - protected function insertDiffHist( &$s, &$rc, $unpatrolled ) { + /** + * @param $s + * @param $rc RecentChange + * @param $unpatrolled + * @return void + */ + public function insertDiffHist( &$s, &$rc, $unpatrolled ) { # Diff link if( $rc->mAttribs['rc_type'] == RC_NEW || $rc->mAttribs['rc_type'] == RC_LOG ) { $diffLink = $this->message['diff']; @@ -322,7 +313,14 @@ class ChangesList { $s .= ') . . '; } - protected function insertArticleLink( &$s, &$rc, $unpatrolled, $watched ) { + /** + * @param $s + * @param $rc RecentChange + * @param $unpatrolled + * @param $watched + * @return void + */ + public function insertArticleLink( &$s, &$rc, $unpatrolled, $watched ) { global $wgContLang; # If it's a new article, there is no diff link, but if it hasn't been # patrolled yet, we need to give users a way to do so @@ -363,24 +361,35 @@ class ChangesList { $s .= " $articlelink"; } - protected function insertTimestamp( &$s, $rc ) { + /** + * @param $s + * @param $rc RecentChange + * @return void + */ + public function insertTimestamp( &$s, $rc ) { global $wgLang; $s .= $this->message['semicolon-separator'] . $wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ) . ' . . '; } - /** Insert links to user page, user talk page and eventually a blocking link */ + /** Insert links to user page, user talk page and eventually a blocking link + * + * @param $rc RecentChange + */ public function insertUserRelatedLinks( &$s, &$rc ) { if( $this->isDeleted( $rc, Revision::DELETED_USER ) ) { - $s .= ' ' . wfMsgHtml( 'rev-deleted-user' ) . ''; + $s .= ' ' . wfMsgHtml( 'rev-deleted-user' ) . ''; } else { - $s .= $this->skin->userLink( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] ); - $s .= $this->skin->userToolLinks( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] ); + $s .= $this->skin->userLink( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] ); + $s .= $this->skin->userToolLinks( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] ); } } - /** insert a formatted action */ - protected function insertAction( &$s, &$rc ) { + /** insert a formatted action + * + * @param $rc RecentChange + */ + public function insertAction( &$s, &$rc ) { if( $rc->mAttribs['rc_type'] == RC_LOG ) { if( $this->isDeleted( $rc, LogPage::DELETED_ACTION ) ) { $s .= ' ' . wfMsgHtml( 'rev-deleted-event' ) . ''; @@ -391,8 +400,11 @@ class ChangesList { } } - /** insert a formatted comment */ - protected function insertComment( &$s, &$rc ) { + /** insert a formatted comment + * + * @param $rc RecentChange + */ + public function insertComment( &$s, &$rc ) { if( $rc->mAttribs['rc_type'] != RC_MOVE && $rc->mAttribs['rc_type'] != RC_MOVE_OVER_REDIRECT ) { if( $this->isDeleted( $rc, Revision::DELETED_COMMENT ) ) { $s .= ' ' . wfMsgHtml( 'rev-deleted-comment' ) . ''; @@ -461,7 +473,11 @@ class ChangesList { } } - /** Inserts a rollback link */ + /** Inserts a rollback link + * + * @param $s + * @param $rc RecentChange + */ public function insertRollback( &$s, &$rc ) { global $wgUser; if( !$rc->mAttribs['rc_new'] && $rc->mAttribs['rc_this_oldid'] && $rc->mAttribs['rc_cur_id'] ) { @@ -482,6 +498,12 @@ class ChangesList { } } + /** + * @param $s + * @param $rc RecentChange + * @param $classes + * @return + */ public function insertTags( &$s, &$rc, &$classes ) { if ( empty($rc->mAttribs['ts_tags']) ) return; @@ -503,6 +525,8 @@ class ChangesList { class OldChangesList extends ChangesList { /** * Format a line using the old system (aka without any javascript). + * + * @param $rc RecentChange */ public function recentChangesLine( &$rc, $watched = false, $linenumber = null ) { global $wgLang, $wgRCShowChangedSize, $wgUser; @@ -534,7 +558,7 @@ class OldChangesList extends ChangesList { $this->insertLog( $s, $logtitle, $rc->mAttribs['rc_log_type'] ); // Log entries (old format) or log targets, and special pages } elseif( $rc->mAttribs['rc_namespace'] == NS_SPECIAL ) { - list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $rc->mAttribs['rc_title'] ); + list( $name, $subpage ) = SpecialPageFactory::resolveAlias( $rc->mAttribs['rc_title'] ); if( $name == 'Log' ) { $this->insertLog( $s, $rc->getTitle(), $subpage ); } @@ -542,8 +566,15 @@ class OldChangesList extends ChangesList { } else { $this->insertDiffHist( $s, $rc, $unpatrolled ); # M, N, b and ! (minor, new, bot and unpatrolled) - $s .= $this->recentChangesFlags( $rc->mAttribs['rc_new'], $rc->mAttribs['rc_minor'], - $unpatrolled, '', $rc->mAttribs['rc_bot'] ); + $s .= $this->recentChangesFlags( + array( + 'newpage' => $rc->mAttribs['rc_new'], + 'minor' => $rc->mAttribs['rc_minor'], + 'unpatrolled' => $unpatrolled, + 'bot' => $rc->mAttribs['rc_bot'] + ), + '' + ); $this->insertArticleLink( $s, $rc, $unpatrolled, $watched ); } # Edit/log timestamp @@ -595,17 +626,19 @@ class EnhancedChangesList extends ChangesList { * @return String */ public function beginRecentChangesList() { - global $wgStylePath, $wgStyleVersion; + global $wgOut; $this->rc_cache = array(); $this->rcMoveIndex = 0; $this->rcCacheIndex = 0; $this->lastdate = ''; $this->rclistOpen = false; - $script = Html::linkedScript( $wgStylePath . "/common/enhancedchanges.js?$wgStyleVersion" ); - return $script; + $wgOut->addModuleStyles( 'mediawiki.special.changeslist' ); + return ''; } /** * Format a line for enhanced recentchange (aka with javascript and block of lines). + * + * @param $baseRC RecentChange */ public function recentChangesLine( &$baseRC, $watched = false ) { global $wgLang, $wgUser; @@ -615,55 +648,53 @@ class EnhancedChangesList extends ChangesList { # Create a specialised object $rc = RCCacheEntry::newFromParent( $baseRC ); - # Extract fields from DB into the function scope (rc_xxxx variables) - // FIXME: Would be good to replace this extract() call with something - // that explicitly initializes variables. - extract( $rc->mAttribs ); - $curIdEq = array( 'curid' => $rc_cur_id ); + $curIdEq = array( 'curid' => $rc->mAttribs['rc_cur_id'] ); # If it's a new day, add the headline and flush the cache - $date = $wgLang->date( $rc_timestamp, true ); + $date = $wgLang->date( $rc->mAttribs['rc_timestamp'], true ); $ret = ''; if( $date != $this->lastdate ) { # Process current cache $ret = $this->recentChangesBlock(); $this->rc_cache = array(); - $ret .= Xml::element( 'h4', null, $date ); + $ret .= Xml::element( 'h4', null, $date ) . "\n"; $this->lastdate = $date; } # Should patrol-related stuff be shown? if( $wgUser->useRCPatrol() ) { - $rc->unpatrolled = !$rc_patrolled; + $rc->unpatrolled = !$rc->mAttribs['rc_patrolled']; } else { $rc->unpatrolled = false; } $showdifflinks = true; # Make article link + $type = $rc->mAttribs['rc_type']; + $logType = $rc->mAttribs['rc_log_type']; // Page moves - if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) { - $msg = ( $rc_type == RC_MOVE ) ? "1movedto2" : "1movedto2_redir"; + if( $type == RC_MOVE || $type == RC_MOVE_OVER_REDIRECT ) { + $msg = ( $type == RC_MOVE ) ? "1movedto2" : "1movedto2_redir"; $clink = wfMsg( $msg, $this->skin->linkKnown( $rc->getTitle(), null, array(), array( 'redirect' => 'no' ) ), $this->skin->linkKnown( $rc->getMovedToTitle() ) ); // New unpatrolled pages - } else if( $rc->unpatrolled && $rc_type == RC_NEW ) { + } else if( $rc->unpatrolled && $type == RC_NEW ) { $clink = $this->skin->linkKnown( $rc->getTitle(), null, array(), - array( 'rcid' => $rc_id ) ); + array( 'rcid' => $rc->mAttribs['rc_id'] ) ); // Log entries - } else if( $rc_type == RC_LOG ) { - if( $rc_log_type ) { - $logtitle = SpecialPage::getTitleFor( 'Log', $rc_log_type ); + } else if( $type == RC_LOG ) { + if( $logType ) { + $logtitle = SpecialPage::getTitleFor( 'Log', $logType ); $clink = '(' . $this->skin->linkKnown( $logtitle, - LogPage::logName($rc_log_type) ) . ')'; + LogPage::logName( $logType ) ) . ')'; } else { $clink = $this->skin->link( $rc->getTitle() ); } $watched = false; // Log entries (old format) and special pages - } elseif( $rc_namespace == NS_SPECIAL ) { - list( $specialName, $logtype ) = SpecialPage::resolveAliasWithSubpage( $rc_title ); + } elseif( $rc->mAttribs['rc_namespace'] == NS_SPECIAL ) { + list( $specialName, $logtype ) = SpecialPageFactory::resolveAlias( $rc->mAttribs['rc_title'] ); if ( $specialName == 'Log' ) { # Log updates, etc $logname = LogPage::logName( $logtype ); @@ -682,7 +713,7 @@ class EnhancedChangesList extends ChangesList { $showdifflinks = false; } - $time = $wgLang->time( $rc_timestamp, true, true ); + $time = $wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ); $rc->watched = $watched; $rc->link = $clink; $rc->timestamp = $time; @@ -690,20 +721,22 @@ class EnhancedChangesList extends ChangesList { # Make "cur" and "diff" links. Do not use link(), it is too slow if # called too many times (50% of CPU time on RecentChanges!). + $thisOldid = $rc->mAttribs['rc_this_oldid']; + $lastOldid = $rc->mAttribs['rc_last_oldid']; if( $rc->unpatrolled ) { - $rcIdQuery = array( 'rcid' => $rc_id ); + $rcIdQuery = array( 'rcid' => $rc->mAttribs['rc_id'] ); } else { $rcIdQuery = array(); } - $querycur = $curIdEq + array( 'diff' => '0', 'oldid' => $rc_this_oldid ); - $querydiff = $curIdEq + array( 'diff' => $rc_this_oldid, 'oldid' => - $rc_last_oldid ) + $rcIdQuery; + $querycur = $curIdEq + array( 'diff' => '0', 'oldid' => $thisOldid ); + $querydiff = $curIdEq + array( 'diff' => $thisOldid, 'oldid' => + $lastOldid ) + $rcIdQuery; if( !$showdifflinks ) { $curLink = $this->message['cur']; $diffLink = $this->message['diff']; - } else if( in_array( $rc_type, array(RC_NEW,RC_LOG,RC_MOVE,RC_MOVE_OVER_REDIRECT) ) ) { - if ( $rc_type != RC_NEW ) { + } else if( in_array( $type, array( RC_NEW, RC_LOG, RC_MOVE, RC_MOVE_OVER_REDIRECT ) ) ) { + if ( $type != RC_NEW ) { $curLink = $this->message['cur']; } else { $curUrl = htmlspecialchars( $rc->getTitle()->getLinkUrl( $querycur ) ); @@ -718,21 +751,21 @@ class EnhancedChangesList extends ChangesList { } # Make "last" link - if( !$showdifflinks || !$rc_last_oldid ) { + if( !$showdifflinks || !$lastOldid ) { $lastLink = $this->message['last']; - } else if( $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) { + } else if( in_array( $type, array( RC_LOG, RC_MOVE, RC_MOVE_OVER_REDIRECT ) ) ) { $lastLink = $this->message['last']; } else { $lastLink = $this->skin->linkKnown( $rc->getTitle(), $this->message['last'], - array(), $curIdEq + array('diff' => $rc_this_oldid, 'oldid' => $rc_last_oldid) + $rcIdQuery ); + array(), $curIdEq + array('diff' => $thisOldid, 'oldid' => $lastOldid) + $rcIdQuery ); } # Make user links - if( $this->isDeleted($rc,Revision::DELETED_USER) ) { - $rc->userlink = ' ' . wfMsgHtml( 'rev-deleted-user' ) . ''; + if( $this->isDeleted( $rc, Revision::DELETED_USER ) ) { + $rc->userlink = ' ' . wfMsgHtml( 'rev-deleted-user' ) . ''; } else { - $rc->userlink = $this->skin->userLink( $rc_user, $rc_user_text ); - $rc->usertalklink = $this->skin->userToolLinks( $rc_user, $rc_user_text ); + $rc->userlink = $this->skin->userLink( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] ); + $rc->usertalklink = $this->skin->userToolLinks( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] ); } $rc->lastlink = $lastLink; @@ -743,13 +776,13 @@ class EnhancedChangesList extends ChangesList { # Page moves go on their own line $title = $rc->getTitle(); $secureName = $title->getPrefixedDBkey(); - if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) { + if( $type == RC_MOVE || $type == RC_MOVE_OVER_REDIRECT ) { # Use an @ character to prevent collision with page names $this->rc_cache['@@' . ($this->rcMoveIndex++)] = array($rc); } else { # Logs are grouped by type - if( $rc_type == RC_LOG ){ - $secureName = SpecialPage::getTitleFor( 'Log', $rc_log_type )->getPrefixedDBkey(); + if( $type == RC_LOG ){ + $secureName = SpecialPage::getTitleFor( 'Log', $logType )->getPrefixedDBkey(); } if( !isset( $this->rc_cache[$secureName] ) ) { $this->rc_cache[$secureName] = array(); @@ -771,7 +804,15 @@ class EnhancedChangesList extends ChangesList { wfProfileIn( __METHOD__ ); - $r = ''; + # Add the namespace and title of the block as part of the class + if ( $block[0]->mAttribs['rc_log_type'] ) { + # Log entry + $classes = 'mw-collapsible mw-collapsed mw-enhanced-rc ' . Sanitizer::escapeClass( 'mw-changeslist-log-' . $block[0]->mAttribs['rc_log_type'] . '-' . $block[0]->mAttribs['rc_title'] ); + } else { + $classes = 'mw-collapsible mw-collapsed mw-enhanced-rc ' . Sanitizer::escapeClass( 'mw-changeslist-ns' . $block[0]->mAttribs['rc_namespace'] . '-' . $block[0]->mAttribs['rc_title'] ); + } + $r = Html::openElement( 'table', array( 'class' => $classes ) ) . + Html::openElement( 'tr' ); # Collate list of users $userlinks = array(); @@ -831,23 +872,28 @@ class EnhancedChangesList extends ChangesList { $users = ' [' . implode( $this->message['semicolon-separator'], $users ) . ']'; - # ID for JS visibility toggle - $jsid = $this->rcCacheIndex; - # onclick handler to toggle hidden/expanded - $toggleLink = "onclick='toggleVisibility($jsid); return false'"; # Title for tags $expandTitle = htmlspecialchars( wfMsg( 'rc-enhanced-expand' ) ); $closeTitle = htmlspecialchars( wfMsg( 'rc-enhanced-hide' ) ); - $tl = "" . $this->sideArrow() . ""; - $tl .= ""; - $r .= '"; # Main line - $r .= $this->recentChangesFlags( $isnew, false, $unpatrolled, ' ', $bot ); + $r .= '
'.$tl.' '; + $tl = "" + . "" + . "{$this->sideArrow()}" + . "" + . "{$this->downArrow()}" + . ""; + $r .= "$tl' . $this->recentChangesFlags( array( + 'newpage' => $isnew, + 'minor' => false, + 'unpatrolled' => $unpatrolled, + 'bot' => $bot , + ) ); # Timestamp - $r .= ' '.$block[0]->timestamp.' '; + $r .= ' '.$block[0]->timestamp.' '; # Article link if( $namehidden ) { @@ -935,39 +981,36 @@ class EnhancedChangesList extends ChangesList { $r .= $users; $r .= $this->numberofWatchingusers($block[0]->numberofWatchingusers); - $r .= "
\n"; - # Sub-entries - $r .= '
'; - $r .= ''; foreach( $block as $rcObj ) { - # Extract fields from DB into the function scope (rc_xxxx variables) - // FIXME: Would be good to replace this extract() call with something - // that explicitly initializes variables. # Classes to apply -- TODO implement $classes = array(); - extract( $rcObj->mAttribs ); + $type = $rcObj->mAttribs['rc_type']; #$r .= '\n"; } - $r .= "
'.$this->spacerArrow(); - $r .= '
'; - $r .= $this->spacerIndent() . $this->spacerIndent(); - $r .= $this->recentChangesFlags( $rc_new, $rc_minor, $rcObj->unpatrolled, ' ', $rc_bot ); - $r .= ' '; + $r .= '
'; + $r .= $this->recentChangesFlags( array( + 'newpage' => $rcObj->mAttribs['rc_new'], + 'minor' => $rcObj->mAttribs['rc_minor'], + 'unpatrolled' => $rcObj->unpatrolled, + 'bot' => $rcObj->mAttribs['rc_bot'], + ) ); + $r .= ' '; $params = $queryParams; - if( $rc_this_oldid != 0 ) { - $params['oldid'] = $rc_this_oldid; + if( $rcObj->mAttribs['rc_this_oldid'] != 0 ) { + $params['oldid'] = $rcObj->mAttribs['rc_this_oldid']; } # Log timestamp - if( $rc_type == RC_LOG ) { + if( $type == RC_LOG ) { $link = $rcObj->timestamp; # Revision link } else if( !ChangesList::userCan($rcObj,Revision::DELETED_TEXT) ) { $link = ''.$rcObj->timestamp.' '; } else { - if ( $rcObj->unpatrolled && $rc_type == RC_NEW) { + if ( $rcObj->unpatrolled && $type == RC_NEW) { $params['rcid'] = $rcObj->mAttribs['rc_id']; } @@ -983,7 +1026,7 @@ class EnhancedChangesList extends ChangesList { } $r .= $link . ''; - if ( !$rc_type == RC_LOG || $rc_type == RC_NEW ) { + if ( !$type == RC_LOG || $type == RC_NEW ) { $r .= ' ('; $r .= $rcObj->curlink; $r .= $this->message['pipe-separator']; @@ -993,9 +1036,10 @@ class EnhancedChangesList extends ChangesList { $r .= ' . . '; # Character diff - if( $wgRCShowChangedSize ) { - $r .= ( $rcObj->getCharacterDifference() == '' ? '' : $rcObj->getCharacterDifference() . ' . . ' ) ; + if( $wgRCShowChangedSize && $rcObj->getCharacterDifference() ) { + $r .= $rcObj->getCharacterDifference() . ' . . ' ; } + # User links $r .= $rcObj->userlink; $r .= $rcObj->usertalklink; @@ -1010,7 +1054,7 @@ class EnhancedChangesList extends ChangesList { $r .= "
\n"; + $r .= "\n"; $this->rcCacheIndex++; @@ -1062,43 +1106,46 @@ class EnhancedChangesList extends ChangesList { return $this->arrow( '', codepointToUtf8( 0xa0 ) ); // non-breaking space } - /** - * Add a set of spaces - * @return String: HTML tag - */ - protected function spacerIndent() { - return '     '; - } - /** * Enhanced RC ungrouped line. + * + * @param $rcObj RecentChange * @return String: a HTML formated line (generated using $r) */ protected function recentChangesBlockLine( $rcObj ) { global $wgRCShowChangedSize; wfProfileIn( __METHOD__ ); + $query['curid'] = $rcObj->mAttribs['rc_cur_id']; - # Extract fields from DB into the function scope (rc_xxxx variables) - // FIXME: Would be good to replace this extract() call with something - // that explicitly initializes variables. - $classes = array(); // TODO implement - extract( $rcObj->mAttribs ); - $query['curid'] = $rc_cur_id; + $type = $rcObj->mAttribs['rc_type']; + $logType = $rcObj->mAttribs['rc_log_type']; + if( $logType ) { + # Log entry + $classes = 'mw-enhanced-rc ' . Sanitizer::escapeClass( 'mw-changeslist-log-' . $logType . '-' . $rcObj->mAttribs['rc_title'] ); + } else { + $classes = 'mw-enhanced-rc ' . Sanitizer::escapeClass( 'mw-changeslist-ns' . $rcObj->mAttribs['rc_namespace'] . '-' . $rcObj->mAttribs['rc_title'] ); + } + $r = Html::openElement( 'table', array( 'class' => $classes ) ) . + Html::openElement( 'tr' ); - $r = ''; - $r .= '
' . $this->spacerArrow() . ' '; + $r .= '' . $this->spacerArrow(); # Flag and Timestamp - if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) { - $r .= '    '; // 4 flags -> 4 spaces + if( $type == RC_MOVE || $type == RC_MOVE_OVER_REDIRECT ) { + $r .= '    '; // 4 flags -> 4 spaces } else { - $r .= $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $rcObj->unpatrolled, ' ', $rc_bot ); + $r .= $this->recentChangesFlags( array( + 'newpage' => $type == RC_NEW, + 'mino' => $rcObj->mAttribs['rc_minor'], + 'unpatrolled' => $rcObj->unpatrolled, + 'bot' => $rcObj->mAttribs['rc_bot'], + ) ); } - $r .= ' '.$rcObj->timestamp.' '; + $r .= ' '.$rcObj->timestamp.' '; # Article or log link - if( $rc_log_type ) { - $logtitle = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL ); - $logname = LogPage::logName( $rc_log_type ); + if( $logType ) { + $logtitle = Title::newFromText( "Log/$logType", NS_SPECIAL ); + $logname = LogPage::logName( $logType ); $r .= '(' . $this->skin->link( $logtitle, $logname, @@ -1110,7 +1157,7 @@ class EnhancedChangesList extends ChangesList { $this->insertArticleLink( $r, $rcObj, $rcObj->unpatrolled, $rcObj->watched ); } # Diff and hist links - if ( $rc_type != RC_LOG ) { + if ( $type != RC_LOG ) { $r .= ' ('. $rcObj->difflink . $this->message['pipe-separator']; $query['action'] = 'history'; $r .= $this->skin->link( @@ -1129,17 +1176,18 @@ class EnhancedChangesList extends ChangesList { # User/talk $r .= ' '.$rcObj->userlink . $rcObj->usertalklink; # Log action (if any) - if( $rc_log_type ) { + if( $logType ) { if( $this->isDeleted($rcObj,LogPage::DELETED_ACTION) ) { $r .= ' ' . wfMsgHtml('rev-deleted-event') . ''; } else { - $r .= ' ' . LogPage::actionText( $rc_log_type, $rc_log_action, $rcObj->getTitle(), - $this->skin, LogPage::extractParams($rc_params), true, true ); + $r .= ' ' . LogPage::actionText( $logType, $rcObj->mAttribs['rc_log_action'], $rcObj->getTitle(), + $this->skin, LogPage::extractParams( $rcObj->mAttribs['rc_params'] ), true, true ); } } $this->insertComment( $r, $rcObj ); $this->insertRollback( $r, $rcObj ); # Tags + $classes = explode( ' ', $classes ); $this->insertTags( $r, $rcObj, $classes ); # Show how many people are watching this if enabled $r .= $this->numberofWatchingusers($rcObj->numberofWatchingusers);