X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebRequest.php;h=b549b9e66efb4692e481311bf4dfb77a7383e00e;hb=8407c408ab991533e7a1b927f85b0a931bb8fa35;hp=6c058af0c9f686f0a4d7e7a770a92e6cdc16ed67;hpb=fd11a81597c7e290fc7d2f03d24e449c0fda1a03;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 6c058af0c9..b549b9e66e 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -21,6 +21,15 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
+
+/**
+ * Some entry points may use this file without first enabling the 
+ * autoloader.
+ */
+if ( !function_exists( '__autoload' ) ) {
+	require_once( dirname(__FILE__) . '/normal/UtfNormal.php' );
+}
+
 /**
  * The WebRequest class encapsulates getting at data passed in the
  * URL or via a POSTed form, handling remove of "magic quotes" slashes,
@@ -32,29 +41,96 @@
  * input.
  *
  */
-
-/**
- * Some entry points may use this file without first enabling the 
- * autoloader.
- */
-if ( !function_exists( '__autoload' ) ) {
-	require_once( dirname(__FILE__) . '/normal/UtfNormal.php' );
-}
-
 class WebRequest {
 	function __construct() {
 		$this->checkMagicQuotes();
+	}
+	
+	/**
+	 * Check for title, action, and/or variant data in the URL
+	 * and interpolate it into the GET variables.
+	 * This should only be run after $wgContLang is available,
+	 * as we may need the list of language variants to determine
+	 * available variant URLs.
+	 */
+	function interpolateTitle() {
 		global $wgUsePathInfo;
 		if ( $wgUsePathInfo ) {
-			if ( isset( $_SERVER['ORIG_PATH_INFO'] ) && $_SERVER['ORIG_PATH_INFO'] != '' ) {
-				# Mangled PATH_INFO
-				# http://bugs.php.net/bug.php?id=31892
-				# Also reported when ini_get('cgi.fix_pathinfo')==false
-				$_GET['title'] = $_REQUEST['title'] = substr( $_SERVER['ORIG_PATH_INFO'], 1 );
-			} elseif ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != '') && $wgUsePathInfo ) {
-				$_GET['title'] = $_REQUEST['title'] = substr( $_SERVER['PATH_INFO'], 1 );
+			// PATH_INFO is mangled due to http://bugs.php.net/bug.php?id=31892
+			// And also by Apache 2.x, double slashes are converted to single slashes.
+			// So we will use REQUEST_URI if possible.
+			$matches = array();
+			if ( !empty( $_SERVER['REQUEST_URI'] ) ) {
+				// Slurp out the path portion to examine...
+				$url = $_SERVER['REQUEST_URI'];
+				if ( !preg_match( '!^https?://!', $url ) ) {
+					$url = 'http://unused' . $url;
+				}
+				$a = parse_url( $url );
+				if( $a ) {
+					$path = $a['path'];
+					
+					global $wgArticlePath;
+					$matches = $this->extractTitle( $path, $wgArticlePath );
+					
+					global $wgActionPaths;
+					if( !$matches && $wgActionPaths) {
+						$matches = $this->extractTitle( $path, $wgActionPaths, 'action' );
+					}
+					
+					global $wgVariantArticlePath, $wgContLang;
+					if( !$matches && $wgVariantArticlePath ) {
+						$variantPaths = array();
+						foreach( $wgContLang->getVariants() as $variant ) {
+							$variantPaths[$variant] =
+								str_replace( '$2', $variant, $wgVariantArticlePath );
+						}
+						$matches = $this->extractTitle( $path, $variantPaths, 'variant' );
+					}
+				}
+			} elseif ( isset( $_SERVER['ORIG_PATH_INFO'] ) && $_SERVER['ORIG_PATH_INFO'] != '' ) {
+				// Mangled PATH_INFO
+				// http://bugs.php.net/bug.php?id=31892
+				// Also reported when ini_get('cgi.fix_pathinfo')==false
+				$matches['title'] = substr( $_SERVER['ORIG_PATH_INFO'], 1 );
+				
+			} elseif ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != '') ) {
+				// Regular old PATH_INFO yay
+				$matches['title'] = substr( $_SERVER['PATH_INFO'], 1 );
+			}
+			foreach( $matches as $key => $val) {
+				$_GET[$key] = $_REQUEST[$key] = $val;
+			}
+		}
+	}
+	
+	/**
+	 * Internal URL rewriting function; tries to extract page title and,
+	 * optionally, one other fixed parameter value from a URL path.
+	 *
+	 * @param string $path the URL path given from the client
+	 * @param array $bases one or more URLs, optionally with $1 at the end
+	 * @param string $key if provided, the matching key in $bases will be
+	 *        passed on as the value of this URL parameter
+	 * @return array of URL variables to interpolate; empty if no match
+	 */
+	private function extractTitle( $path, $bases, $key=false ) {
+		foreach( (array)$bases as $keyValue => $base ) {
+			// Find the part after $wgArticlePath
+			$base = str_replace( '$1', '', $base );
+			$baseLen = strlen( $base );
+			if( substr( $path, 0, $baseLen ) == $base ) {
+				$raw = substr( $path, $baseLen );
+				if( $raw !== '' ) {
+					$matches = array( 'title' => rawurldecode( $raw ) );
+					if( $key ) {
+						$matches[$key] = $keyValue;
+					}
+					return $matches;
+				}
 			}
 		}
+		return array();
 	}
 	
 	private $_response;
@@ -140,7 +216,9 @@ class WebRequest {
 
 	/**
 	 * Fetch a scalar from the input or return $default if it's not set.
-	 * Returns a string. Arrays are discarded.
+	 * Returns a string. Arrays are discarded. Useful for 
+	 * non-freeform text inputs (e.g. predefined internal text keys 
+	 * selected by a drop-down menu). For freeform input, see getText().
 	 *
 	 * @param string $name
 	 * @param string $default optional default (or NULL)
@@ -250,7 +328,9 @@ class WebRequest {
 	 * Fetch a text string from the given array or return $default if it's not
 	 * set. \r is stripped from the text, and with some language modules there
 	 * is an input transliteration applied. This should generally be used for
-	 * form <textarea> and <input> fields.
+	 * form <textarea> and <input> fields. Used for user-supplied freeform text
+	 * input (for which input transformations may be required - e.g. Esperanto 
+	 * x-coding).
 	 *
 	 * @param string $name
 	 * @param string $default optional
@@ -499,6 +579,11 @@ class FauxRequest extends WebRequest {
 	var $data = null;
 	var $wasPosted = false;
 
+	/**
+	 * @param array $data Array of *non*-urlencoded key => value pairs, the
+	 *   fake GET/POST values
+	 * @param bool $wasPosted Whether to treat the data as POST
+	 */
 	function FauxRequest( $data, $wasPosted = false ) {
 		if( is_array( $data ) ) {
 			$this->data = $data;
@@ -539,4 +624,4 @@ class FauxRequest extends WebRequest {
 
 }
 
-?>
+