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;
}
# 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']);
- $this->mAttribs['rc_id'] = $dbw->nextSequenceValue( 'rc_rc_id_seq' );
+ $this->mAttribs['rc_id'] = $dbw->nextSequenceValue( 'recentchanges_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'] );
+ unset( $this->mAttribs['rc_cur_id'] );
}
# Insert new row
# Set the ID
$this->mAttribs['rc_id'] = $dbw->insertId();
+
+ # Notify extensions
+ wfRunHooks( 'RecentChange_save', array( &$this ) );
# Notify external application via UDP
if( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) {
$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() );
+ }
}
/**
$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 and carriage returns
+ * Remove newlines, carriage returns and decode html entites
* @param string $line
* @return string
*/
public static function cleanupForIRC( $text ) {
- return str_replace(array("\n", "\r"), array("", ""), $text);
+ return Sanitizer::decodeCharReferences( str_replace( array( "\n", "\r" ), array( "", "" ), $text ) );
}
/**
{
if( !$ip ) {
$ip = wfGetIP();
- if( !$ip ) {
- $ip = '';
- }
+ if( !$ip ) $ip = '';
}
$rc = new RecentChange;
{
if( !$ip ) {
$ip = wfGetIP();
- if( !$ip ) {
- $ip = '';
- }
+ if( !$ip ) $ip = '';
}
$rc = new RecentChange;
public static function notifyMove( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='', $overRedir = false )
{
global $wgRequest;
-
if( !$ip ) {
$ip = wfGetIP();
- if( !$ip ) {
- $ip = '';
- }
+ if( !$ip ) $ip = '';
}
$rc = new RecentChange;
RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip, true );
}
- 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 )
{
- global $wgRequest;
+ 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;
'lastTimestamp' => 0,
'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
$this->mAttribs = get_object_vars( $row );
$this->mAttribs['rc_timestamp'] = wfTimestamp(TS_MW, $this->mAttribs['rc_timestamp']);
$this->mAttribs['rc_deleted'] = $row->rc_deleted; // MUST be set
- $this->mExtra = array();
}
# Makes a pseudo-RC entry from a cur row
'rc_log_id' => isset($row->rc_log_id) ? $row->rc_log_id: 0,
'rc_deleted' => $row->rc_deleted // MUST be set
);
- $this->mExtra = array();
}
/**
return isset( $this->mAttribs[$name] ) ? $this->mAttribs[$name] : NULL;
}
+ public function getAttributes() {
+ return $this->mAttribs;
+ }
+
/**
* Gets the end part of the diff URL associated with this object
* Blank if no diff link should be displayed
return $trail;
}
- protected function getIRCLine() {
- global $wgUseRCPatrol, $wgUseNPPatrol, $wgRC2UDPInterwikiPrefix, $wgLocalInterwiki,
- $wgInternalServer, $wgScript;
+ 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]
$title = $titleObj->getPrefixedText();
$title = self::cleanupForIRC( $title );
- // XXX: This used to call Title::getInternalURL() and then strip out the title, but that's
- // a lot of complex code just to prepend two globals to a query string. Simplified.
if( $rc_type == RC_LOG ) {
$url = '';
} else {
- // XXX: *HACK* this should use $wgServer, hacked for SSL madness --brion 2005-12-26
- $url = $wgInternalServer . $wgScript;
if( $rc_type == RC_NEW ) {
- $url .= "?oldid=$rc_this_oldid";
+ $url = "oldid=$rc_this_oldid";
} else {
- $url .= "?diff=$rc_this_oldid&oldid=$rc_last_oldid";
+ $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 ) ) {
$flag = $rc_log_action;
} else {
$comment = self::cleanupForIRC( $rc_comment );
- $flag = ($rc_new ? "N" : "") . ($rc_minor ? "M" : "") . ($rc_bot ? "B" : "");
+ $flag = '';
+ if( !$rc_patrolled && ($wgUseRCPatrol || $rc_new && $wgUseNPPatrol) ) {
+ $flag .= '!';
+ }
+ $flag .= ($rc_new ? "N" : "") . ($rc_minor ? "M" : "") . ($rc_bot ? "B" : "");
}
if ( $wgRC2UDPInterwikiPrefix === true ) {
dépôts / lhc / web / wiklou.git / blobdiff