Making INNER JOIN implicit
[lhc/web/wiklou.git] / includes / RecentChange.php
index 2721d9c..19f39dd 100644 (file)
@@ -1,7 +1,6 @@
 <?php
 /**
  *
- * @package MediaWiki
  */
 
 /**
  *     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 character count of the text before the edit
+ *     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
@@ -39,7 +43,6 @@
  *      numberofWatchingusers
  *
  * @todo document functions and variables
- * @package MediaWiki
  */
 class RecentChange
 {
@@ -49,7 +52,7 @@ class RecentChange
 
        # Factory methods
 
-       /* static */ function newFromRow( $row )
+       public static function newFromRow( $row )
        {
                $rc = new RecentChange;
                $rc->loadFromRow( $row );
@@ -65,6 +68,49 @@ class RecentChange
                return $rc;
        }
 
+       /**
+        * Obtain the recent change with a given rc_id value
+        *
+        * @param $rcid rc_id value to retrieve
+        * @return RecentChange
+        */
+       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 );
+                       $dbr->freeResult( $res );
+                       return self::newFromRow( $row );
+               } else {
+                       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
+        * @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 )
@@ -100,7 +146,7 @@ class RecentChange
                global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPPort, $wgRC2UDPPrefix;
                $fname = 'RecentChange::save';
 
-               $dbw =& wfGetDB( DB_MASTER );
+               $dbw = wfGetDB( DB_MASTER );
                if ( !is_array($this->mExtra) ) {
                        $this->mExtra = array();
                }
@@ -179,10 +225,10 @@ class RecentChange
                global $wgUseEnotif;
                if( $wgUseEnotif ) {
                        # this would be better as an extension hook
-                       include_once( "UserMailer.php" );
-                       $enotif = new EmailNotification();
+                       global $wgUser;
+                       $enotif = new EmailNotification;
                        $title = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
-                       $enotif->notifyOnPageChange( $title,
+                       $enotif->notifyOnPageChange( $wgUser, $title,
                                $this->mAttribs['rc_timestamp'],
                                $this->mAttribs['rc_comment'],
                                $this->mAttribs['rc_minor'],
@@ -193,32 +239,35 @@ class RecentChange
                wfRunHooks( 'RecentChange_save', array( &$this ) );
        }
 
-       # Marks a certain row as patrolled
-       function markPatrolled( $rcid )
-       {
-               $fname = 'RecentChange::markPatrolled';
-
-               $dbw =& wfGetDB( DB_MASTER );
-
-               $dbw->update( 'recentchanges',
-                       array( /* SET */
+       /**
+        * Mark a given change as patrolled
+        *
+        * @param mixed $change RecentChange or corresponding rc_id
+        * @returns integer number of affected rows
+        */
+       public static function markPatrolled( $change ) {
+               $rcid = $change instanceof RecentChange
+                       ? $change->mAttribs['rc_id']
+                       : $change;
+               $dbw = wfGetDB( DB_MASTER );
+               $dbw->update(
+                       'recentchanges',
+                       array(
                                'rc_patrolled' => 1
-                       ), array( /* WHERE */
+                       ),
+                       array(
                                'rc_id' => $rcid
-                       ), $fname
+                       ),
+                       __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,
+       public static function notifyEdit( $timestamp, &$title, $minor, &$user, $comment,
+               $oldId, $lastTimestamp, $bot, $ip = '', $oldSize = 0, $newSize = 0,
                $newId = 0)
        {
-
-               if ( $bot === 'default' ) {
-                       $bot = $user->isAllowed( 'bot' );
-               }
-
                if ( !$ip ) {
                        $ip = wfGetIP();
                        if ( !$ip ) {
@@ -247,7 +296,12 @@ class RecentChange
                        'rc_patrolled'  => 0,
                        '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(
@@ -264,10 +318,8 @@ class RecentChange
         * 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",
+       public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot,
          $ip='', $size = 0, $newId = 0 )
        {
                if ( !$ip ) {
@@ -276,9 +328,6 @@ class RecentChange
                                $ip = '';
                        }
                }
-               if ( $bot == 'default' ) {
-                       $bot = $user->isAllowed( 'bot' );
-               }
 
                $rc = new RecentChange;
                $rc->mAttribs = array(
@@ -299,9 +348,14 @@ class RecentChange
                        'rc_moved_to_title' => '',
                        'rc_ip'             => $ip,
                        'rc_patrolled'      => 0,
-                       'rc_new'            => 1, # obsolete
+                       '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(
@@ -315,8 +369,10 @@ class RecentChange
        }
 
        # 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 )
        {
+               global $wgRequest;
+
                if ( !$ip ) {
                        $ip = wfGetIP();
                        if ( !$ip ) {
@@ -338,7 +394,7 @@ class RecentChange
                        '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,
@@ -346,6 +402,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(
@@ -356,19 +417,20 @@ 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 )
+       # A log entry is different to an edit in that previous revisions are not kept
+       public static function notifyLog( $timestamp, &$title, &$user, $actionComment, $ip='',
+          $type, $action, $target, $logComment, $params, $newId=0 )
        {
+               global $wgRequest;
+
                if ( !$ip ) {
                        $ip = wfGetIP();
                        if ( !$ip ) {
@@ -380,17 +442,17 @@ class 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_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,
@@ -398,15 +460,16 @@ 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();
        }
@@ -419,7 +482,7 @@ class RecentChange
                $this->mExtra = array();
        }
 
-       # Makes a pseudo-RC entry from a cur row, for watchlists and things
+       # Makes a pseudo-RC entry from a cur row
        function loadFromCurRow( $row )
        {
                $this->mAttribs = array(
@@ -442,13 +505,28 @@ class RecentChange
                        'rc_id' => $row->rc_id,
                        'rc_patrolled' => $row->rc_patrolled,
                        'rc_new' => $row->page_is_new, # obsolete
-                       'rc_old_len' => NULL, # we can't get the text lengts from a cur row
-                       'rc_new_len' => NULL,
+                       '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,
+                       // this one REALLY should be set...
+                       'rc_deleted' => isset($row->rc_deleted) ? $row->rc_deleted: 0,
                );
 
                $this->mExtra = array();
        }
 
+       /**
+        * Get an attribute value
+        *
+        * @param $name Attribute name
+        * @return mixed
+        */
+       public function getAttribute( $name ) {
+               return isset( $this->mAttribs[$name] ) ? $this->mAttribs[$name] : NULL;
+       }
 
        /**
         * Gets the end part of the diff URL associated with this object
@@ -477,21 +555,18 @@ class RecentChange
        function getIRCLine() {
                global $wgUseRCPatrol;
 
+               // 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();
+                       $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 = $this->cleanupForIRC( $title );
 
                // FIXME: *HACK* these should be getFullURL(), hacked for SSL madness --brion 2005-12-26
                if ( $rc_type == RC_LOG ) {
@@ -521,9 +596,9 @@ class RecentChange
                $user = $this->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;
+                       $logTargetText = $this->getTitle()->getPrefixedText();
+                       $comment = $this->cleanupForIRC( str_replace($logTargetText,"\00302$logTargetText\00310",$actionComment) );
+                       $flag = $rc_log_action;
                } else {
                        $comment = $this->cleanupForIRC( $rc_comment );
                        $flag = ($rc_minor ? "M" : "") . ($rc_new ? "N" : "");
@@ -554,18 +629,17 @@ class RecentChange
                }
 
                $szdiff = $new - $old;
+               $formatedSize = wfMsgExt( 'rc-change-size', array( 'parsemag', 'escape'),
+                       $wgLang->formatNum($szdiff) );
 
                if( $szdiff < $wgRCChangedSizeThreshold ) {
-                       // workaround to make it show a minus char instead of a dash. formatNum() doesn't do that.
-                       return '<span class=\'mw-pluminus-bold\'>(&minus;' . $wgLang->formatNum( abs( $szdiff ) ) . ')</span>';
+                       return '<strong class=\'mw-plusminus-neg\'>(' . $formatedSize . ')</strong>';
                } elseif( $szdiff === 0 ) {
-                       return '<span class=\'mw-plusminus-null\'>(' . $wgLang->formatNum( $szdiff ) . ')</span>';
+                       return '<span class=\'mw-plusminus-null\'>(' . $formatedSize . ')</span>';
                } elseif( $szdiff > 0 ) {
-                       return '<span class=\'mw-plusminus-pos\'>(+' . $wgLang->formatNum( $szdiff ) . ')</span>';
+                       return '<span class=\'mw-plusminus-pos\'>(+' . $formatedSize . ')</span>';
                } else {
-                       // same workaround.
-                       return '<span class=\'mw-pluminus-neg\'>(&minus;' . $wgLang->formatNum( abs( $szdiff ) ) . ')</span>';
+                       return '<span class=\'mw-plusminus-neg\'>(' . $formatedSize . ')</span>';
                }
        }
 }
-?>