Pass the user as an argument to 'isValidPassword' hook callbacks; see docs/hooks...

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

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index 8c2f8aa..3fc8bab 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 {
 
@@ -70,19 +68,17 @@ class SpecialSearch {
        }
 
        /**
-        * 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
         * @public
         */
        function goResult( $term ) {
                global $wgOut;
                global $wgGoToEdit;
-               global $wgContLang;
 
                $this->setupPage( $term );
 
                # Try to go to page as entered.
-               #
                $t = Title::newFromText( $term );
 
                # If the string cannot be used to create a title
@@ -99,17 +95,13 @@ class SpecialSearch {
 
                # 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( 'noexactmatch', wfEscapeWikiText( $term ) ) );
 
@@ -126,8 +118,7 @@ class SpecialSearch {
 
                $this->setupPage( $term );
 
-               global $wgUser, $wgOut;
-               $sk = $wgUser->getSkin();
+               global $wgOut;
                $wgOut->addWikiText( wfMsg( 'searchresulttext' ) );
 
                #if ( !$this->parseQuery() ) {
@@ -168,19 +159,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" );
                }
 
@@ -191,6 +185,7 @@ class SpecialSearch {
                        } else {
                                $wgOut->addWikiText( '==' . wfMsg( 'notitlematches' ) . "==\n" );
                        }
+                       $titleMatches->free();
                }
 
                if( $textMatches ) {
@@ -201,6 +196,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 ) {
@@ -321,14 +317,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'),
@@ -348,6 +350,7 @@ class SpecialSearch {
                                break;
                        }
                        ++$lineno;
+                       $m = array();
                        if ( ! preg_match( $pat1, $line, $m ) ) {
                                continue;
                        }
@@ -411,4 +414,4 @@ class SpecialSearch {
        }
 }
 
-?>
+