X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRecentChange.php;h=69cbb17c9fa746a4ffd1a8664c5587ba13912de0;hb=22c392d03c1cfb2ae294cc67c481382995613f95;hp=f64191dc76657b29dfd36f8bb155618d646a93c0;hpb=798270581d38271fa87b2744fa157f77f2d2db80;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/RecentChange.php b/includes/RecentChange.php index f64191dc76..69cbb17c9f 100644 --- a/includes/RecentChange.php +++ b/includes/RecentChange.php @@ -16,7 +16,7 @@ define( 'RC_MOVE_OVER_REDIRECT', 4); /** * Utility class for creating new RC entries - * mAttributes: + * 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 @@ -24,22 +24,24 @@ define( 'RC_MOVE_OVER_REDIRECT', 4); * 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 id of associated cur entry + * 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 old_id associated with this entry (or zero) - * rc_last_oldid old_id associated with the entry before this one (or zero) + * 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 - * + * * 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() - * + * oldSize text size before the change + * newSize text size after the change + * * temporary: not stored in the database * notificationtimestamp * numberofWatchingusers @@ -61,10 +63,10 @@ class RecentChange return $rc; } - /* static */ function newFromCurRow( $row ) + /* static */ function newFromCurRow( $row, $rc_this_oldid = 0 ) { $rc = new RecentChange; - $rc->loadFromCurRow( $row ); + $rc->loadFromCurRow( $row, $rc_this_oldid ); $rc->notificationtimestamp = false; $rc->numberofWatchingusers = false; return $rc; @@ -102,7 +104,7 @@ class RecentChange # Writes the data in this object to the database function save() { - global $wgUseRCQueue, $wgRCQueueID, $wgLocalInterwiki, $wgPutIPinRC; + global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPPort, $wgRC2UDPPrefix; $fname = 'RecentChange::save'; $dbw =& wfGetDB( DB_MASTER ); @@ -131,29 +133,36 @@ class RecentChange $now = $this->mAttribs['rc_timestamp']; $curId = $this->mAttribs['rc_cur_id']; - # Update rc_this_oldid for the entries which were current - $dbw->update( 'recentchanges', - array( /* SET */ - 'rc_this_oldid' => $oldid - ), array( /* WHERE */ - 'rc_namespace' => $ns, - 'rc_title' => $title, - 'rc_timestamp' => $dbw->timestamp($lastTime) - ), $fname - ); + # 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 + # Update rc_this_oldid for the entries which were current + #$dbw->update( 'recentchanges', + # array( /* SET */ + # 'rc_this_oldid' => $oldid + # ), array( /* WHERE */ + # 'rc_namespace' => $ns, + # 'rc_title' => $title, + # 'rc_timestamp' => $dbw->timestamp( $lastTime ) + # ), $fname + #); + } # Update rc_cur_time $dbw->update( 'recentchanges', array( 'rc_cur_time' => $now ), array( 'rc_cur_id' => $curId ), $fname ); } - # Notify external application - if ( $wgUseRCQueue ) { - $queue = msg_get_queue( $wgRCQueueID ); - if (!msg_send( $queue, array_merge( $this->mAttribs, 1, $this->mExtra ), - true, false, $error )) - { - wfDebug( "Error sending message to RC queue, code $error\n" ); + # Notify external application via UDP + if ( $wgRC2UDPAddress ) { + $conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP ); + if ( $conn ) { + $line = $wgRC2UDPPrefix . $this->getIRCLine(); + socket_sendto( $conn, $line, strlen($line), 0, $wgRC2UDPAddress, $wgRC2UDPPort ); + socket_close( $conn ); } } } @@ -176,7 +185,8 @@ class RecentChange # Makes an entry in the database corresponding to an edit /*static*/ function notifyEdit( $timestamp, &$title, $minor, &$user, $comment, - $oldId, $lastTimestamp, $bot = "default", $ip = '' ) + $oldId, $lastTimestamp, $bot = "default", $ip = '', $oldSize = 0, $newSize = 0, + $newId = 0) { if ( $bot == 'default ' ) { $bot = $user->isBot(); @@ -199,7 +209,7 @@ class RecentChange 'rc_user' => $user->getID(), 'rc_user_text' => $user->getName(), 'rc_comment' => $comment, - 'rc_this_oldid' => 0, + 'rc_this_oldid' => $newId, 'rc_last_oldid' => $oldId, 'rc_bot' => $bot ? 1 : 0, 'rc_moved_to_ns' => 0, @@ -211,14 +221,17 @@ class RecentChange $rc->mExtra = array( 'prefixedDBkey' => $title->getPrefixedDBkey(), - 'lastTimestamp' => $lastTimestamp + 'lastTimestamp' => $lastTimestamp, + 'oldSize' => $oldSize, + 'newSize' => $newSize, ); $rc->save(); } # 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", $ip='' ) + /*static*/ function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = "default", + $ip='', $size = 0, $newId = 0 ) { if ( !$ip ) { global $wgIP; @@ -240,7 +253,7 @@ class RecentChange 'rc_user' => $user->getID(), 'rc_user_text' => $user->getName(), 'rc_comment' => $comment, - 'rc_this_oldid' => 0, + 'rc_this_oldid' => $newId, 'rc_last_oldid' => 0, 'rc_bot' => $bot ? 1 : 0, 'rc_moved_to_ns' => 0, @@ -252,7 +265,9 @@ class RecentChange $rc->mExtra = array( 'prefixedDBkey' => $title->getPrefixedDBkey(), - 'lastTimestamp' => 0 + 'lastTimestamp' => 0, + 'oldSize' => 0, + 'newSize' => $size ); $rc->save(); } @@ -349,25 +364,25 @@ class RecentChange function loadFromCurRow( $row ) { $this->mAttribs = array( - 'rc_timestamp' => $row->cur_timestamp, - 'rc_cur_time' => $row->cur_timestamp, - 'rc_user' => $row->cur_user, - 'rc_user_text' => $row->cur_user_text, - 'rc_namespace' => $row->cur_namespace, - 'rc_title' => $row->cur_title, - 'rc_comment' => $row->cur_comment, - 'rc_minor' => !!$row->cur_minor_edit, - 'rc_type' => $row->cur_is_new ? RC_NEW : RC_EDIT, - 'rc_cur_id' => $row->cur_id, - 'rc_this_oldid' => 0, - 'rc_last_oldid' => 0, + 'rc_timestamp' => $row->rev_timestamp, + 'rc_cur_time' => $row->rev_timestamp, + 'rc_user' => $row->rev_user, + 'rc_user_text' => $row->rev_user_text, + 'rc_namespace' => $row->page_namespace, + 'rc_title' => $row->page_title, + 'rc_comment' => $row->rev_comment, + 'rc_minor' => $row->rev_minor_edit ? 1 : 0, + 'rc_type' => $row->page_is_new ? RC_NEW : RC_EDIT, + 'rc_cur_id' => $row->page_id, + 'rc_this_oldid' => $row->rev_id, + 'rc_last_oldid' => isset($row->rc_last_oldid) ? $row->rc_last_oldid : 0, 'rc_bot' => 0, '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->cur_is_new # obsolete + 'rc_new' => $row->page_is_new # obsolete ); $this->mExtra = array(); @@ -375,7 +390,7 @@ class RecentChange /** - * Gets the end part of the diff URL assoicated with this object + * Gets the end part of the diff URL associated with this object * Blank if no diff link should be displayed */ function diffLinkTrail( $forceCur ) @@ -393,5 +408,45 @@ class RecentChange } return $trail; } + + function getIRCLine() { + extract($this->mAttribs); + extract($this->mExtra); + + $titleObj =& $this->getTitle(); + + $bad = array("\n", "\r"); + $empty = array("", ""); + $title = $titleObj->getPrefixedText(); + $title = str_replace($bad, $empty, $title); + + if ( $rc_new ) { + $url = $titleObj->getFullURL(); + } else { + $url = $titleObj->getFullURL("diff=0&oldid=$rc_last_oldid"); + } + + if ( isset( $oldSize ) && isset( $newSize ) ) { + $szdiff = $newSize - $oldSize; + if ($szdiff < -500) + $szdiff = "\002$szdiff\002"; + else if ($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, + # 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; + } } ?>