X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRecentChange.php;h=c22c9ea5a5826900a57fafd3e302e56d1db2f436;hb=399956f4209406fa49898022e34a9741d2c7035f;hp=bcc4f063820a82399e0d1ef2c7897f297796c69e;hpb=9260c3b7cadbc74f097307f49ce389d71ebe6d92;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/RecentChange.php b/includes/RecentChange.php index bcc4f06382..c22c9ea5a5 100644 --- a/includes/RecentChange.php +++ b/includes/RecentChange.php @@ -1,18 +1,4 @@ loadFromRow( $row ); return $rc; } - /* static */ function newFromCurRow( $row, $rc_this_oldid = 0 ) + public static function newFromCurRow( $row ) { $rc = new RecentChange; - $rc->loadFromCurRow( $row, $rc_this_oldid ); + $rc->loadFromCurRow( $row ); $rc->notificationtimestamp = false; $rc->numberofWatchingusers = false; 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 ) @@ -104,10 +140,11 @@ class RecentChange # Writes the data in this object to the database function save() { - global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPPort, $wgRC2UDPPrefix; + global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, + $wgRC2UDPPort, $wgRC2UDPPrefix, $wgRC2UDPOmitBots; $fname = 'RecentChange::save'; - $dbw =& wfGetDB( DB_MASTER ); + $dbw = wfGetDB( DB_MASTER ); if ( !is_array($this->mExtra) ) { $this->mExtra = array(); } @@ -117,30 +154,45 @@ class RecentChange $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'] == '' ) { + unset( $this->mAttribs['rc_ip'] ); + } + # 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' ); + ## 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'] ); + } + # Insert new row $dbw->insert( 'recentchanges', $this->mAttribs, $fname ); + # Set the ID + $this->mAttribs['rc_id'] = $dbw->insertId(); + # Update old rows, if necessary if ( $this->mAttribs['rc_type'] == RC_EDIT ) { - $oldid = $this->mAttribs['rc_last_oldid']; - $ns = $this->mAttribs['rc_namespace']; - $title = $this->mAttribs['rc_title']; $lastTime = $this->mExtra['lastTimestamp']; - $now = $this->mAttribs['rc_timestamp']; - $curId = $this->mAttribs['rc_cur_id']; + #$now = $this->mAttribs['rc_timestamp']; + #$curId = $this->mAttribs['rc_cur_id']; # Don't bother looking for entries that have probably # been purged, it just locks up the indexes needlessly. global $wgRCMaxAge; $age = time() - wfTimestamp( TS_UNIX, $lastTime ); if( $age < $wgRCMaxAge ) { - # live hack, will commit once tested - kate + # live hack, will commit once tested - kate # Update rc_this_oldid for the entries which were current + # + #$oldid = $this->mAttribs['rc_last_oldid']; + #$ns = $this->mAttribs['rc_namespace']; + #$title = $this->mAttribs['rc_title']; + # #$dbw->update( 'recentchanges', # array( /* SET */ # 'rc_this_oldid' => $oldid @@ -153,12 +205,12 @@ class RecentChange } # Update rc_cur_time - $dbw->update( 'recentchanges', array( 'rc_cur_time' => $now ), - array( 'rc_cur_id' => $curId ), $fname ); + #$dbw->update( 'recentchanges', array( 'rc_cur_time' => $now ), + # array( 'rc_cur_id' => $curId ), $fname ); } # Notify external application via UDP - if ( $wgRC2UDPAddress ) { + if ( $wgRC2UDPAddress && ( !$this->mAttribs['rc_bot'] || !$wgRC2UDPOmitBots ) ) { $conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP ); if ( $conn ) { $line = $wgRC2UDPPrefix . $this->getIRCLine(); @@ -166,33 +218,106 @@ class RecentChange socket_close( $conn ); } } - } - # Marks a certain row as patrolled - function markPatrolled( $rcid ) - { - $fname = 'RecentChange::markPatrolled'; + # E-mail notifications + global $wgUseEnotif, $wgShowUpdatedMarker, $wgUser; + if( $wgUseEnotif || $wgShowUpdatedMarker ) { + // Users + if( $this->mAttribs['rc_user'] ) { + $editor = ($wgUser->getId() == $this->mAttribs['rc_user']) ? + $wgUser : User::newFromID( $this->mAttribs['rc_user'] ); + // Anons + } else { + $editor = ($wgUser->getName() == $this->mAttribs['rc_user_text']) ? + $wgUser : User::newFromName( $this->mAttribs['rc_user_text'], false ); + } + # FIXME: this would be better as an extension hook + $enotif = new EmailNotification(); + $title = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] ); + $enotif->notifyOnPageChange( $editor, $title, + $this->mAttribs['rc_timestamp'], + $this->mAttribs['rc_comment'], + $this->mAttribs['rc_minor'], + $this->mAttribs['rc_last_oldid'] ); + } - $dbw =& wfGetDB( DB_MASTER ); + # Notify extensions + wfRunHooks( 'RecentChange_save', array( &$this ) ); + } - $dbw->update( 'recentchanges', - array( /* SET */ + /** + * Mark a given change as patrolled + * + * @param mixed $change RecentChange or corresponding rc_id + * @return See doMarkPatrolled(), or null if $change is not an existing rc_id + */ + public static function markPatrolled( $change ) { + $change = $change instanceof RecentChange + ? $change + : RecentChange::newFromId($change); + if(!$change instanceof RecentChange) + return null; + return $change->doMarkPatrolled(); + } + + /** + * Mark this RecentChange as patrolled + * + * NOTE: Can also return 'rcpatroldisabled', 'hookaborted' and 'markedaspatrollederror-noautopatrol' as errors + * @return array of permissions errors, see Title::getUserPermissionsErrors() + */ + public function doMarkPatrolled() { + global $wgUser, $wgUseRCPatrol, $wgUseNPPatrol; + $errors = array(); + // If recentchanges patrol is disabled, only new pages + // can be patrolled + if(!$wgUseRCPatrol && (!$wgUseNPPatrol || $this->getAttribute('rc_type') != RC_NEW)) + $errors[] = array('rcpatroldisabled'); + $errors = array_merge($errors, $this->getTitle()->getUserPermissionsErrors('patrol', $wgUser)); + 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')) + $errors[] = array('markedaspatrollederror-noautopatrol'); + if(!empty($errors)) + return $errors; + + // If the change was patrolled already, do nothing + if($this->getAttribute('rc_patrolled')) + return array(); + $this->reallyMarkPatrolled(); + PatrolLog::record($this); + wfRunHooks('MarkPatrolledComplete', + array($this->getAttribute('rc_id'), &$wgUser, false)); + return array(); + } + + /** + * Mark this RecentChange patrolled, without error checking + * @return int Number of affected rows + */ + public function reallyMarkPatrolled() { + $dbw = wfGetDB( DB_MASTER ); + $dbw->update( + 'recentchanges', + array( 'rc_patrolled' => 1 - ), array( /* WHERE */ - 'rc_id' => $rcid - ), $fname + ), + array( + 'rc_id' => $this->getAttribute('rc_id') + ), + __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->isBot(); - } - if ( !$ip ) { $ip = wfGetIP(); if ( !$ip ) { @@ -209,7 +334,7 @@ class RecentChange 'rc_type' => RC_EDIT, 'rc_minor' => $minor ? 1 : 0, 'rc_cur_id' => $title->getArticleID(), - 'rc_user' => $user->getID(), + 'rc_user' => $user->getId(), 'rc_user_text' => $user->getName(), 'rc_comment' => $comment, 'rc_this_oldid' => $newId, @@ -217,9 +342,16 @@ class RecentChange '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_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->mExtra = array( @@ -229,11 +361,15 @@ class RecentChange 'newSize' => $newSize, ); $rc->save(); + return( $rc->mAttribs['rc_id'] ); } - # Makes an entry in the database corresponding to page creation - # Note: the title object must be loaded with the new id using resetArticleID() - /*static*/ function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = "default", + /** + * 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 function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot, $ip='', $size = 0, $newId = 0 ) { if ( !$ip ) { @@ -242,9 +378,6 @@ class RecentChange $ip = ''; } } - if ( $bot == 'default' ) { - $bot = $user->isBot(); - } $rc = new RecentChange; $rc->mAttribs = array( @@ -255,7 +388,7 @@ class RecentChange 'rc_type' => RC_NEW, 'rc_minor' => $minor ? 1 : 0, 'rc_cur_id' => $title->getArticleID(), - 'rc_user' => $user->getID(), + 'rc_user' => $user->getId(), 'rc_user_text' => $user->getName(), 'rc_comment' => $comment, 'rc_this_oldid' => $newId, @@ -265,7 +398,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_deleted' => 0, + 'rc_logid' => 0, + 'rc_log_type' => null, + 'rc_log_action' => '', + 'rc_params' => '' ); $rc->mExtra = array( @@ -275,11 +415,14 @@ class RecentChange 'newSize' => $size ); $rc->save(); + return( $rc->mAttribs['rc_id'] ); } # 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 ) { @@ -296,17 +439,24 @@ class RecentChange 'rc_type' => $overRedir ? RC_MOVE_OVER_REDIRECT : RC_MOVE, 'rc_minor' => 0, 'rc_cur_id' => $oldTitle->getArticleID(), - 'rc_user' => $user->getID(), + 'rc_user' => $user->getId(), 'rc_user_text' => $user->getName(), 'rc_comment' => $comment, 'rc_this_oldid' => 0, 'rc_last_oldid' => 0, - 'rc_bot' => $user->isBot() ? 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, 'rc_new' => 0, # obsolete - 'rc_patrolled' => 1 + '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( @@ -317,18 +467,19 @@ 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='' ) { - RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip='', true ); + 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='' ) + public static function notifyLog( $timestamp, &$title, &$user, $actionComment, $ip='', + $type, $action, $target, $logComment, $params, $newId=0 ) { + global $wgRequest; + if ( !$ip ) { $ip = wfGetIP(); if ( !$ip ) { @@ -340,26 +491,34 @@ 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_user' => $user->getID(), + '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->isBot() ? 1 : 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_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 + 'lastTimestamp' => 0, + 'actionComment' => $actionComment, // the comment appended to the action, passed from LogPage ); $rc->save(); } @@ -372,7 +531,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( @@ -392,14 +551,31 @@ class RecentChange 'rc_moved_to_ns' => 0, 'rc_moved_to_title' => '', 'rc_ip' => '', - 'rc_patrolled' => '1', # we can't support patrolling on the Watchlist - # currently because it uses cur, not recentchanges - 'rc_new' => $row->page_is_new # obsolete + 'rc_id' => $row->rc_id, + 'rc_patrolled' => $row->rc_patrolled, + 'rc_new' => $row->page_is_new, # obsolete + '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 @@ -421,44 +597,98 @@ class RecentChange return $trail; } + function cleanupForIRC( $text ) { + return str_replace(array("\n", "\r"), array("", ""), $text); + } + 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(); - - $bad = array("\n", "\r"); - $empty = array("", ""); + if ( $rc_type == RC_LOG ) { + $titleObj = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL ); + } else { + $titleObj =& $this->getTitle(); + } $title = $titleObj->getPrefixedText(); - $title = str_replace($bad, $empty, $title); - - if ( $rc_new ) { - $url = $titleObj->getFullURL(); + $title = $this->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 ) { + $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->getFullURL("diff=0&oldid=$rc_last_oldid"); + $url = $titleObj->getInternalURL("diff=$rc_this_oldid&oldid=$rc_last_oldid"); } if ( isset( $oldSize ) && isset( $newSize ) ) { $szdiff = $newSize - $oldSize; - if ($szdiff < -500) + if ($szdiff < -500) { $szdiff = "\002$szdiff\002"; - else if ($szdiff >= 0) - $szdiff = "+$szdiff"; - $szdiff = "($szdiff)"; + } elseif ($szdiff >= 0) { + $szdiff = '+' . $szdiff ; + } + $szdiff = '(' . $szdiff . ')' ; } else { $szdiff = ''; } - $comment = str_replace($bad, $empty, $rc_comment); - $user = str_replace($bad, $empty, $rc_user_text); - $flag = ($rc_minor ? "M" : "") . ($rc_new ? "N" : ""); - # see http://www.irssi.org/?page=docs&doc=formats for some colour codes. prefix is \003, + $user = $this->cleanupForIRC( $rc_user_text ); + + if ( $rc_type == RC_LOG ) { + $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_new ? "N" : "") . ($rc_minor ? "M" : "") . ($rc_bot ? "B" : ""); + } + # see http://www.irssi.org/documentation/formats for some colour codes. prefix is \003, # no colour (\003) switches back to the term default - $comment = preg_replace("/\/\* (.*) \*\/(.*)/", "\00315\$1\003 - \00310\$2\003", $comment); $fullString = "\00314[[\00307$title\00314]]\0034 $flag\00310 " . "\00302$url\003 \0035*\003 \00303$user\003 \0035*\003 $szdiff \00310$comment\003\n"; - return $fullString; } + + /** + * Returns the change size (HTML). + * The lengths can be given optionally. + */ + 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 ) { + return ''; + } + + $szdiff = $new - $old; + $formatedSize = wfMsgExt( 'rc-change-size', array( 'parsemag', 'escape'), + $wgLang->formatNum($szdiff) ); + + if( $szdiff < $wgRCChangedSizeThreshold ) { + return '(' . $formatedSize . ')'; + } elseif( $szdiff === 0 ) { + return '(' . $formatedSize . ')'; + } elseif( $szdiff > 0 ) { + return '(+' . $formatedSize . ')'; + } else { + return '(' . $formatedSize . ')'; + } + } } -?>