Merge "Revert "Adding sanity check to Title::isRedirect().""

[lhc/web/wiklou.git] / includes / upload / UploadFromFile.php

diff --git a/includes/upload/UploadFromFile.php b/includes/upload/UploadFromFile.php
index 9ca9229..fae9974 100644 (file)
--- a/includes/upload/UploadFromFile.php
+++ b/includes/upload/UploadFromFile.php
@@ -1,15 +1,43 @@
 <?php
 /**
- * Implements regular file uploads
+ * Backend for regular file upload.
+ *
+ * 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
+ * (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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
- * @ingroup upload
- * @author Bryan Tong Minh
+ * @ingroup Upload
  */
 
+/**
+ * Implements regular file uploads
+ *
+ * @ingroup Upload
+ * @author Bryan Tong Minh
+ */
 class UploadFromFile extends UploadBase {
+
+       /**
+        * @var WebRequestUpload
+        */
        protected $mUpload = null;
 
+       /**
+        * @param $request WebRequest
+        * @return null
+        */
        function initializeFromRequest( &$request ) {
                $upload = $request->getUpload( 'wpUploadFile' );                
                $desiredDestName = $request->getText( 'wpDestFile' );
@@ -18,31 +46,48 @@ class UploadFromFile extends UploadBase {
                        
                return $this->initialize( $desiredDestName, $upload );
        }
-       
+
        /**
         * Initialize from a filename and a WebRequestUpload
+        * @param $name
+        * @param $webRequestUpload
+        * @return null
         */
        function initialize( $name, $webRequestUpload ) {
                $this->mUpload = $webRequestUpload;
                return $this->initializePathInfo( $name, 
                        $this->mUpload->getTempName(), $this->mUpload->getSize() );
        }
+
+       /**
+        * @param $request
+        * @return bool
+        */
        static function isValidRequest( $request ) {
                # Allow all requests, even if no file is present, so that an error
                # because a post_max_size or upload_max_filesize overflow
                return true;
        }
-       
+
+       /**
+        * @return string
+        */
+       public function getSourceType() {
+               return 'file';
+       }
+
+       /**
+        * @return array
+        */
        public function verifyUpload() {
                # Check for a post_max_size or upload_max_size overflow, so that a 
                # proper error can be shown to the user
                if ( is_null( $this->mTempPath ) || $this->isEmptyFile() ) {
                        if ( $this->mUpload->isIniSizeOverflow() ) {
-                               global $wgMaxUploadSize;
                                return array( 
-                                       'status' => self::FILE_TOO_LARGE,
+                                       'status' => UploadBase::FILE_TOO_LARGE,
                                        'max' => min( 
-                                               $wgMaxUploadSize, 
+                                               self::getMaxUploadSize( $this->getSourceType() ), 
                                                wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ), 
                                                wfShorthandToInteger( ini_get( 'post_max_size' ) )
                                        ),