X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebRequest.php;h=c20110edb15f695554aae04726fc765cd7edd039;hb=24c478b815585a32fd9c4441f8a3ff59e505db59;hp=4de082004ea08d9cb44e976a9349ea8e1d48fd2d;hpb=fe40fe9da89278bc33549162f46490af91e60d11;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 4de082004e..c20110edb1 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -1,27 +1,35 @@
 <?php
 /**
  * Deal with importing all those nasssty globals and things
- * @package MediaWiki
  */
 
 # Copyright (C) 2003 Brion Vibber <brion@pobox.com>
 # http://www.mediawiki.org/
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or 
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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,18 +40,111 @@
  * you want to pass arbitrary data to some function in place of the web
  * input.
  *
- * @package MediaWiki
  */
 class WebRequest {
-	function 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( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != '') && $wgUsePathInfo ) {
-			# Stuff it!
-			$_GET['title'] = $_REQUEST['title'] =
-				substr( $_SERVER['PATH_INFO'], 1 );
+		if ( $wgUsePathInfo ) {
+			// 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 $wgScript;
+					if( $path == $wgScript ) {
+						// Script inside a rewrite path?
+						// Abort to keep from breaking...
+						return;
+					}
+					// Raw PATH_INFO style
+					$matches = $this->extractTitle( $path, "$wgScript/$1" );
+					
+					global $wgArticlePath;
+					if( !$matches && $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;
 
 	/**
 	 * Recursively strips slashes from the given array;
@@ -62,10 +163,10 @@ class WebRequest {
 		}
 		return $arr;
 	}
-	
+
 	/**
 	 * If magic_quotes_gpc option is on, run the global arrays
-	 * through fix_magic_quotes to strip out the stupid dlashes.
+	 * through fix_magic_quotes to strip out the stupid slashes.
 	 * WARNING: This should only be done once! Running a second
 	 * time could damage the values.
 	 * @private
@@ -80,7 +181,7 @@ class WebRequest {
 			$this->fix_magic_quotes( $_SERVER );
 		}
 	}
-	
+
 	/**
 	 * Recursively normalizes UTF-8 strings in the given array.
 	 * @param array $data string or array
@@ -97,31 +198,26 @@ class WebRequest {
 		}
 		return $data;
 	}
-	
+
 	/**
 	 * Fetch a value from the given array or return $default if it's not set.
 	 *
-	 * @param array &$arr
+	 * @param array $arr
 	 * @param string $name
 	 * @param mixed $default
 	 * @return mixed
 	 * @private
 	 */
-	function getGPCVal( &$arr, $name, $default ) {
+	function getGPCVal( $arr, $name, $default ) {
 		if( isset( $arr[$name] ) ) {
-			global $wgServer, $wgContLang;
+			global $wgContLang;
 			$data = $arr[$name];
-			if( isset( $_GET[$name] ) &&
-				!is_array( $data ) &&
-				( empty( $_SERVER['HTTP_REFERER'] ) ||
-				strncmp($wgServer, $_SERVER['HTTP_REFERER'], strlen( $wgServer ) ) ) ) {
-				# For links that came from outside, check for alternate/legacy
-				# character encoding.
+			if( isset( $_GET[$name] ) && !is_array( $data ) ) {
+				# Check for alternate/legacy character encoding.
 				if( isset( $wgContLang ) ) {
 					$data = $wgContLang->checkTitleEncoding( $data );
 				}
 			}
-			require_once( 'normal/UtfNormal.php' );
 			$data = $this->normalizeUnicode( $data );
 			return $data;
 		} else {
@@ -131,7 +227,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)
@@ -148,7 +246,7 @@ class WebRequest {
 			return (string)$val;
 		}
 	}
-	
+
 	/**
 	 * Fetch an array from the input or return $default if it's not set.
 	 * If source was scalar, will return an array with a single element.
@@ -166,6 +264,24 @@ class WebRequest {
 			return (array)$val;
 		}
 	}
+	
+	/**
+	 * Fetch an array of integers, or return $default if it's not set.
+	 * If source was scalar, will return an array with a single element.
+	 * If no source and no default, returns NULL.
+	 * If an array is returned, contents are guaranteed to be integers.
+	 *
+	 * @param string $name
+	 * @param array $default option default (or NULL)
+	 * @return array of ints
+	 */
+	function getIntArray( $name, $default = NULL ) {
+		$val = $this->getArray( $name, $default );
+		if( is_array( $val ) ) {
+			$val = array_map( 'intval', $val );
+		}
+		return $val;
+	}
 
 	/**
 	 * Fetch an integer value from the input or return $default if not set.
@@ -176,9 +292,23 @@ class WebRequest {
 	 * @return int
 	 */
 	function getInt( $name, $default = 0 ) {
-		return IntVal( $this->getVal( $name, $default ) );
+		return intval( $this->getVal( $name, $default ) );
 	}
-	
+
+	/**
+	 * Fetch an integer value from the input or return null if empty.
+	 * Guaranteed to return an integer or null; non-numeric input will
+	 * typically return null.
+	 * @param string $name
+	 * @return int
+	 */
+	function getIntOrNull( $name ) {
+		$val = $this->getVal( $name );
+		return is_numeric( $val )
+			? intval( $val )
+			: null;
+	}
+
 	/**
 	 * Fetch a boolean value from the input or return $default if not set.
 	 * Guaranteed to return true or false, with normal PHP semantics for
@@ -190,7 +320,7 @@ class WebRequest {
 	function getBool( $name, $default = false ) {
 		return $this->getVal( $name, $default ) ? true : false;
 	}
-	
+
 	/**
 	 * Return true if the named value is set in the input, whatever that
 	 * value is (even "0"). Return false if the named value is not set.
@@ -204,12 +334,14 @@ class WebRequest {
 		$val = $this->getVal( $name, NULL );
 		return isset( $val );
 	}
-	
+
 	/**
 	 * 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 
+	 * 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
@@ -221,20 +353,20 @@ class WebRequest {
 		return str_replace( "\r\n", "\n",
 			$wgContLang->recodeInput( $val ) );
 	}
-	
+
 	/**
 	 * Extracts the given named values into an array.
 	 * If no arguments are given, returns all input values.
 	 * No transformation is performed on the values.
 	 */
-	function getValues() {	
+	function getValues() {
 		$names = func_get_args();
 		if ( count( $names ) == 0 ) {
 			$names = array_keys( $_REQUEST );
 		}
 
 		$retVal = array();
-		foreach ( $names as $name ) { 
+		foreach ( $names as $name ) {
 			$value = $this->getVal( $name );
 			if ( !is_null( $value ) ) {
 				$retVal[$name] = $value;
@@ -255,25 +387,57 @@ class WebRequest {
 	function wasPosted() {
 		return $_SERVER['REQUEST_METHOD'] == 'POST';
 	}
-	
+
 	/**
 	 * Returns true if there is a session cookie set.
 	 * This does not necessarily mean that the user is logged in!
 	 *
+	 * If you want to check for an open session, use session_id()
+	 * instead; that will also tell you if the session was opened
+	 * during the current request (in which case the cookie will
+	 * be sent back to the client at the end of the script run).
+	 *
 	 * @return bool
 	 */
 	function checkSessionCookie() {
-		return isset( $_COOKIE[ini_get('session.name')] );
+		return isset( $_COOKIE[session_name()] );
 	}
-	
+
 	/**
 	 * Return the path portion of the request URI.
 	 * @return string
 	 */
 	function getRequestURL() {
-		return $_SERVER['REQUEST_URI'];
+		if( isset( $_SERVER['REQUEST_URI'] ) ) {
+			$base = $_SERVER['REQUEST_URI'];
+		} elseif( isset( $_SERVER['SCRIPT_NAME'] ) ) {
+			// Probably IIS; doesn't set REQUEST_URI
+			$base = $_SERVER['SCRIPT_NAME'];
+			if( isset( $_SERVER['QUERY_STRING'] ) && $_SERVER['QUERY_STRING'] != '' ) {
+				$base .= '?' . $_SERVER['QUERY_STRING'];
+			}
+		} else {
+			// This shouldn't happen!
+			throw new MWException( "Web server doesn't provide either " .
+				"REQUEST_URI or SCRIPT_NAME. Report details of your " .
+				"web server configuration to http://bugzilla.wikimedia.org/" );
+		}
+		// User-agents should not send a fragment with the URI, but
+		// if they do, and the web server passes it on to us, we
+		// need to strip it or we get false-positive redirect loops
+		// or weird output URLs
+		$hash = strpos( $base, '#' );
+		if( $hash !== false ) {
+			$base = substr( $base, 0, $hash );
+		}
+		if( $base{0} == '/' ) {
+			return $base;
+		} else {
+			// We may get paths with a host prepended; strip it.
+			return preg_replace( '!^[^:]+://[^/]+/!', '/', $base );
+		}
 	}
-	
+
 	/**
 	 * Return the request URI with the canonical service and hostname.
 	 * @return string
@@ -282,47 +446,53 @@ class WebRequest {
 		global $wgServer;
 		return $wgServer . $this->getRequestURL();
 	}
-	
+
 	/**
 	 * Take an arbitrary query and rewrite the present URL to include it
-	 * @param string $query Query string fragment; do not include initial '?'
+	 * @param $query String: query string fragment; do not include initial '?'
 	 * @return string
 	 */
 	function appendQuery( $query ) {
 		global $wgTitle;
 		$basequery = '';
 		foreach( $_GET as $var => $val ) {
-			if( $var == 'title' ) continue;
+			if ( $var == 'title' )
+				continue;
+			if ( is_array( $val ) )
+				/* This will happen given a request like
+				 * http://en.wikipedia.org/w/index.php?title[]=Special:Userlogin&returnto[]=Main_Page
+				 */
+				continue;
 			$basequery .= '&' . urlencode( $var ) . '=' . urlencode( $val );
 		}
 		$basequery .= '&' . $query;
-		
+
 		# Trim the extra &
 		$basequery = substr( $basequery, 1 );
 		return $wgTitle->getLocalURL( $basequery );
 	}
-	
+
 	/**
 	 * HTML-safe version of appendQuery().
-	 * @param string $query Query string fragment; do not include initial '?'
+	 * @param $query String: query string fragment; do not include initial '?'
 	 * @return string
 	 */
 	function escapeAppendQuery( $query ) {
 		return htmlspecialchars( $this->appendQuery( $query ) );
 	}
-	
+
 	/**
 	 * Check for limit and offset parameters on the input, and return sensible
 	 * defaults if not given. The limit must be positive and is capped at 5000.
 	 * Offset must be positive but is not capped.
 	 *
-	 * @param int $deflimit Limit to use if no input and the user hasn't set the option.
-	 * @param string $optionname To specify an option other than rclimit to pull from.
+	 * @param $deflimit Integer: limit to use if no input and the user hasn't set the option.
+	 * @param $optionname String: to specify an option other than rclimit to pull from.
 	 * @return array first element is limit, second is offset
 	 */
 	function getLimitOffset( $deflimit = 50, $optionname = 'rclimit' ) {
 		global $wgUser;
-	
+
 		$limit = $this->getInt( 'limit', 0 );
 		if( $limit < 0 ) $limit = 0;
 		if( ( $limit == 0 ) && ( $optionname != '' ) ) {
@@ -330,16 +500,16 @@ class WebRequest {
 		}
 		if( $limit <= 0 ) $limit = $deflimit;
 		if( $limit > 5000 ) $limit = 5000; # We have *some* limits...
-	
+
 		$offset = $this->getInt( 'offset', 0 );
 		if( $offset < 0 ) $offset = 0;
-	
+
 		return array( $limit, $offset );
 	}
-	
+
 	/**
 	 * Return the path to the temporary file where PHP has stored the upload.
-	 * @param string $key
+	 * @param $key String:
 	 * @return string or NULL if no such file.
 	 */
 	function getFileTempname( $key ) {
@@ -348,10 +518,10 @@ class WebRequest {
 		}
 		return $_FILES[$key]['tmp_name'];
 	}
-	
+
 	/**
 	 * Return the size of the upload, or 0.
-	 * @param string $key
+	 * @param $key String:
 	 * @return integer
 	 */
 	function getFileSize( $key ) {
@@ -360,7 +530,19 @@ class WebRequest {
 		}
 		return $_FILES[$key]['size'];
 	}
-	
+
+	/**
+	 * Return the upload error or 0
+	 * @param $key String:
+	 * @return integer
+	 */
+	function getUploadError( $key ) {
+		if( !isset( $_FILES[$key] ) || !isset( $_FILES[$key]['error'] ) ) {
+			return 0/*UPLOAD_ERR_OK*/;
+		}
+		return $_FILES[$key]['error'];
+	}
+
 	/**
 	 * Return the original filename of the uploaded file, as reported by
 	 * the submitting user agent. HTML-style character entities are
@@ -369,7 +551,7 @@ class WebRequest {
 	 *
 	 * Other than this the name is not verified for being a safe filename.
 	 *
-	 * @param string $key
+	 * @param $key String: 
 	 * @return string or NULL if no such file.
 	 */
 	function getFileName( $key ) {
@@ -377,7 +559,7 @@ class WebRequest {
 			return NULL;
 		}
 		$name = $_FILES[$key]['name'];
-		
+
 		# Safari sends filenames in HTML-encoded Unicode form D...
 		# Horrid and evil! Let's try to make some kind of sense of it.
 		$name = Sanitizer::decodeCharReferences( $name );
@@ -385,22 +567,39 @@ class WebRequest {
 		wfDebug( "WebRequest::getFileName() '" . $_FILES[$key]['name'] . "' normalized to '$name'\n" );
 		return $name;
 	}
+	
+	/**
+	 * Return a handle to WebResponse style object, for setting cookies, 
+	 * headers and other stuff, for Request being worked on.
+	 */
+	function response() {
+		/* Lazy initialization of response object for this request */
+		if (!is_object($this->_response)) {
+			$this->_response = new WebResponse;
+		} 
+		return $this->_response;
+	}
+	
 }
 
 /**
  * WebRequest clone which takes values from a provided array.
  *
- * @package MediaWiki
  */
 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;
 		} else {
-			wfDebugDieBacktrace( "FauxRequest() got bogus data" );
+			throw new MWException( "FauxRequest() got bogus data" );
 		}
 		$this->wasPosted = $wasPosted;
 	}
@@ -408,32 +607,32 @@ class FauxRequest extends WebRequest {
 	function getVal( $name, $default = NULL ) {
 		return $this->getGPCVal( $this->data, $name, $default );
 	}
-	
+
 	function getText( $name, $default = '' ) {
 		# Override; don't recode since we're using internal data
 		return $this->getVal( $name, $default );
 	}
-	
-	function getValues() {	
+
+	function getValues() {
 		return $this->data;
 	}
 
 	function wasPosted() {
 		return $this->wasPosted;
 	}
-	
+
 	function checkSessionCookie() {
 		return false;
 	}
-	
+
 	function getRequestURL() {
-		wfDebugDieBacktrace( 'FauxRequest::getRequestURL() not implemented' );
+		throw new MWException( 'FauxRequest::getRequestURL() not implemented' );
 	}
-	
+
 	function appendQuery( $query ) {
-		wfDebugDieBacktrace( 'FauxRequest::appendQuery() not implemented' );
+		throw new MWException( 'FauxRequest::appendQuery() not implemented' );
 	}
-	
+
 }
 
-?>
+