X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebRequest.php;h=1bde4aed6f1b9b9fd521dd142707c7b6c98d951b;hb=022b7ba1406a4f402ff24c355288cb6ffd6eb82d;hp=03939de08d6d69953101c19e3d748e2c6aa78267;hpb=a26d5a49d755ff4b8039b11d1f26abb5d7bc7e8c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 03939de08d..1bde4aed6f 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * Deal with importing all those nasssty globals and things
- * @package MediaWiki
  */
 
 # Copyright (C) 2003 Brion Vibber <brion@pobox.com>
@@ -19,9 +18,18 @@
 #
 # 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,27 +40,131 @@
  * you want to pass arbitrary data to some function in place of the web
  * input.
  *
- * @package MediaWiki
+ * @ingroup HTTP
  */
 class WebRequest {
-	function WebRequest() {
+	protected $data, $headers = array();
+	private $_response;
+
+	public function __construct() {
+		/// @todo Fixme: this preemptive de-quoting can interfere with other web libraries
+		///        and increases our memory footprint. It would be cleaner to do on
+		///        demand; but currently we have no wrapper for $_SERVER etc.
 		$this->checkMagicQuotes();
+
+		// POST overrides GET data
+		// We don't use $_REQUEST here to avoid interference from cookies...
+		$this->data = $_POST + $_GET;
+	}
+
+	/**
+	 * 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.
+	 */
+	public 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 = isset( $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) {
+				$this->data[$key] = $_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 $path string: the URL path given from the client
+	 * @param $bases array: one or more URLs, optionally with $1 at the end
+	 * @param $key string: 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();
+	}
+
 	/**
 	 * Recursively strips slashes from the given array;
 	 * used for undoing the evil that is magic_quotes_gpc.
-	 * @param array &$arr will be modified
+	 *
+	 * @param $arr array: will be modified
 	 * @return array the original array
-	 * @access private
 	 */
-	function &fix_magic_quotes( &$arr ) {
+	private function &fix_magic_quotes( &$arr ) {
 		foreach( $arr as $key => $val ) {
 			if( is_array( $val ) ) {
 				$this->fix_magic_quotes( $arr[$key] );
@@ -68,10 +180,11 @@ class WebRequest {
 	 * 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.
-	 * @access private
 	 */
-	function checkMagicQuotes() {
-		if ( get_magic_quotes_gpc() ) {
+	private function checkMagicQuotes() {
+		$mustFixQuotes = function_exists( 'get_magic_quotes_gpc' )
+			&& get_magic_quotes_gpc();
+		if( $mustFixQuotes ) {
 			$this->fix_magic_quotes( $_COOKIE );
 			$this->fix_magic_quotes( $_ENV );
 			$this->fix_magic_quotes( $_GET );
@@ -83,9 +196,10 @@ class WebRequest {
 
 	/**
 	 * Recursively normalizes UTF-8 strings in the given array.
-	 * @param array $data string or array
+	 *
+	 * @param $data string or array
 	 * @return cleaned-up version of the given
-	 * @access private
+	 * @private
 	 */
 	function normalizeUnicode( $data ) {
 		if( is_array( $data ) ) {
@@ -93,7 +207,8 @@ class WebRequest {
 				$data[$key] = $this->normalizeUnicode( $val );
 			}
 		} else {
-			$data = UtfNormal::cleanUp( $data );
+			global $wgContLang;
+			$data = $wgContLang->normalize( $data );
 		}
 		return $data;
 	}
@@ -101,13 +216,16 @@ class WebRequest {
 	/**
 	 * Fetch a value from the given array or return $default if it's not set.
 	 *
-	 * @param array $arr
-	 * @param string $name
-	 * @param mixed $default
+	 * @param $arr Array
+	 * @param $name String
+	 * @param $default Mixed
 	 * @return mixed
-	 * @access private
 	 */
-	function getGPCVal( $arr, $name, $default ) {
+	private function getGPCVal( $arr, $name, $default ) {
+		# PHP is so nice to not touch input data, except sometimes:
+		# http://us2.php.net/variables.external#language.variables.external.dot-in-names
+		# Work around PHP *feature* to avoid *bugs* elsewhere.
+		$name = strtr( $name, '.', '_' );
 		if( isset( $arr[$name] ) ) {
 			global $wgContLang;
 			$data = $arr[$name];
@@ -117,45 +235,60 @@ class WebRequest {
 					$data = $wgContLang->checkTitleEncoding( $data );
 				}
 			}
-			require_once( 'normal/UtfNormal.php' );
 			$data = $this->normalizeUnicode( $data );
 			return $data;
 		} else {
+			taint( $default );
 			return $default;
 		}
 	}
 
 	/**
 	 * 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)
-	 * @return string
+	 * @param $name String
+	 * @param $default String: optional default (or NULL)
+	 * @return String
 	 */
-	function getVal( $name, $default = NULL ) {
-		$val = $this->getGPCVal( $_REQUEST, $name, $default );
+	public function getVal( $name, $default = null ) {
+		$val = $this->getGPCVal( $this->data, $name, $default );
 		if( is_array( $val ) ) {
 			$val = $default;
 		}
 		if( is_null( $val ) ) {
-			return null;
+			return $val;
 		} else {
 			return (string)$val;
 		}
 	}
 
+	/**
+	 * Set an aribtrary value into our get/post data.
+	 *
+	 * @param $key String: key name to use
+	 * @param $value Mixed: value to set
+	 * @return Mixed: old value if one was present, null otherwise
+	 */
+	public function setVal( $key, $value ) {
+		$ret = isset( $this->data[$key] ) ? $this->data[$key] : null;
+		$this->data[$key] = $value;
+		return $ret;
+	}
+
 	/**
 	 * 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.
 	 * If no source and no default, returns NULL.
 	 *
-	 * @param string $name
-	 * @param array $default optional default (or NULL)
-	 * @return array
+	 * @param $name String
+	 * @param $default Array: optional default (or NULL)
+	 * @return Array
 	 */
-	function getArray( $name, $default = NULL ) {
-		$val = $this->getGPCVal( $_REQUEST, $name, $default );
+	public function getArray( $name, $default = null ) {
+		$val = $this->getGPCVal( $this->data, $name, $default );
 		if( is_null( $val ) ) {
 			return null;
 		} else {
@@ -163,15 +296,34 @@ class WebRequest {
 		}
 	}
 
+	/**
+	 * 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 $name String
+	 * @param $default Array: option default (or NULL)
+	 * @return Array of ints
+	 */
+	public 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.
 	 * Guaranteed to return an integer; non-numeric input will typically
 	 * return 0.
-	 * @param string $name
-	 * @param int $default
-	 * @return int
+	 *
+	 * @param $name String
+	 * @param $default Integer
+	 * @return Integer
 	 */
-	function getInt( $name, $default = 0 ) {
+	public function getInt( $name, $default = 0 ) {
 		return intval( $this->getVal( $name, $default ) );
 	}
 
@@ -179,10 +331,11 @@ class WebRequest {
 	 * 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
+	 *
+	 * @param $name String
+	 * @return Integer
 	 */
-	function getIntOrNull( $name ) {
+	public function getIntOrNull( $name ) {
 		$val = $this->getVal( $name );
 		return is_numeric( $val )
 			? intval( $val )
@@ -193,11 +346,12 @@ class WebRequest {
 	 * Fetch a boolean value from the input or return $default if not set.
 	 * Guaranteed to return true or false, with normal PHP semantics for
 	 * boolean interpretation of strings.
-	 * @param string $name
-	 * @param bool $default
-	 * @return bool
+	 *
+	 * @param $name String
+	 * @param $default Boolean
+	 * @return Boolean
 	 */
-	function getBool( $name, $default = false ) {
+	public function getBool( $name, $default = false ) {
 		return $this->getVal( $name, $default ) ? true : false;
 	}
 
@@ -205,13 +359,14 @@ class WebRequest {
 	 * 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.
 	 * Example use is checking for the presence of check boxes in forms.
-	 * @param string $name
-	 * @return bool
+	 *
+	 * @param $name String
+	 * @return Boolean
 	 */
-	function getCheck( $name ) {
+	public function getCheck( $name ) {
 		# Checkboxes and buttons are only present when clicked
 		# Presence connotes truth, abscense false
-		$val = $this->getVal( $name, NULL );
+		$val = $this->getVal( $name, null );
 		return isset( $val );
 	}
 
@@ -219,13 +374,15 @@ 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
-	 * @return string
+	 * @param $name String
+	 * @param $default String: optional
+	 * @return String
 	 */
-	function getText( $name, $default = '' ) {
+	public function getText( $name, $default = '' ) {
 		global $wgContLang;
 		$val = $this->getVal( $name, $default );
 		return str_replace( "\r\n", "\n",
@@ -237,10 +394,10 @@ class WebRequest {
 	 * If no arguments are given, returns all input values.
 	 * No transformation is performed on the values.
 	 */
-	function getValues() {
+	public function getValues() {
 		$names = func_get_args();
 		if ( count( $names ) == 0 ) {
-			$names = array_keys( $_REQUEST );
+			$names = array_keys( $this->data );
 		}
 
 		$retVal = array();
@@ -260,9 +417,9 @@ class WebRequest {
 	 * Note that values retrieved by the object may come from the
 	 * GET URL etc even on a POST request.
 	 *
-	 * @return bool
+	 * @return Boolean
 	 */
-	function wasPosted() {
+	public function wasPosted() {
 		return $_SERVER['REQUEST_METHOD'] == 'POST';
 	}
 
@@ -270,18 +427,61 @@ class WebRequest {
 	 * Returns true if there is a session cookie set.
 	 * This does not necessarily mean that the user is logged in!
 	 *
-	 * @return bool
+	 * 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 Boolean
 	 */
-	function checkSessionCookie() {
-		return isset( $_COOKIE[ini_get('session.name')] );
+	public function checkSessionCookie() {
+		return isset( $_COOKIE[session_name()] );
+	}
+
+	/**
+	 * Get a cookie from the $_COOKIE jar
+	 *
+	 * @param $key String: the name of the cookie
+	 * @param $default Mixed: what to return if the value isn't found
+	 * @param $prefix String: a prefix to use for the cookie name, if not $wgCookiePrefix
+	 * @return Mixed: cookie value or $default if the cookie not set
+	 */
+	public function getCookie( $key, $default = null, $prefix = '' ) {
+		if( !$prefix ) {
+			global $wgCookiePrefix;
+			$prefix = $wgCookiePrefix;
+		}
+		return $this->getGPCVal( $_COOKIE, $prefix . $key , $default );
 	}
 
 	/**
 	 * Return the path portion of the request URI.
-	 * @return string
+	 *
+	 * @return String
 	 */
-	function getRequestURL() {
-		$base = $_SERVER['REQUEST_URI'];
+	public function getRequestURL() {
+		if( isset( $_SERVER['REQUEST_URI']) && strlen($_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 {
@@ -292,23 +492,31 @@ class WebRequest {
 
 	/**
 	 * Return the request URI with the canonical service and hostname.
-	 * @return string
+	 *
+	 * @return String
 	 */
-	function getFullRequestURL() {
+	public function getFullRequestURL() {
 		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 '?'
-	 * @return string
+	 * @param $query String: query string fragment; do not include initial '?'
+	 *
+	 * @return String
 	 */
-	function appendQuery( $query ) {
+	public 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;
@@ -320,23 +528,45 @@ class WebRequest {
 
 	/**
 	 * HTML-safe version of appendQuery().
-	 * @param string $query Query string fragment; do not include initial '?'
-	 * @return string
+	 *
+	 * @param $query String: query string fragment; do not include initial '?'
+	 * @return String
 	 */
-	function escapeAppendQuery( $query ) {
+	public function escapeAppendQuery( $query ) {
 		return htmlspecialchars( $this->appendQuery( $query ) );
 	}
 
+	public function appendQueryValue( $key, $value, $onlyquery = false ) {
+		return $this->appendQueryArray( array( $key => $value ), $onlyquery );
+	}
+
+	/**
+	 * Appends or replaces value of query variables.
+	 *
+	 * @param $array Array of values to replace/add to query
+	 * @param $onlyquery Bool: whether to only return the query string and not
+	 *                   the complete URL
+	 * @return String
+	 */
+	public function appendQueryArray( $array, $onlyquery = false ) {
+		global $wgTitle;
+		$newquery = $_GET;
+		unset( $newquery['title'] );
+		$newquery = array_merge( $newquery, $array );
+		$query = wfArrayToCGI( $newquery );
+		return $onlyquery ? $query : $wgTitle->getLocalURL( $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' ) {
+	public function getLimitOffset( $deflimit = 50, $optionname = 'rclimit' ) {
 		global $wgUser;
 
 		$limit = $this->getInt( 'limit', 0 );
@@ -355,22 +585,24 @@ class WebRequest {
 
 	/**
 	 * 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 ) {
+	public function getFileTempname( $key ) {
 		if( !isset( $_FILES[$key] ) ) {
-			return NULL;
+			return null;
 		}
 		return $_FILES[$key]['tmp_name'];
 	}
 
 	/**
 	 * Return the size of the upload, or 0.
-	 * @param string $key
+	 *
+	 * @param $key String:
 	 * @return integer
 	 */
-	function getFileSize( $key ) {
+	public function getFileSize( $key ) {
 		if( !isset( $_FILES[$key] ) ) {
 			return 0;
 		}
@@ -379,10 +611,11 @@ class WebRequest {
 
 	/**
 	 * Return the upload error or 0
-	 * @param string $key
+	 *
+	 * @param $key String:
 	 * @return integer
 	 */
-	function getUploadError( $key ) {
+	public function getUploadError( $key ) {
 		if( !isset( $_FILES[$key] ) || !isset( $_FILES[$key]['error'] ) ) {
 			return 0/*UPLOAD_ERR_OK*/;
 		}
@@ -397,71 +630,218 @@ 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 ) {
+	public function getFileName( $key ) {
+		global $wgContLang;
 		if( !isset( $_FILES[$key] ) ) {
-			return NULL;
+			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 );
-		$name = UtfNormal::cleanUp( $name );
+		$name = $wgContLang->normalize( $name );
 		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.
+	 */
+	public function response() {
+		/* Lazy initialization of response object for this request */
+		if ( !is_object( $this->_response ) ) {
+			$class = ( $this instanceof FauxRequest ) ? 'FauxResponse' : 'WebResponse';
+			$this->_response = new $class();
+		}
+		return $this->_response;
+	}
+
+	/**
+	 * Get a request header, or false if it isn't set
+	 * @param $name String: case-insensitive header name
+	 */
+	public function getHeader( $name ) {
+		$name = strtoupper( $name );
+		if ( function_exists( 'apache_request_headers' ) ) {
+			if ( !$this->headers ) {
+				foreach ( apache_request_headers() as $tempName => $tempValue ) {
+					$this->headers[ strtoupper( $tempName ) ] = $tempValue;
+				}
+			}
+			if ( isset( $this->headers[$name] ) ) {
+				return $this->headers[$name];
+			} else {
+				return false;
+			}
+		} else {
+			$name = 'HTTP_' . str_replace( '-', '_', $name );
+			if ( isset( $_SERVER[$name] ) ) {
+				return $_SERVER[$name];
+			} else {
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * Get data from $_SESSION
+	 *
+	 * @param $key String: name of key in $_SESSION
+	 * @return Mixed
+	 */
+	public function getSessionData( $key ) {
+		if( !isset( $_SESSION[$key] ) )
+			return null;
+		return $_SESSION[$key];
+	}
+
+	/**
+	 * Set session data
+	 *
+	 * @param $key String: name of key in $_SESSION
+	 * @param $data Mixed
+	 */
+	public function setSessionData( $key, $data ) {
+		$_SESSION[$key] = $data;
+	}
+
+	/**
+	 * Returns true if the PATH_INFO ends with an extension other than a script
+	 * extension. This could confuse IE for scripts that send arbitrary data which
+	 * is not HTML but may be detected as such.
+	 *
+	 * Various past attempts to use the URL to make this check have generally
+	 * run up against the fact that CGI does not provide a standard method to
+	 * determine the URL. PATH_INFO may be mangled (e.g. if cgi.fix_pathinfo=0),
+	 * but only by prefixing it with the script name and maybe some other stuff,
+	 * the extension is not mangled. So this should be a reasonably portable
+	 * way to perform this security check.
+	 */
+	public function isPathInfoBad() {
+		global $wgScriptExtension;
+
+		if ( !isset( $_SERVER['PATH_INFO'] ) ) {
+			return false;
+		}
+		$pi = $_SERVER['PATH_INFO'];
+		$dotPos = strrpos( $pi, '.' );
+		if ( $dotPos === false ) {
+			return false;
+		}
+		$ext = substr( $pi, $dotPos );
+		return !in_array( $ext, array( $wgScriptExtension, '.php', '.php5' ) );
+	}
+	
+	/**
+	 * Parse the Accept-Language header sent by the client into an array
+	 * @return array( languageCode => q-value ) sorted by q-value in descending order
+	 */
+	public function getAcceptLang() {
+		// Modified version of code found at http://www.thefutureoftheweb.com/blog/use-accept-language-header
+		if ( !isset( $_SERVER['HTTP_ACCEPT_LANGUAGE'] ) ) {
+			return array();
+		}
+		
+		// Break up string into pieces (languages and q factors)
+		$lang_parse = null;
+		preg_match_all( '/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0(\.[0-9]+))?)?/i',
+			$_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse );
+		
+		if ( !count( $lang_parse[1] ) ) {
+			return array();
+		}
+		// Create a list like "en" => 0.8
+		$langs = array_combine( $lang_parse[1], $lang_parse[4] );
+		// Set default q factor to 1
+		foreach ( $langs as $lang => $val ) {
+			if ( $val === '' ) {
+				$langs[$lang] = 1;
+			}
+		}
+		// Sort list
+		arsort( $langs, SORT_NUMERIC );
+		return $langs;
+	}
 }
 
 /**
  * WebRequest clone which takes values from a provided array.
  *
- * @package MediaWiki
+ * @ingroup HTTP
  */
 class FauxRequest extends WebRequest {
-	var $data = null;
-	var $wasPosted = false;
+	private $wasPosted = false;
+	private $session = array();
 
-	function FauxRequest( $data, $wasPosted = false ) {
+	/**
+	 * @param $data Array of *non*-urlencoded key => value pairs, the
+	 *   fake GET/POST values
+	 * @param $wasPosted Bool: whether to treat the data as POST
+	 * @param $session Mixed: session array or null
+	 */
+	public function __construct( $data, $wasPosted = false, $session = null ) {
 		if( is_array( $data ) ) {
 			$this->data = $data;
 		} else {
-			wfDebugDieBacktrace( "FauxRequest() got bogus data" );
+			throw new MWException( "FauxRequest() got bogus data" );
 		}
 		$this->wasPosted = $wasPosted;
+		if( $session )
+			$this->session = $session;
 	}
 
-	function getVal( $name, $default = NULL ) {
-		return $this->getGPCVal( $this->data, $name, $default );
+	private function notImplemented( $method ) {
+		throw new MWException( "{$method}() not implemented" );
 	}
 
-	function getText( $name, $default = '' ) {
+	public function getText( $name, $default = '' ) {
 		# Override; don't recode since we're using internal data
-		return $this->getVal( $name, $default );
+		return (string)$this->getVal( $name, $default );
 	}
 
-	function getValues() {
+	public function getValues() {
 		return $this->data;
 	}
 
-	function wasPosted() {
+	public function wasPosted() {
 		return $this->wasPosted;
 	}
 
-	function checkSessionCookie() {
+	public function checkSessionCookie() {
 		return false;
 	}
 
-	function getRequestURL() {
-		wfDebugDieBacktrace( 'FauxRequest::getRequestURL() not implemented' );
+	public function getRequestURL() {
+		$this->notImplemented( __METHOD__ );
 	}
 
-	function appendQuery( $query ) {
-		wfDebugDieBacktrace( 'FauxRequest::appendQuery() not implemented' );
+	public function appendQuery( $query ) {
+		$this->notImplemented( __METHOD__ );
 	}
 
-}
+	public function getHeader( $name ) {
+		return isset( $this->headers[$name] ) ? $this->headers[$name] : false;
+	}
+
+	public function setHeader( $name, $val ) {
+		$this->headers[$name] = $val;
+	}
+
+	public function getSessionData( $key ) {
+		if( isset( $this->session[$key] ) )
+			return $this->session[$key];
+	}
+
+	public function setSessionData( $key, $data ) {
+		$this->session[$key] = $data;
+	}
 
-?>
+	public function isPathInfoBad() {
+		return false;
+	}
+}