X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FAjaxFunctions.php;h=8e5de31b7306651513c115e98a93bccabb54dc14;hb=0c99ecc6f2bda2ba9b7b74e5d1e248a5ad0b4b9d;hp=86f853dbd740ce598c5e6930726efaeb3bdeb814;hpb=343420d0adbb86eb4e5007b0baeaae5165ef5c32;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php
index 86f853dbd7..8e5de31b73 100644
--- a/includes/AjaxFunctions.php
+++ b/includes/AjaxFunctions.php
@@ -1,11 +1,12 @@
 <?php
-
-/** 
- * @package MediaWiki
- * @addtogroup Ajax
+/**
+ * Handler functions for Ajax requests
+ *
+ * @file
+ * @ingroup Ajax
  */
 
-if( !defined( 'MEDIAWIKI' ) ) {
+if ( !defined( 'MEDIAWIKI' ) ) {
 	die( 1 );
 }
 
@@ -15,30 +16,32 @@ if( !defined( 'MEDIAWIKI' ) ) {
  * Modified function from http://pure-essence.net/stuff/code/utf8RawUrlDecode.phps
  *
  * @param $source String escaped with Javascript's escape() function
- * @param $iconv_to String destination character set will be used as second paramether in the iconv function. Default is UTF-8.
+ * @param $iconv_to String destination character set will be used as second parameter
+ * in the iconv function. Default is UTF-8.
  * @return string
  */
-function js_unescape($source, $iconv_to = 'UTF-8') {
+function js_unescape( $source, $iconv_to = 'UTF-8' ) {
 	$decodedStr = '';
 	$pos = 0;
-	$len = strlen ($source);
+	$len = strlen ( $source );
 
-	while ($pos < $len) {
-		$charAt = substr ($source, $pos, 1);
-		if ($charAt == '%') {
+	while ( $pos < $len ) {
+		$charAt = substr ( $source, $pos, 1 );
+		if ( $charAt == '%' ) {
 			$pos++;
-			$charAt = substr ($source, $pos, 1);
-			if ($charAt == 'u') {
+			$charAt = substr ( $source, $pos, 1 );
+
+			if ( $charAt == 'u' ) {
 				// we got a unicode character
 				$pos++;
-				$unicodeHexVal = substr ($source, $pos, 4);
-				$unicode = hexdec ($unicodeHexVal);
-				$decodedStr .= code2utf($unicode);
+				$unicodeHexVal = substr ( $source, $pos, 4 );
+				$unicode = hexdec ( $unicodeHexVal );
+				$decodedStr .= code2utf( $unicode );
 				$pos += 4;
 			} else {
 				// we have an escaped ascii character
-				$hexVal = substr ($source, $pos, 2);
-				$decodedStr .= chr (hexdec ($hexVal));
+				$hexVal = substr ( $source, $pos, 2 );
+				$decodedStr .= chr ( hexdec ( $hexVal ) );
 				$pos += 2;
 			}
 		} else {
@@ -47,8 +50,8 @@ function js_unescape($source, $iconv_to = 'UTF-8') {
 		}
 	}
 
-	if ($iconv_to != "UTF-8") {
-		$decodedStr = iconv("UTF-8", $iconv_to, $decodedStr);
+	if ( $iconv_to != "UTF-8" ) {
+		$decodedStr = iconv( "utf-8", $iconv_to, $decodedStr );
 	}
 
 	return $decodedStr;
@@ -56,121 +59,43 @@ function js_unescape($source, $iconv_to = 'UTF-8') {
 
 /**
  * Function coverts number of utf char into that character.
- * Function taken from: http://sk2.php.net/manual/en/function.utf8-encode.php#49336
+ * Function taken from: http://www.php.net/manual/en/function.utf8-encode.php#49336
  *
  * @param $num Integer
  * @return utf8char
  */
-function code2utf($num){
-   if ( $num<128 )
-   	return chr($num);
-   if ( $num<2048 )
-   	return chr(($num>>6)+192).chr(($num&63)+128);
-   if ( $num<65536 )
-   	return chr(($num>>12)+224).chr((($num>>6)&63)+128).chr(($num&63)+128);
-   if ( $num<2097152 )
-   	return chr(($num>>18)+240).chr((($num>>12)&63)+128).chr((($num>>6)&63)+128) .chr(($num&63)+128);
-   return '';
-}
-
-function wfSajaxSearch( $term ) {
-	global $wgContLang, $wgOut;
-	$limit = 16;
-
-	$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 = "";
-
-	$i=0;
-	while ( ( $row = $db->fetchObject( $res ) ) && ( ++$i <= $limit ) ) {
-		$nt = Title::newFromDBkey( $row->page_title );
-		$r .= '<li>' . $l->makeKnownLinkObj( $nt ) . "</li>\n";
-	}
-	if ( $i > $limit ) {
-		$more = '<i>' .  $l->makeKnownLink( $wgContLang->specialPage( "Allpages" ),
-		                                wfMsg('moredotdotdot'),
-		                                "namespace=0&from=" . wfUrlEncode ( $term ) ) .
-			'</i>';
-	} else {
-		$more = '';
+function code2utf( $num ) {
+	if ( $num < 128 ) {
+		return chr( $num );
 	}
 
-	$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;
+	if ( $num < 2048 ) {
+		return chr( ( $num >> 6 ) + 192 ) . chr( ( $num&63 ) + 128 );
+	}
 
-	$response = new AjaxResponse( $html );
+	if ( $num < 65536 ) {
+		return chr( ( $num >> 12 ) + 224 ) . chr( ( ( $num >> 6 )&63 ) + 128 ) . chr( ( $num&63 ) + 128 );
+	}
 
-	$response->setCacheDuration( 30*60 );
+	if ( $num < 2097152 ) {
+		return chr( ( $num >> 18 ) + 240 ) . chr( ( ( $num >> 12 )&63 ) + 128 ) . chr( ( ( $num >> 6 )&63 ) + 128 ) . chr( ( $num&63 ) + 128 );
+	}
 
-	return $response;
+	return '';
 }
 
 /**
- * Called for AJAX watch/unwatch requests.
- * @param $pageID Integer ID of the page to be watched/unwatched
- * @param $watch String 'w' to watch, 'u' to unwatch
- * @return String '<w#>' or '<u#>' on successful watch or unwatch, respectively, or '<err#>' on error (invalid XML in case we want to add HTML sometime)
+ * Called in some places (currently just extensions)
+ * to get the URL for a given file.
  */
-function wfAjaxWatch($pageID = "", $watch = "") {
-	if(wfReadOnly())
-		return '<err#>'; // redirect to action=(un)watch, which will display the database lock message
+function wfAjaxGetFileUrl( $file ) {
+	$file = wfFindFile( $file );
 
-	if(('w' !== $watch && 'u' !== $watch) || !is_numeric($pageID))
-		return '<err#>';
-	$watch = 'w' === $watch;
-	$pageID = intval($pageID);
-
-	$title = Title::newFromID($pageID);
-	if(!$title)
-		return '<err#>';
-	$article = new Article($title);
-	$watching = $title->userIsWatching();
-
-	if($watch) {
-		if(!$watching) {
-			$dbw = wfGetDB(DB_MASTER);
-			$dbw->begin();
-			$article->doWatch();
-			$dbw->commit();
-		}
-	} else {
-		if($watching) {
-			$dbw = wfGetDB(DB_MASTER);
-			$dbw->begin();
-			$article->doUnwatch();
-			$dbw->commit();
-		}
+	if ( !$file || !$file->exists() ) {
+		return null;
 	}
 
-	return $watch ? '<w#>' : '<u#>';
+	$url = $file->getUrl();
+
+	return $url;
 }
-?>