X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRecentChange.php;h=2f036750f0cbf3b562c9d2bfc086b79a6348b1ac;hb=a8cc4dc52cb73cea3553b53cd0ff426fe272da28;hp=7e1c90f2ad7c29aa0bcdd12344945f2c59a1da07;hpb=e074e99c8a7deed396d8d2aa56233a1e5ceb8a02;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/RecentChange.php b/includes/RecentChange.php index 7e1c90f2ad..2f036750f0 100644 --- a/includes/RecentChange.php +++ b/includes/RecentChange.php @@ -34,14 +34,14 @@ define( 'RC_MOVE_OVER_REDIRECT', 4); * 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 @@ -63,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; @@ -104,7 +104,7 @@ 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, $wgUseRCPatrol; $fname = 'RecentChange::save'; $dbw =& wfGetDB( DB_MASTER ); @@ -118,12 +118,18 @@ 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_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' ); # Insert new row $dbw->insert( 'recentchanges', $this->mAttribs, $fname ); + if ( $wgUseRCPatrol ) { + # Retrieve the id assigned by the db, but only if we'll use it later + $this->mAttribs['rc_id'] = $dbw->insertId(); + } + # Update old rows, if necessary if ( $this->mAttribs['rc_type'] == RC_EDIT ) { $oldid = $this->mAttribs['rc_last_oldid']; @@ -138,21 +144,22 @@ class RecentChange 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 - ); + #$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 ); + #$dbw->update( 'recentchanges', array( 'rc_cur_time' => $now ), + # array( 'rc_cur_id' => $curId ), $fname ); } # Notify external application via UDP @@ -184,15 +191,18 @@ 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 = '', $oldSize = 0, $newSize = 0 ) + $oldId, $lastTimestamp, $bot = "default", $ip = '', $oldSize = 0, $newSize = 0, + $newId = 0) { if ( $bot == 'default ' ) { $bot = $user->isBot(); } if ( !$ip ) { - global $wgIP; - $ip = empty( $wgIP ) ? '' : $wgIP; + $ip = wfGetIP(); + if ( !$ip ) { + $ip = ''; + } } $rc = new RecentChange; @@ -207,7 +217,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, @@ -228,12 +238,14 @@ 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() - /*static*/ function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = "default", - $ip='', $size = 0 ) + /*static*/ function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = "default", + $ip='', $size = 0, $newId = 0 ) { if ( !$ip ) { - global $wgIP; - $ip = empty( $wgIP ) ? '' : $wgIP; + $ip = wfGetIP(); + if ( !$ip ) { + $ip = ''; + } } if ( $bot == 'default' ) { $bot = $user->isBot(); @@ -251,7 +263,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, @@ -274,9 +286,12 @@ class RecentChange /*static*/ function notifyMove( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='', $overRedir = false ) { if ( !$ip ) { - global $wgIP; - $ip = empty( $wgIP ) ? '' : $wgIP; + $ip = wfGetIP(); + if ( !$ip ) { + $ip = ''; + } } + $rc = new RecentChange; $rc->mAttribs = array( 'rc_timestamp' => $timestamp, @@ -320,9 +335,12 @@ class RecentChange /*static*/ function notifyLog( $timestamp, &$title, &$user, $comment, $ip='' ) { if ( !$ip ) { - global $wgIP; - $ip = empty( $wgIP ) ? '' : $wgIP; + $ip = wfGetIP(); + if ( !$ip ) { + $ip = ''; + } } + $rc = new RecentChange; $rc->mAttribs = array( 'rc_timestamp' => $timestamp, @@ -337,7 +355,7 @@ class RecentChange 'rc_comment' => $comment, 'rc_this_oldid' => 0, 'rc_last_oldid' => 0, - 'rc_bot' => 0, + 'rc_bot' => $user->isBot() ? 1 : 0, 'rc_moved_to_ns' => 0, 'rc_moved_to_title' => '', 'rc_ip' => $ip, @@ -355,6 +373,7 @@ class RecentChange function loadFromRow( $row ) { $this->mAttribs = get_object_vars( $row ); + $this->mAttribs["rc_timestamp"] = wfTimestamp(TS_MW, $this->mAttribs["rc_timestamp"]); $this->mExtra = array(); } @@ -362,7 +381,7 @@ class RecentChange function loadFromCurRow( $row ) { $this->mAttribs = array( - 'rc_timestamp' => $row->rev_timestamp, + 'rc_timestamp' => wfTimestamp(TS_MW, $row->rev_timestamp), 'rc_cur_time' => $row->rev_timestamp, 'rc_user' => $row->rev_user, 'rc_user_text' => $row->rev_user_text, @@ -372,8 +391,8 @@ class RecentChange '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' => (int)$row->rev_id, - 'rc_last_oldid' => 0, + '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' => '', @@ -388,7 +407,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 ) @@ -408,18 +427,24 @@ class RecentChange } function getIRCLine() { + global $wgUseRCPatrol; + extract($this->mAttribs); extract($this->mExtra); $titleObj =& $this->getTitle(); - + $bad = array("\n", "\r"); - $empty = array("", ""); + $empty = array("", ""); $title = $titleObj->getPrefixedText(); $title = str_replace($bad, $empty, $title); - - if ( $rc_new ) { + + if ( $rc_new && $wgUseRCPatrol ) { + $url = $titleObj->getFullURL("rcid=$rc_id"); + } else if ( $rc_new ) { $url = $titleObj->getFullURL(); + } else if ( $wgUseRCPatrol ) { + $url = $titleObj->getFullURL("diff=0&oldid=$rc_last_oldid&rcid=$rc_id"); } else { $url = $titleObj->getFullURL("diff=0&oldid=$rc_last_oldid"); } @@ -438,7 +463,7 @@ class RecentChange $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, + # 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 " .