X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRecentChange.php;h=8e3f110744e6d99e4d2384850243dda25c7fece3;hb=10500033b7264ac2ec2fdfacfbb72450888e8e81;hp=aa3a649eed3480f30817289bc30aa27f4daae051;hpb=f18a20e6336214e1013be021ef2aae97d07af7f5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index aa3a649eed..8e3f110744 100644
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -49,15 +49,13 @@ class RecentChange
 
 	# Factory methods
 
-	public static function newFromRow( $row )
-	{
+	public static function newFromRow( $row ) {
 		$rc = new RecentChange;
 		$rc->loadFromRow( $row );
 		return $rc;
 	}
 
-	public static function newFromCurRow( $row )
-	{
+	public static function newFromCurRow( $row ) {
 		$rc = new RecentChange;
 		$rc->loadFromCurRow( $row );
 		$rc->notificationtimestamp = false;
@@ -110,27 +108,23 @@ class RecentChange
 
 	# 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'] );
 		}
 		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'] );
 		}
@@ -138,23 +132,22 @@ class RecentChange
 	}
 
 	# Writes the data in this object to the database
-	function save()
-	{
+	public function save() {
 		global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPOmitBots;
 		$fname = 'RecentChange::save';
 
 		$dbw = wfGetDB( DB_MASTER );
-		if ( !is_array($this->mExtra) ) {
+		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( $dbw->strictIPs() and $this->mAttribs['rc_ip'] == '' ) {
 			unset( $this->mAttribs['rc_ip'] );
 		}
 
@@ -164,7 +157,7 @@ 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 ) {
+		if( $dbw->cascadingDeletes() and $this->mAttribs['rc_cur_id']==0 ) {
 			unset ( $this->mAttribs['rc_cur_id'] );
 		}
 
@@ -173,9 +166,12 @@ class RecentChange
 
 		# 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 ) ) {
+		if( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) {
 			self::sendToUDP( $this->getIRCLine() );
 		}
 
@@ -200,9 +196,14 @@ class RecentChange
 				$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() );
+		}
 	}
 
 	/**
@@ -222,21 +223,24 @@ class RecentChange
 			$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 ) );
 	}
 
 	/**
@@ -268,34 +272,29 @@ class RecentChange
 		$errors = array();
 		// If recentchanges patrol is disabled, only new pages
 		// can be patrolled
-		if ( !$wgUseRCPatrol 
-			&& ( !$wgUseNPPatrol || $this->getAttribute( 'rc_type' ) != RC_NEW ) ) 
-		{
+		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)) )
+		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') )
+		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') )
+		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) );
@@ -322,14 +321,12 @@ class RecentChange
 	}
 
 	# Makes an entry in the database corresponding to an edit
-	public static function notifyEdit( $timestamp, &$title, $minor, &$user, $comment,
-		$oldId, $lastTimestamp, $bot, $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 ( !$ip ) {
+		if( !$ip ) {
 			$ip = wfGetIP();
-			if ( !$ip ) {
-				$ip = '';
-			}
+			if( !$ip ) $ip = '';
 		}
 
 		$rc = new RecentChange;
@@ -350,7 +347,7 @@ 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,
@@ -377,13 +374,11 @@ class RecentChange
 	 * @todo Document parameters and return
 	 */
 	public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot,
-	  $ip='', $size = 0, $newId = 0 )
+		$ip='', $size=0, $newId=0, $patrol=0 )
 	{
-		if ( !$ip ) {
+		if( !$ip ) {
 			$ip = wfGetIP();
-			if ( !$ip ) {
-				$ip = '';
-			}
+			if( !$ip ) $ip = '';
 		}
 
 		$rc = new RecentChange;
@@ -404,7 +399,7 @@ class RecentChange
 			'rc_moved_to_ns'    => 0,
 			'rc_moved_to_title' => '',
 			'rc_ip'             => $ip,
-			'rc_patrolled'      => 0,
+			'rc_patrolled'      => intval($patrol),
 			'rc_new'	    	=> 1, # obsolete
 			'rc_old_len'        => 0,
 			'rc_new_len'	    => $size,
@@ -429,12 +424,9 @@ class RecentChange
 	public static function notifyMove( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='', $overRedir = false )
 	{
 		global $wgRequest;
-
-		if ( !$ip ) {
+		if( !$ip ) {
 			$ip = wfGetIP();
-			if ( !$ip ) {
-				$ip = '';
-			}
+			if( !$ip ) $ip = '';
 		}
 
 		$rc = new RecentChange;
@@ -482,16 +474,27 @@ class 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;
+	}
 
-		if ( !$ip ) {
+	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;
@@ -527,20 +530,18 @@ class 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
-	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,
@@ -567,11 +568,8 @@ class RecentChange
 			'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,
-			// this one REALLY should be set...
-			'rc_deleted' => isset($row->rc_deleted) ? $row->rc_deleted: 0,
+			'rc_deleted' => $row->rc_deleted // MUST be set
 		);
-
-		$this->mExtra = array();
 	}
 
 	/**
@@ -588,12 +586,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']);
@@ -604,15 +601,15 @@ class RecentChange
 		return $trail;
 	}
 
-	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);
 
-		if ( $rc_type == RC_LOG ) {
+		if( $rc_type == RC_LOG ) {
 			$titleObj = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
 		} else {
 			$titleObj =& $this->getTitle();
@@ -620,24 +617,29 @@ class RecentChange
 		$title = $titleObj->getPrefixedText();
 		$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 . ')' ;
@@ -647,18 +649,37 @@ class RecentChange
 
 		$user = self::cleanupForIRC( $rc_user_text );
 
-		if ( $rc_type == RC_LOG ) {
+		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 = ($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 ) {
+			$prefix = $wgLocalInterwiki;
+		} elseif ( $wgRC2UDPInterwikiPrefix ) {
+			$prefix = $wgRC2UDPInterwikiPrefix;
+		} else {
+			$prefix = false;
 		}
+		if ( $prefix !== false ) {
+			$titleString = "\00314[[\00303$prefix:\00307$title\00314]]";
+		} else {
+			$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;
 	}
 
@@ -666,38 +687,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( abs( $szdiff ) > abs( $wgRCChangedSizeThreshold ) ) {
-			$tag = 'strong';
-		} 
-		else{
-		    $tag = 'span';
-		}
-
-		if( $szdiff === 0 ) {
-			return "<$tag class='mw-plusminus-null'>($formatedSize)</$tag>";
-		} elseif( $szdiff > 0 ) {
-			return "<$tag class='mw-plusminus-pos'>(+$formatedSize)</$tag>";
-	    } else {
-			return "<$tag class='mw-plusminus-neg'>($formatedSize)</$tag>";
-		}
+		return ChangesList::showCharacterDifference( $old, $new );
 	}
 }