# Called by history lists and recent changes
#
- /** @todo document */
+ /**
+ * Changeslist contructor
+ * @param Skin $skin
+ */
function __construct( &$skin ) {
$this->skin =& $skin;
$this->preCacheMessages();
* As we use the same small set of messages in various methods and that
* they are called often, we call them once and save them in $this->message
*/
- function preCacheMessages() {
+ private function preCacheMessages() {
// Precache various messages
if( !isset( $this->message ) ) {
foreach( explode(' ', 'cur diff hist minoreditletter newpageletter last '.
'blocklink history boteditletter semicolon-separator' ) as $msg ) {
- $this->message[$msg] = wfMsgExt( $msg, array( 'escape') );
+ $this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
}
}
}
/**
* Returns the appropriate flags for new page, minor change and patrolling
+ * @param bool $new
+ * @param bool $minor
+ * @param bool $patrolled
+ * @param string $nothing, string to use for empty space
+ * @param bool $bot
+ * @param bool $newbie
+ * @return string
*/
- function recentChangesFlags( $new, $minor, $patrolled, $nothing = ' ', $bot = false ) {
+ protected function recentChangesFlags( $new, $minor, $patrolled, $nothing = ' ', $bot = false, $newbie = false ) {
$f = $new ? '<span class="newpage">' . $this->message['newpageletter'] . '</span>'
: $nothing;
$f .= $minor ? '<span class="minor">' . $this->message['minoreditletter'] . '</span>'
: $nothing;
$f .= $bot ? '<span class="bot">' . $this->message['boteditletter'] . '</span>' : $nothing;
$f .= $patrolled ? '<span class="unpatrolled">!</span>' : $nothing;
+ $f .= $newbie ? '<span class="newuser">*</span>' : $nothing;
return $f;
}
+
+ protected static function userIsNew( $attribs ) {
+ global $wgAutoConfirmCount, $wgAutoConfirmAge;
+ if( !array_key_exists('user_editcount',$attribs) || !array_key_exists('user_registration',$attribs) ) {
+ return false; // missing input!
+ }
+ static $time;
+ $time = time();
+ $edits = $attribs['user_editcount'];
+ $age = $attribs['user_registration'];
+ if( $wgAutoConfirmCount && !$edits || $wgAutoConfirmAge && !$age ) {
+ return true;
+ } else if( $wgAutoConfirmCount && $edits < $wgAutoConfirmCount ) {
+ return true;
+ } else if( $wgAutoConfirmAge && ($time - wfTimestampOrNull(TS_UNIX,$age)) < $wgAutoConfirmAge ) {
+ return true;
+ }
+ return false;
+ }
/**
* Returns text for the start of the tabular part of RC
+ * @return string
*/
- function beginRecentChangesList() {
+ public function beginRecentChangesList() {
$this->rc_cache = array();
$this->rcMoveIndex = 0;
$this->rcCacheIndex = 0;
/**
* Returns text for the end of RC
+ * @return string
*/
- function endRecentChangesList() {
+ public function endRecentChangesList() {
if( $this->rclistOpen ) {
return "</ul>\n";
} else {
}
}
- /**
- * int $field one of DELETED_* bitfield constants
- * @return bool
- */
- function isDeleted( $rc, $field ) {
- return ($rc->mAttribs['rc_deleted'] & $field) == $field;
- }
-
- /**
- * Determine if the current user is allowed to view a particular
- * field of this revision, if it's marked as deleted.
- * @param int $field
- * @return bool
- */
- function userCan( $rc, $field ) {
- if( ( $rc->mAttribs['rc_deleted'] & $field ) == $field ) {
- global $wgUser;
- $permission = ( $rc->mAttribs['rc_deleted'] & Revision::DELETED_RESTRICTED ) == Revision::DELETED_RESTRICTED
- ? 'hiderevision'
- : 'deleterevision';
- wfDebug( "Checking for $permission due to $field match on $rc->mAttribs['rc_deleted']\n" );
- return $wgUser->isAllowed( $permission );
- } else {
- return true;
- }
- }
-
- function insertMove( &$s, $rc ) {
+ protected function insertMove( &$s, $rc ) {
# Diff
$s .= '(' . $this->message['diff'] . ') (';
# Hist
$this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
}
- function insertDateHeader(&$s, $rc_timestamp) {
+ protected function insertDateHeader(&$s, $rc_timestamp) {
global $wgLang;
# Make date header if necessary
$date = $wgLang->date( $rc_timestamp, true, true );
- $s = '';
if( $date != $this->lastdate ) {
if( '' != $this->lastdate ) {
$s .= "</ul>\n";
}
}
- function insertLog(&$s, $title, $logtype) {
+ protected function insertLog(&$s, $title, $logtype) {
$logname = LogPage::logName( $logtype );
$s .= '(' . $this->skin->makeKnownLinkObj($title, $logname ) . ')';
}
- function insertDiffHist(&$s, &$rc, $unpatrolled) {
+ protected function insertDiffHist(&$s, &$rc, $unpatrolled) {
# Diff link
if( !$this->userCan($rc,Revision::DELETED_TEXT) ) {
$diffLink = $this->message['diff'];
$s .= ') . . ';
}
- function insertArticleLink(&$s, &$rc, $unpatrolled, $watched) {
+ protected function insertArticleLink(&$s, &$rc, $unpatrolled, $watched) {
# Article link
# 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
wfRunHooks('ChangesListInsertArticleLink',
array(&$this, &$articlelink, &$s, &$rc, $unpatrolled, $watched));
-
+
$s .= ' '.$articlelink;
}
- function insertTimestamp(&$s, $rc) {
+ protected function insertTimestamp(&$s, $rc) {
global $wgLang;
# Timestamp
- $s .= $this->message['semicolon-separator'] . ' ' . $wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ) . ' . . ';
+ $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 */
- function insertUserRelatedLinks(&$s, &$rc) {
+ public function insertUserRelatedLinks(&$s, &$rc) {
if ( $this->isDeleted($rc,Revision::DELETED_USER) ) {
- $s .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-user') . '</span>';
+ $s .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-user') . '</span>';
} 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'] );
}
/** insert a formatted action */
- function insertAction(&$s, &$rc) {
+ protected function insertAction(&$s, &$rc) {
# Add action
if( $rc->mAttribs['rc_type'] == RC_LOG ) {
// log action
if ( $this->isDeleted($rc,LogPage::DELETED_ACTION) ) {
$s .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
} else {
- $s .= ' ' . LogPage::actionText( $rc->mAttribs['rc_log_type'], $rc->mAttribs['rc_log_action'],
+ $s .= ' ' . LogPage::actionText( $rc->mAttribs['rc_log_type'], $rc->mAttribs['rc_log_action'],
$rc->getTitle(), $this->skin, LogPage::extractParams($rc->mAttribs['rc_params']), true, true );
}
}
}
/** insert a formatted comment */
- function insertComment(&$s, &$rc) {
+ protected function insertComment(&$s, &$rc) {
# Add comment
if( $rc->mAttribs['rc_type'] != RC_MOVE && $rc->mAttribs['rc_type'] != RC_MOVE_OVER_REDIRECT ) {
// log comment
* Check whether to enable recent changes patrol features
* @return bool
*/
- function usePatrol() {
- global $wgUseRCPatrol, $wgUser;
- return( $wgUseRCPatrol && ($wgUser->isAllowed('patrol') || $wgUser->isAllowed('patrolmarks')) );
+ public static function usePatrol() {
+ global $wgUser;
+ return $wgUser->useRCPatrol();
}
/**
* Returns the string which indicates the number of watching users
*/
- function numberofWatchingusers( $count ) {
+ protected function numberofWatchingusers( $count ) {
global $wgLang;
static $cache = array();
if ( $count > 0 ) {
return '';
}
}
+
+ /**
+ * Determine if said field of a revision is hidden
+ * @param RCCacheEntry $rc
+ * @param int $field one of DELETED_* bitfield constants
+ * @return bool
+ */
+ public static function isDeleted( $rc, $field ) {
+ return ($rc->mAttribs['rc_deleted'] & $field) == $field;
+ }
+
+ /**
+ * Determine if the current user is allowed to view a particular
+ * field of this revision, if it's marked as deleted.
+ * @param RCCacheEntry $rc
+ * @param int $field
+ * @return bool
+ */
+ public static function userCan( $rc, $field ) {
+ if( ( $rc->mAttribs['rc_deleted'] & $field ) == $field ) {
+ global $wgUser;
+ $permission = ( $rc->mAttribs['rc_deleted'] & Revision::DELETED_RESTRICTED ) == Revision::DELETED_RESTRICTED
+ ? 'suppressrevision'
+ : 'deleterevision';
+ wfDebug( "Checking for $permission due to $field match on $rc->mAttribs['rc_deleted']\n" );
+ return $wgUser->isAllowed( $permission );
+ } else {
+ return true;
+ }
+ }
}
/**
* Format a line using the old system (aka without any javascript).
*/
- function recentChangesLine( &$rc, $watched = false ) {
- global $wgContLang, $wgRCShowChangedSize;
+ public function recentChangesLine( &$rc, $watched = false ) {
+ global $wgContLang, $wgRCShowChangedSize, $wgUser;
$fname = 'ChangesList::recentChangesLineOld';
wfProfileIn( $fname );
extract( $rc->mAttribs );
# Should patrol-related stuff be shown?
- $unpatrolled = $this->usePatrol() && $rc_patrolled == 0;
+ $unpatrolled = $wgUser->useRCPatrol() && $rc_patrolled == 0;
- $this->insertDateHeader($s,$rc_timestamp);
+ $dateheader = ""; // $s now contains only <li>...</li>, for hooks' convenience.
+ $this->insertDateHeader($dateheader,$rc_timestamp);
- $s .= '<li>';
+ $s = '<li>';
// Moved pages
if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
$this->insertMove( $s, $rc );
// Log entries
- } elseif( $rc_log_type !='' ) {
+ } elseif( $rc_log_type ) {
$logtitle = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
$this->insertLog( $s, $logtitle, $rc_log_type );
// Log entries (old format) or log targets, and special pages
} else {
wfDebug( "Unexpected special page in recentchanges\n" );
}
- // Log entries
+ // Regular entries
} else {
wfProfileIn($fname.'-page');
$this->insertDiffHist($s, $rc, $unpatrolled);
-
# M, N, b and ! (minor, new, bot and unpatrolled)
- $s .= '<tt> '.$this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $unpatrolled, '', $rc_bot ).'</tt>';
+ $newbie = self::userIsNew( $rc->mAttribs );
+ $s .= $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $unpatrolled, '',
+ $rc_bot, $newbie );
$this->insertArticleLink($s, $rc, $unpatrolled, $watched);
wfProfileOut($fname.'-page');
if( $wgRCShowChangedSize ) {
$s .= ( $rc->getCharacterDifference() == '' ? '' : $rc->getCharacterDifference() . ' . . ' );
}
-
+ # User tool links
$this->insertUserRelatedLinks($s,$rc);
+ # Log action text (if any)
$this->insertAction($s, $rc);
+ # Edit or log comment
$this->insertComment($s, $rc);
-
- # Mark revision as deleted
+
+ # Mark revision as deleted if so
if ( !$rc_log_type && $this->isDeleted($rc,Revision::DELETED_TEXT) )
$s .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
if($rc->numberofWatchingusers > 0) {
$s .= "</li>\n";
+ wfRunHooks('OldChangesListRecentChangesLine', array(&$this, &$s, &$rc));
+
wfProfileOut( $fname.'-rest' );
wfProfileOut( $fname );
- return $s;
+ return $dateheader . $s;
}
}
/**
* Format a line for enhanced recentchange (aka with javascript and block of lines).
*/
- function recentChangesLine( &$baseRC, $watched = false ) {
- global $wgLang, $wgContLang;
+ public function recentChangesLine( &$baseRC, $watched = false ) {
+ global $wgLang, $wgContLang, $wgUser;
# Create a specialised object
$rc = RCCacheEntry::newFromParent( $baseRC );
}
# Should patrol-related stuff be shown?
- if( $this->usePatrol() ) {
+ if( $wgUser->useRCPatrol() ) {
$rc->unpatrolled = !$rc_patrolled;
} else {
$rc->unpatrolled = false;
wfDebug( "Unexpected special page in recentchanges\n" );
$clink = '';
}
- // Page edits or log entries (group these page)
- } else if( $this->isDeleted($rc,Revision::DELETED_TEXT) ) {
- $clink = '<span class="history-deleted">' . $this->skin->makeKnownLinkObj( $rc->getTitle(), '' ) . '</span>';
- if ( !ChangesList::userCan($rc,Revision::DELETED_TEXT) )
- $showdifflinks = false;
+ // New unpatrolled pages
} else if( $rc->unpatrolled && $rc_type == RC_NEW ) {
- # Unpatrolled new page, give rc_id in query
$clink = $this->skin->makeKnownLinkObj( $rc->getTitle(), '', "rcid={$rc_id}" );
+ // Log entries
+ } else if( $rc_type == RC_LOG ) {
+ if( $rc_log_type ) {
+ $logtitle = SpecialPage::getTitleFor( 'Log', $rc_log_type );
+ $clink = '(' . $this->skin->makeKnownLinkObj( $logtitle, LogPage::logName($rc_log_type) ) . ')';
+ } else {
+ $clink = $this->skin->makeLinkObj( $rc->getTitle(), '' );
+ }
+ $watched = false;
+ // Edits
} else {
$clink = $this->skin->makeKnownLinkObj( $rc->getTitle(), '' );
}
+ # Don't show unusable diff links
+ if ( !ChangesList::userCan($rc,Revision::DELETED_TEXT) ) {
+ $showdifflinks = false;
+ }
+
$time = $wgContLang->time( $rc_timestamp, true, true );
$rc->watched = $watched;
$rc->link = $clink;
$querydiff = $curIdEq."&diff=$rc_this_oldid&oldid=$rc_last_oldid$rcIdQuery";
$aprops = ' tabindex="'.$baseRC->counter.'"';
$curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $this->message['cur'], $querycur, '' ,'', $aprops );
-
+
# Make "diff" an "cur" links
- if ( !$showdifflinks ) {
+ if( !$showdifflinks ) {
$curLink = $this->message['cur'];
$diffLink = $this->message['diff'];
} else if( $rc_type == RC_NEW || $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
} else {
$diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $this->message['diff'], $querydiff, '' ,'', $aprops );
}
-
+
# Make "last" link
if( !$showdifflinks ) {
$lastLink = $this->message['last'];
$lastLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $this->message['last'],
$curIdEq.'&diff='.$rc_this_oldid.'&oldid='.$rc_last_oldid . $rcIdQuery );
}
-
+
# Make user links
- if ( $this->isDeleted($rc,Revision::DELETED_USER) ) {
+ if( $this->isDeleted($rc,Revision::DELETED_USER) ) {
$rc->userlink = ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-user') . '</span>';
} else {
$rc->userlink = $this->skin->userLink( $rc_user, $rc_user_text );
# Use an @ character to prevent collision with page names
$this->rc_cache['@@' . ($this->rcMoveIndex++)] = array($rc);
} else {
- if( !isset ( $this->rc_cache[$secureName] ) ) {
+ # Logs are grouped by type
+ if( $rc_type == RC_LOG ){
+ $secureName = SpecialPage::getTitleFor( 'Log', $rc_log_type )->getPrefixedDBkey();
+ }
+ if( !isset( $this->rc_cache[$secureName] ) ) {
$this->rc_cache[$secureName] = array();
}
array_push( $this->rc_cache[$secureName], $rc );
/**
* Enhanced RC group
*/
- function recentChangesBlockGroup( $block ) {
+ protected function recentChangesBlockGroup( $block ) {
global $wgLang, $wgContLang, $wgRCShowChangedSize;
- $r = '<table cellpadding="0" cellspacing="0" border="1"><tr>';
+ $r = '<table cellpadding="0" cellspacing="0" border="0" style="background: none"><tr>';
# Collate list of users
- $isnew = false;
- $namehidden = true;
- $unpatrolled = false;
$userlinks = array();
+ # Other properties
+ $unpatrolled = $isnew = $newbie = false;
+ $curId = $currentRevision = 0;
+ # Some catalyst variables...
+ $namehidden = true;
+ $alllogs = true;
foreach( $block as $rcObj ) {
$oldid = $rcObj->mAttribs['rc_last_oldid'];
- if( $rcObj->mAttribs['rc_new'] ) {
+ if( $rcObj->mAttribs['rc_type'] == RC_NEW ) {
$isnew = true;
}
// If all log actions to this page were hidden, then don't
// give the name of the affected page for this block!
- if( !($rcObj->mAttribs['rc_deleted'] & LogPage::DELETED_ACTION) ) {
+ if( !$this->isDeleted( $rcObj, LogPage::DELETED_ACTION ) ) {
$namehidden = false;
}
$u = $rcObj->userlink;
if( $rcObj->unpatrolled ) {
$unpatrolled = true;
}
+ if( $rcObj->mAttribs['rc_type'] != RC_LOG ) {
+ $alllogs = false;
+ }
+ if( self::userIsNew( $rcObj->mAttribs ) ) {
+ $newbie = true;
+ }
+ # Get the latest entry with a page_id and oldid
+ # since logs may not have these.
+ if( !$curId && $rcObj->mAttribs['rc_cur_id'] ) {
+ $curId = $rcObj->mAttribs['rc_cur_id'];
+ }
+ if( !$currentRevision && $rcObj->mAttribs['rc_this_oldid'] ) {
+ $currentRevision = $rcObj->mAttribs['rc_this_oldid'];
+ }
+
$bot = $rcObj->mAttribs['rc_bot'];
$userlinks[$u]++;
}
$text = $userlink;
$text .= $wgContLang->getDirMark();
if( $count > 1 ) {
- $text .= ' ('.$count.'×)';
+ $text .= ' (' . $wgLang->formatNum( $count ) . '×)';
}
array_push( $users, $text );
}
- $users = ' <span class="changedby">[' . implode( $this->message['semicolon-separator'] . ' ', $users ) . ']</span>';
+ $users = ' <span class="changedby">[' . implode( $this->message['semicolon-separator'], $users ) . ']</span>';
# Arrow
$rci = 'RCI'.$this->rcCacheIndex;
$toggleLink = "javascript:toggleVisibility('$rci','$rcm','$rcl')";
$tl = '<span id="'.$rcm.'"><a href="'.$toggleLink.'">' . $this->sideArrow() . '</a></span>';
$tl .= '<span id="'.$rcl.'" style="display:none"><a href="'.$toggleLink.'">' . $this->downArrow() . '</a></span>';
- $r .= '<td valign="top">'.$tl.'</td>';
+ $r .= '<td valign="top" style="white-space: nowrap"><tt>'.$tl.' ';
# Main line
- $r .= '<td valign="top"><tt> '.$this->recentChangesFlags( $isnew, false, $unpatrolled, ' ', $bot );
+ $r .= $this->recentChangesFlags( $isnew, false, $unpatrolled, ' ', $bot, $newbie );
# Timestamp
$r .= ' '.$block[0]->timestamp.' </tt></td><td>';
# Article link
- if ( $namehidden )
+ if( $namehidden ) {
$r .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
- else
+ } else {
$r .= $this->maybeWatchedLink( $block[0]->link, $block[0]->watched );
- $r .= $wgContLang->getDirMark();
-
- $curIdEq = 'curid=' . $block[0]->mAttribs['rc_cur_id'];
- $currentRevision = $block[0]->mAttribs['rc_this_oldid'];
- if( $block[0]->mAttribs['rc_type'] != RC_LOG ) {
- # Changes
- $n = count($block);
- static $nchanges = array();
- if ( !isset( $nchanges[$n] ) ) {
- $nchanges[$n] = wfMsgExt( 'nchanges', array( 'parsemag', 'escape'),
- $wgLang->formatNum( $n ) );
- }
+ }
- $r .= ' (';
+ $r .= $wgContLang->getDirMark();
+ $curIdEq = 'curid=' . $curId;
+ # Changes message
+ $n = count($block);
+ static $nchanges = array();
+ if ( !isset( $nchanges[$n] ) ) {
+ $nchanges[$n] = wfMsgExt( 'nchanges', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) );
+ }
+ # Total change link
+ $r .= ' ';
+ if( !$alllogs ) {
+ $r .= '(';
if( !ChangesList::userCan($rcObj,Revision::DELETED_TEXT) ) {
- $r .= $nchanges[$n];
+ $r .= $nchanges[$n];
} else if( $isnew ) {
$r .= $nchanges[$n];
} else {
$r .= $this->skin->makeKnownLinkObj( $block[0]->getTitle(),
$nchanges[$n], $curIdEq."&diff=$currentRevision&oldid=$oldid" );
}
-
- $r .= ') . . ';
+ $r .= ') . . ';
+ }
- if( $wgRCShowChangedSize ) {
- # Character difference
- $chardiff = $rcObj->getCharacterDifference( $block[ count( $block ) - 1 ]->mAttribs['rc_old_len'],
- $block[0]->mAttribs['rc_new_len'] );
- if( $chardiff == '' ) {
- $r .= ') ';
- } else {
- $r .= ' ' . $chardiff. ' . . ';
- }
+ # Character difference (does not apply if only log items)
+ if( $wgRCShowChangedSize && !$alllogs ) {
+ $last = 0;
+ $first = count($block) - 1;
+ # Some events (like logs) have an "empty" size, so we need to skip those...
+ while( $last < $first && $block[$last]->mAttribs['rc_new_len'] === NULL ) {
+ $last++;
}
+ while( $first > $last && $block[$first]->mAttribs['rc_old_len'] === NULL ) {
+ $first--;
+ }
+ # Get net change
+ $chardiff = $rcObj->getCharacterDifference( $block[$first]->mAttribs['rc_old_len'],
+ $block[$last]->mAttribs['rc_new_len'] );
+
+ if( $chardiff == '' ) {
+ $r .= ' ';
+ } else {
+ $r .= ' ' . $chardiff. ' . . ';
+ }
+ }
- # History
+ # History
+ if( $alllogs ) {
+ // don't show history link for logs
+ } else if( $namehidden || !$block[0]->getTitle()->exists() ) {
+ $r .= '(' . $this->message['history'] . ')';
+ } else {
$r .= '(' . $this->skin->makeKnownLinkObj( $block[0]->getTitle(),
- $this->message['history'], $curIdEq.'&action=history' );
- $r .= ')';
+ $this->message['history'], $curIdEq.'&action=history' ) . ')';
}
$r .= $users;
- $r .=$this->numberofWatchingusers($block[0]->numberofWatchingusers);
-
+ $r .= $this->numberofWatchingusers($block[0]->numberofWatchingusers);
+
$r .= "</td></tr></table>\n";
# Sub-entries
- $r .= '<div id="'.$rci.'" style="display:none;"><table cellpadding="0" cellspacing="0" border="1">';
+ $r .= '<div id="'.$rci.'" style="display:none;"><table cellpadding="0" cellspacing="0" border="0" style="background: none">';
foreach( $block as $rcObj ) {
# Get rc_xxxx variables
// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
#$r .= '<tr><td valign="top">'.$this->spacerArrow();
$r .= '<tr><td valign="top">';
$r .= '<tt>'.$this->spacerIndent() . $this->spacerIndent();
- $r .= $this->recentChangesFlags( $rc_new, $rc_minor, $rcObj->unpatrolled, ' ', $rc_bot );
+ $newbie = self::userIsNew( $rcObj->mAttribs );
+ $r .= $this->recentChangesFlags( $rc_new, $rc_minor, $rcObj->unpatrolled, ' ', $rc_bot, $newbie );
$r .= ' </tt></td><td valign="top">';
$o = '';
if( $rc_this_oldid != 0 ) {
$o = 'oldid='.$rc_this_oldid;
}
- # Revision link
+ # Log timestamp
if( $rc_type == RC_LOG ) {
$link = '<tt>'.$rcObj->timestamp.'</tt> ';
+ # Revision link
} else if( !ChangesList::userCan($rcObj,Revision::DELETED_TEXT) ) {
$link = '<span class="history-deleted"><tt>'.$rcObj->timestamp.'</tt></span> ';
} else {
- $link = '<tt>'.$this->skin->makeKnownLinkObj( $rcObj->getTitle(), $rcObj->timestamp, $curIdEq.'&'.$o ).'</tt>';
+ $rcIdEq = ($rcObj->unpatrolled && $rc_type == RC_NEW) ? '&rcid='.$rcObj->mAttribs['rc_id'] : '';
+
+ $link = '<tt>'.$this->skin->makeKnownLinkObj( $rcObj->getTitle(), $rcObj->timestamp, $curIdEq.'&'.$o.$rcIdEq ).'</tt>';
if( $this->isDeleted($rcObj,Revision::DELETED_TEXT) )
$link = '<span class="history-deleted">'.$link.'</span> ';
}
$r .= $link;
-
- if ( !$rc_log_type ) {
+
+ if ( !$rc_type == RC_LOG || $rc_type == RC_NEW ) {
$r .= ' (';
$r .= $rcObj->curlink;
- $r .= $this->message['semicolon-separator'] . ' ';
+ $r .= $this->message['semicolon-separator'];
$r .= $rcObj->lastlink;
$r .= ')';
- } else {
- $logname = LogPage::logName( $rc_log_type );
- $logtitle = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
- $r .= '(' . $this->skin->makeKnownLinkObj($logtitle, $logname ) . ')';
}
$r .= ' . . ';
$r .= $rcObj->userlink;
$r .= $rcObj->usertalklink;
// log action
- parent::insertAction($r, $rcObj);
+ parent::insertAction( $r, $rcObj );
// log comment
- parent::insertComment($r, $rcObj);
+ parent::insertComment( $r, $rcObj );
# Mark revision as deleted
- if ( !$rc_log_type && $this->isDeleted($rcObj,Revision::DELETED_TEXT) )
+ if( !$rc_log_type && $this->isDeleted($rcObj,Revision::DELETED_TEXT) ) {
$r .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
+ }
$r .= "</td></tr>\n";
}
return $r;
}
- function maybeWatchedLink( $link, $watched=false ) {
+ protected function maybeWatchedLink( $link, $watched=false ) {
if( $watched ) {
// FIXME: css style might be more appropriate
return '<strong class="mw-watched">' . $link . '</strong>';
* @param string $dir one of '', 'd', 'l', 'r'
* @param string $alt text
* @return string HTML <img> tag
- * @access private
*/
- function arrow( $dir, $alt='' ) {
+ protected function arrow( $dir, $alt='' ) {
global $wgStylePath;
$encUrl = htmlspecialchars( $wgStylePath . '/common/images/Arr_' . $dir . '.png' );
$encAlt = htmlspecialchars( $alt );
* Generate HTML for a right- or left-facing arrow,
* depending on language direction.
* @return string HTML <img> tag
- * @access private
*/
- function sideArrow() {
+ protected function sideArrow() {
global $wgContLang;
$dir = $wgContLang->isRTL() ? 'l' : 'r';
return $this->arrow( $dir, '+' );
* Generate HTML for a down-facing arrow
* depending on language direction.
* @return string HTML <img> tag
- * @access private
*/
- function downArrow() {
+ protected function downArrow() {
return $this->arrow( 'd', '-' );
}
/**
* Generate HTML for a spacer image
* @return string HTML <img> tag
- * @access private
*/
- function spacerArrow() {
+ protected function spacerArrow() {
return $this->arrow( '', ' ' );
}
-
- /**
- * Generate HTML for the equivalent of a spacer image for tables
- * @return string HTML <td> tag
- * @access private
- */
- function spacerColumn() {
- return '<td width="12"></td>';
- }
-
+
/**
* Add a set of spaces
* @return string HTML <td> tag
- * @access private
- */
- function spacerIndent() {
+ */
+ protected function spacerIndent() {
return ' ';
}
* Enhanced RC ungrouped line.
* @return string a HTML formated line (generated using $r)
*/
- function recentChangesBlockLine( $rcObj ) {
+ protected function recentChangesBlockLine( $rcObj ) {
global $wgContLang, $wgRCShowChangedSize;
# Get rc_xxxx variables
extract( $rcObj->mAttribs );
$curIdEq = 'curid='.$rc_cur_id;
- $r = '<table cellspacing="0" cellpadding="0" border="1"><tr>';
+ $r = '<table cellspacing="0" cellpadding="0" border="0" style="background: none"><tr>';
+ $r .= '<td valign="top" style="white-space: nowrap"><tt>' . $this->spacerArrow() . ' ';
- # spacerArrow() causes issues in FF
- $r .= $this->spacerColumn();
- $r .= '<td valign="top">';
-
# Flag and Timestamp
- $r .= '<tt> ';
if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
$r .= ' '; // 4 flags -> 4 spaces
} else {
- $r .= $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $rcObj->unpatrolled, ' ', $rc_bot );
+ $newbie = self::userIsNew( $rcObj->mAttribs );
+ $r .= $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $rcObj->unpatrolled,
+ ' ', $rc_bot, $newbie );
}
$r .= ' '.$rcObj->timestamp.' </tt></td><td>';
-
- # Article link
- if ( $rc_log_type !='' ) {
+
+ # Article or log link
+ if( $rc_log_type ) {
$logtitle = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
$logname = LogPage::logName( $rc_log_type );
$r .= '(' . $this->skin->makeKnownLinkObj($logtitle, $logname ) . ')';
- // All other stuff
+ } else if( !$this->userCan($rcObj,Revision::DELETED_TEXT) ) {
+ $r .= '<span class="history-deleted">' . $rcObj->link . '</span>';
} else {
$r .= $this->maybeWatchedLink( $rcObj->link, $rcObj->watched );
}
- if ( $rc_type != RC_LOG ) {
- # Diff
- $r .= ' ('. $rcObj->difflink . $this->message['semicolon-separator'] . ' ';
- # Hist
+
+ # Diff and hist links
+ if( $rc_type != RC_LOG ) {
+ $r .= ' ('. $rcObj->difflink . $this->message['semicolon-separator'];
$r .= $this->skin->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history' ) . ')';
}
$r .= ' . . ';
-
+
# Character diff
if( $wgRCShowChangedSize ) {
$r .= ( $rcObj->getCharacterDifference() == '' ? '' : ' ' . $rcObj->getCharacterDifference() . ' . . ' ) ;
# User/talk
$r .= ' '.$rcObj->userlink . $rcObj->usertalklink;
- # Comment
- if( $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
- // log action
- if ( $this->isDeleted($rcObj,LogPage::DELETED_ACTION) ) {
- $r .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
+ # Log action (if any)
+ if( $rc_log_type ) {
+ if( $this->isDeleted($rcObj,LogPage::DELETED_ACTION) ) {
+ $r .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
} else {
- $r .= ' ' . LogPage::actionText( $rc_log_type, $rc_log_action, $rcObj->getTitle(), $this->skin, LogPage::extractParams($rc_params), true, true );
- }
+ $r .= ' ' . LogPage::actionText( $rc_log_type, $rc_log_action, $rcObj->getTitle(),
+ $this->skin, LogPage::extractParams($rc_params), true, true );
+ }
+ }
+
+ # Edit or log comment
+ if( $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
// log comment
if ( $this->isDeleted($rcObj,LogPage::DELETED_COMMENT) ) {
$r .= ' <span class="history-deleted">' . wfMsg('rev-deleted-comment') . '</span>';
}
}
+ # Show how many people are watching this if enabled
$r .= $this->numberofWatchingusers($rcObj->numberofWatchingusers);
$r .= "</td></tr></table>\n";
* If enhanced RC is in use, this function takes the previously cached
* RC lines, arranges them, and outputs the HTML
*/
- function recentChangesBlock() {
+ protected function recentChangesBlock() {
if( count ( $this->rc_cache ) == 0 ) {
return '';
}
* Returns text for the end of RC
* If enhanced RC is in use, returns pretty much all the text
*/
- function endRecentChangesList() {
+ public function endRecentChangesList() {
return $this->recentChangesBlock() . parent::endRecentChangesList();
}
dépôts / lhc / web / wiklou.git / blobdiff