X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialRecentchanges.php;h=56e15097f9d3d27129523cc446785990a76d5550;hb=19004a27e89867484b337dc3b9bd293b24028fc8;hp=4470c7622c2b82be663e926bd43c9119a51a232b;hpb=6ae494e9e9e064629324e707855b9f9d4eddc054;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php index 4470c7622c..56e15097f9 100644 --- a/includes/SpecialRecentchanges.php +++ b/includes/SpecialRecentchanges.php @@ -1,130 +1,133 @@ getVal( "feed" ); + $feedFormat = $wgRequest->getVal( 'feed' ); $defaultDays = $wgUser->getOption( 'rcdays' ); - if ( !$defaultDays ) { - $defaultDays = 3; - } - + if ( !$defaultDays ) { $defaultDays = 3; } + $days = $wgRequest->getInt( 'days', $defaultDays ); $hideminor = $wgRequest->getBool( 'hideminor', $wgUser->getOption( 'hideminor' ) ) ? 1 : 0; $from = $wgRequest->getText( 'from' ); $hidebots = $wgRequest->getBool( 'hidebots', true ) ? 1 : 0; $hideliu = $wgRequest->getBool( 'hideliu', false ) ? 1 : 0; - + $hidepatrolled = $wgRequest->getBool( 'hidepatrolled', false ) ? 1 : 0; + + list( $limit, $offset ) = wfCheckLimits( 100, 'rclimit' ); + # Get query parameters from path if( $par ) { $bits = preg_split( '/\s*,\s*/', trim( $par ) ); - if( in_array( "hidebots", $bits ) ) $hidebots = 1; - 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; + if( in_array( 'hidebots', $bits ) ) $hidebots = 1; + 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; + if( in_array( 'hidepatrolled', $bits) ) $hidepatrolled = 1; } - - $sql = "SELECT MAX(rc_timestamp) AS lastmod FROM recentchanges"; - $res = wfQuery( $sql, DB_READ, $fname ); - $s = wfFetchObject( $res ); + + + # Database connection and caching + $dbr =& wfGetDB( DB_SLAVE ); + extract( $dbr->tableNames( 'recentchanges', 'watchlist' ) ); + + $lastmod = $dbr->selectField( 'recentchanges', 'MAX(rc_timestamp)', false, $fname ); # 10 seconds server-side caching max $wgOut->setSquidMaxage( 10 ); - if( $wgOut->checkLastModified( $s->lastmod ) ){ + if( $wgOut->checkLastModified( $lastmod ) ){ # Client cache fresh and headers sent, nothing more to do. return; } + # Output header $rctext = wfMsg( "recentchangestext" ); - - # The next few lines can probably be commented out now that wfMsg can get text from the DB - $sql = "SELECT cur_text FROM cur WHERE cur_namespace=4 AND cur_title='Recentchanges'"; - $res = wfQuery( $sql, DB_READ, $fname ); - if( ( $s = wfFetchObject( $res ) ) and ( $s->cur_text != "" ) ) { - $rctext = $s->cur_text; - } - $wgOut->addWikiText( $rctext ); + - list( $limit, $offset ) = wfCheckLimits( 100, "rclimit" ); $now = wfTimestampNow(); $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; + $cutoff = $dbr->timestamp( $cutoff_unixtime ); + if(preg_match('/^[0-9]{14}$/', $from) and $from > wfTimestamp(TS_MW,$cutoff)) { + $cutoff = $dbr->timestamp($from); } else { unset($from); } $sk = $wgUser->getSkin(); - $showhide = array( wfMsg( "show" ), wfMsg( "hide" )); - - if ( $hideminor ) { - $hidem = "AND rc_minor=0"; - } else { - $hidem = ""; - } - - if( $hidebots ) { - $hidem .= " AND rc_bot=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 ); + + $showhide = array( wfMsg( 'show' ), wfMsg( 'hide' )); + + $hidem = ( $hideminor ) ? 'AND rc_minor=0' : ''; + $hidem .= ( $hidebots ) ? ' AND rc_bot=0' : ''; + $hidem .= ( $hideliu ) ? ' AND rc_user=0' : ''; + $hidem .= ( $hidepatrolled )? ' AND rc_patrolled=0' : ''; + + $urlparams = array( 'hideminor' => $hideminor, 'hideliu' => $hideliu, + 'hidebots' => $hidebots, 'hidepatrolled' => $hidepatrolled); $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 ) ); + + $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 ) ); + $patrLink = $sk->makeKnownLink( $wgLang->specialPage( 'Recentchanges' ), + $showhide[1-$hidepatrolled], wfArrayToCGI( array( 'hidepatrolled' => 1-$hidepatrolled ), $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 " : "") . + $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 ); + $res = $dbr->query( $sql2, DB_SLAVE, $fname ); $rows = array(); - while( $row = wfFetchObject( $res ) ){ - $rows[] = $row; + while( $row = $dbr->fetchObject( $res ) ){ + $rows[] = $row; } + $dbr->freeResult( $res ); if(isset($from)) { - $note = wfMsg( "rcnotefrom", $wgLang->formatNum( $limit ), + $note = wfMsg( 'rcnotefrom', $wgLang->formatNum( $limit ), $wgLang->timeanddate( $from, true ) ); } else { - $note = wfMsg( "rcnote", $wgLang->formatNum( $limit ), $wgLang->formatNum( $days ) ); + $note = wfMsg( 'rcnote', $wgLang->formatNum( $limit ), $wgLang->formatNum( $days ) ); } $wgOut->addHTML( "\n