If 'tables' is a string that starts with a space, treat it as user-enforced FROM...

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

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index 61750b0..b58f91d 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -14,23 +14,18 @@
 #
 # 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;
@@ -48,8 +43,7 @@ function wfSpecialSearch( $par = '' ) {
 
 /**
  * @todo document
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 class SpecialSearch {
 
@@ -59,7 +53,7 @@ class SpecialSearch {
         *
         * @param WebRequest $request
         * @param User $user
-        * @access public
+        * @public
         */
        function SpecialSearch( &$request, &$user ) {
                list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
@@ -74,9 +68,9 @@ class SpecialSearch {
        }
 
        /**
-        * 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;
@@ -85,7 +79,6 @@ class SpecialSearch {
                $this->setupPage( $term );
 
                # Try to go to page as entered.
-               #
                $t = Title::newFromText( $term );
 
                # If the string cannot be used to create a title
@@ -102,26 +95,22 @@ class SpecialSearch {
 
                # 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';
@@ -129,8 +118,7 @@ class SpecialSearch {
 
                $this->setupPage( $term );
 
-               global $wgUser, $wgOut;
-               $sk = $wgUser->getSkin();
+               global $wgOut;
                $wgOut->addWikiText( wfMsg( 'searchresulttext' ) );
 
                #if ( !$this->parseQuery() ) {
@@ -155,7 +143,7 @@ class SpecialSearch {
                                wfMsg( 'googlesearch',
                                        htmlspecialchars( $term ),
                                        htmlspecialchars( $wgInputEncoding ),
-                                       htmlspecialchars( wfMsg( 'search' ) )
+                                       htmlspecialchars( wfMsg( 'searchbutton' ) )
                                )
                        );
                        wfProfileOut( $fname );
@@ -180,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 ) ) );
@@ -225,7 +213,8 @@ class SpecialSearch {
        function setupPage( $term ) {
                global $wgOut;
                $wgOut->setPageTitle( wfMsg( 'searchresults' ) );
-               $wgOut->setSubtitle( htmlspecialchars( wfMsg( 'searchquery', $term ) ) );
+               $subtitlemsg = ( Title::newFromText($term) ? 'searchsubtitle' : 'searchsubtitleinvalid' );
+               $wgOut->setSubtitle( $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ) );
                $wgOut->setArticleRelated( false );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
        }
@@ -236,7 +225,7 @@ class SpecialSearch {
         *
         * @param User $user
         * @return array
-        * @access private
+        * @private
         */
        function userNamespaces( &$user ) {
                $arr = array();
@@ -254,7 +243,7 @@ class SpecialSearch {
         *
         * @param WebRequest $request
         * @return array
-        * @access private
+        * @private
         */
        function powerSearch( &$request ) {
                $arr = array();
@@ -269,7 +258,7 @@ class SpecialSearch {
        /**
         * Reconstruct the 'power search' options for links
         * @return array
-        * @access private
+        * @private
         */
        function powerSearchOptions() {
                $opt = array();
@@ -293,7 +282,6 @@ class SpecialSearch {
                $tm = $wgContLang->convertForSearchResult( $matches->termMatches() );
                $terms = implode( '|', $tm );
 
-               global $wgOut;
                $off = $this->offset + 1;
                $out = "<ol start='{$off}'>\n";
 
@@ -317,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 );
 
@@ -350,6 +337,7 @@ class SpecialSearch {
                                break;
                        }
                        ++$lineno;
+                       $m = array();
                        if ( ! preg_match( $pat1, $line, $m ) ) {
                                continue;
                        }
@@ -406,7 +394,7 @@ class SpecialSearch {
                        '', '', '', '', '', # 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";