Standardised file description headers; second part

[lhc/web/wiklou.git] / includes / specials / SpecialNewimages.php

diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index 3922712..898f2e2 100644 (file)
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -1,10 +1,29 @@
 <?php
 /**
+ * Implements Special:Newimages
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup SpecialPage
- * FIXME: this code is crap, should use Pager and Database::select().
  */
 
+/**
+ * @todo FIXME: this code is crap, should use Pager and Database::select().
+ */
 function wfSpecialNewimages( $par, $specialPage ) {
        global $wgUser, $wgOut, $wgLang, $wgRequest, $wgMiserMode;
 
@@ -49,7 +68,6 @@ function wfSpecialNewimages( $par, $specialPage ) {
        } else {
                $ts = false;
        }
-       $dbr->freeResult( $res );
        $sql = '';
 
        # If we were clever, we'd use this to cache.
@@ -65,13 +83,12 @@ function wfSpecialNewimages( $par, $specialPage ) {
        }
 
        $where = array();
-       $searchpar = '';
+       $searchpar = array();
        if ( $wpIlMatch != '' && !$wgMiserMode) {
-               $nt = Title::newFromUrl( $wpIlMatch );
+               $nt = Title::newFromURL( $wpIlMatch );
                if( $nt ) {
-                       $m = $dbr->escapeLike( strtolower( $nt->getDBkey() ) );
-                       $where[] = "LOWER(img_name) LIKE '%{$m}%'";
-                       $searchpar = '&wpIlMatch=' . urlencode( $wpIlMatch );
+                       $where[] = 'LOWER(img_name) ' .  $dbr->buildLike( $dbr->anyString(), strtolower( $nt->getDBkey() ), $dbr->anyString() );
+                       $searchpar['wpIlMatch'] = $wpIlMatch;
                }
        }
 
@@ -108,7 +125,6 @@ function wfSpecialNewimages( $par, $specialPage ) {
                        array_push( $images, $s );
                }
        }
-       $dbr->freeResult( $res );
 
        $gallery = new ImageGallery();
        $firstTimestamp = null;
@@ -128,7 +144,7 @@ function wfSpecialNewimages( $par, $specialPage ) {
                $nt = Title::newFromText( $name, NS_FILE );
                $ul = $sk->link( Title::makeTitle( NS_USER, $ut ), $ut );
 
-               $gallery->add( $nt, "$ul<br />\n<i>".$wgLang->timeanddate( $s->img_timestamp, true )."</i><br />\n" );
+               $gallery->add( $nt, "$ul<br />\n<i>".htmlspecialchars($wgLang->timeanddate( $s->img_timestamp, true ))."</i><br />\n" );
 
                $timestamp = wfTimestamp( TS_MW, $s->img_timestamp );
                if( empty( $firstTimestamp ) ) {
@@ -163,29 +179,72 @@ function wfSpecialNewimages( $par, $specialPage ) {
 
        # If we change bot visibility, this needs to be carried along.
        if( !$hidebots ) {
-               $botpar = '&hidebots=0';
+               $botpar = array( 'hidebots' => 0 );
        } else {
-               $botpar = '';
+               $botpar = array();
        }
        $now = wfTimestampNow();
        $d = $wgLang->date( $now, true );
        $t = $wgLang->time( $now, true );
-       $dateLink = $sk->makeKnownLinkObj( $titleObj, wfMsgHtml( 'sp-newimages-showfrom', $d, $t ), 
-               'from='.$now.$botpar.$searchpar );
+       $query = array_merge(
+               array( 'from' => $now ),
+               $botpar,
+               $searchpar
+       );
+
+       $dateLink = $sk->linkKnown(
+               $titleObj,
+               htmlspecialchars( wfMsg( 'sp-newimages-showfrom', $d, $t ) ),
+               array(),
+               $query
+       );
+
+       $query = array_merge(
+               array( 'hidebots' => ( $hidebots ? 0 : 1 ) ),
+               $searchpar
+       );
 
-       $botLink = $sk->makeKnownLinkObj($titleObj, wfMsgHtml( 'showhidebots', 
-               ($hidebots ? wfMsgHtml('show') : wfMsgHtml('hide'))),'hidebots='.($hidebots ? '0' : '1').$searchpar);
+       $showhide = $hidebots ? wfMsg( 'show' ) : wfMsg( 'hide' );
 
+       $botLink = $sk->linkKnown(
+               $titleObj,
+               htmlspecialchars( wfMsg( 'showhidebots', $showhide ) ),
+               array(),
+               $query
+       );
 
        $opts = array( 'parsemag', 'escapenoentities' );
        $prevLink = wfMsgExt( 'pager-newer-n', $opts, $wgLang->formatNum( $limit ) );
        if( $firstTimestamp && $firstTimestamp != $latestTimestamp ) {
-               $prevLink = $sk->makeKnownLinkObj( $titleObj, $prevLink, 'from=' . $firstTimestamp . $botpar . $searchpar );
+               $query = array_merge(
+                       array( 'from' => $firstTimestamp ),
+                       $botpar,
+                       $searchpar
+               );
+
+               $prevLink = $sk->linkKnown(
+                       $titleObj,
+                       $prevLink,
+                       array(),
+                       $query
+               );
        }
 
        $nextLink = wfMsgExt( 'pager-older-n', $opts, $wgLang->formatNum( $limit ) );
-       if( $shownImages > $limit && $lastTimestamp ) {
-               $nextLink = $sk->makeKnownLinkObj( $titleObj, $nextLink, 'until=' . $lastTimestamp.$botpar.$searchpar );
+       if( $invertSort || ( $shownImages > $limit && $lastTimestamp ) ) {
+               $query = array_merge(
+                       array( 'until' => ( $lastTimestamp ? $lastTimestamp : "" ) ),
+                       $botpar,
+                       $searchpar
+               );
+
+               $nextLink = $sk->linkKnown(
+                       $titleObj,
+                       $nextLink,
+                       array(),
+                       $query
+               );
+
        }
 
        $prevnext = '<p>' . $botLink . ' '. wfMsgHtml( 'viewprevnext', $prevLink, $nextLink, $dateLink ) .'</p>';