Making INNER JOIN implicit

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

diff --git a/includes/SpecialMIMEsearch.php b/includes/SpecialMIMEsearch.php
index 9e5cd8c..041d898 100644 (file)
--- a/includes/SpecialMIMEsearch.php
+++ b/includes/SpecialMIMEsearch.php
@@ -3,19 +3,15 @@
  * A special page to search for files by MIME type as defined in the
  * img_major_mime and img_minor_mime fields in the image table
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  *
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
 
-/* */
-require_once 'QueryPage.php';
-
 /**
- * @package MediaWiki
- * @subpackage SpecialPage
+ * Searches the database for files of the requested MIME type, comparing this with the
+ * 'img_major_mime' and 'img_minor_mime' fields in the image table.
  */
 class MIMEsearchPage extends QueryPage {
        var $major, $minor;
@@ -24,16 +20,16 @@ class MIMEsearchPage extends QueryPage {
                $this->major = $major;
                $this->minor = $minor;
        }
-       
+
        function getName() { return 'MIMEsearch'; }
-       
+
        /**
         * Due to this page relying upon extra fields being passed in the SELECT it
         * will fail if it's set as expensive and misermode is on
         */
        function isExpensive() { return true; }
        function isSyndicated() { return false; }
-       
+
        function linkParameters() {
                $arr = array( $this->major, $this->minor );
                $mime = implode( '/', $arr );
@@ -41,17 +37,17 @@ class MIMEsearchPage extends QueryPage {
        }
 
        function getSQL() {
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
                $image = $dbr->tableName( 'image' );
                $major = $dbr->addQuotes( $this->major );
                $minor = $dbr->addQuotes( $this->minor );
-               
+
                return
                        "SELECT 'MIMEsearch' AS type,
                                " . NS_IMAGE . " AS namespace,
                                img_name AS title,
                                img_major_mime AS value,
-                               
+
                                img_size,
                                img_width,
                                img_height,
@@ -69,18 +65,20 @@ class MIMEsearchPage extends QueryPage {
                $text = $wgContLang->convert( $nt->getText() );
                $plink = $skin->makeLink( $nt->getPrefixedText(), $text );
 
-               $download = $skin->makeMediaLink( $nt->getText(), 'fuck me!', wfMsgHtml( 'download' ) );
-               $bytes = wfMsg( 'nbytes', $wgLang->formatNum( $result->img_size ) );
-               $dimensions = wfMsg( 'widthheight', $result->img_width, $result->img_height );
+               $download = $skin->makeMediaLinkObj( $nt, wfMsgHtml( 'download' ) );
+               $bytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'),
+                       $wgLang->formatNum( $result->img_size ) );
+               $dimensions = wfMsgHtml( 'widthheight', $wgLang->formatNum( $result->img_width ),
+                       $wgLang->formatNum( $result->img_height ) );
                $user = $skin->makeLinkObj( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text );
                $time = $wgLang->timeanddate( $result->img_timestamp );
-               
-               return "($download) $plink .. $dimensions .. $bytes .. $user .. $time";
+
+               return "($download) $plink . . $dimensions . . $bytes . . $user . . $time";
        }
 }
 
 /**
- * constructor
+ * Output the HTML search form, and constructs the MIMEsearchPage object.
  */
 function wfSpecialMIMEsearch( $par = null ) {
        global $wgRequest, $wgTitle, $wgOut;
@@ -88,48 +86,31 @@ function wfSpecialMIMEsearch( $par = null ) {
        $mime = isset( $par ) ? $par : $wgRequest->getText( 'mime' );
 
        $wgOut->addHTML(
-               wfElement( 'form',
-                       array(
-                               'id' => 'specialmimesearch',
-                               'method' => 'get',
-                               'action' => $wgTitle->escapeLocalUrl()
-                       ),
-                       null
-               ) .
-                       wfOpenElement( 'label' ) .
-                               wfMsgHtml( 'mimetype' ) .
-                               wfElement( 'input', array(
-                                               'type' => 'text',
-                                               'size' => 20,
-                                               'name' => 'mime',
-                                               'value' => $mime
-                                       ),
-                                       ''
-                               ) .
-                               ' ' .
-                               wfElement( 'input', array(
-                                               'type' => 'submit',
-                                               'value' => wfMsg( 'ilsubmit' )
-                                       ),
-                                       ''
-                               ) .
-                       wfCloseElement( 'label' ) .
-               wfCloseElement( 'form' )
+               Xml::openElement( 'form', array( 'id' => 'specialmimesearch', 'method' => 'get', 'action' => $wgTitle->getLocalUrl() ) ) .
+               Xml::openElement( 'fieldset' ) .
+               Xml::element( 'legend', null, wfMsg( 'mimesearch' ) ) .
+               Xml::inputLabel( wfMsg( 'mimetype' ), 'mime', 'mime', 20, $mime ) . ' ' .
+               Xml::submitButton( wfMsg( 'ilsubmit' ) ) .
+               Xml::closeElement( 'fieldset' ) .
+               Xml::closeElement( 'form' )
        );
 
        list( $major, $minor ) = wfSpecialMIMEsearchParse( $mime );
        if ( $major == '' or $minor == '' or !wfSpecialMIMEsearchValidType( $major ) )
                return;
        $wpp = new MIMEsearchPage( $major, $minor );
-       
+
        list( $limit, $offset ) = wfCheckLimits();
        $wpp->doQuery( $offset, $limit );
 }
 
 function wfSpecialMIMEsearchParse( $str ) {
-       wfSuppressWarnings();
+       // searched for an invalid MIME type.
+       if( strpos( $str, '/' ) === false) {
+               return array ('', '');
+       }
+
        list( $major, $minor ) = explode( '/', $str, 2 );
-       wfRestoreWarnings();
 
        return array(
                ltrim( $major, ' ' ),
@@ -153,4 +134,3 @@ function wfSpecialMIMEsearchValidType( $type ) {
 
        return in_array( $type, $types );
 }
-?>