From 086ae52d12011746a75f5588e877347bc0457352 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 21 Mar 2008 11:49:34 +0100
Subject: Update auf MediaWiki 1.12.0

---
 includes/AjaxFunctions.php | 121 +++++++++++++++++++++++++++------------------
 1 file changed, 72 insertions(+), 49 deletions(-)

(limited to 'includes/AjaxFunctions.php')

diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php
index 4fb76dcc..ffd3168a 100644
--- a/includes/AjaxFunctions.php
+++ b/includes/AjaxFunctions.php
@@ -73,64 +73,87 @@ function code2utf($num){
    return '';
 }
 
+define( 'AJAX_SEARCH_VERSION', 2 );	//AJAX search cache version
+
 function wfSajaxSearch( $term ) {
-	global $wgContLang, $wgOut;
+	global $wgContLang, $wgOut, $wgUser, $wgCapitalLinks, $wgMemc;
 	$limit = 16;
+	$sk = $wgUser->getSkin();
+	$output = '';
+
+	$term = trim( $term );
+	$term = $wgContLang->checkTitleEncoding( $wgContLang->recodeInput( js_unescape( $term ) ) );
+	if ( $wgCapitalLinks )
+		$term = $wgContLang->ucfirst( $term ); 
+	$term_title = Title::newFromText( $term );
+
+	$memckey = $term_title ? wfMemcKey( 'ajaxsearch', md5( $term_title->getFullText() ) ) : wfMemcKey( 'ajaxsearch', md5( $term ) );
+	$cached = $wgMemc->get($memckey);
+	if( is_array( $cached ) && $cached['version'] == AJAX_SEARCH_VERSION ) {
+		$response = new AjaxResponse( $cached['html'] );
+		$response->setCacheDuration( 30*60 );
+		return $response;
+	}
 
-	$l = new Linker;
-
-	$term = str_replace( ' ', '_', $wgContLang->ucfirst( 
-			$wgContLang->checkTitleEncoding( $wgContLang->recodeInput( js_unescape( $term ) ) )
-		) );
-
-	if ( strlen( str_replace( '_', '', $term ) )<3 )
-		return;
-
-	$db = wfGetDB( DB_SLAVE );
-	$res = $db->select( 'page', 'page_title',
-			array(  'page_namespace' => 0,
-				"page_title LIKE '". $db->strencode( $term) ."%'" ),
-				"wfSajaxSearch",
-				array( 'LIMIT' => $limit+1 )
-			);
-
-	$r = "";
+	$r = $more = '';
+	$canSearch = true;
+	
+	$results = PrefixSearch::titleSearch( $term, $limit + 1 );
+	foreach( array_slice( $results, 0, $limit ) as $titleText ) {
+		$r .= '<li>' . $sk->makeKnownLink( $titleText ) . "</li>\n";
+	}
+	
+	// Hack to check for specials
+	if( $results ) {
+		$t = Title::newFromText( $results[0] );
+		if( $t && $t->getNamespace() == NS_SPECIAL ) {
+			$canSearch = false;
+			if( count( $results ) > $limit ) {
+				$more = '<i>' .
+					$sk->makeKnownLinkObj(
+						SpecialPage::getTitleFor( 'Specialpages' ),
+						wfMsgHtml( 'moredotdotdot' ) ) .
+					'</i>';
+			}
+		} else {
+			if( count( $results ) > $limit ) {
+				$more = '<i>' .
+					$sk->makeKnownLinkObj(
+						SpecialPage::getTitleFor( "Allpages", $term ),
+						wfMsgHtml( 'moredotdotdot' ) ) .
+					'</i>';
+			}
+		}
+	}
 
-	$i=0;
-	while ( ( $row = $db->fetchObject( $res ) ) && ( ++$i <= $limit ) ) {
-		$nt = Title::newFromDBkey( $row->page_title );
-		$r .= '<li>' . $l->makeKnownLinkObj( $nt ) . "</li>\n";
+	$valid = (bool) $term_title;
+	$term_url = urlencode( $term );
+	$term_diplay = htmlspecialchars( $valid ? $term_title->getFullText() : $term );
+	$subtitlemsg = ( $valid ? 'searchsubtitle' : 'searchsubtitleinvalid' );
+	$subtitle = wfMsgWikiHtml( $subtitlemsg, $term_diplay );
+	$html = '<div id="searchTargetHide"><a onclick="Searching_Hide_Results();">'
+		. wfMsgHtml( 'hideresults' ) . '</a></div>'
+		. '<h1 class="firstHeading">'.wfMsgHtml('search')
+		. '</h1><div id="contentSub">'. $subtitle . '</div>';
+	if( $canSearch ) {
+		$html .= '<ul><li>'
+			. $sk->makeKnownLink( $wgContLang->specialPage( 'Search' ),
+						wfMsgHtml( 'searchcontaining', $term_diplay ),
+						"search={$term_url}&fulltext=Search" )
+			. '</li><li>' . $sk->makeKnownLink( $wgContLang->specialPage( 'Search' ),
+						wfMsgHtml( 'searchnamed', $term_diplay ) ,
+						"search={$term_url}&go=Go" )
+			. "</li></ul>";
 	}
-	if ( $i > $limit ) {
-		$more = '<i>' .  $l->makeKnownLink( $wgContLang->specialPage( "Allpages" ),
-		                                wfMsg('moredotdotdot'),
-		                                "namespace=0&from=" . wfUrlEncode ( $term ) ) .
-			'</i>';
-	} else {
-		$more = '';
+	if( $r ) {
+		$html .= "<h2>" . wfMsgHtml( 'articletitles', $term_diplay ) . "</h2>"
+			. '<ul>' .$r .'</ul>' . $more;
 	}
 
-	$subtitlemsg = ( Title::newFromText($term) ? 'searchsubtitle' : 'searchsubtitleinvalid' );
-	$subtitle = $wgOut->parse( wfMsg( $subtitlemsg, wfEscapeWikiText($term) ) ); #FIXME: parser is missing mTitle !
-
-	$term = urlencode( $term );
-	$html = '<div style="float:right; border:solid 1px black;background:gainsboro;padding:2px;"><a onclick="Searching_Hide_Results();">'
-		. wfMsg( 'hideresults' ) . '</a></div>'
-		. '<h1 class="firstHeading">'.wfMsg('search')
-		. '</h1><div id="contentSub">'. $subtitle . '</div><ul><li>'
-		. $l->makeKnownLink( $wgContLang->specialPage( 'Search' ),
-					wfMsg( 'searchcontaining', $term ),
-					"search=$term&fulltext=Search" )
-		. '</li><li>' . $l->makeKnownLink( $wgContLang->specialPage( 'Search' ),
-					wfMsg( 'searchnamed', $term ) ,
-					"search=$term&go=Go" )
-		. "</li></ul><h2>" . wfMsg( 'articletitles', $term ) . "</h2>"
-		. '<ul>' .$r .'</ul>'.$more;
+	$wgMemc->set( $memckey, array( 'version' => AJAX_SEARCH_VERSION, 'html' => $html ), 30 * 60 );
 
 	$response = new AjaxResponse( $html );
-
 	$response->setCacheDuration( 30*60 );
-
 	return $response;
 }
 
@@ -154,7 +177,7 @@ function wfAjaxWatch($pagename = "", $watch = "") {
 	}
 	$watch = 'w' === $watch;
 
-	$title = Title::newFromText($pagename);
+	$title = Title::newFromDBkey($pagename);
 	if(!$title) {
 		// Invalid title
 		return '<err#>';
-- 
cgit v1.2.3-54-g00ecf