Customise display of thread search result titles.
[lhc/web/wiklou.git] / includes / specials / SpecialSearch.php
index a456efe..cbdd337 100644 (file)
@@ -35,8 +35,7 @@ function wfSpecialSearch( $par = '' ) {
        $titleParam = str_replace( '_', ' ', $par );
        // Fetch the search term
        $search = str_replace( "\n", " ", $wgRequest->getText( 'search', $titleParam ) );
-       $class = $wgUseOldSearchUI ? 'SpecialSearchOld' : 'SpecialSearch';
-       $searchPage = new $class( $wgRequest, $wgUser );
+       $searchPage = new SpecialSearch( $wgRequest, $wgUser );
        if( $wgRequest->getVal( 'fulltext' )
                || !is_null( $wgRequest->getVal( 'offset' ))
                || !is_null( $wgRequest->getVal( 'searchx' )) )
@@ -103,7 +102,7 @@ class SpecialSearch {
                        wfRunHooks( 'SpecialSearchNogomatch', array( &$t ) );
                        # If the feature is enabled, go straight to the edit page
                        if( $wgGoToEdit ) {
-                               $wgOut->redirect( $t->getFullURL( 'action=edit' ) );
+                               $wgOut->redirect( $t->getFullURL( array( 'action' => 'edit' ) ) );
                                return;
                        }
                }
@@ -114,7 +113,7 @@ class SpecialSearch {
         * @param string $term
         */
        public function showResults( $term ) {
-               global $wgOut, $wgUser, $wgDisableTextSearch, $wgContLang;
+               global $wgOut, $wgUser, $wgDisableTextSearch, $wgContLang, $wgScript;
                wfProfileIn( __METHOD__ );
 
                $sk = $wgUser->getSkin();
@@ -165,27 +164,48 @@ class SpecialSearch {
                // did you mean... suggestions
                if( $textMatches && $textMatches->hasSuggestion() ) {
                        $st = SpecialPage::getTitleFor( 'Search' );
+
                        # mirror Go/Search behaviour of original request ..
                        $didYouMeanParams = array( 'search' => $textMatches->getSuggestionQuery() );
+
                        if($this->fulltext != NULL)
                                $didYouMeanParams['fulltext'] = $this->fulltext;
-                       $stParams = wfArrayToCGI(
+
+                       $stParams = array_merge(
                                $didYouMeanParams,
                                $this->powerSearchOptions()
                        );
-                       $suggestLink = $sk->makeKnownLinkObj( $st,
-                               $textMatches->getSuggestionSnippet(),
-                               $stParams );
+
+                       $suggestionSnippet = $textMatches->getSuggestionSnippet();
+
+                       if( $suggestionSnippet == '' )
+                               $suggestionSnippet = null;
+
+                       $suggestLink = $sk->linkKnown(
+                               $st,
+                               $suggestionSnippet,
+                               array(),
+                               $stParams
+                       );
 
                        $this->didYouMeanHtml = '<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>';
                }
-
                // start rendering the page
                $wgOut->addHtml(
-                       Xml::openElement( 'table', array( 'border'=>0, 'cellpadding'=>0, 'cellspacing'=>0 ) ) .
+                       Xml::openElement(
+                               'form',
+                               array(
+                                       'id' => ( $this->searchAdvanced ? 'powersearch' : 'search' ),
+                                       'method' => 'get',
+                                       'action' => $wgScript
+                               )
+                       )
+               );
+               $wgOut->addHtml(
+                       Xml::openElement( 'table', array( 'id'=>'mw-search-top-table', 'border'=>0, 'cellpadding'=>0, 'cellspacing'=>0 ) ) .
                        Xml::openElement( 'tr' ) .
                        Xml::openElement( 'td' ) . "\n" .
-                       ( $this->searchAdvanced ? $this->powerSearchBox( $term ) : $this->shortDialog( $term ) ) .
+                       $this->shortDialog( $term ) .
                        Xml::closeElement('td') .
                        Xml::closeElement('tr') .
                        Xml::closeElement('table')
@@ -200,14 +220,17 @@ class SpecialSearch {
 
                $filePrefix = $wgContLang->getFormattedNsText(NS_FILE).':';
                if( '' === trim( $term ) || $filePrefix === trim( $term ) ) {
-                       $wgOut->addHTML( $this->searchAdvanced ? $this->powerSearchFocus() : $this->searchFocus() );
+                       $wgOut->addHTML( $this->searchFocus() );
                        $wgOut->addHTML( $this->formHeader($term, 0, 0));
+                       if( $this->searchAdvanced ) {
+                               $wgOut->addHTML( $this->powerSearchBox( $term ) );
+                       } 
+                       $wgOut->addHTML( '</form>' );
                        // Empty query -- straight view of search form
                        wfProfileOut( __METHOD__ );
                        return;
                }
 
-
                // Get number of results
                $titleMatchesNum = $titleMatches ? $titleMatches->numRows() : 0;
                $textMatchesNum = $textMatches ? $textMatches->numRows() : 0;
@@ -229,16 +252,23 @@ class SpecialSearch {
                        
                // 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'>" );
                
                // show direct page/create link
-               if( !is_null($t) && ($this->active=='default' || $this->active=='all') ) {
+               if( !is_null($t) ) {
                        if( !$t->exists() ) {
                                $wgOut->addWikiMsg( 'searchmenu-new', wfEscapeWikiText( $t->getPrefixedText() ) );
                        } else {
                                $wgOut->addWikiMsg( 'searchmenu-exists', wfEscapeWikiText( $t->getPrefixedText() ) );
                        }
+               } else {
+                       // preserve the paragraph for margins etc...
+                       $wgOut->addHTML('<p></p>');
                }
 
                // prev/next links
@@ -254,7 +284,6 @@ class SpecialSearch {
                        wfRunHooks( 'SpecialSearchNoResults', array( $term ) );
                } 
 
-               
                if( $titleMatches ) {
                        if( $numTitleMatches > 0 ) {
                                $wgOut->wrapWikiMsg( "==$1==\n", 'titlematches' );
@@ -283,11 +312,11 @@ class SpecialSearch {
                        $textMatches->free();
                }
                if( $num === 0 ) {
-                       $wgOut->addWikiMsg( 'search-nonefound' );
+                       $wgOut->addWikiMsg( 'search-nonefound', wfEscapeWikiText( $term ) );
                }
                $wgOut->addHtml( "</div>" );
                if( $num === 0 ) {
-                       $wgOut->addHTML( $this->searchAdvanced ? $this->powerSearchFocus() : $this->searchFocus() );
+                       $wgOut->addHTML( $this->searchFocus() );
                }
 
                if( $num || $this->offset ) {
@@ -406,7 +435,20 @@ class SpecialSearch {
                $sk = $wgUser->getSkin();
                $t = $result->getTitle();
 
-               $link = $this->sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
+               $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_t,
+                       $titleSnippet
+               );
 
                //If page content is not readable, just return the title.
                //This is not quite safe, but better than showing excerpts from non-readable pages
@@ -430,15 +472,38 @@ class SpecialSearch {
                $sectionTitle = $result->getSectionTitle();
                $sectionText = $result->getSectionSnippet($terms);
                $redirect = '';
-               if( !is_null($redirectTitle) )
-                       $redirect = "<span class='searchalttitle'>"
-                               .wfMsg('search-redirect',$this->sk->makeKnownLinkObj( $redirectTitle, $redirectText))
-                               ."</span>";
+
+               if( !is_null($redirectTitle) ) {
+                       if( $redirectText == '' )
+                               $redirectText = null;
+
+                       $redirect = "<span class='searchalttitle'>" .
+                               wfMsg(
+                                       'search-redirect',
+                                       $this->sk->linkKnown(
+                                               $redirectTitle,
+                                               $redirectText
+                                       )
+                               ) .
+                               "</span>";
+               }
+
                $section = '';
-               if( !is_null($sectionTitle) )
-                       $section = "<span class='searchalttitle'>"
-                               .wfMsg('search-section', $this->sk->makeKnownLinkObj( $sectionTitle, $sectionText))
-                               ."</span>";
+
+
+               if( !is_null($sectionTitle) ) {
+                       if( $sectionText == '' )
+                               $sectionText = null;
+
+                       $section = "<span class='searchalttitle'>" .
+                               wfMsg(
+                                       'search-section', $this->sk->linkKnown(
+                                               $sectionTitle,
+                                               $sectionText
+                                       )
+                               ) .
+                               "</span>";
+               }
 
                // format text extract
                $extract = "<div class='searchresult'>".$result->getTextSnippet($terms)."</div>";
@@ -457,20 +522,32 @@ class SpecialSearch {
                $byteSize = $result->getByteSize();
                $wordCount = $result->getWordCount();
                $timestamp = $result->getTimestamp();
-               $size = wfMsgExt( 'search-result-size', array( 'parsemag', 'escape' ),
-                       $this->sk->formatSize( $byteSize ), $wordCount );
+               $size = wfMsgExt(
+                       'search-result-size',
+                       array( 'parsemag', 'escape' ),
+                       $this->sk->formatSize( $byteSize ),
+                       $wordCount
+               );
                $date = $wgLang->timeanddate( $timestamp );
 
                // link to related articles if supported
                $related = '';
                if( $result->hasRelated() ) {
                        $st = SpecialPage::getTitleFor( 'Search' );
-                       $stParams = wfArrayToCGI( $this->powerSearchOptions(),
-                               array('search'    => wfMsgForContent('searchrelated').':'.$t->getPrefixedText(),
-                                     'fulltext'  => wfMsg('search') ));
+                       $stParams = array_merge(
+                               $this->powerSearchOptions(),
+                               array(
+                                       'search' => wfMsgForContent( 'searchrelated' ) . ':' . $t->getPrefixedText(),
+                                       'fulltext' => wfMsg( 'search' )
+                               )
+                       );
 
-                       $related = ' -- ' . $sk->makeKnownLinkObj( $st,
-                               wfMsg('search-relatedarticle'), $stParams );
+                       $related = ' -- ' . $sk->linkKnown(
+                               $st,
+                               wfMsg('search-relatedarticle'),
+                               array(),
+                               $stParams
+                       );
                }
 
                // Include a thumbnail for media files...
@@ -567,16 +644,34 @@ class SpecialSearch {
 
                $t = $result->getTitle();
 
-               $link = $this->sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
+               $titleSnippet = $result->getTitleSnippet($terms);
+
+               if( $titleSnippet == '' )
+                       $titleSnippet = null;
+
+               $link = $this->sk->linkKnown(
+                       $t,
+                       $titleSnippet
+               );
 
                // format redirect if any
                $redirectTitle = $result->getRedirectTitle();
                $redirectText = $result->getRedirectSnippet($terms);
                $redirect = '';
-               if( !is_null($redirectTitle) )
-                       $redirect = "<span class='searchalttitle'>"
-                               .wfMsg('search-redirect',$this->sk->makeKnownLinkObj( $redirectTitle, $redirectText))
-                               ."</span>";
+               if( !is_null($redirectTitle) ) {
+                       if( $redirectText == '' )
+                               $redirectText = null;
+
+                       $redirect = "<span class='searchalttitle'>" .
+                               wfMsg(
+                                       'search-redirect',
+                                       $this->sk->linkKnown(
+                                               $redirectTitle,
+                                               $redirectText
+                                       )
+                               ) .
+                               "</span>";
+               }
 
                $out = "";
                // display project name
@@ -592,8 +687,15 @@ class SpecialSearch {
                        }
                        // "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->makeKnownLinkObj( $searchTitle, wfMsg('search-interwiki-more'),
-                               wfArrayToCGI(array('search' => $query, 'fulltext' => 'Search')));
+                       $searchLink = $this->sk->linkKnown(
+                               $searchTitle,
+                               wfMsg('search-interwiki-more'),
+                               array(),
+                               array(
+                                       'search' => $query,
+                                       'fulltext' => 'Search'
+                               )
+                       );
                        $out .= "</ul><div class='mw-search-interwiki-project'><span class='mw-search-interwiki-more'>
                                {$searchLink}</span>{$caption}</div>\n<ul>";
                }
@@ -610,187 +712,214 @@ class SpecialSearch {
         * @return $out string: HTML form
         */
        protected function powerSearchBox( $term ) {
-               global $wgScript;
-
-               $namespaces = SearchEngine::searchableNamespaces();
-
-               $tables = $this->namespaceTables( $namespaces );
+               global $wgScript, $wgContLang;
                
-               // include redirects in the search
-               $redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' ) );
-               $redirectLabel = Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' );
-
-               $redirectText = '';
-               // show redirects check only if backend supports it
-               if( $this->searchEngine->acceptListRedirects() ) {
-                       $redirectText = $redirect . " " . $redirectLabel;
+               // Groups namespaces into rows according to subject
+               $rows = array();
+               foreach( SearchEngine::searchableNamespaces() as $namespace => $name ) {
+                       $subject = MWNamespace::getSubject( $namespace );
+                       if( !array_key_exists( $subject, $rows ) ) {
+                               $rows[$subject] = "";
+                       }
+                       $name = str_replace( '_', ' ', $name );
+                       if( $name == '' ) {
+                               $name = wfMsg( 'blanknamespace' );
+                       }
+                       $rows[$subject] .=
+                               Xml::openElement(
+                                       'td', array( 'style' => 'white-space: nowrap' )
+                               ) .
+                               Xml::checkLabel(
+                                       $name,
+                                       "ns{$namespace}",
+                                       "mw-search-ns{$namespace}",
+                                       in_array( $namespace, $this->namespaces )
+                               ) .
+                               Xml::closeElement( 'td' );
                }
+               $rows = array_values( $rows );
+               $numRows = count( $rows );
                
-               $searchField = Xml::inputLabel( wfMsg( 'powersearch-field' ), 'search', 'powerSearchText', 50, $term,
-                       array( 'type' => 'text') );
-
-               // toggle for turning on and off all checkboxes
-               $selectOptionsLabel = Xml::label( wfMsg( 'powersearch-togglelabel' ), 'mw-search-togglelabel' );
-               $selectAllButton = Xml::openElement('input', array('type'=>'button', 'id' => 'mw-search-toggleall', 'onclick' => 'mwToggleSearchCheckboxes("all");', 
-                       'value' => wfMsg( 'powersearch-toggleall' ) )) . '</input>';
-                       
-               $selectNoneButton = Xml::openElement('input', array('type'=>'button', 'id' => 'mw-search-togglenone', 'onclick' => 'mwToggleSearchCheckboxes("none");',
-                       'value' => wfMsg( 'powersearch-togglenone' ) )) . '</input>';
-                       
-               $selectOptionsText = "<td id='mw-search-togglebox' align='right'>" . $selectOptionsLabel . ' ' . $selectAllButton . $selectNoneButton . "</td>";
-
-               $searchButton = Xml::submitButton( wfMsg( 'powersearch' ) ) . "\n";
-               $searchTitle = SpecialPage::getTitleFor( 'Search' );
-
-               $topText = "<table id='mw-search-powertable'><tr><td>" . wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ). '</td>' . $selectOptionsText . "</tr></table>";
-
-               $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) .
-                       Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n" .
-                       $topText .
-                       '<input type="hidden" name="advanced" value="'.$this->searchAdvanced."\"/>\n".
-                       $tables .
-                       "<hr style=\"clear: both;\" />\n".
-                       $redirectText . "\n".
-                       "<div style=\"padding-top:4px;padding-bottom:2px;\">".
-                       $searchField .
-                       "&nbsp;" .
-                       Xml::hidden( 'fulltext', 'Advanced search' ) . "\n" .
-                       $searchButton .
-                       "</div>".
-                       "</form>";
-               return Xml::openElement( 'fieldset', array('id' => 'mw-searchoptions','style' => 'margin:0em;') ) .
+               // Lays out namespaces in multiple floating two-column tables so they'll
+               // be arranged nicely while still accommodating different screen widths
+               $namespaceTables = '';
+               for( $i = 0; $i < $numRows; $i += 4 ) {
+                       $namespaceTables .= Xml::openElement(
+                               'table',
+                               array( 'cellpadding' => 0, 'cellspacing' => 0, 'border' => 0 )
+                       );
+                       for( $j = $i; $j < $i + 4 && $j < $numRows; $j++ ) {
+                               $namespaceTables .= Xml::tags( 'tr', null, $rows[$j] );
+                       }
+                       $namespaceTables .= Xml::closeElement( 'table' );
+               }
+               // 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' );
+               }
+               // Return final output
+               return
+                       Xml::openElement(
+                               'fieldset',
+                               array( 'id' => 'mw-searchoptions', 'style' => 'margin:0em;' )
+                       ) .
                        Xml::element( 'legend', null, wfMsg('powersearch-legend') ) .
-                       $out . $this->didYouMeanHtml .
+                       Xml::tags( 'h4', null, wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) ) .
+                       Xml::tags(
+                               'div',
+                               array( 'id' => 'mw-search-togglebox' ),
+                               Xml::label( wfMsg( 'powersearch-togglelabel' ), 'mw-search-togglelabel' ) .
+                                       Xml::element(
+                                               'input',
+                                               array(
+                                                       'type'=>'button',
+                                                       'id' => 'mw-search-toggleall',
+                                                       'onclick' => 'mwToggleSearchCheckboxes("all");',
+                                                       'value' => wfMsg( 'powersearch-toggleall' )
+                                               )
+                                       ) .
+                                       Xml::element(
+                                               'input',
+                                               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' ) .
                        Xml::closeElement( 'fieldset' );
        }
 
        protected function searchFocus() {
-               global $wgJsMimeType;
-               return "<script type=\"$wgJsMimeType\">" .
+               return Html::inlineScript(
                        "hookEvent(\"load\", function() {" .
                                "document.getElementById('searchText').focus();" .
-                       "});" .
-                       "</script>";
-       }
-
-       protected function powerSearchFocus() {
-               global $wgJsMimeType;
-               return "<script type=\"$wgJsMimeType\">" .
-                       "hookEvent(\"load\", function() {" .
-                               "document.getElementById('powerSearchText').focus();" .
-                       "});" .
-                       "</script>";
+                       "});" );
        }
 
        protected function formHeader( $term, $resultsShown, $totalNum ) {
                global $wgContLang, $wgCanonicalNamespaceNames, $wgLang;
                
-               $sep = '&nbsp;&nbsp;&nbsp;';
                $out = Xml::openElement('div', array( 'class' =>  'mw-search-formheader' ) );
-               $out .= Xml::openElement('div');
-
+               
                $bareterm = $term;
-               if( $this->startsWithImage( $term ) )
-                       $bareterm = substr( $term, strpos( $term, ':' ) + 1 ); // delete all/image prefix
-
-               $nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
-
-               // search profiles headers
-               $m = wfMsg( 'searchprofile-articles' );
-               $tt = wfMsg( 'searchprofile-articles-tooltip',
-                       $wgLang->commaList( SearchEngine::namespacesAsText( SearchEngine::defaultNamespaces() ) ) );
-               $tt = Sanitizer::decodeCharReferences( $tt ); // need to allow entities
-               if( $this->active == 'default' ) {
-                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );
-               } else {
-                       $out .= $this->makeSearchLink( $bareterm, SearchEngine::defaultNamespaces(), $m, $tt);
-               }
-               $out .= $sep;
-
-               $m = wfMsg( 'searchprofile-images' );
-               $tt = wfMsg( 'searchprofile-images-tooltip' );
-               if( $this->active == 'images' ) {
-                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );
-               } else {
-                       $out .= $this->makeSearchLink( $bareterm, array( NS_FILE ) , $m, $tt );
-               }
-               $out .= $sep;
-
-               $m = wfMsg( 'searchprofile-project' );
-               $tt = wfMsg( 'searchprofile-project-tooltip',
-                       $wgLang->commaList( SearchEngine::namespacesAsText( SearchEngine::helpNamespaces() ) ) );
-               $tt = Sanitizer::decodeCharReferences( $tt ); // need to allow entities
-               if( $this->active == 'help' ) {
-                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );
-               } else {
-                       $out .= $this->makeSearchLink( $bareterm, SearchEngine::helpNamespaces(), $m, $tt );
-               }
-               $out .= $sep;
-
-               $m = wfMsg( 'searchprofile-everything' );
-               $tt = wfMsg( 'searchprofile-everything-tooltip' );
-               if( $this->active == 'all' ) {
-                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );
-               } else {
-                       $out .= $this->makeSearchLink( $bareterm, $nsAllSet, $m, $tt );
+               if( $this->startsWithImage( $term ) ) {
+                       // Deletes prefixes
+                       $bareterm = substr( $term, strpos( $term, ':' ) + 1 );
                }
-               $out .= $sep;
-
-               $m = wfMsg( 'searchprofile-advanced' );
-               $tt = wfMsg( 'searchprofile-advanced-tooltip' );
-               if( $this->active == 'advanced' ) {
-                       $out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );
-               } else {
-                       $out .= $this->makeSearchLink( $bareterm, $this->namespaces, $m, $tt, array( 'advanced' => '1' ) );
+               $nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
+               
+               // Builds list of Search Types (profiles)
+               $profiles = array(
+                       'default' => array(
+                               'message' => 'searchprofile-articles',
+                               'tooltip' => 'searchprofile-articles-tooltip',
+                               'namespaces' => SearchEngine::defaultNamespaces(),
+                               'namespace-messages' => SearchEngine::namespacesAsText(
+                                       SearchEngine::defaultNamespaces()
+                               ),
+                       ),
+                       'images' => array(
+                               'message' => 'searchprofile-images',
+                               'tooltip' => 'searchprofile-images-tooltip',
+                               'namespaces' => array( NS_FILE ),
+                       ),
+                       'help' => array(
+                               'message' => 'searchprofile-project',
+                               'tooltip' => 'searchprofile-project-tooltip',
+                               'namespaces' => SearchEngine::helpNamespaces(),
+                               'namespace-messages' => SearchEngine::namespacesAsText(
+                                       SearchEngine::helpNamespaces()
+                               ),
+                       ),
+                       'all' => array(
+                               'message' => 'searchprofile-everything',
+                               'tooltip' => 'searchprofile-everything-tooltip',
+                               'namespaces' => $nsAllSet,
+                       ),
+                       'advanced' => array(
+                               'message' => 'searchprofile-advanced',
+                               'tooltip' => 'searchprofile-advanced-tooltip',
+                               'namespaces' => $this->namespaces,
+                               'parameters' => array( 'advanced' => 1 ),
+                       )
+               );
+               // Outputs XML for Search Types
+               $out .= Xml::openElement( 'div', array( 'class' => 'search-types' ) );
+               $out .= Xml::openElement( 'ul' );
+               foreach ( $profiles as $id => $profile ) {
+                       $tooltipParam = isset( $profile['namespace-messages'] ) ?
+                               $wgLang->commaList( $profile['namespace-messages'] ) : null;
+                       $out .= Xml::tags(
+                               'li',
+                               array(
+                                       'class' => $this->active == $id ? 'current' : 'normal'
+                               ),
+                               $this->makeSearchLink(
+                                       $bareterm,
+                                       $profile['namespaces'],
+                                       wfMsg( $profile['message'] ),
+                                       wfMsg( $profile['tooltip'], $tooltipParam ),
+                                       isset( $profile['parameters'] ) ? $profile['parameters'] : array() 
+                               )
+                       );
                }
+               $out .= Xml::closeElement( 'ul' );
                $out .= Xml::closeElement('div') ;
                
+               // Results-info
                if ( $resultsShown > 0 ) {
                        if ( $totalNum > 0 ){
                                $top = wfMsgExt('showingresultsheader', array( 'parseinline' ),
-                                       $this->offset+1, $this->offset+$resultsShown, $totalNum, $term, $resultsShown );
+                                       $this->offset+1, $this->offset+$resultsShown, $totalNum, wfEscapeWikiText($term), $resultsShown );
                        } elseif ( $resultsShown >= $this->limit ) {
                                $top = wfShowingResults( $this->offset, $this->limit );
                        } else {
                                $top = wfShowingResultsNum( $this->offset, $this->limit, $resultsShown );
                        }
-                       $out .= "<p>{$top}</p>\n";
-               } else
-                       $out .= "<p>&nbsp;</p>\n";
-                               
-               $out .= Xml::closeElement('div') ;
-
+                       $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;
        }
 
        protected function shortDialog( $term ) {
-               global $wgScript;
                $searchTitle = SpecialPage::getTitleFor( 'Search' );
                $searchable = SearchEngine::searchableNamespaces();
-               $out = Xml::openElement( 'form', array( 'id' => 'search', 'method' => 'get', 'action' => $wgScript ) );
-               $out .= Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n";
-               // show namespaces only for advanced search
-               if( $this->active == 'advanced' ) {
-                       $active = array();
-                       foreach( $this->namespaces as $ns ) {
-                               $active[$ns] = $searchable[$ns];
-                       }
-                       $out .= wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) . "<br/>\n";
-                       $out .= $this->namespaceTables( $active, 1 )."<br/>\n";
-               // Still keep namespace settings otherwise, but don't show them
-               } else {
-                       foreach( $this->namespaces as $ns ) {
-                               $out .= Xml::hidden( "ns{$ns}", '1' );
-                       }
-               }
+               $out = Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n";
                // Keep redirect setting
                $out .= Xml::hidden( "redirs", (int)$this->searchRedirects );
                // Term box
                $out .= Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'searchText' ) ) . "\n";
                $out .= Xml::hidden( 'fulltext', 'Search' );
                $out .= Xml::submitButton( wfMsg( 'searchbutton' ) );
-               $out .= Xml::closeElement( 'form' );
                return $out . $this->didYouMeanHtml;            
        }
 
@@ -803,13 +932,23 @@ class SpecialSearch {
                $opt['redirs'] = $this->searchRedirects ? 1 : 0;
 
                $st = SpecialPage::getTitleFor( 'Search' );
-               $stParams = wfArrayToCGI( array( 'search' => $term, 'fulltext' => wfMsg( 'search' ) ), $opt );
+               $stParams = array_merge(
+                       array(
+                               'search' => $term,
+                               'fulltext' => wfMsg( 'search' )
+                       ),
+                       $opt
+               );
 
-               return Xml::element( 'a',
-                       array( 'href'=> $st->getLocalURL( $stParams ), 'title' => $tooltip, 
-                              'onmousedown' => 'mwSearchHeaderClick(this);',
-                              'onkeydown' => 'mwSearchHeaderClick(this);'),
-                       $label );
+               return Xml::element(
+                       'a',
+                       array(
+                               'href' => $st->getLocalURL( $stParams ),
+                               'title' => $tooltip, 
+                               'onmousedown' => 'mwSearchHeaderClick(this);',
+                               'onkeydown' => 'mwSearchHeaderClick(this);'),
+                       $label
+               );
        }
 
        /** Check if query starts with image: prefix */
@@ -834,690 +973,5 @@ class SpecialSearch {
                }
                return false;
        }
-
-       protected function namespaceTables( $namespaces, $rowsPerTable = 3 ) {
-               global $wgContLang;
-               // Group namespaces into rows according to subject.
-               // Try not to make too many assumptions about namespace numbering.
-               $rows = array();
-               $tables = "";
-               foreach( $namespaces as $ns => $name ) {
-                       $subj = MWNamespace::getSubject( $ns );
-                       if( !array_key_exists( $subj, $rows ) ) {
-                               $rows[$subj] = "";
-                       }
-                       $name = str_replace( '_', ' ', $name );
-                       if( '' == $name ) {
-                               $name = wfMsg( 'blanknamespace' );
-                       }
-                       $rows[$subj] .= Xml::openElement( 'td', array( 'style' => 'white-space: nowrap' ) ) .
-                               Xml::checkLabel( $name, "ns{$ns}", "mw-search-ns{$ns}", in_array( $ns, $this->namespaces ) ) .
-                               Xml::closeElement( 'td' ) . "\n";
-               }
-               $rows = array_values( $rows );
-               $numRows = count( $rows );
-               // Lay out namespaces in multiple floating two-column tables so they'll
-               // be arranged nicely while still accommodating different screen widths
-               // Float to the right on RTL wikis
-               $tableStyle = $wgContLang->isRTL() ?
-                       'float: right; margin: 0 0 0em 1em' : 'float: left; margin: 0 1em 0em 0';
-               // Build the final HTML table...
-               for( $i = 0; $i < $numRows; $i += $rowsPerTable ) {
-                       $tables .= Xml::openElement( 'table', array( 'style' => $tableStyle ) );
-                       for( $j = $i; $j < $i + $rowsPerTable && $j < $numRows; $j++ ) {
-                               $tables .= "<tr>\n" . $rows[$j] . "</tr>";
-                       }
-                       $tables .= Xml::closeElement( 'table' ) . "\n";
-               }
-               return $tables;
-       }
 }
 
-/**
- * implements Special:Search - Run text & title search and display the output
- * @ingroup SpecialPage
- */
-class SpecialSearchOld {
-
-       /**
-        * Set up basic search parameters from the request and user settings.
-        * Typically you'll pass $wgRequest and $wgUser.
-        *
-        * @param WebRequest $request
-        * @param User $user
-        * @public
-        */
-       function __construct( &$request, &$user ) {
-               list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
-               $this->mPrefix = $request->getVal('prefix', '');
-               $this->namespaces = $this->powerSearch( $request );
-               if( empty( $this->namespaces ) ) {
-                       $this->namespaces = SearchEngine::userNamespaces( $user );
-               }
-
-               $this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
-               $this->fulltext = $request->getVal('fulltext');
-       }
-
-       /**
-        * If an exact title match can be found, jump straight ahead to it.
-        * @param string $term
-        * @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 ) ){
-                       return $this->showResults( $term );
-               }
-
-               # If there's an exact or very near match, jump right there.
-               $t = SearchEngine::getNearMatch( $term );
-               if( !is_null( $t ) ) {
-                       $wgOut->redirect( $t->getFullURL() );
-                       return;
-               }
-
-               # No match, generate an edit URL
-               $t = Title::newFromText( $term );
-               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;
-                       }
-               }
-
-               $extra = $wgOut->parse( '=='.wfMsgNoTrans( 'notitlematches' )."==\n" );
-               if( $t->quickUserCan( 'create' ) && $t->quickUserCan( 'edit' ) ) {
-                       $extra .= wfMsgExt( 'noexactmatch', 'parse', wfEscapeWikiText( $term ) );
-               } else {
-                       $extra .= wfMsgExt( 'noexactmatch-nocreate', 'parse', wfEscapeWikiText( $term ) );
-               }
-
-               $this->showResults( $term, $extra );
-       }
-
-       /**
-        * @param string $term
-        * @param string $extra Extra HTML to add after "did you mean"
-        */
-       public function showResults( $term, $extra = '' ) {
-               wfProfileIn( __METHOD__ );
-               global $wgOut, $wgUser;
-               $sk = $wgUser->getSkin();
-
-               $search = SearchEngine::create();
-               $search->setLimitOffset( $this->limit, $this->offset );
-               $search->setNamespaces( $this->namespaces );
-               $search->showRedirects = $this->searchRedirects;
-               $search->prefix = $this->mPrefix;
-               $term = $search->transformSearchTerm($term);
-
-               $this->setupPage( $term );
-
-               $rewritten = $search->replacePrefixes($term);
-               $titleMatches = $search->searchTitle( $rewritten );
-               $textMatches = $search->searchText( $rewritten );
-
-               // did you mean... suggestions
-               if($textMatches && $textMatches->hasSuggestion()){
-                       $st = SpecialPage::getTitleFor( 'Search' );
-
-                       # mirror Go/Search behaviour of original request
-                       $didYouMeanParams = array( 'search' => $textMatches->getSuggestionQuery() );
-                       if($this->fulltext != NULL)
-                               $didYouMeanParams['fulltext'] = $this->fulltext;
-                       $stParams = wfArrayToCGI(
-                               $didYouMeanParams,
-                               $this->powerSearchOptions()
-                       );
-
-                       $suggestLink = $sk->makeKnownLinkObj( $st,
-                               $textMatches->getSuggestionSnippet(),
-                               $stParams );
-
-                       $wgOut->addHTML('<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>');
-               }
-
-               $wgOut->addHTML( $extra );
-
-               $wgOut->wrapWikiMsg( "<div class='mw-searchresult'>\n$1</div>", 'searchresulttext' );
-
-               if( '' === trim( $term ) ) {
-                       // Empty query -- straight view of search form
-                       $wgOut->setSubtitle( '' );
-                       $wgOut->addHTML( $this->powerSearchBox( $term ) );
-                       $wgOut->addHTML( $this->powerSearchFocus() );
-                       wfProfileOut( __METHOD__ );
-                       return;
-               }
-
-               global $wgDisableTextSearch;
-               if ( $wgDisableTextSearch ) {
-                       global $wgSearchForwardUrl;
-                       if( $wgSearchForwardUrl ) {
-                               $url = str_replace( '$1', urlencode( $term ), $wgSearchForwardUrl );
-                               $wgOut->redirect( $url );
-                               wfProfileOut( __METHOD__ );
-                               return;
-                       }
-                       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;
-               }
-
-               $wgOut->addHTML( $this->shortDialog( $term ) );
-
-               // Sometimes the search engine knows there are too many hits
-               if ($titleMatches instanceof SearchResultTooMany) {
-                       $wgOut->addWikiText( '==' . wfMsg( 'toomanymatches' ) . "==\n" );
-                       $wgOut->addHTML( $this->powerSearchBox( $term ) );
-                       $wgOut->addHTML( $this->powerSearchFocus() );
-                       wfProfileOut( __METHOD__ );
-                       return;
-               }
-
-               // show number of results
-               $num = ( $titleMatches ? $titleMatches->numRows() : 0 )
-                       + ( $textMatches ? $textMatches->numRows() : 0);
-               $totalNum = 0;
-               if($titleMatches && !is_null($titleMatches->getTotalHits()))
-                       $totalNum += $titleMatches->getTotalHits();
-               if($textMatches && !is_null($textMatches->getTotalHits()))
-                       $totalNum += $textMatches->getTotalHits();
-               if ( $num > 0 ) {
-                       if ( $totalNum > 0 ){
-                               $top = wfMsgExt('showingresultstotal', array( 'parseinline' ),
-                                       $this->offset+1, $this->offset+$num, $totalNum, $num );
-                       } elseif ( $num >= $this->limit ) {
-                               $top = wfShowingResults( $this->offset, $this->limit );
-                       } else {
-                               $top = wfShowingResultsNum( $this->offset, $this->limit, $num );
-                       }
-                       $wgOut->addHTML( "<p class='mw-search-numberresults'>{$top}</p>\n" );
-               }
-
-               // prev/next links
-               if( $num || $this->offset ) {
-                       $prevnext = wfViewPrevNext( $this->offset, $this->limit,
-                               SpecialPage::getTitleFor( 'Search' ),
-                               wfArrayToCGI(
-                                       $this->powerSearchOptions(),
-                                       array( 'search' => $term ) ),
-                                       ($num < $this->limit) );
-                       $wgOut->addHTML( "<p class='mw-search-pager-top'>{$prevnext}</p>\n" );
-                       wfRunHooks( 'SpecialSearchResults', array( $term, &$titleMatches, &$textMatches ) );
-               } else {
-                       wfRunHooks( 'SpecialSearchNoResults', array( $term ) );
-               }
-
-               if( $titleMatches ) {
-                       if( $titleMatches->numRows() ) {
-                               $wgOut->wrapWikiMsg( "==$1==\n", 'titlematches' );
-                               $wgOut->addHTML( $this->showMatches( $titleMatches ) );
-                       }
-                       $titleMatches->free();
-               }
-
-               if( $textMatches ) {
-                       // output appropriate heading
-                       if( $textMatches->numRows() ) {
-                               if($titleMatches)
-                                       $wgOut->wrapWikiMsg( "==$1==\n", 'textmatches' );
-                               else // if no title matches the heading is redundant
-                                       $wgOut->addHTML("<hr/>");
-                       } elseif( $num == 0 ) {
-                               # Don't show the 'no text matches' if we received title matches
-                               $wgOut->wrapWikiMsg( "==$1==\n", 'notextmatches' );
-                       }
-                       // show interwiki results if any
-                       if( $textMatches->hasInterwikiResults() )
-                               $wgOut->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ));
-                       // show results
-                       if( $textMatches->numRows() )
-                               $wgOut->addHTML( $this->showMatches( $textMatches ) );
-
-                       $textMatches->free();
-               }
-
-               if ( $num == 0 ) {
-                       $wgOut->addWikiMsg( 'nonefound' );
-               }
-               if( $num || $this->offset ) {
-                       $wgOut->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
-               }
-               $wgOut->addHTML( $this->powerSearchBox( $term ) );
-               wfProfileOut( __METHOD__ );
-       }
-
-       #------------------------------------------------------------------
-       # Private methods below this line
-
-       /**
-        *
-        */
-       function setupPage( $term ) {
-               global $wgOut;
-               if( !empty( $term ) ){
-                       $wgOut->setPageTitle( wfMsg( 'searchresults') );
-                       $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term) ) );
-               }
-               $subtitlemsg = ( Title::newFromText( $term ) ? 'searchsubtitle' : 'searchsubtitleinvalid' );
-               $wgOut->setSubtitle( $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ) );
-               $wgOut->setArticleRelated( false );
-               $wgOut->setRobotPolicy( 'noindex,nofollow' );
-       }
-
-       /**
-        * Extract "power search" namespace settings from the request object,
-        * returning a list of index numbers to search.
-        *
-        * @param WebRequest $request
-        * @return array
-        * @private
-        */
-       function powerSearch( &$request ) {
-               $arr = array();
-               foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
-                       if( $request->getCheck( 'ns' . $ns ) ) {
-                               $arr[] = $ns;
-                       }
-               }
-               return $arr;
-       }
-
-       /**
-        * Reconstruct the 'power search' options for links
-        * @return array
-        * @private
-        */
-       function powerSearchOptions() {
-               $opt = array();
-               foreach( $this->namespaces as $n ) {
-                       $opt['ns' . $n] = 1;
-               }
-               $opt['redirs'] = $this->searchRedirects ? 1 : 0;
-               return $opt;
-       }
-
-       /**
-        * Show whole set of results
-        *
-        * @param SearchResultSet $matches
-        */
-       function showMatches( &$matches ) {
-               wfProfileIn( __METHOD__ );
-
-               global $wgContLang;
-               $terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
-
-               $out = "";
-
-               $infoLine = $matches->getInfo();
-               if( !is_null($infoLine) )
-                       $out .= "\n<!-- {$infoLine} -->\n";
-
-
-               $off = $this->offset + 1;
-               $out .= "<ul class='mw-search-results'>\n";
-
-               while( $result = $matches->next() ) {
-                       $out .= $this->showHit( $result, $terms );
-               }
-               $out .= "</ul>\n";
-
-               // convert the whole thing to desired language variant
-               global $wgContLang;
-               $out = $wgContLang->convert( $out );
-               wfProfileOut( __METHOD__ );
-               return $out;
-       }
-
-       /**
-        * Format a single hit result
-        * @param SearchResult $result
-        * @param array $terms terms to highlight
-        */
-       function showHit( $result, $terms ) {
-               wfProfileIn( __METHOD__ );
-               global $wgUser, $wgContLang, $wgLang;
-
-               if( $result->isBrokenTitle() ) {
-                       wfProfileOut( __METHOD__ );
-                       return "<!-- Broken link in search result -->\n";
-               }
-
-               $t = $result->getTitle();
-               $sk = $wgUser->getSkin();
-
-               $link = $sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
-
-               //If page content is not readable, just return the title.
-               //This is not quite safe, but better than showing excerpts from non-readable pages
-               //Note that hiding the entry entirely would screw up paging.
-               if (!$t->userCanRead()) {
-                       wfProfileOut( __METHOD__ );
-                       return "<li>{$link}</li>\n";
-               }
-
-               // If the page doesn't *exist*... our search index is out of date.
-               // The least confusing at this point is to drop the result.
-               // You may get less results, but... oh well. :P
-               if( $result->isMissingRevision() ) {
-                       wfProfileOut( __METHOD__ );
-                       return "<!-- missing page " .
-                               htmlspecialchars( $t->getPrefixedText() ) . "-->\n";
-               }
-
-               // format redirects / relevant sections
-               $redirectTitle = $result->getRedirectTitle();
-               $redirectText = $result->getRedirectSnippet($terms);
-               $sectionTitle = $result->getSectionTitle();
-               $sectionText = $result->getSectionSnippet($terms);
-               $redirect = '';
-               if( !is_null($redirectTitle) )
-                       $redirect = "<span class='searchalttitle'>"
-                               .wfMsg('search-redirect',$sk->makeKnownLinkObj( $redirectTitle, $redirectText))
-                               ."</span>";
-               $section = '';
-               if( !is_null($sectionTitle) )
-                       $section = "<span class='searchalttitle'>"
-                               .wfMsg('search-section', $sk->makeKnownLinkObj( $sectionTitle, $sectionText))
-                               ."</span>";
-
-               // format text extract
-               $extract = "<div class='searchresult'>".$result->getTextSnippet($terms)."</div>";
-
-               // 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 ) )
-                               . ' - ';
-               }
-
-               // format description
-               $byteSize = $result->getByteSize();
-               $wordCount = $result->getWordCount();
-               $timestamp = $result->getTimestamp();
-               $size = wfMsgExt( 'search-result-size', array( 'parsemag', 'escape' ),
-                       $sk->formatSize( $byteSize ),
-                       $wordCount );
-               $date = $wgLang->timeanddate( $timestamp );
-
-               // link to related articles if supported
-               $related = '';
-               if( $result->hasRelated() ){
-                       $st = SpecialPage::getTitleFor( 'Search' );
-                       $stParams = wfArrayToCGI( $this->powerSearchOptions(),
-                               array('search'    => wfMsgForContent('searchrelated').':'.$t->getPrefixedText(),
-                                     'fulltext'  => wfMsg('search') ));
-
-                       $related = ' -- ' . $sk->makeKnownLinkObj( $st,
-                               wfMsg('search-relatedarticle'), $stParams );
-               }
-
-               // Include a thumbnail for media files...
-               if( $t->getNamespace() == NS_FILE ) {
-                       $img = wfFindFile( $t );
-                       if( $img ) {
-                               $thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
-                               if( $thumb ) {
-                                       $desc = $img->getShortDesc();
-                                       wfProfileOut( __METHOD__ );
-                                       // Ugly table. :D
-                                       // Float doesn't seem to interact well with the bullets.
-                                       // Table messes up vertical alignment of the bullet, but I'm
-                                       // not sure what more I can do about that. :(
-                                       return "<li>" .
-                                               '<table class="searchResultImage">' .
-                                               '<tr>' .
-                                               '<td width="120" align="center">' .
-                                               $thumb->toHtml( array( 'desc-link' => true ) ) .
-                                               '</td>' .
-                                               '<td valign="top">' .
-                                               $link .
-                                               $extract .
-                                               "<div class='mw-search-result-data'>{$score}{$desc} - {$date}{$related}</div>" .
-                                               '</td>' .
-                                               '</tr>' .
-                                               '</table>' .
-                                               "</li>\n";
-                               }
-                       }
-               }
-
-               wfProfileOut( __METHOD__ );
-               return "<li>{$link} {$redirect} {$section} {$extract}\n" .
-                       "<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
-                       "</li>\n";
-
-       }
-
-       /**
-        * Show results from other wikis
-        *
-        * @param SearchResultSet $matches
-        */
-       function showInterwiki( &$matches, $query ) {
-               wfProfileIn( __METHOD__ );
-
-               global $wgContLang;
-               $terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
-
-               $out = "<div id='mw-search-interwiki'><div id='mw-search-interwiki-caption'>".wfMsg('search-interwiki-caption')."</div>\n";
-               $off = $this->offset + 1;
-               $out .= "<ul start='{$off}' class='mw-search-iwresults'>\n";
-
-               // work out custom project captions
-               $customCaptions = array();
-               $customLines = explode("\n",wfMsg('search-interwiki-custom')); // format per line <iwprefix>:<caption>
-               foreach($customLines as $line){
-                       $parts = explode(":",$line,2);
-                       if(count($parts) == 2) // validate line
-                               $customCaptions[$parts[0]] = $parts[1];
-               }
-
-
-               $prev = null;
-               while( $result = $matches->next() ) {
-                       $out .= $this->showInterwikiHit( $result, $prev, $terms, $query, $customCaptions );
-                       $prev = $result->getInterwikiPrefix();
-               }
-               // FIXME: should support paging in a non-confusing way (not sure how though, maybe via ajax)..
-               $out .= "</ul></div>\n";
-
-               // convert the whole thing to desired language variant
-               global $wgContLang;
-               $out = $wgContLang->convert( $out );
-               wfProfileOut( __METHOD__ );
-               return $out;
-       }
-
-       /**
-        * Show single interwiki link
-        *
-        * @param SearchResult $result
-        * @param string $lastInterwiki
-        * @param array $terms
-        * @param string $query
-        * @param array $customCaptions iw prefix -> caption
-        */
-       function showInterwikiHit( $result, $lastInterwiki, $terms, $query, $customCaptions) {
-               wfProfileIn( __METHOD__ );
-               global $wgUser, $wgContLang, $wgLang;
-
-               if( $result->isBrokenTitle() ) {
-                       wfProfileOut( __METHOD__ );
-                       return "<!-- Broken link in search result -->\n";
-               }
-
-               $t = $result->getTitle();
-               $sk = $wgUser->getSkin();
-
-               $link = $sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
-
-               // format redirect if any
-               $redirectTitle = $result->getRedirectTitle();
-               $redirectText = $result->getRedirectSnippet($terms);
-               $redirect = '';
-               if( !is_null($redirectTitle) )
-                       $redirect = "<span class='searchalttitle'>"
-                               .wfMsg('search-redirect',$sk->makeKnownLinkObj( $redirectTitle, $redirectText))
-                               ."</span>";
-
-               $out = "";
-               // display project name
-               if(is_null($lastInterwiki) || $lastInterwiki != $t->getInterwiki()){
-                       if( key_exists($t->getInterwiki(),$customCaptions) )
-                               // captions from 'search-interwiki-custom'
-                               $caption = $customCaptions[$t->getInterwiki()];
-                       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());
-                               $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 = $sk->makeKnownLinkObj( $searchTitle, wfMsg('search-interwiki-more'),
-                               wfArrayToCGI(array('search' => $query, 'fulltext' => 'Search')));
-                       $out .= "</ul><div class='mw-search-interwiki-project'><span class='mw-search-interwiki-more'>{$searchLink}</span>{$caption}</div>\n<ul>";
-               }
-
-               $out .= "<li>{$link} {$redirect}</li>\n";
-               wfProfileOut( __METHOD__ );
-               return $out;
-       }
-
-
-       /**
-        * Generates the power search box at bottom of [[Special:Search]]
-        * @param $term string: search term
-        * @return $out string: HTML form
-        */
-       function powerSearchBox( $term ) {
-               global $wgScript, $wgContLang;
-
-               $namespaces = SearchEngine::searchableNamespaces();
-
-               // group namespaces into rows according to subject; try not to make too
-               // many assumptions about namespace numbering
-               $rows = array();
-               foreach( $namespaces as $ns => $name ) {
-                       $subj = MWNamespace::getSubject( $ns );
-                       if( !array_key_exists( $subj, $rows ) ) {
-                               $rows[$subj] = "";
-                       }
-                       $name = str_replace( '_', ' ', $name );
-                       if( '' == $name ) {
-                               $name = wfMsg( 'blanknamespace' );
-                       }
-                       $rows[$subj] .= Xml::openElement( 'td', array( 'style' => 'white-space: nowrap' ) ) .
-                                       Xml::checkLabel( $name, "ns{$ns}", "mw-search-ns{$ns}", in_array( $ns, $this->namespaces ) ) .
-                                       Xml::closeElement( 'td' ) . "\n";
-               }
-               $rows = array_values( $rows );
-               $numRows = count( $rows );
-
-               // lay out namespaces in multiple floating two-column tables so they'll
-               // be arranged nicely while still accommodating different screen widths
-               $rowsPerTable = 3;  // seems to look nice
-
-               // float to the right on RTL wikis
-               $tableStyle = ( $wgContLang->isRTL() ?
-                               'float: right; margin: 0 0 1em 1em' :
-                               'float: left; margin: 0 1em 1em 0' );
-
-               $tables = "";
-               for( $i = 0; $i < $numRows; $i += $rowsPerTable ) {
-                       $tables .= Xml::openElement( 'table', array( 'style' => $tableStyle ) );
-                       for( $j = $i; $j < $i + $rowsPerTable && $j < $numRows; $j++ ) {
-                               $tables .= "<tr>\n" . $rows[$j] . "</tr>";
-                       }
-                       $tables .= Xml::closeElement( 'table' ) . "\n";
-               }
-
-               $redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' ) );
-               $redirectLabel = Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' );
-               $searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) );
-               $searchButton = Xml::submitButton( wfMsg( 'powersearch' ) ) . "\n";
-               $searchTitle = SpecialPage::getTitleFor( 'Search' );
-               $searchHiddens = Xml::hidden( 'title', $searchTitle->getPrefixedText() ) . "\n";
-               $searchHiddens .= Xml::hidden( 'fulltext', 'Advanced search' ) . "\n";
-
-               $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) .
-                       Xml::fieldset( wfMsg( 'powersearch-legend' ),
-                               "<p>" .
-                               wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) .
-                               "</p>\n" .
-                               $tables .
-                               "<hr style=\"clear: both\" />\n" .
-                               "<p>" .
-                               $redirect . " " . $redirectLabel .
-                               "</p>\n" .
-                               wfMsgExt( 'powersearch-field', array( 'parseinline' ) ) .
-                               "&nbsp;" .
-                               $searchField .
-                               "&nbsp;" .
-                               $searchHiddens .
-                               $searchButton ) .
-                       "</form>";
-
-               return $out;
-       }
-
-       function powerSearchFocus() {
-               global $wgJsMimeType;
-               return "<script type=\"$wgJsMimeType\">" .
-                       "hookEvent(\"load\", function(){" .
-                               "document.getElementById('powerSearchText').focus();" .
-                       "});" .
-                       "</script>";
-       }
-
-       function shortDialog($term) {
-               global $wgScript;
-
-               $out  = Xml::openElement( 'form', array(
-                       'id' => 'search',
-                       'method' => 'get',
-                       'action' => $wgScript
-               ));
-               $searchTitle = SpecialPage::getTitleFor( 'Search' );
-               $out .= Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'searchText' ) ) . ' ';
-               foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
-                       if( in_array( $ns, $this->namespaces ) ) {
-                               $out .= Xml::hidden( "ns{$ns}", '1' );
-                       }
-               }
-               $out .= Xml::hidden( 'title', $searchTitle->getPrefixedText() );
-               $out .= Xml::hidden( 'fulltext', 'Search' );
-               $out .= Xml::submitButton( wfMsg( 'searchbutton' ) );
-               $out .= Xml::closeElement( 'form' );
-
-               return $out;
-       }
-}