Fix fatal error in eval.php

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

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index ac39f29..e30ad08 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -19,8 +19,7 @@
 
 /**
  * Run text & title search and display the output
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
@@ -43,9 +42,8 @@ function wfSpecialSearch( $par = '' ) {
 }
 
 /**
- * @todo document
- * @package MediaWiki
- * @subpackage SpecialPage
+ * implements Special:Search - Run text & title search and display the output
+ * @addtogroup SpecialPage
  */
 class SpecialSearch {
 
@@ -105,7 +103,11 @@ class SpecialSearch {
                                return;
                        } 
                }
-               $wgOut->addWikiText( wfMsg( 'noexactmatch', wfEscapeWikiText( $term ) ) );
+               if( $t->quickUserCan( 'create' ) && $t->quickUserCan( 'edit' ) ) {
+                       $wgOut->addWikiText( wfMsg( 'noexactmatch', wfEscapeWikiText( $term ) ) );
+               } else {
+                       $wgOut->addWikiText( wfMsg( 'noexactmatch-nocreate', wfEscapeWikiText( $term ) ) );
+               }
 
                return $this->showResults( $term );
        }
@@ -123,10 +125,11 @@ class SpecialSearch {
                global $wgOut;
                $wgOut->addWikiText( wfMsg( 'searchresulttext' ) );
 
-               #if ( !$this->parseQuery() ) {
                if( '' === trim( $term ) ) {
+                       // Empty query -- straight view of search form
                        $wgOut->setSubtitle( '' );
                        $wgOut->addHTML( $this->powerSearchBox( $term ) );
+                       $wgOut->addHTML( $this->powerSearchFocus() );
                        wfProfileOut( $fname );
                        return;
                }
@@ -161,19 +164,22 @@ class SpecialSearch {
 
                $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 );
+               if ( $num > 0 ) {
+                       if ( $num >= $this->limit ) {
+                               $top = wfShowingResults( $this->offset, $this->limit );
+                       } else {
+                               $top = wfShowingResultsNum( $this->offset, $this->limit, $num );
+                       }
+                       $wgOut->addHTML( "<p>{$top}</p>\n" );
                }
-               $wgOut->addHTML( "<p>{$top}</p>\n" );
 
                if( $num || $this->offset ) {
                        $prevnext = wfViewPrevNext( $this->offset, $this->limit,
                                SpecialPage::getTitleFor( 'Search' ),
                                wfArrayToCGI(
                                        $this->powerSearchOptions(),
-                                       array( 'search' => $term ) ) );
+                                       array( 'search' => $term ) ),
+                                       ($num < $this->limit) );
                        $wgOut->addHTML( "<br />{$prevnext}\n" );
                }
 
@@ -184,6 +190,7 @@ class SpecialSearch {
                        } else {
                                $wgOut->addWikiText( '==' . wfMsg( 'notitlematches' ) . "==\n" );
                        }
+                       $titleMatches->free();
                }
 
                if( $textMatches ) {
@@ -194,6 +201,7 @@ class SpecialSearch {
                                # Don't show the 'no text matches' if we received title matches
                                $wgOut->addWikiText( '==' . wfMsg( 'notextmatches' ) . "==\n" );
                        }
+                       $textMatches->free();
                }
 
                if ( $num == 0 ) {
@@ -314,14 +322,20 @@ class SpecialSearch {
                        wfProfileOut( $fname );
                        return "<!-- Broken link in search result -->\n";
                }
-               $sk =& $wgUser->getSkin();
+               $sk = $wgUser->getSkin();
 
-               $contextlines = $wgUser->getOption( 'contextlines' );
-               if ( '' == $contextlines ) { $contextlines = 5; }
-               $contextchars = $wgUser->getOption( 'contextchars' );
-               if ( '' == $contextchars ) { $contextchars = 50; }
+               $contextlines = $wgUser->getOption( 'contextlines',  5 );
+               $contextchars = $wgUser->getOption( 'contextchars', 50 );
 
                $link = $sk->makeKnownLinkObj( $t );
+
+               //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()) {
+                       return "<li>{$link}</li>\n";
+               }
+
                $revision = Revision::newFromTitle( $t );
                $text = $revision->getText();
                $size = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'),
@@ -387,7 +401,7 @@ class SpecialSearch {
                        : '';
                $redirect = "<input type='checkbox' value='1' name=\"redirs\"{$checked} />\n";
 
-               $searchField = '<input type="text" name="search" value="' .
+               $searchField = '<input type="text" id="powerSearchText" name="search" value="' .
                        htmlspecialchars( $term ) ."\" size=\"16\" />\n";
 
                $searchButton = '<input type="submit" name="searchx" value="' .
@@ -403,6 +417,12 @@ class SpecialSearch {
                return "<br /><br />\n<form id=\"powersearch\" method=\"get\" " .
                  "action=\"$action\">\n{$ret}\n</form>\n";
        }
+       
+       function powerSearchFocus() {
+               return "<script type='text/javascript'>" .
+                       "document.getElementById('powerSearchText').focus();" .
+                       "</script>";
+       }
 }
 
-?>
+