Don't look for pipes in the root node.
[lhc/web/wiklou.git] / includes / RecentChange.php
index db350fa..97a5e1b 100644 (file)
@@ -2,47 +2,47 @@
 
 /**
  * Utility class for creating new RC entries
+ *
  * mAttribs:
- *     rc_id           id of the row in the recentchanges table
- *     rc_timestamp    time the entry was made
- *     rc_cur_time     timestamp on the cur row
- *     rc_namespace    namespace #
- *     rc_title        non-prefixed db key
- *     rc_type         is new entry, used to determine whether updating is necessary
- *     rc_minor        is minor
- *     rc_cur_id       page_id of associated page entry
- *     rc_user         user id who made the entry
- *     rc_user_text    user name who made the entry
- *     rc_comment      edit summary
- *     rc_this_oldid   rev_id associated with this entry (or zero)
- *     rc_last_oldid   rev_id associated with the entry before this one (or zero)
- *     rc_bot          is bot, hidden
- *     rc_ip           IP address of the user in dotted quad notation
- *     rc_new          obsolete, use rc_type==RC_NEW
- *     rc_patrolled    boolean whether or not someone has marked this edit as patrolled
- *     rc_old_len      integer byte length of the text before the edit
- *     rc_new_len      the same after the edit
 *    rc_deleted              partial deletion
- *     rc_logid                the log_id value for this log entry (or zero)
- *  rc_log_type                the log type (or null)
- *     rc_log_action   the log action (or null)
- *  rc_params          log params
+ *  rc_id           id of the row in the recentchanges table
+ *  rc_timestamp    time the entry was made
+ *  rc_cur_time     timestamp on the cur row
+ *  rc_namespace    namespace #
+ *  rc_title        non-prefixed db key
+ *  rc_type         is new entry, used to determine whether updating is necessary
+ *  rc_minor        is minor
+ *  rc_cur_id       page_id of associated page entry
+ *  rc_user         user id who made the entry
+ *  rc_user_text    user name who made the entry
+ *  rc_comment      edit summary
+ *  rc_this_oldid   rev_id associated with this entry (or zero)
+ *  rc_last_oldid   rev_id associated with the entry before this one (or zero)
+ *  rc_bot          is bot, hidden
+ *  rc_ip           IP address of the user in dotted quad notation
+ *  rc_new          obsolete, use rc_type==RC_NEW
+ *  rc_patrolled    boolean whether or not someone has marked this edit as patrolled
+ *  rc_old_len      integer byte length of the text before the edit
+ *  rc_new_len      the same after the edit
*  rc_deleted      partial deletion
+ *  rc_logid        the log_id value for this log entry (or zero)
+ *  rc_log_type     the log type (or null)
+ *  rc_log_action   the log action (or null)
+ *  rc_params       log params
  *
  * mExtra:
- *     prefixedDBkey   prefixed db key, used by external app via msg queue
- *     lastTimestamp   timestamp of previous entry, used in WHERE clause during update
- *     lang            the interwiki prefix, automatically set in save()
+ *  prefixedDBkey   prefixed db key, used by external app via msg queue
+ *  lastTimestamp   timestamp of previous entry, used in WHERE clause during update
+ *  lang            the interwiki prefix, automatically set in save()
  *  oldSize         text size before the change
  *  newSize         text size after the change
  *
- * temporary:          not stored in the database
+ * temporary:       not stored in the database
  *      notificationtimestamp
  *      numberofWatchingusers
  *
  * @todo document functions and variables
  */
-class RecentChange
-{
+class RecentChange {
        var $mAttribs = array(), $mExtra = array();
        var $mTitle = false, $mMovedToTitle = false;
        var $numberofWatchingusers = 0 ; # Dummy to prevent error message in SpecialRecentchangeslinked
@@ -66,7 +66,7 @@ class RecentChange
        /**
         * Obtain the recent change with a given rc_id value
         *
-        * @param $rcid rc_id value to retrieve
+        * @param $rcid Int rc_id value to retrieve
         * @return RecentChange
         */
        public static function newFromId( $rcid ) {
@@ -74,18 +74,17 @@ class RecentChange
                $res = $dbr->select( 'recentchanges', '*', array( 'rc_id' => $rcid ), __METHOD__ );
                if( $res && $dbr->numRows( $res ) > 0 ) {
                        $row = $dbr->fetchObject( $res );
-                       $dbr->freeResult( $res );
                        return self::newFromRow( $row );
                } else {
-                       return NULL;
+                       return null;
                }
        }
 
        /**
         * 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
+        * @param $conds Array of conditions
+        * @param $fname Mixed: override the method name in profiling/logs
         * @return RecentChange
         */
        public static function newFromConds( $conds, $fname = false ) {
@@ -116,9 +115,15 @@ class RecentChange
                $this->mExtra = $extra;
        }
 
+       /**
+        *
+        * @return Title
+        */
        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;
        }
@@ -154,11 +159,11 @@ class RecentChange
                # 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
@@ -166,6 +171,9 @@ 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 ) ) {
@@ -193,51 +201,62 @@ 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() );
+               }
        }
 
        /**
-        * Send some text to UDP
-        * @param string $line
-        * @param string $prefix
-        * @param string $address
-        * @return bool success
+        * Send some text to UDP.
+        * @see RecentChange::cleanupForIRC
+        * @param $line String: text to send
+        * @param $address String: defaults to $wgRC2UDPAddress.
+        * @param $prefix String: defaults to $wgRC2UDPPrefix.
+        * @param $port Int: defaults to $wgRC2UDPPort. (Since 1.17)
+        * @return Boolean: success
         */
-       public static function sendToUDP( $line, $address = '', $prefix = '' ) {
+       public static function sendToUDP( $line, $address = '', $prefix = '', $port = '' ) {
                global $wgRC2UDPAddress, $wgRC2UDPPrefix, $wgRC2UDPPort;
                # Assume default for standard RC case
                $address = $address ? $address : $wgRC2UDPAddress;
                $prefix = $prefix ? $prefix : $wgRC2UDPPrefix;
+               $port = $port ? $port : $wgRC2UDPPort;
                # Notify external application via UDP
                if( $address ) {
                        $conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
                        if( $conn ) {
                                $line = $prefix . $line;
-                               socket_sendto( $conn, $line, strlen($line), 0, $address, $wgRC2UDPPort );
+                               wfDebug( __METHOD__ . ": sending UDP line: $line\n" );
+                               socket_sendto( $conn, $line, strlen($line), 0, $address, $port );
                                socket_close( $conn );
                                return true;
+                       } else {
+                               wfDebug( __METHOD__ . ": failed to create UDP socket\n" );
                        }
                }
                return false;
        }
        
        /**
-        * Remove newlines and carriage returns
-        * @param string $line
-        * @return string
+        * Remove newlines, carriage returns and decode html entites
+        * @param $text String
+        * @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 ) );
        }
 
        /**
         * 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
+        * @param $change Mixed: RecentChange or corresponding rc_id
+        * @param $auto Boolean: for automatic patrol
+        * @return Array See doMarkPatrolled(), or null if $change is not an existing rc_id
         */
        public static function markPatrolled( $change, $auto = false ) {
                $change = $change instanceof RecentChange
@@ -253,7 +272,7 @@ class RecentChange
         * Mark this RecentChange as patrolled
         *
         * NOTE: Can also return 'rcpatroldisabled', 'hookaborted' and 'markedaspatrollederror-noautopatrol' as errors
-        * @param bool $auto for automatic patrol
+        * @param $auto Boolean: for automatic patrol
         * @return array of permissions errors, see Title::getUserPermissionsErrors()
         */
        public function doMarkPatrolled( $auto = false ) {
@@ -292,7 +311,7 @@ class RecentChange
        
        /**
         * Mark this RecentChange patrolled, without error checking
-        * @return int Number of affected rows
+        * @return Integer: number of affected rows
         */
        public function reallyMarkPatrolled() {
                $dbw = wfGetDB( DB_MASTER );
@@ -310,47 +329,45 @@ 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 ) {
                        $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_type'       => RC_EDIT,
-                       'rc_minor'      => $minor ? 1 : 0,
-                       'rc_cur_id'     => $title->getArticleID(),
-                       'rc_user'       => $user->getId(),
-                       'rc_user_text'  => $user->getName(),
-                       'rc_comment'    => $comment,
-                       'rc_this_oldid' => $newId,
-                       'rc_last_oldid' => $oldId,
-                       'rc_bot'        => $bot ? 1 : 0,
-                       'rc_moved_to_ns'        => 0,
-                       'rc_moved_to_title'     => '',
-                       'rc_ip'         => $ip,
-                       'rc_patrolled'  => 0,
-                       'rc_new'        => 0,  # obsolete
-                       'rc_old_len'    => $oldSize,
-                       'rc_new_len'    => $newSize,
-                       'rc_deleted'    => 0,
-                       'rc_logid'              => 0,
-                       'rc_log_type'   => null,
-                       'rc_log_action' => '',
-                       'rc_params'             => ''
+                       'rc_timestamp'  => $timestamp,
+                       'rc_cur_time'   => $timestamp,
+                       'rc_namespace'  => $title->getNamespace(),
+                       'rc_title'      => $title->getDBkey(),
+                       'rc_type'       => RC_EDIT,
+                       'rc_minor'      => $minor ? 1 : 0,
+                       'rc_cur_id'     => $title->getArticleID(),
+                       'rc_user'       => $user->getId(),
+                       'rc_user_text'  => $user->getName(),
+                       'rc_comment'    => $comment,
+                       'rc_this_oldid' => $newId,
+                       'rc_last_oldid' => $oldId,
+                       'rc_bot'        => $bot ? 1 : 0,
+                       'rc_moved_to_ns' => 0,
+                       'rc_moved_to_title' => '',
+                       'rc_ip'         => $ip,
+                       'rc_patrolled'  => intval($patrol),
+                       'rc_new'        => 0,  # obsolete
+                       'rc_old_len'    => $oldSize,
+                       'rc_new_len'    => $newSize,
+                       'rc_deleted'    => 0,
+                       'rc_logid'      => 0,
+                       'rc_log_type'   => null,
+                       'rc_log_action' => '',
+                       'rc_params'     => ''
                );
 
                $rc->mExtra =  array(
-                       'prefixedDBkey' => $title->getPrefixedDBkey(),
+                       'prefixedDBkey' => $title->getPrefixedDBkey(),
                        'lastTimestamp' => $lastTimestamp,
                        'oldSize'       => $oldSize,
                        'newSize'       => $newSize,
@@ -365,13 +382,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 ) {
                        $ip = wfGetIP();
-                       if( !$ip ) {
-                               $ip = '';
-                       }
+                       if( !$ip ) $ip = '';
                }
 
                $rc = new RecentChange;
@@ -392,19 +407,19 @@ 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_deleted'            => 0,
-                       'rc_logid'                      => 0,
-                       'rc_log_type'           => null,
-                       'rc_log_action'         => '',
-                       'rc_params'                     => ''
+                       'rc_new_len'        => $size,
+                       'rc_deleted'        => 0,
+                       'rc_logid'          => 0,
+                       'rc_log_type'       => null,
+                       'rc_log_action'     => '',
+                       'rc_params'         => ''
                );
 
                $rc->mExtra =  array(
-                       'prefixedDBkey' => $title->getPrefixedDBkey(),
+                       'prefixedDBkey' => $title->getPrefixedDBkey(),
                        'lastTimestamp' => 0,
                        'oldSize' => 0,
                        'newSize' => $size
@@ -417,47 +432,44 @@ class 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;
                $rc->mAttribs = array(
-                       'rc_timestamp'  => $timestamp,
-                       'rc_cur_time'   => $timestamp,
-                       'rc_namespace'  => $oldTitle->getNamespace(),
-                       'rc_title'      => $oldTitle->getDBkey(),
-                       'rc_type'       => $overRedir ? RC_MOVE_OVER_REDIRECT : RC_MOVE,
-                       'rc_minor'      => 0,
-                       'rc_cur_id'     => $oldTitle->getArticleID(),
-                       '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' ) ? $wgRequest->getBool( 'bot' , true ) : 0,
-                       'rc_moved_to_ns'        => $newTitle->getNamespace(),
-                       'rc_moved_to_title'     => $newTitle->getDBkey(),
-                       'rc_ip'         => $ip,
-                       'rc_new'        => 0, # obsolete
-                       '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_timestamp'  => $timestamp,
+                       'rc_cur_time'   => $timestamp,
+                       'rc_namespace'  => $oldTitle->getNamespace(),
+                       'rc_title'      => $oldTitle->getDBkey(),
+                       'rc_type'       => $overRedir ? RC_MOVE_OVER_REDIRECT : RC_MOVE,
+                       'rc_minor'      => 0,
+                       'rc_cur_id'     => $oldTitle->getArticleID(),
+                       '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' ) ? $wgRequest->getBool( 'bot' , true ) : 0,
+                       'rc_moved_to_ns' => $newTitle->getNamespace(),
+                       'rc_moved_to_title' => $newTitle->getDBkey(),
+                       'rc_ip'         => $ip,
+                       'rc_new'        => 0, # obsolete
+                       '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(
-                       'prefixedDBkey' => $oldTitle->getPrefixedDBkey(),
+                       'prefixedDBkey' => $oldTitle->getPrefixedDBkey(),
                        'lastTimestamp' => 0,
-                       'prefixedMoveTo'        => $newTitle->getPrefixedDBkey()
+                       'prefixedMoveTo' => $newTitle->getPrefixedDBkey()
                );
                $rc->save();
        }
@@ -470,52 +482,63 @@ 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;
+       }
 
+       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'  => $target->getNamespace(),
-                       'rc_title'      => $target->getDBkey(),
-                       'rc_type'       => RC_LOG,
-                       'rc_minor'      => 0,
-                       'rc_cur_id'     => $target->getArticleID(),
-                       'rc_user'       => $user->getId(),
-                       'rc_user_text'  => $user->getName(),
-                       'rc_comment'    => $logComment,
-                       'rc_this_oldid' => 0,
-                       'rc_last_oldid' => 0,
-                       'rc_bot'        => $user->isAllowed( 'bot' ) ? $wgRequest->getBool( 'bot', true ) : 0,
-                       'rc_moved_to_ns'        => 0,
-                       'rc_moved_to_title'     => '',
-                       'rc_ip' => $ip,
-                       'rc_patrolled' => 1,
-                       '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_timestamp'  => $timestamp,
+                       'rc_cur_time'   => $timestamp,
+                       'rc_namespace'  => $target->getNamespace(),
+                       'rc_title'      => $target->getDBkey(),
+                       'rc_type'       => RC_LOG,
+                       'rc_minor'      => 0,
+                       'rc_cur_id'     => $target->getArticleID(),
+                       'rc_user'       => $user->getId(),
+                       'rc_user_text'  => $user->getName(),
+                       'rc_comment'    => $logComment,
+                       'rc_this_oldid' => 0,
+                       'rc_last_oldid' => 0,
+                       'rc_bot'        => $user->isAllowed( 'bot' ) ? $wgRequest->getBool( 'bot', true ) : 0,
+                       'rc_moved_to_ns' => 0,
+                       'rc_moved_to_title' => '',
+                       'rc_ip'         => $ip,
+                       'rc_patrolled'  => 1,
+                       '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(),
+                       'prefixedDBkey' => $title->getPrefixedDBkey(),
                        '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
@@ -523,7 +546,6 @@ class RecentChange
                $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
@@ -556,17 +578,20 @@ class RecentChange
                        'rc_log_id' => isset($row->rc_log_id) ? $row->rc_log_id: 0,
                        'rc_deleted' => $row->rc_deleted // MUST be set
                );
-               $this->mExtra = array();
        }
 
        /**
         * Get an attribute value
         *
-        * @param $name Attribute name
+        * @param $name String Attribute name
         * @return mixed
         */
        public function getAttribute( $name ) {
-               return isset( $this->mAttribs[$name] ) ? $this->mAttribs[$name] : NULL;
+               return isset( $this->mAttribs[$name] ) ? $this->mAttribs[$name] : null;
+       }
+
+       public function getAttributes() {
+               return $this->mAttribs;
        }
 
        /**
@@ -588,8 +613,8 @@ class RecentChange
                return $trail;
        }
 
-       protected function getIRCLine() {
-               global $wgUseRCPatrol, $wgRC2UDPInterwikiPrefix, $wgLocalInterwiki;
+       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]
@@ -604,19 +629,22 @@ 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 ) {
                        $url = '';
-               } elseif( $rc_new && ($wgUseRCPatrol || $wgUseNPPatrol) ) {
-                       $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");
-                       $url = preg_replace('/title=[^&]*&/', '', $url);
                } else {
-                       $url = $titleObj->getInternalURL("diff=$rc_this_oldid&oldid=$rc_last_oldid");
-                       $url = preg_replace('/title=[^&]*&/', '', $url);
+                       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 ) ) {
@@ -639,11 +667,22 @@ class RecentChange
                        $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 && isset( $wgLocalInterwiki ) ) {
-                       $titleString = "\00314[[\00303$wgLocalInterwiki:\00307$title\00314]]";
+
+               if ( $wgRC2UDPInterwikiPrefix === true && $wgLocalInterwiki !== false ) {
+                       $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]]";
                }
@@ -661,37 +700,15 @@ class RecentChange
         * The lengths can be given optionally.
         */
        public function getCharacterDifference( $old = 0, $new = 0 ) {
-               global $wgRCChangedSizeThreshold, $wgLang;
-
                if( $old === 0 ) {
                        $old = $this->mAttribs['rc_old_len'];
                }
                if( $new === 0 ) {
                        $new = $this->mAttribs['rc_new_len'];
                }
-
-               if( $old === NULL || $new === NULL ) {
+               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 );
        }
 }