htaccessing some directories for dev using cvs tree as www tree ;)

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

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index 23a55af..c98cd5f 100644 (file)
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -1,10 +1,11 @@
-<?
+<?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";
 
@@ -13,6 +14,8 @@ function wfSpecialWatchlist()
        $wgOut->setSubtitle( $sub );
        $wgOut->setRobotpolicy( "noindex,nofollow" );
 
+       $specialTitle = Title::makeTitle( NS_SPECIAL, "Watchlist" );
+       
        $uid = $wgUser->getID();
        if( $uid == 0 ) {
                $wgOut->addHTML( wfMsg( "nowatchlist" ) );
@@ -38,6 +41,17 @@ 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, DB_READ );
        $s = wfFetchObject( $res );
@@ -54,7 +68,7 @@ function wfSpecialWatchlist()
                        # Set default cutoff shorter
                        $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);
@@ -75,11 +89,11 @@ function wfSpecialWatchlist()
        }
        
        if(isset($_REQUEST['magic'])) {
-               $wgOut->addHTML( wfMsg( "watchlistcontains", $nitems ) .
+               $wgOut->addHTML( wfMsg( "watchlistcontains", $wgLang->formatNum( $nitems ) ) .
                        "<p>" . wfMsg( "watcheditlist" ) . "</p>\n" );
                
                $wgOut->addHTML( "<form action='" .
-                       wfLocalUrl( $wgLang->specialPage( "Watchlist" ), "action=submit" ) .
+                       $specialTitle->escapeLocalUrl( "action=submit" ) .
                        "' method='post'>\n" .
                        "<ul>\n" );
                $sql = "SELECT wl_namespace,wl_title FROM watchlist WHERE wl_user=$uid";
@@ -89,13 +103,13 @@ function wfSpecialWatchlist()
                while( $s = wfFetchObject( $res ) ) {
                        $t = Title::makeTitle( $s->wl_namespace, $s->wl_title );
                        $t = $t->getPrefixedText();
-                       $wgOut->addHTML( "<li><input type='checkbox' name='id[]' value=\"" . htmlspecialchars($t) . "\">" .
+                       $wgOut->addHTML( "<li><input type='checkbox' name='id[]' value=\"" . htmlspecialchars($t) . "\" />" .
                                $sk->makeKnownLink( $t, $t ) .
                                "</li>\n" );
                }
                $wgOut->addHTML( "</ul>\n" .
                        "<input type='submit' name='remove' value='" .
-                       wfMsg( "removechecked" ) . "'>\n" .
+                       wfMsg( "removechecked" ) . "' />\n" .
                        "</form>\n" );
                
                return;
@@ -118,12 +132,14 @@ function wfSpecialWatchlist()
                $z = "(wl_namespace=cur_namespace OR wl_namespace+1=cur_namespace)";
        }
 
-       $wgOut->addHTML( "<i>" . wfMsg( "watchdetails", $nitems, $npages, $y,
-               wfLocalUrl( $wgLang->specialPage("Watchlist"),"magic=yes" ) ) . "</i><br>\n" );
+       
+       $wgOut->addHTML( "<i>" . wfMsg( "watchdetails",
+               $wgLang->formatNum( $nitems ), $wgLang->formatNum( $npages ), $y,
+               $specialTitle->escapeLocalUrl( "magic=yes" ) ) . "</i><br />\n" );
         
 
        $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,12 +152,12 @@ function wfSpecialWatchlist()
        $res = wfQuery( $sql, DB_READ, $fname );
 
        if($days >= 1)
-               $note = wfMsg( "rcnote", $limit, $days );
+               $note = wfMsg( "rcnote", $wgLang->formatNum( $limit ), $wgLang->formatNum( $days ) );
        elseif($days > 0)
-               $note = wfMsg( "wlnote", $limit, round($days*24) );
+               $note = wfMsg( "wlnote", $wgLang->formatNum( $limit ), $wgLang->formatNum( round($days*24) ) );
        else
                $note = "";
-       $wgOut->addHTML( "\n<hr>\n{$note}\n<br>" );
+       $wgOut->addHTML( "\n<hr />\n{$note}\n<br />" );
        $note = wlCutoffLinks( $days, $limit );
        $wgOut->addHTML( "{$note}\n" );
 
@@ -152,24 +168,21 @@ function wfSpecialWatchlist()
 
        $sk = $wgUser->getSkin();
        $s = $sk->beginRecentChangesList();
-
+       $counter = 1;
        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 );
+               $rc->counter = $counter++;
+               $s .= $sk->recentChangesLine( $rc, true );
        }
        $s .= $sk->endRecentChangesList();
 
        wfFreeResult( $res );
        $wgOut->addHTML( $s );
+
+       if ( $wgUseWatchlistCache ) {
+               $wgMemc->set( $memckey, $s, $wgWLCacheTimeout);
+       }
 }
 
 
@@ -178,7 +191,8 @@ function wlHoursLink( $h, $page ) {
        $sk = $wgUser->getSkin();
        $s = $sk->makeKnownLink(
          $wgLang->specialPage( $page ),
-         $h, "days=" . ($h / 24.0) );
+         $wgLang->formatNum( $h ),
+         "days=" . ($h / 24.0) );
        return $s;
 }
 
@@ -188,7 +202,7 @@ function wlDaysLink( $d, $page ) {
        $sk = $wgUser->getSkin();
        $s = $sk->makeKnownLink(
          $wgLang->specialPage( $page ),
-         ($d ? $d : wfMsg( "all" ) ), "days=$d" );
+         ($d ? $wgLang->formatNum( $d ) : wfMsg( "all" ) ), "days=$d" );
        return $s;
 }