Add the other existing $skin.css/.js to the message files too to be consistent
[lhc/web/wiklou.git] / includes / SpecialSearch.php
index 4981c74..0a483af 100644 (file)
@@ -1,55 +1,50 @@
 <?php
 # Copyright (C) 2004 Brion Vibber <brion@pobox.com>
 # http://www.mediawiki.org/
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or 
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
 /**
  * Run text & title search and display the output
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @file
+ * @ingroup SpecialPage
  */
 
-/** */
-require_once( 'SearchEngine.php' );
-require_once( 'Revision.php' );
-
 /**
  * Entry point
  *
- * @param string $par (default '')
+ * @param $par String: (default '')
  */
 function wfSpecialSearch( $par = '' ) {
        global $wgRequest, $wgUser;
-       
-       $search = $wgRequest->getText( 'search', $par );
+
+       $search = str_replace( "\n", " ", $wgRequest->getText( 'search', $par ) );
        $searchPage = new SpecialSearch( $wgRequest, $wgUser );
-       if( $wgRequest->getVal( 'fulltext' ) ||
-               !is_null( $wgRequest->getVal( 'offset' ) ) ||
-               !is_null ($wgRequest->getVal( 'searchx' ) ) ) {
-               $searchPage->showResults( $search );
+       if( $wgRequest->getVal( 'fulltext' ) 
+               || !is_null( $wgRequest->getVal( 'offset' )) 
+               || !is_null( $wgRequest->getVal( 'searchx' ))) {
+               $searchPage->showResults( $search, 'search' );
        } else {
                $searchPage->goResult( $search );
        }
 }
 
 /**
- * @todo document
- * @package MediaWiki
- * @subpackage SpecialPage
+ * implements Special:Search - Run text & title search and display the output
+ * @ingroup SpecialPage
  */
 class SpecialSearch {
 
@@ -59,37 +54,35 @@ class SpecialSearch {
         *
         * @param WebRequest $request
         * @param User $user
-        * @access public
+        * @public
         */
        function SpecialSearch( &$request, &$user ) {
                list( $this->limit, $this->offset ) = $request->getLimitOffset( 20, 'searchlimit' );
-               
-               if( $request->getCheck( 'searchx' ) ) {
-                       $this->namespaces = $this->powerSearch( $request );
-               } else {
-                       $this->namespaces = $this->userNamespaces( $user );
+
+               $this->namespaces = $this->powerSearch( $request );
+               if( empty( $this->namespaces ) ) {
+                       $this->namespaces = SearchEngine::userNamespaces( $user );
                }
 
                $this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
        }
-       
+
        /**
-        * If an exact title match can be found, jump straight ahead to
+        * If an exact title match can be found, jump straight ahead to it.
         * @param string $term
-        * @access public
+        * @public
         */
        function goResult( $term ) {
                global $wgOut;
                global $wgGoToEdit;
-               
+
                $this->setupPage( $term );
 
                # Try to go to page as entered.
-               #
                $t = Title::newFromText( $term );
 
                # If the string cannot be used to create a title
-               if( is_null( $t ) ){ 
+               if( is_null( $t ) ){
                        return $this->showResults( $term );
                }
 
@@ -99,47 +92,51 @@ class SpecialSearch {
                        $wgOut->redirect( $t->getFullURL() );
                        return;
                }
-               
+
                # No match, generate an edit URL
                $t = Title::newFromText( $term );
-               if( is_null( $t ) ) {
-                       $editurl = ''; # hrm...
-               } else {
+               if( ! is_null( $t ) ) {
+                       wfRunHooks( 'SpecialSearchNogomatch', array( &$t ) );
                        # If the feature is enabled, go straight to the edit page
                        if ( $wgGoToEdit ) {
                                $wgOut->redirect( $t->getFullURL( 'action=edit' ) );
                                return;
-                       } else {
-                               $editurl = $t->escapeLocalURL( 'action=edit' );
                        }
                }
-               $wgOut->addWikiText( wfMsg('nogomatch', ":$term" ) );
+
+               $wgOut->wrapWikiMsg( "==$1==\n", 'notitlematches' );
+               if( $t->quickUserCan( 'create' ) && $t->quickUserCan( 'edit' ) ) {
+                       $wgOut->addWikiMsg( 'noexactmatch', wfEscapeWikiText( $term ) );
+               } else {
+                       $wgOut->addWikiMsg( 'noexactmatch-nocreate', wfEscapeWikiText( $term ) );
+               }
 
                return $this->showResults( $term );
        }
-       
+
        /**
         * @param string $term
-        * @access public
+        * @public
         */
        function showResults( $term ) {
                $fname = 'SpecialSearch::showResults';
                wfProfileIn( $fname );
-               
-               $this->setupPage( $term );
-               
-               global $wgUser, $wgOut;
+               global $wgOut, $wgUser;
                $sk = $wgUser->getSkin();
-               $wgOut->addWikiText( wfMsg( 'searchresulttext' ) );
-               
-               #if ( !$this->parseQuery() ) {
+
+               $this->setupPage( $term );
+
+               $wgOut->addWikiMsg( 'searchresulttext' );
+
                if( '' === trim( $term ) ) {
+                       // Empty query -- straight view of search form
                        $wgOut->setSubtitle( '' );
                        $wgOut->addHTML( $this->powerSearchBox( $term ) );
+                       $wgOut->addHTML( $this->powerSearchFocus() );
                        wfProfileOut( $fname );
                        return;
                }
-               
+
                global $wgDisableTextSearch;
                if ( $wgDisableTextSearch ) {
                        global $wgForwardSearchUrl;
@@ -149,111 +146,152 @@ class SpecialSearch {
                                return;
                        }
                        global $wgInputEncoding;
-                       $wgOut->addHTML( wfMsg( 'searchdisabled' ) );
                        $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( 'search' ) )
-                               )
+                                       htmlspecialchars( wfMsg( 'searchbutton' ) )
+                               ) .
+                               Xml::closeElement( 'fieldset' )
                        );
                        wfProfileOut( $fname );
                        return;
                }
 
+               $wgOut->addHTML( $this->shortDialog( $term ) );
+
                $search = SearchEngine::create();
                $search->setLimitOffset( $this->limit, $this->offset );
                $search->setNamespaces( $this->namespaces );
                $search->showRedirects = $this->searchRedirects;
-               $titleMatches = $search->searchTitle( $term );
-               $textMatches = $search->searchText( $term );
+               $rewritten = $search->replacePrefixes($term);
+
+               $titleMatches = $search->searchTitle( $rewritten );
+
+               // 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( $fname );
+                       return;
+               }
                
+               $textMatches = $search->searchText( $rewritten );
+
+               // did you mean... suggestions
+               if($textMatches && $textMatches->hasSuggestion()){
+                       $st = SpecialPage::getTitleFor( 'Search' );                     
+                       $stParams = wfArrayToCGI( array( 
+                                       'search'        => $textMatches->getSuggestionQuery(), 
+                                       'fulltext'      => wfMsg('search')),
+                                       $this->powerSearchOptions());
+                                       
+                       $suggestLink = '<a href="'.$st->escapeLocalURL($stParams).'">'.
+                                       $textMatches->getSuggestionSnippet().'</a>';
+                                       
+                       $wgOut->addHTML('<div class="searchdidyoumean">'.wfMsg('search-suggest',$suggestLink).'</div>');
+               }
+
+               // show number of results
                $num = ( $titleMatches ? $titleMatches->numRows() : 0 )
                        + ( $textMatches ? $textMatches->numRows() : 0);
-               if ( $num >= $this->limit ) {
-                       $top = wfShowingResults( $this->offset, $this->limit );
-               } else {
-                       $top = wfShowingResultsNum( $this->offset, $this->limit, $num );
+               $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 );
+                       } 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" );
                }
-               $wgOut->addHTML( "<p>{$top}</p>\n" );
 
+               // prev/next links
                if( $num || $this->offset ) {
                        $prevnext = wfViewPrevNext( $this->offset, $this->limit,
-                               'Special:Search',
+                               SpecialPage::getTitleFor( 'Search' ),
                                wfArrayToCGI(
                                        $this->powerSearchOptions(),
-                                       array( 'search' => $term ) ) );
-                       $wgOut->addHTML( "<br />{$prevnext}\n" );
+                                       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->addWikiText( '==' . wfMsg( 'titlematches' ) . "==\n" );
+                               $wgOut->wrapWikiMsg( "==$1==\n", 'titlematches' );
                                $wgOut->addHTML( $this->showMatches( $titleMatches ) );
-                       } else {
-                               $wgOut->addWikiText( '==' . wfMsg( 'notitlematches' ) . "==\n" );
                        }
+                       $titleMatches->free();
                }
-               
+
                if( $textMatches ) {
+                       // output appropriate heading
                        if( $textMatches->numRows() ) {
-                               $wgOut->addWikiText( '==' . wfMsg( 'textmatches' ) . "==\n" );
-                               $wgOut->addHTML( $this->showMatches( $textMatches ) );
+                               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->addWikiText( '==' . wfMsg( 'notextmatches' ) . "==\n" );
+                               $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->addWikiText( wfMsg( 'nonefound' ) );
+                       $wgOut->addWikiMsg( 'nonefound' );
                }
                if( $num || $this->offset ) {
-                       $wgOut->addHTML( "<p>{$prevnext}</p>\n" );
+                       $wgOut->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
                }
                $wgOut->addHTML( $this->powerSearchBox( $term ) );
                wfProfileOut( $fname );
        }
-       
+
        #------------------------------------------------------------------
        # Private methods below this line
        
        /**
-        * 
+        *
         */
        function setupPage( $term ) {
                global $wgOut;
-               $wgOut->setPageTitle( wfMsg( 'searchresults' ) );
-               $wgOut->setSubtitle( wfMsg( 'searchquery', $term ) );
+               if( !empty( $term ) )
+                       $wgOut->setPageTitle( wfMsg( 'searchresults' ) );                       
+               $subtitlemsg = ( Title::newFromText( $term ) ? 'searchsubtitle' : 'searchsubtitleinvalid' );
+               $wgOut->setSubtitle( $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ) );
                $wgOut->setArticleRelated( false );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
        }
-       
-       /**
-        * Extract default namespaces to search from the given user's
-        * settings, returning a list of index numbers.
-        *
-        * @param User $user
-        * @return array
-        * @access private
-        */
-       function userNamespaces( &$user ) {
-               $arr = array();
-               foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
-                       if( $user->getOption( 'searchNs' . $ns ) ) {
-                               $arr[] = $ns;
-                       }
-               }
-               return $arr;
-       }
-       
+
        /**
         * Extract "power search" namespace settings from the request object,
         * returning a list of index numbers to search.
         *
         * @param WebRequest $request
         * @return array
-        * @access private
+        * @private
         */
        function powerSearch( &$request ) {
                $arr = array();
@@ -264,11 +302,11 @@ class SpecialSearch {
                }
                return $arr;
        }
-       
+
        /**
         * Reconstruct the 'power search' options for links
         * @return array
-        * @access private
+        * @private
         */
        function powerSearchOptions() {
                $opt = array();
@@ -276,30 +314,35 @@ class SpecialSearch {
                        $opt['ns' . $n] = 1;
                }
                $opt['redirs'] = $this->searchRedirects ? 1 : 0;
-               $opt['searchx'] = 1;
                return $opt;
        }
-       
+
        /**
+        * Show whole set of results 
+        * 
         * @param SearchResultSet $matches
-        * @param string $terms partial regexp for highlighting terms
         */
        function showMatches( &$matches ) {
                $fname = 'SpecialSearch::showMatches';
                wfProfileIn( $fname );
-               
+
                global $wgContLang;
-               $tm = $wgContLang->convertForSearchResult( $matches->termMatches() );
-               $terms = implode( '|', $tm );
+               $terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
+
+               $out = "";
+               
+               $infoLine = $matches->getInfo();
+               if( !is_null($infoLine) )
+                       $out .= "\n<!-- {$infoLine} -->\n";
+                       
                
-               global $wgOut;
                $off = $this->offset + 1;
-               $out = "<ol start='{$off}'>\n";
+               $out .= "<ul class='mw-search-results'>\n";
 
                while( $result = $matches->next() ) {
                        $out .= $this->showHit( $result, $terms );
                }
-               $out .= "</ol>\n";
+               $out .= "</ul>\n";
 
                // convert the whole thing to desired language variant
                global $wgContLang;
@@ -307,109 +350,302 @@ class SpecialSearch {
                wfProfileOut( $fname );
                return $out;
        }
-       
+
        /**
         * Format a single hit result
         * @param SearchResult $result
-        * @param string $terms partial regexp for highlighting terms
+        * @param array $terms terms to highlight
         */
        function showHit( $result, $terms ) {
                $fname = 'SpecialSearch::showHit';
                wfProfileIn( $fname );
-               global $wgUser, $wgContLang;
-
-               $t = $result->getTitle();
-               if( is_null( $t ) ) {
+               global $wgUser, $wgContLang, $wgLang;
+               
+               if( $result->isBrokenTitle() ) {
                        wfProfileOut( $fname );
                        return "<!-- Broken link in search result -->\n";
                }
-               $sk =& $wgUser->getSkin();
+               
+               $t = $result->getTitle();
+               $sk = $wgUser->getSkin();
 
-               $contextlines = $wgUser->getOption( 'contextlines' );
-               if ( '' == $contextlines ) { $contextlines = 5; }
-               $contextchars = $wgUser->getOption( 'contextchars' );
-               if ( '' == $contextchars ) { $contextchars = 50; }
+               $link = $sk->makeKnownLinkObj( $t, $result->getTitleSnippet($terms));
 
-               $link = $sk->makeKnownLinkObj( $t );
-               $revision = Revision::newFromTitle( $t );
-               $text = $revision->getText();
-               $size = wfMsg( 'nbytes', strlen( $text ) );
+               //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( $fname );
+                       return "<li>{$link}</li>\n";
+               }
 
-               $lines = explode( "\n", $text );
+               // 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( $fname );
+                       return "<!-- missing page " .
+                               htmlspecialchars( $t->getPrefixedText() ) . "-->\n";
+               }
 
-               $max = IntVal( $contextchars ) + 1;
-               $pat1 = "/(.*)($terms)(.{0,$max})/i";
+               // 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>";
 
-               $lineno = 0;
+               // format text extract
+               $extract = "<div class='searchresult'>".$result->getTextSnippet($terms)."</div>";
                
-               $extract = '';
-               wfProfileIn( "$fname-extract" );
-               foreach ( $lines as $line ) {
-                       if ( 0 == $contextlines ) {
-                               break;
-                       }
-                       ++$lineno;
-                       if ( ! preg_match( $pat1, $line, $m ) ) {
-                               continue;
-                       }
-                       --$contextlines;
-                       $pre = $wgContLang->truncate( $m[1], -$contextchars, '...' );
+               // 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 ) )
+                               . ' - ';
+               }
 
-                       if ( count( $m ) < 3 ) {
-                               $post = '';
-                       } else {
-                               $post = $wgContLang->truncate( $m[3], $contextchars, '...' );
+               // 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 = ' -- <a href="'.$st->escapeLocalURL($stParams).'">'. 
+                               wfMsg('search-relatedarticle').'</a>';
+               }
+                               
+               // Include a thumbnail for media files...
+               if( $t->getNamespace() == NS_IMAGE ) {
+                       $img = wfFindFile( $t );
+                       if( $img ) {
+                               $thumb = $img->getThumbnail( 120, 120 );
+                               if( $thumb ) {
+                                       $desc = $img->getShortDesc();
+                                       wfProfileOut( $fname );
+                                       // 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";
+                               }
                        }
+               }
 
-                       $found = $m[2];
+               wfProfileOut( $fname );
+               return "<li>{$link} {$redirect} {$section} {$extract}\n" .
+                       "<div class='mw-search-result-data'>{$score}{$size} - {$date}{$related}</div>" .
+                       "</li>\n";
 
-                       $line = htmlspecialchars( $pre . $found . $post );
-                       $pat2 = '/(' . $terms . ")/i";
-                       $line = preg_replace( $pat2,
-                         "<span class='searchmatch'>\\1</span>", $line );
+       }
+
+       /**
+        * Show results from other wikis
+        * 
+        * @param SearchResultSet $matches
+        */
+       function showInterwiki( &$matches, $query ) {
+               $fname = 'SpecialSearch::showInterwiki';
+               wfProfileIn( $fname );
+
+               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( $fname );
+               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){
+               $fname = 'SpecialSearch::showInterwikiHit';
+               wfProfileIn( $fname );
+               global $wgUser, $wgContLang, $wgLang;
+               
+               if( $result->isBrokenTitle() ) {
+                       wfProfileOut( $fname );
+                       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>";
 
-                       $extract .= "<br /><small>{$lineno}: {$line}</small>\n";
+               $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>";
                }
-               wfProfileOut( "$fname-extract" );
+
+               $out .= "<li>{$link} {$redirect}</li>\n"; 
                wfProfileOut( $fname );
-               return "<li>{$link} ({$size}){$extract}</li>\n";
+               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;
+
                $namespaces = '';
                foreach( SearchEngine::searchableNamespaces() as $ns => $name ) {
-                       $checked = in_array( $ns, $this->namespaces )
-                               ? ' checked="checked"'
-                               : '';
                        $name = str_replace( '_', ' ', $name );
                        if( '' == $name ) {
                                $name = wfMsg( 'blanknamespace' );
                        }
-                       $namespaces .= " <label><input type='checkbox' value=\"1\" name=\"" .
-                         "ns{$ns}\"{$checked} />{$name}</label>\n";
+                       $namespaces .= Xml::openElement( 'span', array( 'style' => 'white-space: nowrap' ) ) .
+                                       Xml::checkLabel( $name, "ns{$ns}", "mw-search-ns{$ns}", in_array( $ns, $this->namespaces ) ) .
+                                       Xml::closeElement( 'span' ) . "\n";
                }
-               
-               $checked = $this->searchRedirects
-                       ? ' checked="checked"'
-                       : '';
-               $redirect = "<input type='checkbox' value='1' name=\"redirs\"{$checked} />\n";
-               
-               $searchField = "<input type='text' name=\"search\" value=\"" .
-                       htmlspecialchars( $term ) ."\" width=\"80\" />\n";
-               
-               $searchButton = '<input type="submit" name="searchx" value="' .
-                 htmlspecialchars( wfMsg('powersearch') ) . "\" />\n";
-               
-               $ret = wfMsg( 'powersearchtext',
-                       $namespaces, $redirect, $searchField,
-                       '', '', '', '', '', # Dummy placeholders
-                       $searchButton );
-               
-               $title = Title::makeTitle( NS_SPECIAL, 'Search' );
-               $action = $title->escapeLocalURL();
-               return "<br /><br />\n<form id=\"powersearch\" method=\"get\" " .
-                 "action=\"$action\">\n{$ret}\n</form>\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' ), array( 'name' => 'fulltext' ) ) . "\n";
+
+               $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) .
+                       Xml::fieldset( wfMsg( 'powersearch-legend' ),
+                               Xml::hidden( 'title', 'Special:Search' ) .
+                               "<p>" .
+                               wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) .
+                               "<br />" .
+                               $namespaces .
+                               "</p>" .
+                               "<p>" .
+                               $redirect . " " . $redirectLabel .
+                               "</p>" .
+                               wfMsgExt( 'powersearch-field', array( 'parseinline' ) ) .
+                               "&nbsp;" .
+                               $searchField .
+                               "&nbsp;" .
+                               $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
+               ));
+               $out .= Xml::hidden( 'title', 'Special: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::submitButton( wfMsg( 'searchbutton' ), array( 'name' => 'fulltext' ) );
+               $out .= Xml::closeElement( 'form' );
+
+               return $out;
+       }
+}