X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FWebRequest.php;h=824e6848913001dc7e634381b51f09b02aef8fc0;hb=1d41a1a7345c38a87c047f06c5f75d3dace43a29;hp=b4b8be9b159a9d4de007d7aff2ddc755b6bba3d1;hpb=c1d11183bc00b548404393d2229b2d635e867cf3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index b4b8be9b15..824e684891 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -315,7 +315,9 @@ class WebRequest {
 			}
 		} else {
 			global $wgContLang;
-			$data = isset( $wgContLang ) ? $wgContLang->normalize( $data ) : UtfNormal\Validator::cleanUp( $data );
+			$data = isset( $wgContLang ) ?
+				$wgContLang->normalize( $data ) :
+				UtfNormal\Validator::cleanUp( $data );
 		}
 		return $data;
 	}
@@ -754,7 +756,8 @@ class WebRequest {
 	 * Appends or replaces value of query variables.
 	 *
 	 * @param array $array Array of values to replace/add to query
-	 * @param bool $onlyquery Whether to only return the query string and not the complete URL [deprecated]
+	 * @param bool $onlyquery Whether to only return the query string
+	 *  and not the complete URL [deprecated]
 	 * @return string
 	 */
 	public function appendQueryArray( $array, $onlyquery = true ) {
@@ -962,8 +965,7 @@ class WebRequest {
 	 * @return bool
 	 */
 	public function checkUrlExtension( $extWhitelist = array() ) {
-		global $wgScriptExtension;
-		$extWhitelist[] = ltrim( $wgScriptExtension, '.' );
+		$extWhitelist[] = 'php';
 		if ( IEUrlExtension::areServerVarsBad( $_SERVER, $extWhitelist ) ) {
 			if ( !$this->wasPosted() ) {
 				$newUrl = IEUrlExtension::fixUrlForIE6(
@@ -1174,120 +1176,6 @@ HTML;
 	}
 }
 
-/**
- * Object to access the $_FILES array
- */
-class WebRequestUpload {
-	protected $request;
-	protected $doesExist;
-	protected $fileInfo;
-
-	/**
-	 * Constructor. Should only be called by WebRequest
-	 *
-	 * @param WebRequest $request The associated request
-	 * @param string $key Key in $_FILES array (name of form field)
-	 */
-	public function __construct( $request, $key ) {
-		$this->request = $request;
-		$this->doesExist = isset( $_FILES[$key] );
-		if ( $this->doesExist ) {
-			$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 string|null Filename or null if non-existent
-	 */
-	public function getName() {
-		if ( !$this->exists() ) {
-			return null;
-		}
-
-		global $wgContLang;
-		$name = $this->fileInfo['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 = $wgContLang->normalize( $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 string|null 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() {
-		if ( $this->getError() == UPLOAD_ERR_INI_SIZE ) {
-			# PHP indicated that upload_max_filesize is exceeded
-			return true;
-		}
-
-		$contentLength = $this->request->getHeader( 'CONTENT_LENGTH' );
-		if ( $contentLength > wfShorthandToInteger( ini_get( 'post_max_size' ) ) ) {
-			# post_max_size is exceeded
-			return true;
-		}
-
-		return false;
-	}
-}
-
 /**
  * WebRequest clone which takes values from a provided array.
  *