Squid branch merge. Calls to purge functions in Article.php and special pages.

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

diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index c38bf63..e8b763d 100644 (file)
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -2,8 +2,8 @@
 
 function wfSpecialRecentchanges( $par )
 {
-       global $wgUser, $wgOut, $wgLang, $wgTitle;
-       global $days, $hideminor, $from, $hidebots; # From query string
+       global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc, $wgDBname;
+       global $days, $hideminor, $from, $hidebots, $hideliu; # From query string
        $fname = "wfSpecialRecentchanges";
 
        if( $par ) {
@@ -12,6 +12,7 @@ function wfSpecialRecentchanges( $par )
                if( in_array( "bots", $bits ) ) $hidebots = 0;
                if( in_array( "hideminor", $bits ) ) $hideminor = 1;
                if( in_array( "minor", $bits ) ) $hideminor = 0;
+               if( in_array( "hideliu", $bits) ) $hideliu = 1;
        }
        
        $sql = "SELECT MAX(rc_timestamp) AS lastmod FROM recentchanges";
@@ -40,7 +41,9 @@ function wfSpecialRecentchanges( $par )
        $days = (int)$days;
        list( $limit, $offset ) = wfCheckLimits( 100, "rclimit" );
        $now = wfTimestampNow();
-       $cutoff = wfUnix2Timestamp( time() - ( $days * 86400 ) );
+       $cutoff_unixtime = time() - ( $days * 86400 );
+       $cutoff_unixtime = $cutoff_unixtime - ($cutoff_unixtime % 86400);
+       $cutoff = wfUnix2Timestamp( $cutoff_unixtime );
        if(preg_match('/^[0-9]{14}$/', $from) and $from > $cutoff) {
                $cutoff = $from;
        } else {
@@ -48,29 +51,17 @@ function wfSpecialRecentchanges( $par )
        }
 
        $sk = $wgUser->getSkin();
-
+       $showhide = array( wfMsg( "show" ), wfMsg( "hide" ));
+       
        if ( ! isset( $hideminor ) ) {
                $hideminor = $wgUser->getOption( "hideminor" );
        }
        $hideminor = ($hideminor ? 1 : 0);
        if ( $hideminor ) {
                $hidem = "AND rc_minor=0";
-               $mltitle = wfMsg( "show" );
-               $mlhide = 0;
        } else {
                $hidem = "";
-               $mltitle = wfMsg( "hide" );
-               $mlhide = 1;
        }
-
-       if ( isset( $from ) ) {
-               $mlparams = "from={$from}&hideminor={$mlhide}";
-       } else {
-               $mlparams = "days={$days}&limit={$limit}&hideminor={$mlhide}";
-       }
-
-       $mlink = $sk->makeKnownLink( $wgLang->specialPage( "Recentchanges" ),
-               $mltitle, $mlparams );
        
        if ( !isset( $hidebots ) ) {
                $hidebots = 1;
@@ -78,13 +69,37 @@ function wfSpecialRecentchanges( $par )
        if( $hidebots ) {
                $hidem .= " AND rc_bot=0";
        }
+       $hidebots = ($hidebots ? 1 : 0);
+       
+       if ( !isset( $hideliu ) ) {
+               $hideliu = 0;
+       }
+       if ( $hideliu ) {
+               $hidem .= " AND rc_user=0";
+       }
+       $hideliu = ($hideliu ? 1 : 0);
+       #$hideparams = "hideminor={$hideminor}&hideliu={$hideliu}&hidebots={$hidebots}";
+       $urlparams = array( "hideminor" => $hideminor, "hideliu" => $hideliu, "hidebots" => $hidebots );
+       $hideparams = wfArrayToCGI( $urlparams );
+       
+       $minorLink = $sk->makeKnownLink( $wgLang->specialPage( "Recentchanges" ),
+         $showhide[1-$hideminor], wfArrayToCGI( array( "hideminor" => 1-$hideminor ), $urlparams ) );
+       $botLink = $sk->makeKnownLink( $wgLang->specialPage( "Recentchanges" ),
+         $showhide[1-$hidebots], wfArrayToCGI( array( "hidebots" => 1-$hidebots ), $urlparams ) );
+       $liuLink = $sk->makeKnownLink( $wgLang->specialPage( "Recentchanges" ),
+         $showhide[1-$hideliu], wfArrayToCGI( array( "hideliu" => 1-$hideliu ), $urlparams ) );
 
        $uid = $wgUser->getID();
        $sql2 = "SELECT recentchanges.*" . ($uid ? ",wl_user" : "") . " FROM recentchanges " .
          ($uid ? "LEFT OUTER JOIN watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace & 65534 " : "") .
          "WHERE rc_timestamp > '{$cutoff}' {$hidem} " .
          "ORDER BY rc_timestamp DESC LIMIT {$limit}";
+
        $res = wfQuery( $sql2, DB_READ, $fname );
+       $rows = array();
+       while( $row = wfFetchObject( $res ) ){ 
+               $rows[] = $row; 
+       }
 
        if(isset($from)) {
                $note = wfMsg( "rcnotefrom", $limit,
@@ -94,29 +109,25 @@ function wfSpecialRecentchanges( $par )
        }
        $wgOut->addHTML( "\n<hr>\n{$note}\n<br>" );
 
-       $note = rcDayLimitLinks( $days, $limit, "Recentchanges",  "hideminor={$hideminor}", false, $mlink );
+       $note = rcDayLimitLinks( $days, $limit, "Recentchanges", $hideparams, false, $minorLink, $botLink, $liuLink );
 
        $note .= "<br>\n" . wfMsg( "rclistfrom",
          $sk->makeKnownLink( $wgLang->specialPage( "Recentchanges" ),
-         $wgLang->timeanddate( $now, true ), "hideminor={$hideminor}&from=$now" ) );
+         $wgLang->timeanddate( $now, true ), "{$hideparams}&from=$now" ) );
 
        $wgOut->addHTML( "{$note}\n" );
 
-       $count1 = wfNumRows( $res );
-       $obj1 = wfFetchObject( $res );
-
        $s = $sk->beginRecentChangesList();
-       while ( $limit ) {
-               if ( ( 0 == $count1 ) ) { 
+       foreach( $rows as $obj ){
+               if( $limit == 0) {
                        break; 
                }
-               if ( ! ( $hideminor && $obj1->rc_minor ) ) {
-                       $rc = RecentChange::newFromRow( $obj1 );
-                       $s .= $sk->recentChangesLine( $rc, $obj1->wl_user );
+
+               if ( ! ( $hideminor && $obj->rc_minor ) ) {
+                       $rc = RecentChange::newFromRow( $obj );
+                       $s .= $sk->recentChangesLine( $rc, $obj->wl_user );
                        --$limit;
                }
-               $obj1 = wfFetchObject( $res );
-               --$count1;
        }
        $s .= $sk->endRecentChangesList();
 
@@ -144,7 +155,8 @@ function rcDaysLink( $lim, $d, $page="Recentchanges", $more="" )
        return $s;
 }
 
-function rcDayLimitLinks( $days, $limit, $page="Recentchanges", $more="", $doall = false, $mlink = "" )
+function rcDayLimitLinks( $days, $limit, $page="Recentchanges", $more="", $doall = false, $minorLink = "", 
+       $botLink = "", $liuLink = "" )
 {
        if ($more != "") $more .= "&";
        $cl = rcCountLink( 50, $days, $page, $more ) . " | " .
@@ -158,11 +170,12 @@ function rcDayLimitLinks( $days, $limit, $page="Recentchanges", $more="", $doall
          rcDaysLink( $limit, 14, $page, $more  ) . " | " .
          rcDaysLink( $limit, 30, $page, $more  ) .
          ( $doall ? ( " | " . rcDaysLink( $limit, 0, $page, $more ) ) : "" );
-        $shm = wfMsg( "showhideminor", $mlink );
+       $shm = wfMsg( "showhideminor", $minorLink, $botLink, $liuLink );
        $note = wfMsg( "rclinks", $cl, $dl, $shm );
        return $note;
 }
 
+# Obsolete? Isn't called from anywhere and $mlink isn't defined
 function rcLimitLinks( $page="Recentchanges", $more="", $doall = false )
 {
        if ($more != "") $more .= "&";