# 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.
function WebRequest() {
$this->checkMagicQuotes();
global $wgUsePathInfo;
- if( isset( $_SERVER['PATH_INFO'] ) && $wgUsePathInfo ) {
+ if( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != '') && $wgUsePathInfo ) {
# Stuff it!
$_GET['title'] = $_REQUEST['title'] =
substr( $_SERVER['PATH_INFO'], 1 );
* used for undoing the evil that is magic_quotes_gpc.
* @param array &$arr will be modified
* @return array the original array
- * @private
+ * @access private
*/
function &fix_magic_quotes( &$arr ) {
foreach( $arr as $key => $val ) {
}
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
+ * @access private
*/
function checkMagicQuotes() {
if ( get_magic_quotes_gpc() ) {
$this->fix_magic_quotes( $_SERVER );
}
}
-
+
/**
* Recursively normalizes UTF-8 strings in the given array.
* @param array $data string or array
* @return cleaned-up version of the given
- * @private
+ * @access private
*/
function normalizeUnicode( $data ) {
if( is_array( $data ) ) {
}
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
+ * @access private
*/
- function getGPCVal( &$arr, $name, $default ) {
+ function getGPCVal( $arr, $name, $default ) {
if( isset( $arr[$name] ) ) {
- global $wgUseLatin1, $wgServer, $wgLang;
+ global $wgContLang;
$data = $arr[$name];
- if( isset( $_GET[$name] ) &&
- ( empty( $_SERVER['HTTP_REFERER'] ) ||
- strncmp($wgServer, $_SERVER['HTTP_REFERER'], strlen( $wgServer ) ) ) ) {
- # For links that came from outside, check for alternate/legacy
- # character encoding.
- $data = $wgLang->checkTitleEncoding( $data );
- }
- if( !$wgUseLatin1 ) {
- require_once( 'normal/UtfNormal.php' );
- $data = $this->normalizeUnicode( $data );
+ 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 {
return $default;
}
}
-
+
/**
- * Fetch a value 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.
- * @param array &$arr
+ * Fetch a scalar from the input or return $default if it's not set.
+ * Returns a string. Arrays are discarded.
+ *
* @param string $name
- * @param string $default
+ * @param string $default optional default (or NULL)
* @return string
- * @private
*/
- function getGPCText( &$arr, $name, $default ) {
- # Text fields may be in an alternate encoding which we should check.
- # Also, strip CRLF line endings down to LF to achieve consistency.
- global $wgLang;
- if( isset( $arr[$name] ) ) {
- return str_replace( "\r\n", "\n", $wgLang->recodeInput( $arr[$name] ) );
+ function getVal( $name, $default = NULL ) {
+ $val = $this->getGPCVal( $_REQUEST, $name, $default );
+ if( is_array( $val ) ) {
+ $val = $default;
+ }
+ if( is_null( $val ) ) {
+ return null;
} else {
- return $default;
+ return (string)$val;
}
}
-
+
/**
- * Fetch a value from the input or return $default if it's not set.
- * Value may be of a string or array, and is not altered.
+ * 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 mixed $default optional default (or NULL)
- * @return mixed
+ * @param array $default optional default (or NULL)
+ * @return array
*/
- function getVal( $name, $default = NULL ) {
- return $this->getGPCVal( $_REQUEST, $name, $default );
+ function getArray( $name, $default = NULL ) {
+ $val = $this->getGPCVal( $_REQUEST, $name, $default );
+ if( is_null( $val ) ) {
+ return null;
+ } else {
+ return (array)$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 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
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.
$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.
*
* @return string
*/
function getText( $name, $default = '' ) {
- return $this->getGPCText( $_REQUEST, $name, $default );
+ global $wgContLang;
+ $val = $this->getVal( $name, $default );
+ 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;
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!
function checkSessionCookie() {
return isset( $_COOKIE[ini_get('session.name')] );
}
-
+
/**
* Return the path portion of the request URI.
* @return string
*/
function getRequestURL() {
- return $_SERVER['REQUEST_URI'];
+ $base = $_SERVER['REQUEST_URI'];
+ 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
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 '?'
$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 '?'
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.
*/
function getLimitOffset( $deflimit = 50, $optionname = 'rclimit' ) {
global $wgUser;
-
+
$limit = $this->getInt( 'limit', 0 );
if( $limit < 0 ) $limit = 0;
if( ( $limit == 0 ) && ( $optionname != '' ) ) {
}
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
}
return $_FILES[$key]['tmp_name'];
}
-
+
/**
* Return the size of the upload, or 0.
* @param string $key
}
return $_FILES[$key]['size'];
}
-
+
+ /**
+ * Return the upload error or 0
+ * @param string $key
+ * @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
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.
- global $wgUseLatin1;
- if( $wgUseLatin1 ) {
- $name = utf8_encode( $name );
- }
- $name = wfMungeToUtf8( $name );
+ $name = Sanitizer::decodeCharReferences( $name );
$name = UtfNormal::cleanUp( $name );
- if( $wgUseLatin1 ) {
- $name = utf8_decode( $name );
- }
wfDebug( "WebRequest::getFileName() '" . $_FILES[$key]['name'] . "' normalized to '$name'\n" );
return $name;
}
class FauxRequest extends WebRequest {
var $data = null;
var $wasPosted = false;
-
- function WebRequest( $data, $wasPosted = false ) {
+
+ function FauxRequest( $data, $wasPosted = false ) {
if( is_array( $data ) ) {
$this->data = $data;
} else {
- wfDebugDieBacktrace( "FauxReqeust() got bogus data" );
+ wfDebugDieBacktrace( "FauxRequest() got bogus data" );
}
$this->wasPosted = $wasPosted;
}
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' );
}
-
+
function appendQuery( $query ) {
wfDebugDieBacktrace( 'FauxRequest::appendQuery() not implemented' );
}
-
+
}
?>