Apply live hack from Wikimedia code base -- remove unused commented-out checker patte...
[lhc/web/wiklou.git] / includes / RecentChange.php
index ceb0717..750404a 100644 (file)
  *     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
@@ -85,6 +80,31 @@ class RecentChange
                        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
 
@@ -200,10 +220,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'],
@@ -214,31 +234,33 @@ class RecentChange
                wfRunHooks( 'RecentChange_save', array( &$this ) );
        }
 
-       # Marks a certain row as patrolled
-       function markPatrolled( $rcid )
-       {
-               $fname = 'RecentChange::markPatrolled';
-
+       /**
+        * Mark a given change as patrolled
+        *
+        * @param mixed $change RecentChange or corresponding rc_id
+        */
+       public static function markPatrolled( $change ) {
+               $rcid = $change instanceof RecentChange
+                       ? $change->mAttribs['rc_id']
+                       : $change;
                $dbw = wfGetDB( DB_MASTER );
-
-               $dbw->update( 'recentchanges',
-                       array( /* SET */
+               $dbw->update(
+                       'recentchanges',
+                       array(
                                'rc_patrolled' => 1
-                       ), array( /* WHERE */
+                       ),
+                       array(
                                'rc_id' => $rcid
-                       ), $fname
+                       ),
+                       __METHOD__
                );
        }
 
        # 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, $newId=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 ) {
@@ -267,12 +289,7 @@ class RecentChange
                        '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_new_len'    => $newSize
                );
 
                $rc->mExtra =  array(
@@ -289,11 +306,9 @@ 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",
-         $ip='', $size=0, $newId=0 )
+       public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot,
+         $ip='', $size = 0, $newId = 0 )
        {
                if ( !$ip ) {
                        $ip = wfGetIP();
@@ -301,10 +316,6 @@ class RecentChange
                                $ip = '';
                        }
                }
-                               
-               if ( $bot == 'default' ) {
-                       $bot = $user->isAllowed( 'bot' );
-               }
 
                $rc = new RecentChange;
                $rc->mAttribs = array(
@@ -325,14 +336,9 @@ 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_deleted'            => 0,
-                       'rc_logid'                      => 0,
-                       'rc_log_type'           => null,
-                       'rc_log_action'         => '',
-                       'rc_params'                     => ''
+                       'rc_new_len'        => $size
                );
 
                $rc->mExtra =  array(
@@ -346,15 +352,17 @@ 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 ) {
                                $ip = '';
                        }
                }
-               
+
                $rc = new RecentChange;
                $rc->mAttribs = array(
                        'rc_timestamp'  => $timestamp,
@@ -369,7 +377,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,
@@ -377,11 +385,6 @@ 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(
@@ -392,22 +395,28 @@ 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, $actionText = null, $ip='',
-          $type, $action, $target, $logComment, $params, $newId=0 )
+       # A log entry is different to an edit in that previous revisions are
+       # not kept
+       public static function notifyLog( $timestamp, &$title, &$user, $comment, $ip='',
+          $type, $action, $target, $logComment, $params )
        {
+               global $wgRequest;
+
                if ( !$ip ) {
                        $ip = wfGetIP();
-                       if ( !$ip ) $ip = '';
+                       if ( !$ip ) {
+                               $ip = '';
+                       }
                }
+
                $rc = new RecentChange;
                $rc->mAttribs = array(
                        'rc_timestamp'  => $timestamp,
@@ -419,10 +428,10 @@ class RecentChange
                        'rc_cur_id'     => $title->getArticleID(),
                        'rc_user'       => $user->getID(),
                        'rc_user_text'  => $user->getName(),
-                       'rc_comment'    => $logComment,
+                       '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'        => 0,
                        'rc_moved_to_title'     => '',
                        'rc_ip' => $ip,
@@ -430,11 +439,6 @@ 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(),
@@ -481,11 +485,6 @@ class RecentChange
                        'rc_new' => $row->page_is_new, # obsolete
                        'rc_old_len' => $row->rc_old_len,
                        'rc_new_len' => $row->rc_new_len,
-                       'rc_deleted'  => $row->rc_deleted,
-                       'rc_logid'      => $row->rc_logid,
-                       'rc_log_type'   => $row->rc_log_type,
-                       'rc_log_action' => $row->rc_log_action,
-                       'rc_params'     => $row->rc_params
                );
 
                $this->mExtra = array();
@@ -621,4 +620,5 @@ class RecentChange
                }
        }
 }
-?>
+
+