Removing leecruft. No, you sure as hell couldn't defer it.

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

diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index bc3d250..cad79c7 100644 (file)
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -4,16 +4,6 @@
  * @package MediaWiki
  */
 
-/**
- * Various globals
- */
-define( 'RC_EDIT', 0);
-define( 'RC_NEW', 1);
-define( 'RC_MOVE', 2);
-define( 'RC_LOG', 3);
-define( 'RC_MOVE_OVER_REDIRECT', 4);
-
-
 /**
  * Utility class for creating new RC entries
  * mAttribs:
@@ -53,6 +43,7 @@ class RecentChange
 {
        var $mAttribs = array(), $mExtra = array();
        var $mTitle = false, $mMovedToTitle = false;
+       var $numberofWatchingusers = 0 ; # Dummy to prevent error message in SpecialRecentchangeslinked
 
        # Factory methods
 
@@ -132,20 +123,22 @@ class RecentChange
 
                # 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
@@ -171,6 +164,21 @@ class RecentChange
                                socket_close( $conn );
                        }
                }
+
+               // E-mail notifications
+               global $wgUseEnotif;
+               if( $wgUseEnotif ) {
+                       # this would be better as an extension hook
+                       include_once( "UserMailer.php" );
+                       $enotif = new EmailNotification();
+                       $title = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
+                       $enotif->notifyOnPageChange( $title,
+                               $this->mAttribs['rc_timestamp'],
+                               $this->mAttribs['rc_comment'],
+                               $this->mAttribs['rc_minor'],
+                               $this->mAttribs['rc_last_oldid'] );
+               }
+
        }
 
        # Marks a certain row as patrolled
@@ -327,7 +335,7 @@ class RecentChange
        }
 
        /* static */ function notifyMoveOverRedirect( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='' ) {
-               RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip='', true );
+               RecentChange::notifyMove( $timestamp, $oldTitle, $newTitle, $user, $comment, $ip, true );
        }
 
        # A log entry is different to an edit in that previous revisions are
@@ -439,7 +447,9 @@ 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");
@@ -449,11 +459,12 @@ class RecentChange
 
                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 = '';
                }