Fix DatabaseSqliteTest for db changes for chunk support.
[lhc/web/wiklou.git] / includes / specials / SpecialSearch.php
index 690c6b5..022744f 100644 (file)
  * @ingroup SpecialPage
  */
 
-/**
- * Entry point
- *
- * @param $par String: (default '')
- */
-function wfSpecialSearch( $par = '' ) {
-       global $wgRequest, $wgUser;
-       // Strip underscores from title parameter; most of the time we'll want
-       // text form here. But don't strip underscores from actual text params!
-       $titleParam = str_replace( '_', ' ', $par );
-       // Fetch the search term
-       $search = str_replace( "\n", " ", $wgRequest->getText( 'search', $titleParam ) );
-       $searchPage = new SpecialSearch( $wgRequest, $wgUser );
-       if( $wgRequest->getVal( 'fulltext' )
-               || !is_null( $wgRequest->getVal( 'offset' ))
-               || !is_null( $wgRequest->getVal( 'searchx' )) )
-       {
-               $searchPage->showResults( $search );
-       } else {
-               $searchPage->goResult( $search );
-       }
-}
-
 /**
  * implements Special:Search - Run text & title search and display the output
  * @ingroup SpecialPage
  */
-class SpecialSearch {
+class SpecialSearch extends SpecialPage {
+       /**
+        * Current search profile. Search profile is just a name that identifies
+        * the active search tab on the search page (content, help, discussions...)
+        * For users tt replaces the set of enabled namespaces from the query
+        * string when applicable. Extensions can add new profiles with hooks
+        * with custom search options just for that profile.
+        * null|string
+        */
+       protected $profile;
+
+       /// Search engine
+       protected $searchEngine;
+
+       /// For links
+       protected $extraParams = array();
+
+       /// No idea, apparently used by some other classes
+       protected $mPrefix;
 
        /**
-        * Set up basic search parameters from the request and user settings.
-        * Typically you'll pass $wgRequest and $wgUser.
+        * @var int
+        */
+       protected $limit, $offset;
+
+       /**
+        * @var array
+        */
+       protected $namespaces;
+
+       /**
+        * @var bool
+        */
+       protected $searchRedirects;
+
+       /**
+        * @var string
+        */
+       protected $didYouMeanHtml, $fulltext;
+
+       const NAMESPACES_CURRENT = 'sense';
+
+       public function __construct() {
+               parent::__construct( 'Search' );
+       }
+
+       /**
+        * Entry point
         *
-        * @param $request WebRequest
-        * @param $user User
+        * @param $par String or null
+        */
+       public function execute( $par ) {
+               $this->setHeaders();
+               $this->outputHeader();
+               $out = $this->getOutput();
+               $out->allowClickjacking();
+               $out->addModuleStyles( 'mediawiki.special' );
+
+               // Strip underscores from title parameter; most of the time we'll want
+               // text form here. But don't strip underscores from actual text params!
+               $titleParam = str_replace( '_', ' ', $par );
+
+               $request = $this->getRequest();
+
+               // Fetch the search term
+               $search = str_replace( "\n", " ", $request->getText( 'search', $titleParam ) );
+
+               $this->load();
+
+               if ( $request->getVal( 'fulltext' )
+                       || !is_null( $request->getVal( 'offset' ) )
+                       || !is_null( $request->getVal( 'searchx' ) ) )
+               {
+                       $this->showResults( $search );
+               } else {
+                       $this->goResult( $search );
+               }
+       }
+
+       /**
+        * Set up basic search parameters from the request and user settings.
         */
-       public function __construct( &$request, &$user ) {
+       public function load() {
+               $request = $this->getRequest();
                list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
-               $this->mPrefix = $request->getVal('prefix', '');
-               # Extract requested namespaces
-               $this->namespaces = $this->powerSearch( $request );
-               if( empty( $this->namespaces ) ) {
-                       $this->namespaces = SearchEngine::userNamespaces( $user );
+               $this->mPrefix = $request->getVal( 'prefix', '' );
+
+               $user = $this->getUser();
+               # Extract manually requested namespaces
+               $nslist = $this->powerSearch( $request );
+               $this->profile = $profile = $request->getVal( 'profile', null );
+               $profiles = $this->getSearchProfiles();
+               if ( $profile === null) {
+                       // BC with old request format
+                       $this->profile = 'advanced';
+                       if ( count( $nslist ) ) {
+                               foreach( $profiles as $key => $data ) {
+                                       if ( $nslist === $data['namespaces'] && $key !== 'advanced') {
+                                               $this->profile = $key;
+                                       }
+                               }
+                               $this->namespaces = $nslist;
+                       } else {
+                               $this->namespaces = SearchEngine::userNamespaces( $user );
+                       }
+               } elseif ( $profile === 'advanced' ) {
+                       $this->namespaces = $nslist;
+               } else {
+                       if ( isset( $profiles[$profile]['namespaces'] ) ) {
+                               $this->namespaces = $profiles[$profile]['namespaces'];
+                       } else {
+                               // Unknown profile requested
+                               $this->profile = 'default';
+                               $this->namespaces = $profiles['default']['namespaces'];
+                       }
                }
-               $this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
-               $this->searchAdvanced = $request->getVal( 'advanced' );
-               $this->active = 'advanced';
-               $this->sk = $user->getSkin();
+
+               // Redirects defaults to true, but we don't know whether it was ticked of or just missing
+               $default = $request->getBool( 'profile' ) ? 0 : 1;
+               $this->searchRedirects = $request->getBool( 'redirs', $default ) ? 1 : 0;
                $this->didYouMeanHtml = ''; # html of did you mean... link
                $this->fulltext = $request->getVal('fulltext');
        }
@@ -81,7 +157,6 @@ class SpecialSearch {
         * @param $term String
         */
        public function goResult( $term ) {
-               global $wgOut;
                $this->setupPage( $term );
                # Try to go to page as entered.
                $t = Title::newFromText( $term );
@@ -91,9 +166,14 @@ class SpecialSearch {
                }
                # If there's an exact or very near match, jump right there.
                $t = SearchEngine::getNearMatch( $term );
+
+               if ( !wfRunHooks( 'SpecialSearchGo', array( &$t, &$term ) ) ) {
+                       # Hook requested termination
+                       return;
+               }
+
                if( !is_null( $t ) ) {
-                       wfRunHooks( 'SpecialSearchGomatch', array( &$t ) );
-                       $wgOut->redirect( $t->getFullURL() );
+                       $this->getOutput()->redirect( $t->getFullURL() );
                        return;
                }
                # No match, generate an edit URL
@@ -101,9 +181,11 @@ class SpecialSearch {
                if( !is_null( $t ) ) {
                        global $wgGoToEdit;
                        wfRunHooks( 'SpecialSearchNogomatch', array( &$t ) );
+                       wfDebugLog( 'nogomatch', $t->getText(), false );
+
                        # If the feature is enabled, go straight to the edit page
                        if( $wgGoToEdit ) {
-                               $wgOut->redirect( $t->getFullURL( array( 'action' => 'edit' ) ) );
+                               $this->getOutput()->redirect( $t->getFullURL( array( 'action' => 'edit' ) ) );
                                return;
                        }
                }
@@ -114,41 +196,40 @@ class SpecialSearch {
         * @param $term String
         */
        public function showResults( $term ) {
-               global $wgOut, $wgUser, $wgDisableTextSearch, $wgContLang, $wgScript;
+               global $wgDisableTextSearch, $wgSearchForwardUrl, $wgContLang, $wgScript;
                wfProfileIn( __METHOD__ );
 
-               $sk = $wgUser->getSkin();
-
-               $this->searchEngine = SearchEngine::create();
-               $search =& $this->searchEngine;
+               $search = $this->getSearchEngine();
                $search->setLimitOffset( $this->limit, $this->offset );
                $search->setNamespaces( $this->namespaces );
-               $search->showRedirects = $this->searchRedirects;
+               $search->showRedirects = $this->searchRedirects; // BC
+               $search->setFeatureData( 'list-redirects', $this->searchRedirects );
                $search->prefix = $this->mPrefix;
                $term = $search->transformSearchTerm($term);
 
+               wfRunHooks( 'SpecialSearchSetupEngine', array( $this, $this->profile, $search ) );
+
                $this->setupPage( $term );
 
-               if( $wgDisableTextSearch ) {
-                       global $wgSearchForwardUrl;
-                       if( $wgSearchForwardUrl ) {
+               $out = $this->getOutput();
+
+               if ( $wgDisableTextSearch ) {
+                       if ( $wgSearchForwardUrl ) {
                                $url = str_replace( '$1', urlencode( $term ), $wgSearchForwardUrl );
-                               $wgOut->redirect( $url );
-                               wfProfileOut( __METHOD__ );
-                               return;
+                               $out->redirect( $url );
+                       } else {
+                               $out->addHTML(
+                                       Xml::openElement( 'fieldset' ) .
+                                       Xml::element( 'legend', null, wfMsg( 'search-external' ) ) .
+                                       Xml::element( 'p', array( 'class' => 'mw-searchdisabled' ), wfMsg( 'searchdisabled' ) ) .
+                                       wfMsg( 'googlesearch',
+                                               htmlspecialchars( $term ),
+                                               htmlspecialchars( 'UTF-8' ),
+                                               htmlspecialchars( wfMsg( 'searchbutton' ) )
+                                       ) .
+                                       Xml::closeElement( 'fieldset' )
+                               );
                        }
-                       global $wgInputEncoding;
-                       $wgOut->addHTML(
-                               Xml::openElement( 'fieldset' ) .
-                               Xml::element( 'legend', null, wfMsg( 'search-external' ) ) .
-                               Xml::element( 'p', array( 'class' => 'mw-searchdisabled' ), wfMsg( 'searchdisabled' ) ) .
-                               wfMsg( 'googlesearch',
-                                       htmlspecialchars( $term ),
-                                       htmlspecialchars( $wgInputEncoding ),
-                                       htmlspecialchars( wfMsg( 'searchbutton' ) )
-                               ) .
-                               Xml::closeElement( 'fieldset' )
-                       );
                        wfProfileOut( __METHOD__ );
                        return;
                }
@@ -159,8 +240,9 @@ class SpecialSearch {
                $rewritten = $search->replacePrefixes($term);
 
                $titleMatches = $search->searchTitle( $rewritten );
-               if( !($titleMatches instanceof SearchResultTooMany))
+               if( !( $titleMatches instanceof SearchResultTooMany ) ) {
                        $textMatches = $search->searchText( $rewritten );
+               }
 
                // did you mean... suggestions
                if( $textMatches && $textMatches->hasSuggestion() ) {
@@ -169,8 +251,9 @@ class SpecialSearch {
                        # mirror Go/Search behaviour of original request ..
                        $didYouMeanParams = array( 'search' => $textMatches->getSuggestionQuery() );
 
-                       if($this->fulltext != null)
+                       if( $this->fulltext != null ) {
                                $didYouMeanParams['fulltext'] = $this->fulltext;
+                       }
 
                        $stParams = array_merge(
                                $didYouMeanParams,
@@ -179,10 +262,11 @@ class SpecialSearch {
 
                        $suggestionSnippet = $textMatches->getSuggestionSnippet();
 
-                       if( $suggestionSnippet == '' )
+                       if( $suggestionSnippet == '' ) {
                                $suggestionSnippet = null;
+                       }
 
-                       $suggestLink = $sk->linkKnown(
+                       $suggestLink = Linker::linkKnown(
                                $st,
                                $suggestionSnippet,
                                array(),
@@ -192,20 +276,20 @@ class SpecialSearch {
                        $this->didYouMeanHtml = '<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>';
                }
                // start rendering the page
-               $wgOut->addHtml(
+               $out->addHtml(
                        Xml::openElement(
                                'form',
                                array(
-                                       'id' => ( $this->searchAdvanced ? 'powersearch' : 'search' ),
+                                       'id' => ( $this->profile === 'advanced' ? 'powersearch' : 'search' ),
                                        'method' => 'get',
                                        'action' => $wgScript
                                )
                        )
                );
-               $wgOut->addHtml(
+               $out->addHtml(
                        Xml::openElement( 'table', array( 'id'=>'mw-search-top-table', 'border'=>0, 'cellpadding'=>0, 'cellspacing'=>0 ) ) .
                        Xml::openElement( 'tr' ) .
-                       Xml::openElement( 'td' ) . "\n" .
+                       Xml::openElement( 'td' ) . "\n" .
                        $this->shortDialog( $term ) .
                        Xml::closeElement('td') .
                        Xml::closeElement('tr') .
@@ -214,19 +298,16 @@ class SpecialSearch {
 
                // Sometimes the search engine knows there are too many hits
                if( $titleMatches instanceof SearchResultTooMany ) {
-                       $wgOut->addWikiText( '==' . wfMsg( 'toomanymatches' ) . "==\n" );
+                       $out->wrapWikiMsg( "==$1==\n", 'toomanymatches' );
                        wfProfileOut( __METHOD__ );
                        return;
                }
 
                $filePrefix = $wgContLang->getFormattedNsText(NS_FILE).':';
                if( trim( $term ) === '' || $filePrefix === trim( $term ) ) {
-                       $wgOut->addHTML( $this->searchFocus() );
-                       $wgOut->addHTML( $this->formHeader($term, 0, 0));
-                       if( $this->searchAdvanced ) {
-                               $wgOut->addHTML( $this->powerSearchBox( $term ) );
-                       } 
-                       $wgOut->addHTML( '</form>' );
+                       $out->addHTML( $this->formHeader( $term, 0, 0 ) );
+                       $out->addHtml( $this->getProfileForm( $this->profile, $term ) );
+                       $out->addHTML( '</form>' );
                        // Empty query -- straight view of search form
                        wfProfileOut( __METHOD__ );
                        return;
@@ -237,7 +318,7 @@ class SpecialSearch {
                $textMatchesNum = $textMatches ? $textMatches->numRows() : 0;
                // Total initial query matches (possible false positives)
                $num = $titleMatchesNum + $textMatchesNum;
-               
+
                // Get total actual results (after second filtering, if any)
                $numTitleMatches = $titleMatches && !is_null( $titleMatches->getTotalHits() ) ?
                        $titleMatches->getTotalHits() : $titleMatchesNum;
@@ -250,35 +331,34 @@ class SpecialSearch {
                        $totalRes += $titleMatches->getTotalHits();
                if($textMatches && !is_null( $textMatches->getTotalHits() ))
                        $totalRes += $textMatches->getTotalHits();
-                       
+
                // show number of results and current offset
-               $wgOut->addHTML( $this->formHeader($term, $num, $totalRes));
-               if( $this->searchAdvanced ) {
-                       $wgOut->addHTML( $this->powerSearchBox( $term ) );
-               }
-               
-               $wgOut->addHtml( Xml::closeElement( 'form' ) );
-               $wgOut->addHtml( "<div class='searchresults'>" );
+               $out->addHTML( $this->formHeader( $term, $num, $totalRes ) );
+               $out->addHtml( $this->getProfileForm( $this->profile, $term ) );
+
+
+               $out->addHtml( Xml::closeElement( 'form' ) );
+               $out->addHtml( "<div class='searchresults'>" );
 
                // prev/next links
                if( $num || $this->offset ) {
                        // Show the create link ahead
                        $this->showCreateLink( $t );
-                       $prevnext = wfViewPrevNext( $this->offset, $this->limit,
-                               SpecialPage::getTitleFor( 'Search' ),
-                               wfArrayToCGI( $this->powerSearchOptions(), array( 'search' => $term ) ),
+                       $prevnext = $this->getLanguage()->viewPrevNext( $this->getTitle(), $this->offset, $this->limit,
+                               $this->powerSearchOptions() + array( 'search' => $term ),
                                max( $titleMatchesNum, $textMatchesNum ) < $this->limit
                        );
-                       //$wgOut->addHTML( "<p class='mw-search-pager-top'>{$prevnext}</p>\n" );
+                       //$out->addHTML( "<p class='mw-search-pager-top'>{$prevnext}</p>\n" );
                        wfRunHooks( 'SpecialSearchResults', array( $term, &$titleMatches, &$textMatches ) );
                } else {
                        wfRunHooks( 'SpecialSearchNoResults', array( $term ) );
-               } 
+               }
 
+               $out->parserOptions()->setEditSection( false );
                if( $titleMatches ) {
                        if( $numTitleMatches > 0 ) {
-                               $wgOut->wrapWikiMsg( "==$1==\n", 'titlematches' );
-                               $wgOut->addHTML( $this->showMatches( $titleMatches ) );
+                               $out->wrapWikiMsg( "==$1==\n", 'titlematches' );
+                               $out->addHTML( $this->showMatches( $titleMatches ) );
                        }
                        $titleMatches->free();
                }
@@ -286,90 +366,80 @@ class SpecialSearch {
                        // output appropriate heading
                        if( $numTextMatches > 0 && $numTitleMatches > 0 ) {
                                // if no title matches the heading is redundant
-                               $wgOut->wrapWikiMsg( "==$1==\n", 'textmatches' );
+                               $out->wrapWikiMsg( "==$1==\n", 'textmatches' );
                        } elseif( $totalRes == 0 ) {
                                # Don't show the 'no text matches' if we received title matches
-                               # $wgOut->wrapWikiMsg( "==$1==\n", 'notextmatches' );
+                               # $out->wrapWikiMsg( "==$1==\n", 'notextmatches' );
                        }
                        // show interwiki results if any
                        if( $textMatches->hasInterwikiResults() ) {
-                               $wgOut->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) );
+                               $out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) );
                        }
                        // show results
                        if( $numTextMatches > 0 ) {
-                               $wgOut->addHTML( $this->showMatches( $textMatches ) );
+                               $out->addHTML( $this->showMatches( $textMatches ) );
                        }
 
                        $textMatches->free();
                }
                if( $num === 0 ) {
-                       $wgOut->addWikiMsg( 'search-nonefound', wfEscapeWikiText( $term ) );
+                       $out->wrapWikiMsg( "<p class=\"mw-search-nonefound\">\n$1</p>", array( 'search-nonefound', wfEscapeWikiText( $term ) ) );
                        $this->showCreateLink( $t );
                }
-               $wgOut->addHtml( "</div>" );
-               if( $num === 0 ) {
-                       $wgOut->addHTML( $this->searchFocus() );
-               }
+               $out->addHtml( "</div>" );
 
                if( $num || $this->offset ) {
-                       $wgOut->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
+                       $out->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
                }
                wfProfileOut( __METHOD__ );
        }
-       
+
+       /**
+        * @param $t Title
+        */
        protected function showCreateLink( $t ) {
-               global $wgOut;
-               
                // show direct page/create link if applicable
-               $messageName = null;
-               if( !is_null($t) ) {
-                       if( $t->isKnown() ) {
-                               $messageName = 'searchmenu-exists';
-                       } elseif( $t->userCan( 'create' ) ) {
-                               $messageName = 'searchmenu-new';
-                       } else {
-                               $messageName = 'searchmenu-new-nocreate';
-                       }
-               } 
+
+               // Check DBkey !== '' in case of fragment link only.
+               if( is_null( $t ) || $t->getDBkey() === '' ) {
+                       // invalid title
+                       // preserve the paragraph for margins etc...
+                       $this->getOutput()->addHtml( '<p></p>' );
+                       return;
+               }
+
+               if( $t->isKnown() ) {
+                       $messageName = 'searchmenu-exists';
+               } elseif( $t->userCan( 'create' ) ) {
+                       $messageName = 'searchmenu-new';
+               } else {
+                       $messageName = 'searchmenu-new-nocreate';
+               }
+               $params = array( $messageName, wfEscapeWikiText( $t->getPrefixedText() ) );
+               wfRunHooks( 'SpecialSearchCreateLink', array( $t, &$params ) );
+
+               // Extensions using the hook might still return an empty $messageName
                if( $messageName ) {
-                       $wgOut->addWikiMsg( $messageName, wfEscapeWikiText( $t->getPrefixedText() ) );
+                       $this->getOutput()->wrapWikiMsg( "<p class=\"mw-search-createlink\">\n$1</p>", $params );
                } else {
                        // preserve the paragraph for margins etc...
-                       $wgOut->addHtml( '<p></p>' );
+                       $this->getOutput()->addHtml( '<p></p>' );
                }
        }
 
        /**
-        *
+        * @param $term string
         */
        protected function setupPage( $term ) {
-               global $wgOut;
-               // Figure out the active search profile header
-               $nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
-               if( $this->searchAdvanced )
-                       $this->active = 'advanced';
-               else {
-                       $profiles = $this->getSearchProfiles();
-                       
-                       foreach( $profiles as $key => $data ) {
-                               if ( $this->namespaces == $data['namespaces'] && $key != 'advanced')
-                                       $this->active = $key;
-                       }
-                       
-               }
                # Should advanced UI be used?
-               $this->searchAdvanced = ($this->active === 'advanced');
-               if( !empty( $term ) ) {
-                       $wgOut->setPageTitle( wfMsg( 'searchresults') );
-                       $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term ) ) );
+               $this->searchAdvanced = ($this->profile === 'advanced');
+               $out = $this->getOutput();
+               if( strval( $term ) !== ''  ) {
+                       $out->setPageTitle( $this->msg( 'searchresults' ) );
+                       $out->setHTMLTitle( $this->msg( 'pagetitle', $this->msg( 'searchresults-title', $term )->plain() ) );
                }
-               $wgOut->setArticleRelated( false );
-               $wgOut->setRobotPolicy( 'noindex,nofollow' );
                // add javascript specific to special:search
-               $wgOut->addScriptFile( 'search.js' );
-
-               // Bug #16886: Sister projects box moves down the first extract on IE7  
-               $wgOut->addStyle( 'common/IE70Fixes.css', 'screen', 'IE 7' );
+               $out->addModules( 'mediawiki.special.search' );
        }
 
        /**
@@ -386,6 +456,7 @@ class SpecialSearch {
                                $arr[] = $ns;
                        }
                }
+
                return $arr;
        }
 
@@ -396,20 +467,23 @@ class SpecialSearch {
         */
        protected function powerSearchOptions() {
                $opt = array();
-               foreach( $this->namespaces as $n ) {
-                       $opt['ns' . $n] = 1;
-               }
                $opt['redirs'] = $this->searchRedirects ? 1 : 0;
-               if( $this->searchAdvanced ) {
-                       $opt['advanced'] = $this->searchAdvanced;
+               if( $this->profile !== 'advanced' ) {
+                       $opt['profile'] = $this->profile;
+               } else {
+                       foreach( $this->namespaces as $n ) {
+                               $opt['ns' . $n] = 1;
+                       }
                }
-               return $opt;
+               return $opt + $this->extraParams;
        }
 
        /**
         * Show whole set of results
         *
         * @param $matches SearchResultSet
+        *
+        * @return string
         */
        protected function showMatches( &$matches ) {
                global $wgContLang;
@@ -422,10 +496,11 @@ class SpecialSearch {
                if( !is_null($infoLine) ) {
                        $out .= "\n<!-- {$infoLine} -->\n";
                }
-               $off = $this->offset + 1;
                $out .= "<ul class='mw-search-results'>\n";
-               while( $result = $matches->next() ) {
+               $result = $matches->next();
+               while( $result ) {
                        $out .= $this->showHit( $result, $terms );
+                       $result = $matches->next();
                }
                $out .= "</ul>\n";
 
@@ -440,9 +515,10 @@ class SpecialSearch {
         *
         * @param $result SearchResult
         * @param $terms Array: terms to highlight
+        *
+        * @return string
         */
        protected function showHit( $result, $terms ) {
-               global $wgLang, $wgUser;
                wfProfileIn( __METHOD__ );
 
                if( $result->isBrokenTitle() ) {
@@ -450,20 +526,19 @@ class SpecialSearch {
                        return "<!-- Broken link in search result -->\n";
                }
 
-               $sk = $wgUser->getSkin();
                $t = $result->getTitle();
 
                $titleSnippet = $result->getTitleSnippet($terms);
 
                if( $titleSnippet == '' )
                        $titleSnippet = null;
-               
+
                $link_t = clone $t;
-               
+
                wfRunHooks( 'ShowSearchHitTitle',
                                        array( &$link_t, &$titleSnippet, $result, $terms, $this ) );
 
-               $link = $this->sk->linkKnown(
+               $link = Linker::linkKnown(
                        $link_t,
                        $titleSnippet
                );
@@ -498,7 +573,7 @@ class SpecialSearch {
                        $redirect = "<span class='searchalttitle'>" .
                                wfMsg(
                                        'search-redirect',
-                                       $this->sk->linkKnown(
+                                       Linker::linkKnown(
                                                $redirectTitle,
                                                $redirectText
                                        )
@@ -508,14 +583,13 @@ class SpecialSearch {
 
                $section = '';
 
-
                if( !is_null($sectionTitle) ) {
                        if( $sectionText == '' )
                                $sectionText = null;
 
                        $section = "<span class='searchalttitle'>" .
                                wfMsg(
-                                       'search-section', $this->sk->linkKnown(
+                                       'search-section', Linker::linkKnown(
                                                $sectionTitle,
                                                $sectionText
                                        )
@@ -526,13 +600,15 @@ class SpecialSearch {
                // format text extract
                $extract = "<div class='searchresult'>".$result->getTextSnippet($terms)."</div>";
 
+               $lang = $this->getLanguage();
+
                // format score
                if( is_null( $result->getScore() ) ) {
                        // Search engine doesn't report scoring info
                        $score = '';
                } else {
                        $percent = sprintf( '%2.1f', $result->getScore() * 100 );
-                       $score = wfMsg( 'search-result-score', $wgLang->formatNum( $percent ) )
+                       $score = wfMsg( 'search-result-score', $lang->formatNum( $percent ) )
                                . ' - ';
                }
 
@@ -543,8 +619,8 @@ class SpecialSearch {
                $size = wfMsgExt(
                        'search-result-size',
                        array( 'parsemag', 'escape' ),
-                       $this->sk->formatSize( $byteSize ),
-                       $wgLang->formatNum( $wordCount )
+                       $lang->formatSize( $byteSize ),
+                       $lang->formatNum( $wordCount )
                );
 
                if( $t->getNamespace() == NS_CATEGORY ) {
@@ -552,13 +628,13 @@ class SpecialSearch {
                        $size = wfMsgExt(
                                'search-result-category-size',
                                array( 'parsemag', 'escape' ),
-                               $wgLang->formatNum( $cat->getPageCount() ),
-                               $wgLang->formatNum( $cat->getSubcatCount() ),
-                               $wgLang->formatNum( $cat->getFileCount() )
+                               $lang->formatNum( $cat->getPageCount() ),
+                               $lang->formatNum( $cat->getSubcatCount() ),
+                               $lang->formatNum( $cat->getFileCount() )
                        );
                }
 
-               $date = $wgLang->timeanddate( $timestamp );
+               $date = $lang->timeanddate( $timestamp );
 
                // link to related articles if supported
                $related = '';
@@ -572,7 +648,7 @@ class SpecialSearch {
                                )
                        );
 
-                       $related = ' -- ' . $sk->linkKnown(
+                       $related = ' -- ' . Linker::linkKnown(
                                $st,
                                wfMsg('search-relatedarticle'),
                                array(),
@@ -586,7 +662,7 @@ class SpecialSearch {
                        if( $img ) {
                                $thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
                                if( $thumb ) {
-                                       $desc = $img->getShortDesc();
+                                       $desc = wfMsg( 'parentheses', $img->getShortDesc() );
                                        wfProfileOut( __METHOD__ );
                                        // Float doesn't seem to interact well with the bullets.
                                        // Table messes up vertical alignment of the bullets.
@@ -621,6 +697,8 @@ class SpecialSearch {
         *
         * @param $matches SearchResultSet
         * @param $query String
+        *
+        * @return string
         */
        protected function showInterwiki( &$matches, $query ) {
                global $wgContLang;
@@ -629,7 +707,6 @@ class SpecialSearch {
 
                $out = "<div id='mw-search-interwiki'><div id='mw-search-interwiki-caption'>".
                        wfMsg('search-interwiki-caption')."</div>\n";
-               $off = $this->offset + 1;
                $out .= "<ul class='mw-search-iwresults'>\n";
 
                // work out custom project captions
@@ -642,9 +719,11 @@ class SpecialSearch {
                }
 
                $prev = null;
-               while( $result = $matches->next() ) {
+               $result = $matches->next();
+               while( $result ) {
                        $out .= $this->showInterwikiHit( $result, $prev, $terms, $query, $customCaptions );
                        $prev = $result->getInterwikiPrefix();
+                       $result = $matches->next();
                }
                // TODO: should support paging in a non-confusing way (not sure how though, maybe via ajax)..
                $out .= "</ul></div>\n";
@@ -663,6 +742,8 @@ class SpecialSearch {
         * @param $terms Array
         * @param $query String
         * @param $customCaptions Array: iw prefix -> caption
+        *
+        * @return string
         */
        protected function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions) {
                wfProfileIn( __METHOD__ );
@@ -679,7 +760,7 @@ class SpecialSearch {
                if( $titleSnippet == '' )
                        $titleSnippet = null;
 
-               $link = $this->sk->linkKnown(
+               $link = Linker::linkKnown(
                        $t,
                        $titleSnippet
                );
@@ -695,7 +776,7 @@ class SpecialSearch {
                        $redirect = "<span class='searchalttitle'>" .
                                wfMsg(
                                        'search-redirect',
-                                       $this->sk->linkKnown(
+                                       Linker::linkKnown(
                                                $redirectTitle,
                                                $redirectText
                                        )
@@ -706,18 +787,18 @@ class SpecialSearch {
                $out = "";
                // display project name
                if(is_null($lastInterwiki) || $lastInterwiki != $t->getInterwiki()) {
-                       if( key_exists($t->getInterwiki(),$customCaptions) )
+                       if( array_key_exists($t->getInterwiki(),$customCaptions) ) {
                                // captions from 'search-interwiki-custom'
                                $caption = $customCaptions[$t->getInterwiki()];
-                       else{
+                       } else {
                                // default is to show the hostname of the other wiki which might suck
                                // if there are many wikis on one hostname
-                               $parsed = parse_url($t->getFullURL());
+                               $parsed = wfParseUrl( $t->getFullURL() );
                                $caption = wfMsg('search-interwiki-default', $parsed['host']);
                        }
                        // "more results" link (special page stuff could be localized, but we might not know target lang)
                        $searchTitle = Title::newFromText($t->getInterwiki().":Special:Search");
-                       $searchLink = $this->sk->linkKnown(
+                       $searchLink = Linker::linkKnown(
                                $searchTitle,
                                wfMsg('search-interwiki-more'),
                                array(),
@@ -735,14 +816,34 @@ class SpecialSearch {
                return $out;
        }
 
+       /**
+        * @param $profile
+        * @param $term
+        * @return String
+        */
+       protected function getProfileForm( $profile, $term ) {
+               // Hidden stuff
+               $opts = array();
+               $opts['redirs'] = $this->searchRedirects;
+               $opts['profile'] = $this->profile;
+
+               if ( $profile === 'advanced' ) {
+                       return $this->powerSearchBox( $term, $opts );
+               } else {
+                       $form = '';
+                       wfRunHooks( 'SpecialSearchProfileForm', array( $this, &$form, $profile, $term, $opts ) );
+                       return $form;
+               }
+       }
 
        /**
-        * Generates the power search box at bottom of [[Special:Search]]
+        * Generates the power search box at [[Special:Search]]
         *
         * @param $term String: search term
+        * @param $opts array
         * @return String: HTML form
         */
-       protected function powerSearchBox( $term ) {
+       protected function powerSearchBox( $term, $opts ) {
                // Groups namespaces into rows according to subject
                $rows = array();
                foreach( SearchEngine::searchableNamespaces() as $namespace => $name ) {
@@ -768,7 +869,7 @@ class SpecialSearch {
                }
                $rows = array_values( $rows );
                $numRows = count( $rows );
-               
+
                // Lays out namespaces in multiple floating two-column tables so they'll
                // be arranged nicely while still accommodating different screen widths
                $namespaceTables = '';
@@ -782,15 +883,21 @@ class SpecialSearch {
                        }
                        $namespaceTables .= Xml::closeElement( 'table' );
                }
+
+               $showSections = array( 'namespaceTables' => $namespaceTables );
+
                // Show redirects check only if backend supports it
-               $redirects = '';
-               if( $this->searchEngine->acceptListRedirects() ) {
-                       $redirects =
-                               Xml::check(
-                                       'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' )
-                               ) .
-                               ' ' .
-                               Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' );
+               if( $this->getSearchEngine()->supports( 'list-redirects' ) ) {
+                       $showSections['redirects'] =
+                               Xml::checkLabel( wfMsg( 'powersearch-redir' ), 'redirs', 'redirs', $this->searchRedirects );
+               }
+
+               wfRunHooks( 'SpecialSearchPowerBox', array( &$showSections, $term, $opts ) );
+
+               $hidden = '';
+               unset( $opts['redirs'] );
+               foreach( $opts as $key => $value ) {
+                       $hidden .= Html::hidden( $key, $value );
                }
                // Return final output
                return
@@ -809,7 +916,6 @@ class SpecialSearch {
                                                array(
                                                        'type'=>'button',
                                                        'id' => 'mw-search-toggleall',
-                                                       'onclick' => 'mwToggleSearchCheckboxes("all");',
                                                        'value' => wfMsg( 'powersearch-toggleall' )
                                                )
                                        ) .
@@ -818,33 +924,23 @@ class SpecialSearch {
                                                array(
                                                        'type'=>'button',
                                                        'id' => 'mw-search-togglenone',
-                                                       'onclick' => 'mwToggleSearchCheckboxes("none");',
                                                        'value' => wfMsg( 'powersearch-togglenone' )
                                                )
                                        )
                        ) .
                        Xml::element( 'div', array( 'class' => 'divider' ), '', false ) .
-                       $namespaceTables .
-                       Xml::element( 'div', array( 'class' => 'divider' ), '', false ) .
-                       $redirects .
-                       Xml::hidden( 'title', SpecialPage::getTitleFor( 'Search' )->getPrefixedText() ) .
-                       Xml::hidden( 'advanced', $this->searchAdvanced ) .
-                       Xml::hidden( 'fulltext', 'Advanced search' ) .
+                       implode( Xml::element( 'div', array( 'class' => 'divider' ), '', false ), $showSections ) .
+                       $hidden .
                        Xml::closeElement( 'fieldset' );
        }
 
-       protected function searchFocus() {
-               $id = $this->searchAdvanced ? 'powerSearchText' : 'searchText';
-               return Html::inlineScript(
-                       "hookEvent(\"load\", function() {" .
-                               "document.getElementById('$id').focus();" .
-                       "});" );
-       }
-       
+       /**
+        * @return array
+        */
        protected function getSearchProfiles() {
                // Builds list of Search Types (profiles)
                $nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
-               
+
                $profiles = array(
                        'default' => array(
                                'message' => 'searchprofile-articles',
@@ -875,25 +971,29 @@ class SpecialSearch {
                        'advanced' => array(
                                'message' => 'searchprofile-advanced',
                                'tooltip' => 'searchprofile-advanced-tooltip',
-                               'namespaces' => $this->namespaces,
-                               'parameters' => array( 'advanced' => 1 ),
+                               'namespaces' => self::NAMESPACES_CURRENT,
                        )
                );
-               
+
                wfRunHooks( 'SpecialSearchProfiles', array( &$profiles ) );
 
-               foreach( $profiles as $key => &$data ) {
-                       sort($data['namespaces']);
+               foreach( $profiles as &$data ) {
+                       if ( !is_array( $data['namespaces'] ) ) continue;
+                       sort( $data['namespaces'] );
                }
-               
+
                return $profiles;
        }
 
+       /**
+        * @param $term
+        * @param $resultsShown
+        * @param $totalNum
+        * @return string
+        */
        protected function formHeader( $term, $resultsShown, $totalNum ) {
-               global $wgLang;
-               
                $out = Xml::openElement('div', array( 'class' =>  'mw-search-formheader' ) );
-               
+
                $bareterm = $term;
                if( $this->startsWithImage( $term ) ) {
                        // Deletes prefixes
@@ -901,24 +1001,30 @@ class SpecialSearch {
                }
 
                $profiles = $this->getSearchProfiles();
-               
+               $lang = $this->getLanguage();
+
                // Outputs XML for Search Types
                $out .= Xml::openElement( 'div', array( 'class' => 'search-types' ) );
                $out .= Xml::openElement( 'ul' );
                foreach ( $profiles as $id => $profile ) {
+                       if ( !isset( $profile['parameters'] ) ) {
+                               $profile['parameters'] = array();
+                       }
+                       $profile['parameters']['profile'] = $id;
+
                        $tooltipParam = isset( $profile['namespace-messages'] ) ?
-                               $wgLang->commaList( $profile['namespace-messages'] ) : null;
+                               $lang->commaList( $profile['namespace-messages'] ) : null;
                        $out .= Xml::tags(
                                'li',
                                array(
-                                       'class' => $this->active == $id ? 'current' : 'normal'
+                                       'class' => $this->profile === $id ? 'current' : 'normal'
                                ),
                                $this->makeSearchLink(
                                        $bareterm,
-                                       $profile['namespaces'],
+                                       array(),
                                        wfMsg( $profile['message'] ),
                                        wfMsg( $profile['tooltip'], $tooltipParam ),
-                                       isset( $profile['parameters'] ) ? $profile['parameters'] : array() 
+                                       $profile['parameters']
                                )
                        );
                }
@@ -929,69 +1035,70 @@ class SpecialSearch {
                if ( $resultsShown > 0 ) {
                        if ( $totalNum > 0 ){
                                $top = wfMsgExt( 'showingresultsheader', array( 'parseinline' ),
-                                       $wgLang->formatNum( $this->offset + 1 ),
-                                       $wgLang->formatNum( $this->offset + $resultsShown ),
-                                       $wgLang->formatNum( $totalNum ),
+                                       $lang->formatNum( $this->offset + 1 ),
+                                       $lang->formatNum( $this->offset + $resultsShown ),
+                                       $lang->formatNum( $totalNum ),
                                        wfEscapeWikiText( $term ),
-                                       $wgLang->formatNum( $resultsShown )
+                                       $lang->formatNum( $resultsShown )
                                );
                        } elseif ( $resultsShown >= $this->limit ) {
-                               $top = wfShowingResults( $this->offset, $this->limit );
+                               $top = wfMsgExt( 'showingresults', array( 'parseinline' ),
+                                       $lang->formatNum( $this->limit ),
+                                       $lang->formatNum( $this->offset + 1 )
+                               );
                        } else {
-                               $top = wfShowingResultsNum( $this->offset, $this->limit, $resultsShown );
+                               $top =  wfMsgExt( 'showingresultsnum', array( 'parseinline' ),
+                                       $lang->formatNum( $this->limit ),
+                                       $lang->formatNum( $this->offset + 1 ),
+                                       $lang->formatNum( $resultsShown )
+                               );
                        }
                        $out .= Xml::tags( 'div', array( 'class' => 'results-info' ),
                                Xml::tags( 'ul', null, Xml::tags( 'li', null, $top ) )
                        );
                }
-               
+
                $out .= Xml::element( 'div', array( 'style' => 'clear:both' ), '', false );
                $out .= Xml::closeElement('div');
-               
-               // Adds hidden namespace fields
-               if ( !$this->searchAdvanced ) {
-                       foreach( $this->namespaces as $ns ) {
-                               $out .= Xml::hidden( "ns{$ns}", '1' );
-                       }
-               }
-               
+
                return $out;
        }
 
+       /**
+        * @param $term string
+        * @return string
+        */
        protected function shortDialog( $term ) {
-               $searchTitle = SpecialPage::getTitleFor( 'Search' );
-               $out = Html::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n";
-               // Keep redirect setting
-               $out .= Html::hidden( "redirs", (int)$this->searchRedirects ) . "\n";
+               $out = Html::hidden( 'title', $this->getTitle()->getPrefixedText() );
+               $out .= Html::hidden( 'profile', $this->profile ) . "\n";
                // Term box
                $out .= Html::input( 'search', $term, 'search', array(
-                       'id' => $this->searchAdvanced ? 'powerSearchText' : 'searchText',
+                       'id' => $this->profile === 'advanced' ? 'powerSearchText' : 'searchText',
                        'size' => '50',
                        'autofocus'
                ) ) . "\n";
                $out .= Html::hidden( 'fulltext', 'Search' ) . "\n";
                $out .= Xml::submitButton( wfMsg( 'searchbutton' ) ) . "\n";
-               return $out . $this->didYouMeanHtml;            
+               return $out . $this->didYouMeanHtml;
        }
 
        /**
         * Make a search link with some target namespaces
         *
         * @param $term String
-        * @param $namespaces Array
+        * @param $namespaces Array ignored
         * @param $label String: link's text
         * @param $tooltip String: link's tooltip
         * @param $params Array: query string parameters
         * @return String: HTML fragment
         */
-       protected function makeSearchLink( $term, $namespaces, $label, $tooltip, $params=array() ) {
+       protected function makeSearchLink( $term, $namespaces, $label, $tooltip, $params = array() ) {
                $opt = $params;
                foreach( $namespaces as $n ) {
                        $opt['ns' . $n] = 1;
                }
-               $opt['redirs'] = $this->searchRedirects ? 1 : 0;
+               $opt['redirs'] = $this->searchRedirects;
 
-               $st = SpecialPage::getTitleFor( 'Search' );
                $stParams = array_merge(
                        array(
                                'search' => $term,
@@ -1003,10 +1110,8 @@ class SpecialSearch {
                return Xml::element(
                        'a',
                        array(
-                               'href' => $st->getLocalURL( $stParams ),
-                               'title' => $tooltip, 
-                               'onmousedown' => 'mwSearchHeaderClick(this);',
-                               'onkeydown' => 'mwSearchHeaderClick(this);'),
+                               'href' => $this->getTitle()->getLocalURL( $stParams ),
+                               'title' => $tooltip),
                        $label
                );
        }
@@ -1026,7 +1131,7 @@ class SpecialSearch {
                }
                return false;
        }
-       
+
        /**
         * Check if query starts with all: prefix
         *
@@ -1036,12 +1141,37 @@ class SpecialSearch {
        protected function startsWithAll( $term ) {
 
                $allkeyword = wfMsgForContent('searchall');
-               
+
                $p = explode( ':', $term );
                if( count( $p ) > 1 ) {
                        return $p[0]  == $allkeyword;
                }
                return false;
        }
-}
 
+       /**
+        * @since 1.18
+        *
+        * @return SearchEngine
+        */
+       public function getSearchEngine() {
+               if ( $this->searchEngine === null ) {
+                       $this->searchEngine = SearchEngine::create();
+               }
+               return $this->searchEngine;
+       }
+
+       /**
+        * Users of hook SpecialSearchSetupEngine can use this to
+        * add more params to links to not lose selection when
+        * user navigates search results.
+        * @since 1.18
+        *
+        * @param $key
+        * @param $value
+        */
+       public function setExtraParam( $key, $value ) {
+               $this->extraParams[$key] = $value;
+       }
+
+}