initialize array before preg_match*

[lhc/web/wiklou.git] / includes / RecentChange.php

diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index 2c66012..2f03675 100644 (file)
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -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'];
@@ -137,22 +143,23 @@ class RecentChange
                        # been purged, it just locks up the indexes needlessly.
                        global $wgRCMaxAge;
                        $age = time() - wfTimestamp( TS_UNIX, $lastTime );
-#                      if( $age < $wgRCMaxAge ) {
-#                              # 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
-#                              );
-#                      }
+                       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 );
+                       #$dbw->update( 'recentchanges', array( 'rc_cur_time' => $now ),
+                       #       array( 'rc_cur_id' => $curId ), $fname );
                }
 
                # Notify external application via UDP
@@ -192,8 +199,10 @@ class RecentChange
                }
 
                if ( !$ip ) {
-                       global $wgIP;
-                       $ip = empty( $wgIP ) ? '' : $wgIP;
+                       $ip = wfGetIP();
+                       if ( !$ip ) {
+                               $ip = '';
+                       }
                }
 
                $rc = new RecentChange;
@@ -233,8 +242,10 @@ class RecentChange
          $ip='', $size = 0, $newId = 0 )
        {
                if ( !$ip ) {
-                       global $wgIP;
-                       $ip = empty( $wgIP ) ? '' : $wgIP;
+                       $ip = wfGetIP();
+                       if ( !$ip ) {
+                               $ip = '';
+                       }
                }
                if ( $bot == 'default' ) {
                        $bot = $user->isBot();
@@ -275,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,
@@ -321,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,
@@ -338,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,
@@ -356,14 +373,15 @@ 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();
        }
 
        # Makes a pseudo-RC entry from a cur row, for watchlists and things
-       function loadFromCurRow( $row, $rc_last_oldid = 0 )
+       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,
@@ -373,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' => (int)$rc_last_oldid,
+                       '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'     => '',
@@ -409,6 +427,8 @@ class RecentChange
        }
 
        function getIRCLine() {
+               global $wgUseRCPatrol;
+
                extract($this->mAttribs);
                extract($this->mExtra);
 
@@ -419,8 +439,12 @@ class RecentChange
                $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");
                }