typo

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

diff --git a/includes/SpecialImagelist.php b/includes/SpecialImagelist.php
index 459b362..3702511 100644 (file)
--- a/includes/SpecialImagelist.php
+++ b/includes/SpecialImagelist.php
@@ -1,12 +1,11 @@
-<?
+<?php
 
 function wfSpecialImagelist()
 {
-       global $wgUser, $wgOut, $wgLang, $sort, $limit;
-       global $wpIlMatch, $wpIlSubmit;
-
-       $fields = array( 'wpIlMatch' );
-       wfCleanFormFields( $fields );
+       global $wgUser, $wgOut, $wgLang, $wgRequest;
+       
+       $sort = $wgRequest->getVal( 'sort' );
+       $wpIlMatch = $wgRequest->getText( 'wpIlMatch' );
 
        $sql = "SELECT img_size,img_name,img_user,img_user_text," .
          "img_description,img_timestamp FROM image";
@@ -32,31 +31,29 @@ function wfSpecialImagelist()
                $sql .= " ORDER BY img_timestamp DESC";
                $st = $bydate;
        }
-       if ( ! isset( $limit ) ) { $limit = 50; }
+       list( $limit, $offset ) = wfCheckLimits( 50 );
        if ( 0 == $limit ) {
                $lt = wfMsg( "all" );
        } else {
-               $lt = "${limit}";
+               $lt = $wgLang->formatNum( "${limit}" );
                $sql .= " LIMIT {$limit}";
        }
-       $wgOut->addHTML( "<p>" . wfMsg( "imglegend" ) . "\n" );
+       $wgOut->addHTML( "<p>" . wfMsg( "imglegend" ) . "</p>\n" );
 
-       $text = str_replace( "$1", "<strong>{$lt}</strong>",
-         wfMsg( "imagelisttext" ) );
-       $text = str_replace( "$2", "<strong>{$st}</strong>", $text );
-       $wgOut->addHTML( "<p>{$text}\n<p>" );
+       $text = wfMsg( "imagelisttext",
+               "<strong>{$lt}</strong>", "<strong>{$st}</strong>" );
+       $wgOut->addHTML( "<p>{$text}\n</p>" );
 
        $sk = $wgUser->getSkin();
        $cap = wfMsg( "ilshowmatch" );
        $sub = wfMsg( "ilsubmit" );
-       $action = wfLocalUrlE( $wgLang->specialPage( "Imagelist" ),
-         "sort=byname&limit={$limit}" );
+       $titleObj = Title::makeTitle( NS_SPECIAL, "Imagelist" );
+       $action = $titleObj->escapeLocalURL(  "sort=byname&limit={$limit}" );
 
        $wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
          "{$action}\">" .
-         "{$cap}: <input type=text size=8 name=\"wpIlMatch\" value=\"\"> " .
-         "<input type=submit name=\"wpIlSubmit\" value=\"{$sub}\"></form>" );
-
+         "{$cap}: <input type='text' size='8' name=\"wpIlMatch\" value=\"\" /> " .
+         "<input type='submit' name=\"wpIlSubmit\" value=\"{$sub}\" /></form>" );
        $nums = array( 50, 100, 250, 500 );
        $here = $wgLang->specialPage( "Imagelist" );
 
@@ -66,12 +63,11 @@ function wfSpecialImagelist()
                if ( ! $first ) { $fill .= " | "; }
                $first = false;
 
-               $fill .= $sk->makeKnownLink( $here, "{$num}",
+               $fill .= $sk->makeKnownLink( $here, $wgLang->formatNum( $num ),
                  "sort=bysize&limit={$num}" );
        }
-       $text = str_replace( "$1", $fill, wfMsg( "showlast" ) );
-       $text = str_replace( "$2", $bysize, $text );
-       $wgOut->addHTML( "{$text}<br>\n" );
+       $text = wfMsg( "showlast", $fill, $bysize );
+       $wgOut->addHTML( "<p>{$text}<br />\n" );
 
        $fill = "";
        $first = true;
@@ -79,14 +75,13 @@ function wfSpecialImagelist()
                if ( ! $first ) { $fill .= " | "; }
                $first = false;
 
-               $fill .= $sk->makeKnownLink( $here, $num,
+               $fill .= $sk->makeKnownLink( $here, $wgLang->formatNum( $num ),
                  "sort=bydate&limit={$num}" );
        }
-       $text = str_replace( "$1", $fill, wfMsg( "showlast" ) );
-       $text = str_replace( "$2", $bydate, $text );
-       $wgOut->addHTML( "{$text}<br>\n<p>" );
+       $text = wfMsg( "showlast", $fill, $bydate );
+       $wgOut->addHTML( "{$text}</p>\n<p>" );
 
-       $res = wfQuery( $sql, "wfSpecialImagelist" );
+       $res = wfQuery( $sql, DB_READ, "wfSpecialImagelist" );
        while ( $s = wfFetchObject( $res ) ) {
                $name = $s->img_name;
                $ut = $s->img_user_text;
@@ -94,10 +89,10 @@ function wfSpecialImagelist()
                else { $ul = $sk->makeLink( $wgLang->getNsText(
                  Namespace::getUser() ) . ":{$ut}", $ut ); }
 
-               $ilink = "<a href=\"" . wfImageUrl( $name ) .
+               $ilink = "<a href=\"" . Image::wfImageUrl( $name ) .
                  "\">{$name}</a>";
 
-               $nb = str_replace( "$1", $s->img_size, wfMsg( "nbytes" ) );
+               $nb = wfMsg( "nbytes", $wgLang->formatNum( $s->img_size ) );
                $l = "(" .
                  $sk->makeKnownLink( $wgLang->getNsText(
                  Namespace::getImage() ) . ":{$name}", wfMsg( "imgdesc" ) ) .
@@ -107,8 +102,9 @@ function wfSpecialImagelist()
                if ( "" != $s->img_description ) {
                        $l .= " <em>({$s->img_description})</em>";
                }
-               $wgOut->addHTML( "{$l}<br>\n" );
+               $wgOut->addHTML( "{$l}<br />\n" );
        }
+       $wgOut->addHTML( "</p>" );
        wfFreeResult( $res );
 }