From 222b01f5169f1c7e69762e0e8904c24f78f71882 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 28 Jul 2010 11:52:48 +0200
Subject: update to MediaWiki 1.16.0

---
 includes/AjaxFunctions.php | 96 +++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to 'includes/AjaxFunctions.php')

diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php
index 1a9adbca..e3180e0a 100644
--- a/includes/AjaxFunctions.php
+++ b/includes/AjaxFunctions.php
@@ -4,7 +4,7 @@
  * @ingroup Ajax
  */
 
-if( !defined( 'MEDIAWIKI' ) ) {
+if ( !defined( 'MEDIAWIKI' ) ) {
 	die( 1 );
 }
 
@@ -14,31 +14,31 @@ 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 parameter 
+ * @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 +47,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;
@@ -61,16 +61,16 @@ function js_unescape($source, $iconv_to = 'UTF-8') {
  * @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 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 '';
 }
 
 /**
@@ -81,49 +81,49 @@ function code2utf($num){
  *   respectively, followed by an HTML message to display in the alert box; or
  *   '<err#>' on error
  */
-function wfAjaxWatch($pagename = "", $watch = "") {
-	if(wfReadOnly()) {
+function wfAjaxWatch( $pagename = "", $watch = "" ) {
+	if ( wfReadOnly() ) {
 		// redirect to action=(un)watch, which will display the database lock
 		// message
 		return '<err#>';
 	}
 
-	if('w' !== $watch && 'u' !== $watch) {
+	if ( 'w' !== $watch && 'u' !== $watch ) {
 		return '<err#>';
 	}
 	$watch = 'w' === $watch;
 
-	$title = Title::newFromDBkey($pagename);
-	if(!$title) {
+	$title = Title::newFromDBkey( $pagename );
+	if ( !$title ) {
 		// Invalid title
 		return '<err#>';
 	}
-	$article = new Article($title);
+	$article = new Article( $title );
 	$watching = $title->userIsWatching();
 
-	if($watch) {
-		if(!$watching) {
-			$dbw = wfGetDB(DB_MASTER);
+	if ( $watch ) {
+		if ( !$watching ) {
+			$dbw = wfGetDB( DB_MASTER );
 			$dbw->begin();
 			$ok = $article->doWatch();
 			$dbw->commit();
 		}
 	} else {
-		if($watching) {
-			$dbw = wfGetDB(DB_MASTER);
+		if ( $watching ) {
+			$dbw = wfGetDB( DB_MASTER );
 			$dbw->begin();
 			$ok = $article->doUnwatch();
 			$dbw->commit();
 		}
 	}
 	// Something stopped the change
-	if( isset($ok) && !$ok ) {
+	if ( isset( $ok ) && !$ok ) {
 		return '<err#>';
 	}
-	if( $watch ) {
-		return '<w#>'.wfMsgExt( 'addedwatchtext', array( 'parse' ), $title->getPrefixedText() );
+	if ( $watch ) {
+		return '<w#>' . wfMsgExt( 'addedwatchtext', array( 'parse' ), $title->getPrefixedText() );
 	} else {
-		return '<u#>'.wfMsgExt( 'removedwatchtext', array( 'parse' ), $title->getPrefixedText() );
+		return '<u#>' . wfMsgExt( 'removedwatchtext', array( 'parse' ), $title->getPrefixedText() );
 	}
 }
 
@@ -133,12 +133,12 @@ function wfAjaxWatch($pagename = "", $watch = "") {
  */
 function wfAjaxGetThumbnailUrl( $file, $width, $height ) {
 	$file = wfFindFile( $file );
-	
+
 	if ( !$file || !$file->exists() )
 		return null;
-		
+
 	$url = $file->getThumbnail( $width, $height )->url;
-	
+
 	return $url;
 }
 
@@ -148,11 +148,11 @@ function wfAjaxGetThumbnailUrl( $file, $width, $height ) {
  */
 function wfAjaxGetFileUrl( $file ) {
 	$file = wfFindFile( $file );
-	
+
 	if ( !$file || !$file->exists() )
 		return null;
-		
+
 	$url = $file->getUrl();
-	
+
 	return $url;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf