X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FAjaxFunctions.php;h=9e892f1abc52c8211d104c8bf5e42d1a1ab5fe7c;hb=968da62b1e5bca3d2b6dbf2461157a008c994de1;hp=8631b4e5733cd5ab05748b8dfc38ab680e03d322;hpb=ed8e8e58335db38a0ee0eedfc4d4417611dd645f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php
index 8631b4e573..9e892f1abc 100644
--- a/includes/AjaxFunctions.php
+++ b/includes/AjaxFunctions.php
@@ -1,7 +1,12 @@
 <?php
+/**
+ * @file
+ * @ingroup Ajax
+ */
 
-if( !defined( 'MEDIAWIKI' ) )
-        die( 1 );
+if( !defined( 'MEDIAWIKI' ) ) {
+	die( 1 );
+}
 
 /**
  * Function converts an Javascript escaped string back into a string with
@@ -13,45 +18,44 @@ if( !defined( 'MEDIAWIKI' ) )
  * @return string
  */
 function js_unescape($source, $iconv_to = 'UTF-8') {
-   $decodedStr = '';
-   $pos = 0;
-   $len = strlen ($source);
-   while ($pos < $len) {
-       $charAt = substr ($source, $pos, 1);
-       if ($charAt == '%') {
-           $pos++;
-           $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);
-               $pos += 4;
-           }
-           else {
-               // we have an escaped ascii character
-               $hexVal = substr ($source, $pos, 2);
-               $decodedStr .= chr (hexdec ($hexVal));
-               $pos += 2;
-           }
-       }
-       else {
-           $decodedStr .= $charAt;
-           $pos++;
-       }
-   }
+	$decodedStr = '';
+	$pos = 0;
+	$len = strlen ($source);
+
+	while ($pos < $len) {
+		$charAt = substr ($source, $pos, 1);
+		if ($charAt == '%') {
+			$pos++;
+			$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);
+				$pos += 4;
+			} else {
+				// we have an escaped ascii character
+				$hexVal = substr ($source, $pos, 2);
+				$decodedStr .= chr (hexdec ($hexVal));
+				$pos += 2;
+			}
+		} else {
+			$decodedStr .= $charAt;
+			$pos++;
+		}
+	}
+
+	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;
+	return $decodedStr;
 }
 
 /**
  * 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
@@ -68,202 +72,56 @@ function code2utf($num){
    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 = '';
-	}
-
-	$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;
-
-	$response = new AjaxResponse( $html );
-
-	$response->setCacheDuration( 30*60 );
-
-	return $response;
-}
-
 /**
  * Called for AJAX watch/unwatch requests.
- * @param $pageID Integer ID of the page to be watched/unwatched
+ * @param $pagename Prefixed title string for page to watch/unwatch
  * @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)
+ * @return String '<w#>' or '<u#>' on successful watch or unwatch,
+ *   respectively, followed by an HTML message to display in the alert box; or
+ *   '<err#>' on error
  */
-function wfAjaxWatch($pageID = "", $watch = "") {
-	if(wfReadOnly())
-		return '<err#>'; // redirect to action=(un)watch, which will display the database lock message
+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) || !is_numeric($pageID))
+	if('w' !== $watch && 'u' !== $watch) {
 		return '<err#>';
+	}
 	$watch = 'w' === $watch;
-	$pageID = intval($pageID);
 
-	$title = Title::newFromID($pageID);
-	if(!$title)
+	$title = Title::newFromDBkey($pagename);
+	if(!$title) {
+		// Invalid title
 		return '<err#>';
+	}
 	$article = new Article($title);
 	$watching = $title->userIsWatching();
 
 	if($watch) {
 		if(!$watching) {
-			$dbw =& wfGetDB(DB_MASTER);
+			$dbw = wfGetDB(DB_MASTER);
 			$dbw->begin();
-			$article->doWatch();
+			$ok = $article->doWatch();
 			$dbw->commit();
 		}
 	} else {
 		if($watching) {
-			$dbw =& wfGetDB(DB_MASTER);
+			$dbw = wfGetDB(DB_MASTER);
 			$dbw->begin();
-			$article->doUnwatch();
+			$ok = $article->doUnwatch();
 			$dbw->commit();
 		}
 	}
-
-	return $watch ? '<w#>' : '<u#>';
-}
-
-/**
- * Return a list of Editors currently editing the article.
- * Based on an idea by Tim Starling.
- *
- * @author Ashar Voultoiz <hashar@altern.org>
- * @author Tim Starling
- */
-function wfAjaxShowEditors( $articleId, $username ) {
-	global $wgOut;
-	$articleId = intval($articleId);
-
-	// Validate request
-	$title = Title::newFromID( $articleId );
-	if( !($title) ) { return 'ERR: page id invalid'; }
-
-	$user = User::newFromSession() ;
-	if( !$user ) { return 'ERR: user invalid'; }
-
-	$username = $user->getName();
-	if( !(  $user->isLoggedIn() or User::isIP( $username )  ) ) { return 'ERR: user not found'; }
-
-
-	// When did the user started editing ?
-	$dbr =& wfGetDB(DB_SLAVE);
-	$userStarted = $dbr->selectField( 'editings',
-		'editings_started',
-		array(
-			'editings_user' => $username,
-			'editings_page' => $title->getArticleID(),
-		),
-		__METHOD__
-	);
-
-	// He just started editing, assume NOW
-	if(!$userStarted) { $userStarted = $dbr->timestamp(); }
-
-	# Either create a new entry or update the touched timestamp.
-	# This is done using a unique index on the database :
-	# `editings_page_started` (`editings_page`,`editings_user`,`editings_started`)
-
-	$dbw =& wfGetDB(DB_MASTER);
-	$dbw->replace( 'editings',
-		array( 'editings_page', 'editings_user', 'editings_started' ),
-		array(
-			'editings_page' => $title->getArticleID() ,
-			'editings_user' => $username,
-			'editings_started' => $userStarted ,
-			'editings_touched' => $dbw->timestamp(),
-		), __METHOD__
-	);
-
-	// Now we get the list of all watching users
-	$dbr = & wfGetDB(DB_SLAVE);
-	$res = $dbr->select( 'editings',
-		array( 'editings_user','editings_started','editings_touched' ),
-		array( 'editings_page' => $title->getArticleID() ),
-		__METHOD__
-	);
-
-	$l = new Linker();
-
-	$wikitext = '';
-	$unix_now = wfTimestamp(TS_UNIX);
-	$first = 1;
-	while( $editor = $dbr->fetchObject( $res ) ) {
-
-		// Check idling time
-		$idle = $unix_now - wfTimestamp( TS_UNIX, $editor->editings_touched );
-
-		global $wgAjaxShowEditorsTimeout ;
-		if( $idle >= $wgAjaxShowEditorsTimeout ) {
-			$dbw->delete('editings',
-				array(
-					'editings_page' => $title->getArticleID(),
-					'editings_user' => $editor->editings_user,
-				),
-				__METHOD__
-			);
-			continue; // we will not show the user
-		}
-
-		if( $first ) { $first = 0; }
-		else { $wikitext .= ' ~  '; }
-
-		$since = wfTimestamp( TS_DB, $editor->editings_started );
-		$wikitext .= $since;
-
-		$wikitext .= ' ' . $l->makeLinkObj(
-				Title::makeTitle( NS_USER, $editor->editings_user ),
-				$editor->editings_user
-			);
-
-
-		$wikitext .= ' ' . wfMsg( 'ajax-se-idling', '<span>'.$idle.'</span>' );
+	// Something stopped the change
+	if( isset($ok) && !$ok ) {
+		return '<err#>';
+	}
+	if( $watch ) {
+		return '<w#>'.wfMsgExt( 'addedwatchtext', array( 'parse' ), $title->getPrefixedText() );
+	} else {
+		return '<u#>'.wfMsgExt( 'removedwatchtext', array( 'parse' ), $title->getPrefixedText() );
 	}
-	return $wikitext ;
 }
-?>