X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRecentChange.php;h=2ca2f69c6d9f6b2e4a674b5a1d65462d09148e92;hb=775154ca2137e2c253deeafe9497579c56bd35f0;hp=966bfe9862b171eef373123fd323dab213602495;hpb=c771fc9c96aacb44b86ade5ecca68334c5d8213f;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index 966bfe9862..2ca2f69c6d 100644
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -1,7 +1,4 @@
loadFromRow( $row );
return $rc;
}
- public static function newFromCurRow( $row, $rc_this_oldid = 0 )
- {
+ public static function newFromCurRow( $row ) {
$rc = new RecentChange;
- $rc->loadFromCurRow( $row, $rc_this_oldid );
+ $rc->loadFromCurRow( $row );
$rc->notificationtimestamp = false;
$rc->numberofWatchingusers = false;
return $rc;
}
-
+
/**
* Obtain the recent change with a given rc_id value
*
@@ -70,7 +70,7 @@ class RecentChange
* @return RecentChange
*/
public static function newFromId( $rcid ) {
- $dbr =& wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select( 'recentchanges', '*', array( 'rc_id' => $rcid ), __METHOD__ );
if( $res && $dbr->numRows( $res ) > 0 ) {
$row = $dbr->fetchObject( $res );
@@ -81,29 +81,52 @@ class RecentChange
}
}
+ /**
+ * Find the first recent change matching some specific conditions
+ *
+ * @param array $conds Array of conditions
+ * @param mixed $fname Override the method name in profiling/logs
+ * @return RecentChange
+ */
+ public static function newFromConds( $conds, $fname = false ) {
+ if( $fname === false )
+ $fname = __METHOD__;
+ $dbr = wfGetDB( DB_SLAVE );
+ $res = $dbr->select(
+ 'recentchanges',
+ '*',
+ $conds,
+ $fname
+ );
+ if( $res instanceof ResultWrapper && $res->numRows() > 0 ) {
+ $row = $res->fetchObject();
+ $res->free();
+ return self::newFromRow( $row );
+ }
+ return null;
+ }
+
# Accessors
- function setAttribs( $attribs )
- {
+ public function setAttribs( $attribs ) {
$this->mAttribs = $attribs;
}
- function setExtra( $extra )
- {
+ public function setExtra( $extra ) {
$this->mExtra = $extra;
}
- function &getTitle()
- {
- if ( $this->mTitle === false ) {
+ public function &getTitle() {
+ if( $this->mTitle === false ) {
$this->mTitle = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
+ # Make sure the correct page ID is process cached
+ $this->mTitle->resetArticleID( $this->mAttribs['rc_cur_id'] );
}
return $this->mTitle;
}
- function getMovedToTitle()
- {
- if ( $this->mMovedToTitle === false ) {
+ public function getMovedToTitle() {
+ if( $this->mMovedToTitle === false ) {
$this->mMovedToTitle = Title::makeTitle( $this->mAttribs['rc_moved_to_ns'],
$this->mAttribs['rc_moved_to_title'] );
}
@@ -111,23 +134,22 @@ class RecentChange
}
# Writes the data in this object to the database
- function save()
- {
- global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPPort, $wgRC2UDPPrefix;
+ public function save() {
+ global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPOmitBots;
$fname = 'RecentChange::save';
- $dbw =& wfGetDB( DB_MASTER );
- if ( !is_array($this->mExtra) ) {
+ $dbw = wfGetDB( DB_MASTER );
+ if( !is_array($this->mExtra) ) {
$this->mExtra = array();
}
$this->mExtra['lang'] = $wgLocalInterwiki;
- if ( !$wgPutIPinRC ) {
+ if( !$wgPutIPinRC ) {
$this->mAttribs['rc_ip'] = '';
}
- ## If our database is strict about IP addresses, use NULL instead of an empty string
- if ( $dbw->strictIPs() and $this->mAttribs['rc_ip'] == '' ) {
+ # If our database is strict about IP addresses, use NULL instead of an empty string
+ if( $dbw->strictIPs() and $this->mAttribs['rc_ip'] == '' ) {
unset( $this->mAttribs['rc_ip'] );
}
@@ -137,8 +159,8 @@ class RecentChange
$this->mAttribs['rc_id'] = $dbw->nextSequenceValue( 'rc_rc_id_seq' );
## If we are using foreign keys, an entry of 0 for the page_id will fail, so use NULL
- if ( $dbw->cascadingDeletes() and $this->mAttribs['rc_cur_id']==0 ) {
- unset ( $this->mAttribs['rc_cur_id'] );
+ if( $dbw->cascadingDeletes() and $this->mAttribs['rc_cur_id']==0 ) {
+ unset( $this->mAttribs['rc_cur_id'] );
}
# Insert new row
@@ -146,100 +168,167 @@ class RecentChange
# Set the ID
$this->mAttribs['rc_id'] = $dbw->insertId();
-
- # Update old rows, if necessary
- if ( $this->mAttribs['rc_type'] == RC_EDIT ) {
- $lastTime = $this->mExtra['lastTimestamp'];
- #$now = $this->mAttribs['rc_timestamp'];
- #$curId = $this->mAttribs['rc_cur_id'];
-
- # Don't bother looking for entries that have probably
- # been purged, it just locks up the indexes needlessly.
- global $wgRCMaxAge;
- $age = time() - wfTimestamp( TS_UNIX, $lastTime );
- if( $age < $wgRCMaxAge ) {
- # live hack, will commit once tested - kate
- # Update rc_this_oldid for the entries which were current
- #
- #$oldid = $this->mAttribs['rc_last_oldid'];
- #$ns = $this->mAttribs['rc_namespace'];
- #$title = $this->mAttribs['rc_title'];
- #
- #$dbw->update( 'recentchanges',
- # array( /* SET */
- # 'rc_this_oldid' => $oldid
- # ), array( /* WHERE */
- # 'rc_namespace' => $ns,
- # 'rc_title' => $title,
- # 'rc_timestamp' => $dbw->timestamp( $lastTime )
- # ), $fname
- #);
- }
-
- # Update rc_cur_time
- #$dbw->update( 'recentchanges', array( 'rc_cur_time' => $now ),
- # array( 'rc_cur_id' => $curId ), $fname );
- }
+
+ # Notify extensions
+ wfRunHooks( 'RecentChange_save', array( &$this ) );
# Notify external application via UDP
- if ( $wgRC2UDPAddress ) {
- $conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
- if ( $conn ) {
- $line = $wgRC2UDPPrefix . $this->getIRCLine();
- socket_sendto( $conn, $line, strlen($line), 0, $wgRC2UDPAddress, $wgRC2UDPPort );
- socket_close( $conn );
- }
+ if( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) {
+ self::sendToUDP( $this->getIRCLine() );
}
# E-mail notifications
- global $wgUseEnotif;
- if( $wgUseEnotif ) {
- # this would be better as an extension hook
- include_once( "UserMailer.php" );
+ global $wgUseEnotif, $wgShowUpdatedMarker, $wgUser;
+ if( $wgUseEnotif || $wgShowUpdatedMarker ) {
+ // Users
+ if( $this->mAttribs['rc_user'] ) {
+ $editor = ($wgUser->getId() == $this->mAttribs['rc_user']) ?
+ $wgUser : User::newFromID( $this->mAttribs['rc_user'] );
+ // Anons
+ } else {
+ $editor = ($wgUser->getName() == $this->mAttribs['rc_user_text']) ?
+ $wgUser : User::newFromName( $this->mAttribs['rc_user_text'], false );
+ }
+ # FIXME: this would be better as an extension hook
$enotif = new EmailNotification();
$title = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
- $enotif->notifyOnPageChange( $title,
+ $enotif->notifyOnPageChange( $editor, $title,
$this->mAttribs['rc_timestamp'],
$this->mAttribs['rc_comment'],
$this->mAttribs['rc_minor'],
$this->mAttribs['rc_last_oldid'] );
}
-
- # Notify extensions
- wfRunHooks( 'RecentChange_save', array( &$this ) );
+ }
+
+ public function notifyRC2UDP() {
+ global $wgRC2UDPAddress, $wgRC2UDPOmitBots;
+ # Notify external application via UDP
+ if( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) {
+ self::sendToUDP( $this->getIRCLine() );
+ }
}
- # Marks a certain row as patrolled
- function markPatrolled( $rcid )
- {
- $fname = 'RecentChange::markPatrolled';
-
- $dbw =& wfGetDB( DB_MASTER );
+ /**
+ * Send some text to UDP
+ * @param string $line
+ * @param string $prefix
+ * @param string $address
+ * @return bool success
+ */
+ public static function sendToUDP( $line, $address = '', $prefix = '' ) {
+ global $wgRC2UDPAddress, $wgRC2UDPPrefix, $wgRC2UDPPort;
+ # Assume default for standard RC case
+ $address = $address ? $address : $wgRC2UDPAddress;
+ $prefix = $prefix ? $prefix : $wgRC2UDPPrefix;
+ # Notify external application via UDP
+ if( $address ) {
+ $conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
+ if( $conn ) {
+ $line = $prefix . $line;
+ wfDebug( __METHOD__ . ": sending UDP line: $line\n" );
+ socket_sendto( $conn, $line, strlen($line), 0, $address, $wgRC2UDPPort );
+ socket_close( $conn );
+ return true;
+ } else {
+ wfDebug( __METHOD__ . ": failed to create UDP socket\n" );
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Remove newlines, carriage returns and decode html entites
+ * @param string $line
+ * @return string
+ */
+ public static function cleanupForIRC( $text ) {
+ return Sanitizer::decodeCharReferences( str_replace( array( "\n", "\r" ), array( "", "" ), $text ) );
+ }
- $dbw->update( 'recentchanges',
- array( /* SET */
+ /**
+ * Mark a given change as patrolled
+ *
+ * @param mixed $change RecentChange or corresponding rc_id
+ * @param bool $auto for automatic patrol
+ * @return See doMarkPatrolled(), or null if $change is not an existing rc_id
+ */
+ public static function markPatrolled( $change, $auto = false ) {
+ $change = $change instanceof RecentChange
+ ? $change
+ : RecentChange::newFromId($change);
+ if( !$change instanceof RecentChange ) {
+ return null;
+ }
+ return $change->doMarkPatrolled( $auto );
+ }
+
+ /**
+ * Mark this RecentChange as patrolled
+ *
+ * NOTE: Can also return 'rcpatroldisabled', 'hookaborted' and 'markedaspatrollederror-noautopatrol' as errors
+ * @param bool $auto for automatic patrol
+ * @return array of permissions errors, see Title::getUserPermissionsErrors()
+ */
+ public function doMarkPatrolled( $auto = false ) {
+ global $wgUser, $wgUseRCPatrol, $wgUseNPPatrol;
+ $errors = array();
+ // If recentchanges patrol is disabled, only new pages
+ // can be patrolled
+ if( !$wgUseRCPatrol && ( !$wgUseNPPatrol || $this->getAttribute('rc_type') != RC_NEW ) ) {
+ $errors[] = array('rcpatroldisabled');
+ }
+ // Automatic patrol needs "autopatrol", ordinary patrol needs "patrol"
+ $right = $auto ? 'autopatrol' : 'patrol';
+ $errors = array_merge( $errors, $this->getTitle()->getUserPermissionsErrors( $right, $wgUser ) );
+ if( !wfRunHooks('MarkPatrolled', array($this->getAttribute('rc_id'), &$wgUser, false)) ) {
+ $errors[] = array('hookaborted');
+ }
+ // Users without the 'autopatrol' right can't patrol their
+ // own revisions
+ if( $wgUser->getName() == $this->getAttribute('rc_user_text') && !$wgUser->isAllowed('autopatrol') ) {
+ $errors[] = array('markedaspatrollederror-noautopatrol');
+ }
+ if( $errors ) {
+ return $errors;
+ }
+ // If the change was patrolled already, do nothing
+ if( $this->getAttribute('rc_patrolled') ) {
+ return array();
+ }
+ // Actually set the 'patrolled' flag in RC
+ $this->reallyMarkPatrolled();
+ // Log this patrol event
+ PatrolLog::record( $this, $auto );
+ wfRunHooks( 'MarkPatrolledComplete', array($this->getAttribute('rc_id'), &$wgUser, false) );
+ return array();
+ }
+
+ /**
+ * Mark this RecentChange patrolled, without error checking
+ * @return int Number of affected rows
+ */
+ public function reallyMarkPatrolled() {
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->update(
+ 'recentchanges',
+ array(
'rc_patrolled' => 1
- ), array( /* WHERE */
- 'rc_id' => $rcid
- ), $fname
+ ),
+ array(
+ 'rc_id' => $this->getAttribute('rc_id')
+ ),
+ __METHOD__
);
+ return $dbw->affectedRows();
}
# Makes an entry in the database corresponding to an edit
- /*static*/ function notifyEdit( $timestamp, &$title, $minor, &$user, $comment,
- $oldId, $lastTimestamp, $bot = "default", $ip = '', $oldSize = 0, $newSize = 0,
- $newId = 0)
+ public static function notifyEdit( $timestamp, &$title, $minor, &$user, $comment, $oldId,
+ $lastTimestamp, $bot, $ip='', $oldSize=0, $newSize=0, $newId=0, $patrol=0 )
{
-
- if ( $bot === 'default' ) {
- $bot = $user->isAllowed( 'bot' );
- }
-
- if ( !$ip ) {
+ if( !$ip ) {
$ip = wfGetIP();
- if ( !$ip ) {
- $ip = '';
- }
+ if( !$ip ) $ip = '';
}
$rc = new RecentChange;
@@ -251,7 +340,7 @@ class RecentChange
'rc_type' => RC_EDIT,
'rc_minor' => $minor ? 1 : 0,
'rc_cur_id' => $title->getArticleID(),
- 'rc_user' => $user->getID(),
+ 'rc_user' => $user->getId(),
'rc_user_text' => $user->getName(),
'rc_comment' => $comment,
'rc_this_oldid' => $newId,
@@ -260,10 +349,15 @@ class RecentChange
'rc_moved_to_ns' => 0,
'rc_moved_to_title' => '',
'rc_ip' => $ip,
- 'rc_patrolled' => 0,
+ 'rc_patrolled' => intval($patrol),
'rc_new' => 0, # obsolete
'rc_old_len' => $oldSize,
- 'rc_new_len' => $newSize
+ 'rc_new_len' => $newSize,
+ 'rc_deleted' => 0,
+ 'rc_logid' => 0,
+ 'rc_log_type' => null,
+ 'rc_log_action' => '',
+ 'rc_params' => ''
);
$rc->mExtra = array(
@@ -273,27 +367,20 @@ class RecentChange
'newSize' => $newSize,
);
$rc->save();
- return( $rc->mAttribs['rc_id'] );
+ return $rc;
}
/**
* Makes an entry in the database corresponding to page creation
* Note: the title object must be loaded with the new id using resetArticleID()
* @todo Document parameters and return
- * @public
- * @static
*/
- public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = "default",
- $ip='', $size = 0, $newId = 0 )
+ public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot,
+ $ip='', $size=0, $newId=0, $patrol=0 )
{
- if ( !$ip ) {
+ if( !$ip ) {
$ip = wfGetIP();
- if ( !$ip ) {
- $ip = '';
- }
- }
- if ( $bot == 'default' ) {
- $bot = $user->isAllowed( 'bot' );
+ if( !$ip ) $ip = '';
}
$rc = new RecentChange;
@@ -305,7 +392,7 @@ class RecentChange
'rc_type' => RC_NEW,
'rc_minor' => $minor ? 1 : 0,
'rc_cur_id' => $title->getArticleID(),
- 'rc_user' => $user->getID(),
+ 'rc_user' => $user->getId(),
'rc_user_text' => $user->getName(),
'rc_comment' => $comment,
'rc_this_oldid' => $newId,
@@ -314,10 +401,15 @@ class RecentChange
'rc_moved_to_ns' => 0,
'rc_moved_to_title' => '',
'rc_ip' => $ip,
- 'rc_patrolled' => 0,
- 'rc_new' => 1, # obsolete
+ 'rc_patrolled' => intval($patrol),
+ 'rc_new' => 1, # obsolete
'rc_old_len' => 0,
- 'rc_new_len' => $size
+ 'rc_new_len' => $size,
+ 'rc_deleted' => 0,
+ 'rc_logid' => 0,
+ 'rc_log_type' => null,
+ 'rc_log_action' => '',
+ 'rc_params' => ''
);
$rc->mExtra = array(
@@ -327,17 +419,16 @@ class RecentChange
'newSize' => $size
);
$rc->save();
- return( $rc->mAttribs['rc_id'] );
+ return $rc;
}
# Makes an entry in the database corresponding to a rename
- /*static*/ function notifyMove( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='', $overRedir = false )
+ public static function notifyMove( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='', $overRedir = false )
{
- if ( !$ip ) {
+ global $wgRequest;
+ if( !$ip ) {
$ip = wfGetIP();
- if ( !$ip ) {
- $ip = '';
- }
+ if( !$ip ) $ip = '';
}
$rc = new RecentChange;
@@ -349,12 +440,12 @@ class RecentChange
'rc_type' => $overRedir ? RC_MOVE_OVER_REDIRECT : RC_MOVE,
'rc_minor' => 0,
'rc_cur_id' => $oldTitle->getArticleID(),
- 'rc_user' => $user->getID(),
+ 'rc_user' => $user->getId(),
'rc_user_text' => $user->getName(),
'rc_comment' => $comment,
'rc_this_oldid' => 0,
'rc_last_oldid' => 0,
- 'rc_bot' => $user->isAllowed( 'bot' ) ? 1 : 0,
+ 'rc_bot' => $user->isAllowed( 'bot' ) ? $wgRequest->getBool( 'bot' , true ) : 0,
'rc_moved_to_ns' => $newTitle->getNamespace(),
'rc_moved_to_title' => $newTitle->getDBkey(),
'rc_ip' => $ip,
@@ -362,6 +453,11 @@ class RecentChange
'rc_patrolled' => 1,
'rc_old_len' => NULL,
'rc_new_len' => NULL,
+ 'rc_deleted' => 0,
+ 'rc_logid' => 0, # notifyMove not used anymore
+ 'rc_log_type' => null,
+ 'rc_log_action' => '',
+ 'rc_params' => ''
);
$rc->mExtra = array(
@@ -372,41 +468,52 @@ class RecentChange
$rc->save();
}
- /* static */ function notifyMoveToNew( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='' ) {
+ public static function notifyMoveToNew( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='' ) {
RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip, false );
}
- /* static */ function notifyMoveOverRedirect( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='' ) {
+ public static function notifyMoveOverRedirect( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='' ) {
RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip, true );
}
- # A log entry is different to an edit in that previous revisions are
- # not kept
- /*static*/ function notifyLog( $timestamp, &$title, &$user, $comment, $ip='',
- $type, $action, $target, $logComment, $params )
+ public static function notifyLog( $timestamp, &$title, &$user, $actionComment, $ip='', $type,
+ $action, $target, $logComment, $params, $newId=0 )
{
- if ( !$ip ) {
+ global $wgLogRestrictions;
+ # Don't add private logs to RC!
+ if( isset($wgLogRestrictions[$type]) && $wgLogRestrictions[$type] != '*' ) {
+ return false;
+ }
+ $rc = self::newLogEntry( $timestamp, $title, $user, $actionComment, $ip, $type, $action,
+ $target, $logComment, $params, $newId );
+ $rc->save();
+ return true;
+ }
+
+ public static function newLogEntry( $timestamp, &$title, &$user, $actionComment, $ip='',
+ $type, $action, $target, $logComment, $params, $newId=0 )
+ {
+ global $wgRequest;
+ if( !$ip ) {
$ip = wfGetIP();
- if ( !$ip ) {
- $ip = '';
- }
+ if( !$ip ) $ip = '';
}
$rc = new RecentChange;
$rc->mAttribs = array(
'rc_timestamp' => $timestamp,
'rc_cur_time' => $timestamp,
- 'rc_namespace' => $title->getNamespace(),
- 'rc_title' => $title->getDBkey(),
+ 'rc_namespace' => $target->getNamespace(),
+ 'rc_title' => $target->getDBkey(),
'rc_type' => RC_LOG,
'rc_minor' => 0,
- 'rc_cur_id' => $title->getArticleID(),
- 'rc_user' => $user->getID(),
+ 'rc_cur_id' => $target->getArticleID(),
+ 'rc_user' => $user->getId(),
'rc_user_text' => $user->getName(),
- 'rc_comment' => $comment,
+ 'rc_comment' => $logComment,
'rc_this_oldid' => 0,
'rc_last_oldid' => 0,
- 'rc_bot' => $user->isAllowed( 'bot' ) ? 1 : 0,
+ 'rc_bot' => $user->isAllowed( 'bot' ) ? $wgRequest->getBool( 'bot', true ) : 0,
'rc_moved_to_ns' => 0,
'rc_moved_to_title' => '',
'rc_ip' => $ip,
@@ -414,30 +521,29 @@ class RecentChange
'rc_new' => 0, # obsolete
'rc_old_len' => NULL,
'rc_new_len' => NULL,
+ 'rc_deleted' => 0,
+ 'rc_logid' => $newId,
+ 'rc_log_type' => $type,
+ 'rc_log_action' => $action,
+ 'rc_params' => $params
);
$rc->mExtra = array(
'prefixedDBkey' => $title->getPrefixedDBkey(),
'lastTimestamp' => 0,
- 'logType' => $type,
- 'logAction' => $action,
- 'logComment' => $logComment,
- 'logTarget' => $target,
- 'logParams' => $params
+ 'actionComment' => $actionComment, // the comment appended to the action, passed from LogPage
);
- $rc->save();
+ return $rc;
}
# Initialises the members of this object from a mysql row object
- function loadFromRow( $row )
- {
+ public function loadFromRow( $row ) {
$this->mAttribs = get_object_vars( $row );
- $this->mAttribs["rc_timestamp"] = wfTimestamp(TS_MW, $this->mAttribs["rc_timestamp"]);
- $this->mExtra = array();
+ $this->mAttribs['rc_timestamp'] = wfTimestamp(TS_MW, $this->mAttribs['rc_timestamp']);
+ $this->mAttribs['rc_deleted'] = $row->rc_deleted; // MUST be set
}
# Makes a pseudo-RC entry from a cur row
- function loadFromCurRow( $row )
- {
+ public function loadFromCurRow( $row ) {
$this->mAttribs = array(
'rc_timestamp' => wfTimestamp(TS_MW, $row->rev_timestamp),
'rc_cur_time' => $row->rev_timestamp,
@@ -460,9 +566,12 @@ class RecentChange
'rc_new' => $row->page_is_new, # obsolete
'rc_old_len' => $row->rc_old_len,
'rc_new_len' => $row->rc_new_len,
+ 'rc_params' => isset($row->rc_params) ? $row->rc_params : '',
+ 'rc_log_type' => isset($row->rc_log_type) ? $row->rc_log_type : null,
+ 'rc_log_action' => isset($row->rc_log_action) ? $row->rc_log_action : null,
+ 'rc_log_id' => isset($row->rc_log_id) ? $row->rc_log_id: 0,
+ 'rc_deleted' => $row->rc_deleted // MUST be set
);
-
- $this->mExtra = array();
}
/**
@@ -479,12 +588,11 @@ class RecentChange
* Gets the end part of the diff URL associated with this object
* Blank if no diff link should be displayed
*/
- function diffLinkTrail( $forceCur )
- {
- if ( $this->mAttribs['rc_type'] == RC_EDIT ) {
+ public function diffLinkTrail( $forceCur ) {
+ if( $this->mAttribs['rc_type'] == RC_EDIT ) {
$trail = "curid=" . (int)($this->mAttribs['rc_cur_id']) .
"&oldid=" . (int)($this->mAttribs['rc_last_oldid']);
- if ( $forceCur ) {
+ if( $forceCur ) {
$trail .= '&diff=0' ;
} else {
$trail .= '&diff=' . (int)($this->mAttribs['rc_this_oldid']);
@@ -495,49 +603,45 @@ class RecentChange
return $trail;
}
- function cleanupForIRC( $text ) {
- return str_replace(array("\n", "\r"), array("", ""), $text);
- }
-
- function getIRCLine() {
- global $wgUseRCPatrol;
+ public function getIRCLine() {
+ global $wgUseRCPatrol, $wgUseNPPatrol, $wgRC2UDPInterwikiPrefix, $wgLocalInterwiki;
// FIXME: Would be good to replace these 2 extract() calls with something more explicit
// e.g. list ($rc_type, $rc_id) = array_values ($this->mAttribs); [or something like that]
extract($this->mAttribs);
extract($this->mExtra);
- $titleObj =& $this->getTitle();
- if ( $rc_type == RC_LOG ) {
- $title = Namespace::getCanonicalName( $titleObj->getNamespace() ) . $titleObj->getText();
+ if( $rc_type == RC_LOG ) {
+ $titleObj = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
} else {
- $title = $titleObj->getPrefixedText();
+ $titleObj =& $this->getTitle();
}
- $title = $this->cleanupForIRC( $title );
-
- $bad = array("\n", "\r");
- $empty = array("", "");
$title = $titleObj->getPrefixedText();
- $title = str_replace($bad, $empty, $title);
+ $title = self::cleanupForIRC( $title );
- // FIXME: *HACK* these should be getFullURL(), hacked for SSL madness --brion 2005-12-26
- if ( $rc_type == RC_LOG ) {
+ if( $rc_type == RC_LOG ) {
$url = '';
- } elseif ( $rc_new && $wgUseRCPatrol ) {
- $url = $titleObj->getInternalURL("rcid=$rc_id");
- } else if ( $rc_new ) {
- $url = $titleObj->getInternalURL();
- } else if ( $wgUseRCPatrol ) {
- $url = $titleObj->getInternalURL("diff=$rc_this_oldid&oldid=$rc_last_oldid&rcid=$rc_id");
} else {
- $url = $titleObj->getInternalURL("diff=$rc_this_oldid&oldid=$rc_last_oldid");
+ if( $rc_type == RC_NEW ) {
+ $url = "oldid=$rc_this_oldid";
+ } else {
+ $url = "diff=$rc_this_oldid&oldid=$rc_last_oldid";
+ }
+ if( $wgUseRCPatrol || ($rc_type == RC_NEW && $wgUseNPPatrol) ) {
+ $url .= "&rcid=$rc_id";
+ }
+ // XXX: *HACK* this should use getFullURL(), hacked for SSL madness --brion 2005-12-26
+ // XXX: *HACK^2* the preg_replace() undoes much of what getInternalURL() does, but we
+ // XXX: need to call it so that URL paths on the Wikimedia secure server can be fixed
+ // XXX: by a custom GetInternalURL hook --vyznev 2008-12-10
+ $url = preg_replace( '/title=[^&]*&/', '', $titleObj->getInternalURL( $url ) );
}
- if ( isset( $oldSize ) && isset( $newSize ) ) {
+ if( isset( $oldSize ) && isset( $newSize ) ) {
$szdiff = $newSize - $oldSize;
- if ($szdiff < -500) {
+ if($szdiff < -500) {
$szdiff = "\002$szdiff\002";
- } elseif ($szdiff >= 0) {
+ } elseif($szdiff >= 0) {
$szdiff = '+' . $szdiff ;
}
$szdiff = '(' . $szdiff . ')' ;
@@ -545,20 +649,39 @@ class RecentChange
$szdiff = '';
}
- $user = $this->cleanupForIRC( $rc_user_text );
+ $user = self::cleanupForIRC( $rc_user_text );
- if ( $rc_type == RC_LOG ) {
- $logTargetText = $logTarget->getPrefixedText();
- $comment = $this->cleanupForIRC( str_replace( $logTargetText, "\00302$logTargetText\00310", $rc_comment ) );
- $flag = $logAction;
+ if( $rc_type == RC_LOG ) {
+ $targetText = $this->getTitle()->getPrefixedText();
+ $comment = self::cleanupForIRC( str_replace("[[$targetText]]","[[\00302$targetText\00310]]",$actionComment) );
+ $flag = $rc_log_action;
+ } else {
+ $comment = self::cleanupForIRC( $rc_comment );
+ $flag = '';
+ if( !$rc_patrolled && ($wgUseRCPatrol || $rc_new && $wgUseNPPatrol) ) {
+ $flag .= '!';
+ }
+ $flag .= ($rc_new ? "N" : "") . ($rc_minor ? "M" : "") . ($rc_bot ? "B" : "");
+ }
+
+ if ( $wgRC2UDPInterwikiPrefix === true ) {
+ $prefix = $wgLocalInterwiki;
+ } elseif ( $wgRC2UDPInterwikiPrefix ) {
+ $prefix = $wgRC2UDPInterwikiPrefix;
+ } else {
+ $prefix = false;
+ }
+ if ( $prefix !== false ) {
+ $titleString = "\00314[[\00303$prefix:\00307$title\00314]]";
} else {
- $comment = $this->cleanupForIRC( $rc_comment );
- $flag = ($rc_minor ? "M" : "") . ($rc_new ? "N" : "");
+ $titleString = "\00314[[\00307$title\00314]]";
}
+
# see http://www.irssi.org/documentation/formats for some colour codes. prefix is \003,
# no colour (\003) switches back to the term default
- $fullString = "\00314[[\00307$title\00314]]\0034 $flag\00310 " .
+ $fullString = "$titleString\0034 $flag\00310 " .
"\00302$url\003 \0035*\003 \00303$user\003 \0035*\003 $szdiff \00310$comment\003\n";
+
return $fullString;
}
@@ -566,33 +689,16 @@ class RecentChange
* Returns the change size (HTML).
* The lengths can be given optionally.
*/
- function getCharacterDifference( $old = 0, $new = 0 ) {
- global $wgRCChangedSizeThreshold, $wgLang;
-
+ public function getCharacterDifference( $old = 0, $new = 0 ) {
if( $old === 0 ) {
$old = $this->mAttribs['rc_old_len'];
}
if( $new === 0 ) {
$new = $this->mAttribs['rc_new_len'];
}
-
if( $old === NULL || $new === NULL ) {
return '';
}
-
- $szdiff = $new - $old;
- $formatedSize = wfMsgExt( 'rc-change-size', array( 'parsemag', 'escape'),
- $wgLang->formatNum($szdiff) );
-
- if( $szdiff < $wgRCChangedSizeThreshold ) {
- return '(' . $formatedSize . ')';
- } elseif( $szdiff === 0 ) {
- return '(' . $formatedSize . ')';
- } elseif( $szdiff > 0 ) {
- return '(+' . $formatedSize . ')';
- } else {
- return '(' . $formatedSize . ')';
- }
+ return ChangesList::showCharacterDifference( $old, $new );
}
}
-?>