*/
var $mMovedToTitle = false;
var $numberofWatchingusers = 0 ; # Dummy to prevent error message in SpecialRecentchangeslinked
+ var $notificationtimestamp;
# Factory methods
}
/**
- * @staticw
+ * @param $row
* @return RecentChange
*/
public static function newFromCurRow( $row ) {
*/
public static function newFromId( $rcid ) {
$dbr = wfGetDB( DB_SLAVE );
- $res = $dbr->select( 'recentchanges', '*', array( 'rc_id' => $rcid ), __METHOD__ );
- if( $res && $dbr->numRows( $res ) > 0 ) {
- $row = $dbr->fetchObject( $res );
+ $row = $dbr->selectRow( 'recentchanges', '*', array( 'rc_id' => $rcid ), __METHOD__ );
+ if( $row !== false ) {
return self::newFromRow( $row );
} else {
return null;
* @param $fname Mixed: override the method name in profiling/logs
* @return RecentChange
*/
- public static function newFromConds( $conds, $fname = false ) {
- if( $fname === false )
- $fname = __METHOD__;
+ public static function newFromConds( $conds, $fname = __METHOD__ ) {
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select(
'recentchanges',
# Accessors
+ /**
+ * @param $attribs array
+ */
public function setAttribs( $attribs ) {
$this->mAttribs = $attribs;
}
+ /**
+ * @param $extra array
+ */
public function setExtra( $extra ) {
$this->mExtra = $extra;
}
/**
* Writes the data in this object to the database
- * @param $noudp bool
+ * @param $noudp bool
*/
public function save( $noudp = false ) {
- global $wgLocalInterwiki, $wgPutIPinRC;
+ global $wgLocalInterwiki, $wgPutIPinRC, $wgContLang;
$dbw = wfGetDB( DB_MASTER );
if( !is_array($this->mExtra) ) {
unset( $this->mAttribs['rc_ip'] );
}
+ # Make sure summary is truncated (whole multibyte characters)
+ $this->mAttribs['rc_comment'] = $wgContLang->truncate( $this->mAttribs['rc_comment'], 255 );
+
# Fixup database timestamps
$this->mAttribs['rc_timestamp'] = $dbw->timestamp($this->mAttribs['rc_timestamp']);
$this->mAttribs['rc_cur_time'] = $dbw->timestamp($this->mAttribs['rc_cur_time']);
# Notify external application via UDP
if ( !$noudp ) {
- $this->notifyRC2UDP()
+ $this->notifyRC2UDP();
}
# E-mail notifications
$editor = ($wgUser->getName() == $this->mAttribs['rc_user_text']) ?
$wgUser : User::newFromName( $this->mAttribs['rc_user_text'], false );
}
+ $title = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
+
# @todo 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( $editor, $title,
+ $status = $enotif->notifyOnPageChange( $editor, $title,
$this->mAttribs['rc_timestamp'],
$this->mAttribs['rc_comment'],
$this->mAttribs['rc_minor'],
// Actually set the 'patrolled' flag in RC
$this->reallyMarkPatrolled();
// Log this patrol event
- PatrolLog::record( $this, $auto );
+ PatrolLog::record( $this, $auto, $user );
wfRunHooks( 'MarkPatrolledComplete', array($this->getAttribute('rc_id'), &$user, false) );
return array();
}
*/
public static function notifyEdit( $timestamp, &$title, $minor, &$user, $comment, $oldId,
$lastTimestamp, $bot, $ip='', $oldSize=0, $newSize=0, $newId=0, $patrol=0 ) {
- global $wgRequest;
- if( !$ip ) {
- $ip = $wgRequest->getIP();
- if( !$ip ) $ip = '';
- }
-
$rc = new RecentChange;
$rc->mAttribs = array(
'rc_timestamp' => $timestamp,
'rc_bot' => $bot ? 1 : 0,
'rc_moved_to_ns' => 0,
'rc_moved_to_title' => '',
- 'rc_ip' => $ip,
+ 'rc_ip' => self::checkIPAddress( $ip ),
'rc_patrolled' => intval($patrol),
'rc_new' => 0, # obsolete
'rc_old_len' => $oldSize,
*/
public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot,
$ip='', $size=0, $newId=0, $patrol=0 ) {
- global $wgRequest;
- if( !$ip ) {
- $ip = $wgRequest->getIP();
- if( !$ip ) $ip = '';
- }
-
$rc = new RecentChange;
$rc->mAttribs = array(
'rc_timestamp' => $timestamp,
'rc_bot' => $bot ? 1 : 0,
'rc_moved_to_ns' => 0,
'rc_moved_to_title' => '',
- 'rc_ip' => $ip,
+ 'rc_ip' => self::checkIPAddress( $ip ),
'rc_patrolled' => intval($patrol),
'rc_new' => 1, # obsolete
'rc_old_len' => 0,
* @param $logComment
* @param $params
* @param $newId int
+ * @param $actionCommentIRC string
* @return bool
*/
- public static function notifyLog( $timestamp, &$title, &$user, $actionComment, $ip='', $type,
- $action, $target, $logComment, $params, $newId=0 )
+ public static function notifyLog( $timestamp, &$title, &$user, $actionComment, $ip, $type,
+ $action, $target, $logComment, $params, $newId=0, $actionCommentIRC='' )
{
global $wgLogRestrictions;
# Don't add private logs to RC!
return false;
}
$rc = self::newLogEntry( $timestamp, $title, $user, $actionComment, $ip, $type, $action,
- $target, $logComment, $params, $newId );
+ $target, $logComment, $params, $newId, $actionCommentIRC );
$rc->save();
return true;
}
* @param $logComment
* @param $params
* @param $newId int
+ * @param $actionCommentIRC string
* @return RecentChange
*/
- public static function newLogEntry( $timestamp, &$title, &$user, $actionComment, $ip='',
- $type, $action, $target, $logComment, $params, $newId=0 ) {
+ public static function newLogEntry( $timestamp, &$title, &$user, $actionComment, $ip,
+ $type, $action, $target, $logComment, $params, $newId=0, $actionCommentIRC='' ) {
global $wgRequest;
- if( !$ip ) {
- $ip = $wgRequest->getIP();
- if( !$ip ) {
- $ip = '';
- }
- }
$rc = new RecentChange;
$rc->mAttribs = array(
'rc_bot' => $user->isAllowed( 'bot' ) ? $wgRequest->getBool( 'bot', true ) : 0,
'rc_moved_to_ns' => 0,
'rc_moved_to_title' => '',
- 'rc_ip' => $ip,
+ 'rc_ip' => self::checkIPAddress( $ip ),
'rc_patrolled' => 1,
'rc_new' => 0, # obsolete
'rc_old_len' => null,
'rc_log_action' => $action,
'rc_params' => $params
);
+
$rc->mExtra = array(
'prefixedDBkey' => $title->getPrefixedDBkey(),
'lastTimestamp' => 0,
'actionComment' => $actionComment, // the comment appended to the action, passed from LogPage
+ 'actionCommentIRC' => $actionCommentIRC
);
return $rc;
}
} elseif($szdiff >= 0) {
$szdiff = '+' . $szdiff ;
}
+ // @todo i18n with parentheses in content language?
$szdiff = '(' . $szdiff . ')' ;
} else {
$szdiff = '';
if ( $this->mAttribs['rc_type'] == RC_LOG ) {
$targetText = $this->getTitle()->getPrefixedText();
- $comment = self::cleanupForIRC( str_replace( "[[$targetText]]", "[[\00302$targetText\00310]]", $this->mExtra['actionComment'] ) );
+ $comment = self::cleanupForIRC( str_replace( "[[$targetText]]", "[[\00302$targetText\00310]]", $this->mExtra['actionCommentIRC'] ) );
$flag = $this->mAttribs['rc_log_action'];
} else {
$comment = self::cleanupForIRC( $this->mAttribs['rc_comment'] );
# see http://www.irssi.org/documentation/formats for some colour codes. prefix is \003,
# no colour (\003) switches back to the term default
$fullString = "$titleString\0034 $flag\00310 " .
- "\00302$url\003 \0035*\003 \00303$user\003 \0035*\003 $szdiff \00310$comment\003\n";
+ "\00302$url\003 \0035*\003 \00303$user\003 \0035*\003 $szdiff \00310$comment\003\n";
return $fullString;
}
}
return ChangesList::showCharacterDifference( $old, $new );
}
+
+ private static function checkIPAddress( $ip ) {
+ global $wgRequest;
+ if ( $ip ) {
+ if ( !IP::isIPAddress( $ip ) ) {
+ throw new MWException( "Attempt to write \"" . $ip . "\" as an IP address into recent changes" );
+ }
+ } else {
+ $ip = $wgRequest->getIP();
+ if( !$ip )
+ $ip = '';
+ }
+ return $ip;
+ }
}
dépôts / lhc / web / wiklou.git / blobdiff