Fix for compatibility with short_open_tag = Off

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

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index cadf1f9..77fa455 100644 (file)
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -1,15 +1,16 @@
-<?
-global $IP;
-include_once( "$IP/SpecialRecentchanges.php" );
+<?php
+include_once( "SpecialRecentchanges.php" );
+include_once( "WatchedItem.php" );
 
 function wfSpecialWatchlist()
 {
-       global $wgUser, $wgOut, $wgLang, $wgTitle;
+       global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc;
+       global $wgUseWatchlistCache, $wgWLCacheTimeout, $wgDBname;
        global $days, $limit, $target; # From query string
        $fname = "wfSpecialWatchlist";
 
        $wgOut->setPagetitle( wfMsg( "watchlist" ) );
-       $sub = str_replace( "$1", $wgUser->getName(), wfMsg( "watchlistsub" ) );
+       $sub = wfMsg( "watchlistsub", $wgUser->getName() );
        $wgOut->setSubtitle( $sub );
        $wgOut->setRobotpolicy( "noindex,nofollow" );
 
@@ -25,11 +26,8 @@ function wfSpecialWatchlist()
                foreach($id as $one) {
                        $t = Title::newFromURL( $one );
                        if($t->getDBkey() != "") {
-                               $sql = "DELETE FROM watchlist WHERE wl_user=$uid AND " .
-                                       "wl_namespace=" . $t->getNamespace() . " AND " .
-                                       "wl_title='" . wfStrencode( $t->getDBkey() ) . "'";
-                               $res = wfQuery( $sql );
-                               if($res === FALSE) {
+                               $wl = WatchedItem::fromUserTitle( $wgUser, $t );
+                               if( $wl->removeWatch() === false ) {
                                        $wgOut->addHTML( "<br />\n" . wfMsg( "couldntremove", htmlspecialchars($one) ) );
                                } else {
                                        $wgOut->addHTML( " (" . htmlspecialchars($one) . ")" );
@@ -41,8 +39,19 @@ function wfSpecialWatchlist()
                $wgOut->addHTML( "done.\n<p>" );
        }
 
+       if ( $wgUseWatchlistCache ) {
+               $memckey = "$wgDBname:watchlist:id:" . $wgUser->getId();
+               $cache_s = @$wgMemc->get( $memckey );
+               if( $cache_s ){
+                       $wgOut->addHTML( wfMsg("wlsaved") );
+                       $wgOut->addHTML( $cache_s );
+                       return;
+               }
+       }
+
+
        $sql = "SELECT COUNT(*) AS n FROM watchlist WHERE wl_user=$uid";
-       $res = wfQuery( $sql );
+       $res = wfQuery( $sql, DB_READ );
        $s = wfFetchObject( $res );
        $nitems = $s->n;
        
@@ -52,12 +61,12 @@ function wfSpecialWatchlist()
        }
 
        if ( ! isset( $days ) ) {
-               $big = 250;
+               $big = 1000;
                if($nitems > $big) {
                        # Set default cutoff shorter
-                       $days = (1.0 / 24.0); # 1 hour...
+                       $days = (12.0 / 24.0); # 12 hours...
                } else {
-                       $days = 0; # no time cutoff for shortlisters
+                       $days = 3; # longer cutoff for shortlisters
                }
        } else {
                $days = floatval($days);
@@ -72,7 +81,7 @@ function wfSpecialWatchlist()
                  ( $cutoff = wfUnix2Timestamp( time() - intval( $days * 86400 ) ) )
                  . "'";
                $sql = "SELECT COUNT(*) AS n FROM cur WHERE cur_timestamp>'$cutoff'";
-               $res = wfQuery( $sql );
+               $res = wfQuery( $sql, DB_READ );
                $s = wfFetchObject( $res );
                $npages = $s->n;
        }
@@ -86,7 +95,7 @@ function wfSpecialWatchlist()
                        "' method='post'>\n" .
                        "<ul>\n" );
                $sql = "SELECT wl_namespace,wl_title FROM watchlist WHERE wl_user=$uid";
-               $res = wfQuery( $sql );
+               $res = wfQuery( $sql, DB_READ );
                global $wgUser, $wgLang;
                $sk = $wgUser->getSkin();
                while( $s = wfFetchObject( $res ) ) {
@@ -126,7 +135,7 @@ function wfSpecialWatchlist()
         
 
        $sql = "SELECT
-  cur_namespace,cur_title,cur_comment,
+  cur_namespace,cur_title,cur_comment, cur_id,
   cur_user,cur_user_text,cur_timestamp,cur_minor_edit,cur_is_new
   FROM watchlist,cur USE INDEX ($x)
   WHERE wl_user=$uid
@@ -136,7 +145,7 @@ function wfSpecialWatchlist()
   ORDER BY cur_timestamp DESC";
 
 
-       $res = wfQuery( $sql, $fname );
+       $res = wfQuery( $sql, DB_READ, $fname );
 
        if($days >= 1)
                $note = wfMsg( "rcnote", $limit, $days );
@@ -157,22 +166,18 @@ function wfSpecialWatchlist()
        $s = $sk->beginRecentChangesList();
 
        while ( $obj = wfFetchObject( $res ) ) {
-               $ts = $obj->cur_timestamp;
-               $u = $obj->cur_user;
-               $ut = $obj->cur_user_text;
-               $ns = $obj->cur_namespace;
-               $ttl = $obj->cur_title;
-               $com = $obj->cur_comment;
-               $me = ( $obj->cur_minor_edit > 0 );
-               $new = ( $obj->cur_is_new  > 0 );
-               $watched = true;
-
-               $s .= $sk->recentChangesLine( $ts, $u, $ut, $ns, $ttl, $com, $me, $new, $watched );
+               # Make fake RC entry
+               $rc = RecentChange::newFromCurRow( $obj );
+               $s .= $sk->recentChangesLine( $rc, true );
        }
        $s .= $sk->endRecentChangesList();
 
        wfFreeResult( $res );
        $wgOut->addHTML( $s );
+
+       if ( $wgUseWatchlistCache ) {
+               $wgMemc->set( $memckey, $s, $wgWLCacheTimeout);
+       }
 }
 
 
@@ -208,12 +213,10 @@ function wlCutoffLinks( $days, $limit, $page = "Watchlist" )
        foreach( $days as $d ) {
                $days[$i++] = wlDaysLink( $d, $page );
        }
-       return
-               wfMsg ("wlshowlast") .
-               implode(" | ", $hours) . wfMsg("wlhours") .
-               implode(" | ", $days) . wfMsg("wldays") .
-               wlDaysLink( 0, $page );
-#      $note = wfMsg( "rclinks", $cl, $dl, $mlink );
+       return wfMsg ("wlshowlast",
+               implode(" | ", $hours),
+               implode(" | ", $days),
+               wlDaysLink( 0, $page ) );
 }
 
 ?>