*/
class WebRequest {
protected $data, $headers = array();
- private $_response;
+
+ /**
+ * Lazy-init response object
+ * @var WebResponse
+ */
+ private $response;
public function __construct() {
/// @todo Fixme: this preemptive de-quoting can interfere with other web libraries
public function interpolateTitle() {
global $wgUsePathInfo;
+ // bug 16019: title interpolation on API queries is useless and sometimes harmful
+ if ( defined( 'MW_API' ) ) {
+ return;
+ }
+
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.
* @return Boolean
*/
public function getBool( $name, $default = false ) {
- return $this->getVal( $name, $default ) ? true : false;
+ return (bool)$this->getVal( $name, $default );
+ }
+
+ /**
+ * Fetch a boolean value from the input or return $default if not set.
+ * Unlike getBool, the string "false" will result in boolean false, which is
+ * useful when interpreting information sent from JavaScript.
+ *
+ * @param $name String
+ * @param $default Boolean
+ * @return Boolean
+ */
+ public function getFuzzyBool( $name, $default = false ) {
+ return $this->getBool( $name, $default ) && strcasecmp( $this->getVal( $name ), 'false' ) !== 0;
}
/**
global $wgTitle;
$basequery = '';
foreach( $_GET as $var => $val ) {
- if ( $var == 'title' )
+ if ( $var == 'title' ) {
continue;
- if ( is_array( $val ) )
+ }
+ 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;
global $wgUser;
$limit = $this->getInt( 'limit', 0 );
- if( $limit < 0 ) $limit = 0;
+ if( $limit < 0 ) {
+ $limit = 0;
+ }
if( ( $limit == 0 ) && ( $optionname != '' ) ) {
$limit = (int)$wgUser->getOption( $optionname );
}
- if( $limit <= 0 ) $limit = $deflimit;
- if( $limit > 5000 ) $limit = 5000; # We have *some* limits...
+ if( $limit <= 0 ) {
+ $limit = $deflimit;
+ }
+ if( $limit > 5000 ) {
+ $limit = 5000; # We have *some* limits...
+ }
$offset = $this->getInt( 'offset', 0 );
- if( $offset < 0 ) $offset = 0;
+ if( $offset < 0 ) {
+ $offset = 0;
+ }
return array( $limit, $offset );
}
$file = new WebRequestUpload( $this, $key );
return $file->getName();
}
-
+
/**
* Return a WebRequestUpload object corresponding to the key
- *
+ *
* @param @key string
* @return WebRequestUpload
*/
/**
* Return a handle to WebResponse style object, for setting cookies,
* headers and other stuff, for Request being worked on.
+ *
+ * @return WebResponse
*/
public function response() {
/* Lazy initialization of response object for this request */
- if ( !is_object( $this->_response ) ) {
+ if ( !is_object( $this->response ) ) {
$class = ( $this instanceof FauxRequest ) ? 'FauxResponse' : 'WebResponse';
- $this->_response = new $class();
+ $this->response = new $class();
}
- return $this->_response;
+ return $this->response;
}
/**
* @return Mixed
*/
public function getSessionData( $key ) {
- if( !isset( $_SESSION[$key] ) )
+ if( !isset( $_SESSION[$key] ) ) {
return null;
+ }
return $_SESSION[$key];
}
$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
if ( !$acceptLang ) {
return array();
}
-
+
// Return the language codes in lower case
$acceptLang = strtolower( $acceptLang );
-
+
// 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]+)?)?)?/',
$acceptLang, $lang_parse );
-
+
if ( !count( $lang_parse[1] ) ) {
return array();
}
protected $request;
protected $doesExist;
protected $fileInfo;
-
+
/**
* Constructor. Should only be called by WebRequest
- *
+ *
* @param $request WebRequest The associated request
* @param $key string Key in $_FILES array (name of form field)
*/
$this->fileInfo = $_FILES[$key];
}
}
-
+
/**
* Return whether a file with this name was uploaded.
- *
+ *
* @return bool
*/
public function exists() {
return $this->doesExist;
}
-
+
/**
* Return the original filename of the uploaded file
- *
+ *
* @return mixed Filename or null if non-existent
*/
public function getName() {
if ( !$this->exists() ) {
return null;
}
-
+
global $wgContLang;
$name = $this->fileInfo['name'];
wfDebug( __METHOD__ . ": {$this->fileInfo['name']} normalized to '$name'\n" );
return $name;
}
-
+
/**
* Return the file size of the uploaded file
- *
+ *
* @return int File size or zero if non-existent
*/
public function getSize() {
if ( !$this->exists() ) {
return 0;
}
-
+
return $this->fileInfo['size'];
}
-
+
/**
* Return the path to the temporary file
- *
+ *
* @return mixed Path or null if non-existent
*/
public function getTempName() {
if ( !$this->exists() ) {
return null;
}
-
+
return $this->fileInfo['tmp_name'];
}
-
+
/**
* Return the upload error. See link for explanation
* http://www.php.net/manual/en/features.file-upload.errors.php
- *
+ *
* @return int One of the UPLOAD_ constants, 0 if non-existent
*/
public function getError() {
if ( !$this->exists() ) {
return 0; # UPLOAD_ERR_OK
}
-
+
return $this->fileInfo['error'];
}
-
+
/**
* Returns whether this upload failed because of overflow of a maximum set
* in php.ini
- *
+ *
* @return bool
*/
public function isIniSizeOverflow() {
# post_max_size is exceeded
return true;
}
-
+
return false;
}
}
}
public function appendQuery( $query ) {
- $this->notImplemented( __METHOD__ );
+ global $wgTitle;
+ $basequery = '';
+ foreach( $this->data as $var => $val ) {
+ 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 );
}
public function getHeader( $name ) {
dépôts / lhc / web / wiklou.git / blobdiff