Got rid of the MagicWord indexing constants (MAG_xxx), replaced them by string indexi...

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

diff --git a/includes/SpecialImagelist.php b/includes/SpecialImagelist.php
index 277ed15..e456abf 100644 (file)
--- a/includes/SpecialImagelist.php
+++ b/includes/SpecialImagelist.php
@@ -9,8 +9,8 @@
  *
  */
 function wfSpecialImagelist() {
-       global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest;
-       
+       global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest, $wgMiserMode;
+
        $sort = $wgRequest->getVal( 'sort' );
        $wpIlMatch = $wgRequest->getText( 'wpIlMatch' );
        $dbr =& wfGetDB( DB_SLAVE );
@@ -18,11 +18,7 @@ function wfSpecialImagelist() {
        $sql = "SELECT img_size,img_name,img_user,img_user_text," .
          "img_description,img_timestamp FROM $image";
 
-       $byname = wfMsg( "byname" );
-       $bydate = wfMsg( "bydate" );
-       $bysize = wfMsg( "bysize" );
-
-       if ( !empty( $wpIlMatch ) ) {
+       if ( !$wgMiserMode && !empty( $wpIlMatch ) ) {
                $nt = Title::newFromUrl( $wpIlMatch );
                if($nt ) {
                        $m = $dbr->strencode( strtolower( $nt->getDBkey() ) );
@@ -31,81 +27,65 @@ function wfSpecialImagelist() {
                        $sql .= " WHERE LCASE(img_name) LIKE '%{$m}%'";
                }
        }
+
        if ( "bysize" == $sort ) {
                $sql .= " ORDER BY img_size DESC";
-               $st = $bysize;
        } else if ( "byname" == $sort ) {
                $sql .= " ORDER BY img_name";
-               $st = $byname;
        } else {
                $sort = "bydate";
                $sql .= " ORDER BY img_timestamp DESC";
-               $st = $bydate;
        }
+
        list( $limit, $offset ) = wfCheckLimits( 50 );
-       if ( 0 == $limit ) {
-               $lt = wfMsg( 'imagelistall' );
-       } else {
-               $lt = $wgLang->formatNum( "${limit}" );
-               $sql .= " LIMIT {$limit}";
-       }
-       $wgOut->addHTML( "<p>" . wfMsg( "imglegend" ) . "</p>\n" );
+       $lt = $wgLang->formatNum( "${limit}" );
+       $sql .= " LIMIT {$limit}";
 
-       $text = wfMsg( "imagelisttext",
-               "<strong>{$lt}</strong>", "<strong>{$st}</strong>" );
-       $wgOut->addHTML( "<p>{$text}\n</p>" );
+       $wgOut->addWikiText( wfMsg( 'imglegend' ) );
+       $wgOut->addHTML( wfMsgExt( 'imagelisttext', array('parse'), $lt, wfMsg( $sort ) ) );
 
        $sk = $wgUser->getSkin();
-       $cap = wfMsg( "ilshowmatch" );
-       $sub = wfMsg( "ilsubmit" );
        $titleObj = Title::makeTitle( NS_SPECIAL, "Imagelist" );
-       $action = $titleObj->escapeLocalURL(  "sort={$sort}&limit={$limit}" );
-
-       $wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
-         "{$action}\">" .
-         "{$cap}: <input type='text' size='8' name=\"wpIlMatch\" value=\"" .
-         htmlspecialchars( $wpIlMatch ) . "\" /> " .
-         "<input type='submit' name=\"wpIlSubmit\" value=\"{$sub}\" /></form>" );
-       $nums = array( 50, 100, 250, 500 );
-       $here = Title::makeTitle( NS_SPECIAL, 'Imagelist' );
-
-       $fill = "";
-       $first = true;
-       foreach ( $nums as $num ) {
-               if ( ! $first ) { $fill .= " | "; }
-               $first = false;
-
-               $fill .= $sk->makeKnownLinkObj( $here, $wgLang->formatNum( $num ),
-                 "sort=byname&limit={$num}&wpIlMatch=" . urlencode( $wpIlMatch ) );
+       $action = $titleObj->escapeLocalURL( "sort={$sort}&limit={$limit}" );
+
+       if ( !$wgMiserMode ) {
+               $wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
+                 "{$action}\">" .
+                       wfElement( 'input',
+                               array(
+                                       'type' => 'text',
+                                       'size' => '20',
+                                       'name' => 'wpIlMatch',
+                                       'value' => $wpIlMatch, )) .
+                       wfElement( 'input',
+                               array(
+                                       'type' => 'submit',
+                                       'name' => 'wpIlSubmit',
+                                       'value' => wfMsg( 'ilsubmit'), )) .
+                       '</form>' );
        }
-       $text = wfMsg( "showlast", $fill, $byname );
-       $wgOut->addHTML( "<p>{$text}<br />\n" );
-
-       $fill = "";
-       $first = true;
-       foreach ( $nums as $num ) {
-               if ( ! $first ) { $fill .= " | "; }
-               $first = false;
 
-               $fill .= $sk->makeKnownLinkObj( $here, $wgLang->formatNum( $num ),
-                 "sort=bysize&limit={$num}&wpIlMatch=" . urlencode( $wpIlMatch ) );
-       }
-       $text = wfMsg( "showlast", $fill, $bysize );
-       $wgOut->addHTML( "{$text}<br />\n" );
-
-       $fill = "";
-       $first = true;
-       foreach ( $nums as $num ) {
-               if ( ! $first ) { $fill .= " | "; }
-               $first = false;
+       $here = Title::makeTitle( NS_SPECIAL, 'Imagelist' );
 
-               $fill .= $sk->makeKnownLinkObj( $here, $wgLang->formatNum( $num ),
-                 "sort=bydate&limit={$num}&wpIlMatch=" . urlencode( $wpIlMatch ) );
+       foreach ( array( 'byname', 'bysize', 'bydate') as $sorttype ) {
+               $urls = null;
+               foreach ( array( 50, 100, 250, 500 ) as $num ) {
+                       $urls[] = $sk->makeKnownLinkObj( $here, $wgLang->formatNum( $num ),
+                 "sort={$sorttype}&limit={$num}&wpIlMatch=" . urlencode( $wpIlMatch ) );
+               }
+               $sortlinks[] = wfMsgExt(
+                       'showlast',
+                       array( 'parseinline', 'replaceafter' ),
+                       implode($urls, ' | '),
+                       wfMsgExt( $sorttype, array('escape') )
+               );
        }
-       $text = wfMsg( "showlast", $fill, $bydate );
-       $wgOut->addHTML( "{$text}</p>\n<p>" );
+       $wgOut->addHTML( implode( $sortlinks, "<br />\n") . "\n\n<hr />" );
 
+       // lines
+       $wgOut->addHTML( '<p>' );
        $res = $dbr->query( $sql, "wfSpecialImagelist" );
+
        while ( $s = $dbr->fetchObject( $res ) ) {
                $name = $s->img_name;
                $ut = $s->img_user_text;
@@ -115,21 +95,27 @@ function wfSpecialImagelist() {
                        $ul = $sk->makeLinkObj( Title::makeTitle( NS_USER, $ut ), $ut );
                }
 
-               $ilink = "<a href=\"" . htmlspecialchars( Image::wfImageUrl( $name ) ) .
-                 "\">" . htmlspecialchars( $name ) . "</a>";
+               $dirmark = $wgContLang->getDirMark(); // to keep text in correct direction
 
-               $nb = wfMsg( "nbytes", $wgLang->formatNum( $s->img_size ) );
-               $l = "(" .
-                 $sk->makeKnownLinkObj( Title::makeTitle( NS_IMAGE, $name ),
-                 wfMsg( "imgdesc" ) ) .
-                 ") {$ilink} . . {$nb} . . {$ul} . . " .
-                 $wgLang->timeanddate( $s->img_timestamp, true );
+               $ilink = "<a href=\"" . htmlspecialchars( Image::imageUrl( $name ) ) .
+                 "\">" . strtr(htmlspecialchars( $name ), '_', ' ') . "</a>";
 
-               $l .= $sk->commentBlock( $s->img_description );
-               $wgOut->addHTML( "{$l}<br />\n" );
+               $nb = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'),
+                       $wgLang->formatNum( $s->img_size ) );
+
+               $desc = $sk->makeKnownLinkObj( Title::makeTitle( NS_IMAGE, $name ),
+                 wfMsg( 'imgdesc' ) );
+
+               $date = $wgLang->timeanddate( $s->img_timestamp, true );
+               $comment = $sk->commentBlock( $s->img_description );
+
+               $l = "({$desc}) {$dirmark}{$ilink} . . {$dirmark}{$nb} . . {$dirmark}{$ul}".
+                       " . . {$dirmark}{$date} . . {$dirmark}{$comment}<br />\n";
+               $wgOut->addHTML( $l );
        }
-       $wgOut->addHTML( "</p>" );
+
        $dbr->freeResult( $res );
+       $wgOut->addHTML( '</p>' );
 }
 
 ?>