If 'tables' is a string that starts with a space, treat it as user-enforced FROM...
[lhc/web/wiklou.git] / includes / SpecialSearch.php
index 62b207f..b58f91d 100644 (file)
@@ -1,41 +1,36 @@
 <?php
 # Copyright (C) 2004 Brion Vibber <brion@pobox.com>
 # http://www.mediawiki.org/
-# 
+#
 # 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 
+# 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.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
 /**
  * Run text & title search and display the output
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
-/** */
-require_once( 'SearchEngine.php' );
-require_once( 'Revision.php' );
-
 /**
  * Entry point
  *
- * @param string $par (default '')
+ * @param $par String: (default '')
  */
 function wfSpecialSearch( $par = '' ) {
        global $wgRequest, $wgUser;
-       
-       $search = Sanitizer::removeHTMLtags($wgRequest->getText( 'search', $par ));
+
+       $search = $wgRequest->getText( 'search', $par );
        $searchPage = new SpecialSearch( $wgRequest, $wgUser );
        if( $wgRequest->getVal( 'fulltext' ) ||
                !is_null( $wgRequest->getVal( 'offset' ) ) ||
@@ -48,8 +43,7 @@ function wfSpecialSearch( $par = '' ) {
 
 /**
  * @todo document
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 class SpecialSearch {
 
@@ -59,11 +53,11 @@ class SpecialSearch {
         *
         * @param WebRequest $request
         * @param User $user
-        * @access public
+        * @public
         */
        function SpecialSearch( &$request, &$user ) {
                list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
-               
+
                if( $request->getCheck( 'searchx' ) ) {
                        $this->namespaces = $this->powerSearch( $request );
                } else {
@@ -72,24 +66,23 @@ class SpecialSearch {
 
                $this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
        }
-       
+
        /**
-        * If an exact title match can be found, jump straight ahead to
+        * If an exact title match can be found, jump straight ahead to it.
         * @param string $term
-        * @access public
+        * @public
         */
        function goResult( $term ) {
                global $wgOut;
                global $wgGoToEdit;
-               
+
                $this->setupPage( $term );
 
                # Try to go to page as entered.
-               #
                $t = Title::newFromText( $term );
 
                # If the string cannot be used to create a title
-               if( is_null( $t ) ){ 
+               if( is_null( $t ) ){
                        return $this->showResults( $term );
                }
 
@@ -99,39 +92,35 @@ class SpecialSearch {
                        $wgOut->redirect( $t->getFullURL() );
                        return;
                }
-               
+
                # No match, generate an edit URL
                $t = Title::newFromText( $term );
-               if( is_null( $t ) ) {
-                       $editurl = ''; # hrm...
-               } else {
+               if( ! is_null( $t ) ) {
+                       wfRunHooks( 'SpecialSearchNogomatch', array( &$t ) );
                        # If the feature is enabled, go straight to the edit page
                        if ( $wgGoToEdit ) {
                                $wgOut->redirect( $t->getFullURL( 'action=edit' ) );
                                return;
-                       } else {
-                               $editurl = $t->escapeLocalURL( 'action=edit' );
-                       }
+                       } 
                }
-               $wgOut->addWikiText( wfMsg('nogomatch', ":$term" ) );
+               $wgOut->addWikiText( wfMsg( 'noexactmatch', wfEscapeWikiText( $term ) ) );
 
                return $this->showResults( $term );
        }
-       
+
        /**
         * @param string $term
-        * @access public
+        * @public
         */
        function showResults( $term ) {
                $fname = 'SpecialSearch::showResults';
                wfProfileIn( $fname );
-               
+
                $this->setupPage( $term );
-               
-               global $wgUser, $wgOut;
-               $sk = $wgUser->getSkin();
+
+               global $wgOut;
                $wgOut->addWikiText( wfMsg( 'searchresulttext' ) );
-               
+
                #if ( !$this->parseQuery() ) {
                if( '' === trim( $term ) ) {
                        $wgOut->setSubtitle( '' );
@@ -139,7 +128,7 @@ class SpecialSearch {
                        wfProfileOut( $fname );
                        return;
                }
-               
+
                global $wgDisableTextSearch;
                if ( $wgDisableTextSearch ) {
                        global $wgForwardSearchUrl;
@@ -154,7 +143,7 @@ class SpecialSearch {
                                wfMsg( 'googlesearch',
                                        htmlspecialchars( $term ),
                                        htmlspecialchars( $wgInputEncoding ),
-                                       htmlspecialchars( wfMsg( 'search' ) )
+                                       htmlspecialchars( wfMsg( 'searchbutton' ) )
                                )
                        );
                        wfProfileOut( $fname );
@@ -167,7 +156,7 @@ class SpecialSearch {
                $search->showRedirects = $this->searchRedirects;
                $titleMatches = $search->searchTitle( $term );
                $textMatches = $search->searchText( $term );
-               
+
                $num = ( $titleMatches ? $titleMatches->numRows() : 0 )
                        + ( $textMatches ? $textMatches->numRows() : 0);
                if ( $num >= $this->limit ) {
@@ -179,7 +168,7 @@ class SpecialSearch {
 
                if( $num || $this->offset ) {
                        $prevnext = wfViewPrevNext( $this->offset, $this->limit,
-                               'Special:Search',
+                               SpecialPage::getTitleFor( 'Search' ),
                                wfArrayToCGI(
                                        $this->powerSearchOptions(),
                                        array( 'search' => $term ) ) );
@@ -194,7 +183,7 @@ class SpecialSearch {
                                $wgOut->addWikiText( '==' . wfMsg( 'notitlematches' ) . "==\n" );
                        }
                }
-               
+
                if( $textMatches ) {
                        if( $textMatches->numRows() ) {
                                $wgOut->addWikiText( '==' . wfMsg( 'textmatches' ) . "==\n" );
@@ -204,7 +193,7 @@ class SpecialSearch {
                                $wgOut->addWikiText( '==' . wfMsg( 'notextmatches' ) . "==\n" );
                        }
                }
-               
+
                if ( $num == 0 ) {
                        $wgOut->addWikiText( wfMsg( 'nonefound' ) );
                }
@@ -214,28 +203,29 @@ class SpecialSearch {
                $wgOut->addHTML( $this->powerSearchBox( $term ) );
                wfProfileOut( $fname );
        }
-       
+
        #------------------------------------------------------------------
        # Private methods below this line
-       
+
        /**
-        * 
+        *
         */
        function setupPage( $term ) {
                global $wgOut;
                $wgOut->setPageTitle( wfMsg( 'searchresults' ) );
-               $wgOut->setSubtitle( wfMsg( 'searchquery', $term ) );
+               $subtitlemsg = ( Title::newFromText($term) ? 'searchsubtitle' : 'searchsubtitleinvalid' );
+               $wgOut->setSubtitle( $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ) );
                $wgOut->setArticleRelated( false );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
        }
-       
+
        /**
         * Extract default namespaces to search from the given user's
         * settings, returning a list of index numbers.
         *
         * @param User $user
         * @return array
-        * @access private
+        * @private
         */
        function userNamespaces( &$user ) {
                $arr = array();
@@ -246,14 +236,14 @@ class SpecialSearch {
                }
                return $arr;
        }
-       
+
        /**
         * Extract "power search" namespace settings from the request object,
         * returning a list of index numbers to search.
         *
         * @param WebRequest $request
         * @return array
-        * @access private
+        * @private
         */
        function powerSearch( &$request ) {
                $arr = array();
@@ -264,11 +254,11 @@ class SpecialSearch {
                }
                return $arr;
        }
-       
+
        /**
         * Reconstruct the 'power search' options for links
         * @return array
-        * @access private
+        * @private
         */
        function powerSearchOptions() {
                $opt = array();
@@ -279,7 +269,7 @@ class SpecialSearch {
                $opt['searchx'] = 1;
                return $opt;
        }
-       
+
        /**
         * @param SearchResultSet $matches
         * @param string $terms partial regexp for highlighting terms
@@ -287,12 +277,11 @@ class SpecialSearch {
        function showMatches( &$matches ) {
                $fname = 'SpecialSearch::showMatches';
                wfProfileIn( $fname );
-               
+
                global $wgContLang;
                $tm = $wgContLang->convertForSearchResult( $matches->termMatches() );
                $terms = implode( '|', $tm );
-               
-               global $wgOut;
+
                $off = $this->offset + 1;
                $out = "<ol start='{$off}'>\n";
 
@@ -307,7 +296,7 @@ class SpecialSearch {
                wfProfileOut( $fname );
                return $out;
        }
-       
+
        /**
         * Format a single hit result
         * @param SearchResult $result
@@ -316,24 +305,23 @@ class SpecialSearch {
        function showHit( $result, $terms ) {
                $fname = 'SpecialSearch::showHit';
                wfProfileIn( $fname );
-               global $wgUser, $wgContLang;
+               global $wgUser, $wgContLang, $wgLang;
 
                $t = $result->getTitle();
                if( is_null( $t ) ) {
                        wfProfileOut( $fname );
                        return "<!-- Broken link in search result -->\n";
                }
-               $sk =& $wgUser->getSkin();
+               $sk = $wgUser->getSkin();
 
-               $contextlines = $wgUser->getOption( 'contextlines' );
-               if ( '' == $contextlines ) { $contextlines = 5; }
-               $contextchars = $wgUser->getOption( 'contextchars' );
-               if ( '' == $contextchars ) { $contextchars = 50; }
+               $contextlines = $wgUser->getOption( 'contextlines',  5 );
+               $contextchars = $wgUser->getOption( 'contextchars', 50 );
 
                $link = $sk->makeKnownLinkObj( $t );
                $revision = Revision::newFromTitle( $t );
                $text = $revision->getText();
-               $size = wfMsg( 'nbytes', strlen( $text ) );
+               $size = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'),
+                       $wgLang->formatNum( strlen( $text ) ) );
 
                $lines = explode( "\n", $text );
 
@@ -341,7 +329,7 @@ class SpecialSearch {
                $pat1 = "/(.*)($terms)(.{0,$max})/i";
 
                $lineno = 0;
-               
+
                $extract = '';
                wfProfileIn( "$fname-extract" );
                foreach ( $lines as $line ) {
@@ -349,6 +337,7 @@ class SpecialSearch {
                                break;
                        }
                        ++$lineno;
+                       $m = array();
                        if ( ! preg_match( $pat1, $line, $m ) ) {
                                continue;
                        }
@@ -374,7 +363,7 @@ class SpecialSearch {
                wfProfileOut( $fname );
                return "<li>{$link} ({$size}){$extract}</li>\n";
        }
-       
+
        function powerSearchBox( $term ) {
                $namespaces = '';
                foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
@@ -388,24 +377,24 @@ class SpecialSearch {
                        $namespaces .= " <label><input type='checkbox' value=\"1\" name=\"" .
                          "ns{$ns}\"{$checked} />{$name}</label>\n";
                }
-               
+
                $checked = $this->searchRedirects
                        ? ' checked="checked"'
                        : '';
                $redirect = "<input type='checkbox' value='1' name=\"redirs\"{$checked} />\n";
-               
-               $searchField = "<input type='text' name=\"search\" value=\"" .
-                       htmlspecialchars( $term ) ."\" width=\"80\" />\n";
-               
+
+               $searchField = '<input type="text" name="search" value="' .
+                       htmlspecialchars( $term ) ."\" size=\"16\" />\n";
+
                $searchButton = '<input type="submit" name="searchx" value="' .
                  htmlspecialchars( wfMsg('powersearch') ) . "\" />\n";
-               
+
                $ret = wfMsg( 'powersearchtext',
                        $namespaces, $redirect, $searchField,
                        '', '', '', '', '', # Dummy placeholders
                        $searchButton );
-               
-               $title = Title::makeTitle( NS_SPECIAL, 'Search' );
+
+               $title = SpecialPage::getTitleFor( 'Search' );
                $action = $title->escapeLocalURL();
                return "<br /><br />\n<form id=\"powersearch\" method=\"get\" " .
                  "action=\"$action\">\n{$ret}\n</form>\n";