* Using a white background instead of a gray one

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

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index 95ca380..d29f2e3 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -23,9 +23,16 @@
  * @subpackage SpecialPage
  */
 
+/** */
 require_once( 'SearchEngine.php' );
+require_once( 'Revision.php' );
 
-function wfSpecialSearch( $par='' ) {
+/**
+ * Entry point
+ *
+ * @param string $par (default '')
+ */
+function wfSpecialSearch( $par = '' ) {
        global $wgRequest, $wgUser;
        
        $search = $wgRequest->getText( 'search', $par );
@@ -39,8 +46,13 @@ function wfSpecialSearch( $par='' ) {
        }
 }
 
-
+/**
+ * @todo document
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 class SpecialSearch {
+
        /**
         * Set up basic search parameters from the request and user settings.
         * Typically you'll pass $wgRequest and $wgUser.
@@ -101,8 +113,7 @@ class SpecialSearch {
                                $editurl = $t->escapeLocalURL( 'action=edit' );
                        }
                }
-               # FIXME: HTML in wiki message
-               $wgOut->addHTML( '<p>' . wfMsg('nogomatch', $editurl, htmlspecialchars( $term ) ) . "</p>\n" );
+               $wgOut->addWikiText( wfMsg('nogomatch', ":$term" ) );
 
                return $this->showResults( $term );
        }
@@ -132,16 +143,28 @@ class SpecialSearch {
                
                global $wgDisableTextSearch;
                if ( $wgDisableTextSearch ) {
+                       global $wgForwardSearchUrl;
+                       if( $wgForwardSearchUrl ) {
+                               $url = str_replace( '$1', urlencode( $term ), $wgForwardSearchUrl );
+                               $wgOut->redirect( $url );
+                               return;
+                       }
                        global $wgInputEncoding;
                        $wgOut->addHTML( wfMsg( 'searchdisabled' ) );
-                       $wgOut->addHTML( wfMsg( 'googlesearch',
-                               htmlspecialchars( $term ),
-                               htmlspecialchars( $wgInputEncoding ) ) );
+                       $wgOut->addHTML(
+                               wfMsg( 'googlesearch',
+                                       htmlspecialchars( $term ),
+                                       htmlspecialchars( $wgInputEncoding ),
+                                       htmlspecialchars( wfMsg( 'search' ) )
+                               )
+                       );
                        wfProfileOut( $fname );
                        return;
                }
 
-               $search =& $this->getSearchEngine();
+               $search =& SearchEngine::create();
+               $search->setLimitOffset( $this->limit, $this->offset );
+               $search->setNamespaces( $this->namespaces );
                $titleMatches = $search->searchTitle( $term );
                $textMatches = $search->searchText( $term );
                
@@ -204,35 +227,6 @@ class SpecialSearch {
                $wgOut->setArticleRelated( false );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
        }
-
-       /**
-        * Load up the appropriate search engine class for the currently
-        * active database backend, and return a configured instance.
-        *
-        * @return SearchEngine
-        * @access private
-        */
-       function &getSearchEngine() {
-               global $wgDBtype, $wgDBmysql4, $wgSearchType;
-               if( $wgDBtype == 'mysql' ) {
-                       if( $wgDBmysql4 ) {
-                               $class = 'SearchMySQL4';
-                               require_once( 'SearchMySQL4.php' );
-                       } else {
-                               $class = 'SearchMysql3';
-                               require_once( 'SearchMySQL3.php' );
-                       }
-               } else if ( $wgDBtype == 'PostgreSQL' ) {
-                       $class = 'SearchTsearch2';
-                       require_once( 'SearchTsearch2.php' );
-               } else {
-                       $class = 'SearchEngineDummy';
-               }
-               $search = new $class( wfGetDB( DB_SLAVE ) );
-               $search->setLimitOffset( $this->limit, $this->offset );
-               $search->setNamespaces( $this->namespaces );
-               return $search;
-       }
        
        /**
         * Extract default namespaces to search from the given user's
@@ -319,7 +313,7 @@ class SpecialSearch {
                wfProfileIn( $fname );
                global $wgUser, $wgContLang;
 
-               $t = Title::makeTitle( $row->cur_namespace, $row->cur_title );
+               $t = Title::makeTitle( $row->page_namespace, $row->page_title );
                if( is_null( $t ) ) {
                        wfProfileOut( $fname );
                        return "<!-- Broken link in search result -->\n";
@@ -332,9 +326,10 @@ class SpecialSearch {
                if ( '' == $contextchars ) { $contextchars = 50; }
 
                $link = $sk->makeKnownLinkObj( $t, '' );
-               $size = wfMsg( 'nbytes', strlen( $row->cur_text ) );
+               $text = Revision::getRevisionText( $row );
+               $size = wfMsg( 'nbytes', strlen( $text ) );
 
-               $lines = explode( "\n", $row->cur_text );
+               $lines = explode( "\n", $text );
 
                $max = IntVal( $contextchars ) + 1;
                $pat1 = "/(.*)($terms)(.{0,$max})/i";