(bug 17941) $wgMaxUploadSize is now honored by all upload sources
[lhc/web/wiklou.git] / includes / specials / SpecialUpload.php
index 2df3cea..d236f12 100644 (file)
@@ -5,14 +5,13 @@
  * @ingroup Upload
  *
  * Form for handling uploads and special page.
- *
  */
 
 class SpecialUpload extends SpecialPage {
        /**
         * Constructor : initialise object
         * Get data POSTed through the form and assign them to the object
-        * @param WebRequest $request Data posted.
+        * @param $request WebRequest : data posted.
         */
        public function __construct( $request = null ) {
                global $wgRequest;
@@ -30,7 +29,7 @@ class SpecialUpload extends SpecialPage {
        protected $mUploadClicked;
 
        /** User input variables from the "description" section **/
-       protected $mDesiredDestName;    // The requested target file name
+       public    $mDesiredDestName;    // The requested target file name
        protected $mComment;
        protected $mLicense;
 
@@ -45,16 +44,16 @@ class SpecialUpload extends SpecialPage {
        protected $mForReUpload;                // The user followed an "overwrite this file" link
        protected $mCancelUpload;               // The user clicked "Cancel and return to upload form" button
        protected $mTokenOk;
-       
+       protected $mUploadSuccessful = false;   // Subclasses can use this to determine whether a file was uploaded
+
        /** Text injection points for hooks not using HTMLForm **/
        public $uploadFormTextTop;
        public $uploadFormTextAfterSummary;
-       
 
        /**
         * Initialize instance variables from request and create an Upload handler
         *
-        * @param WebRequest $request The request to extract variables from
+        * @param $request WebRequest: the request to extract variables from
         */
        protected function loadRequest( $request ) {
                global $wgUser;
@@ -62,14 +61,15 @@ class SpecialUpload extends SpecialPage {
                $this->mRequest = $request;
                $this->mSourceType        = $request->getVal( 'wpSourceType', 'file' );
                $this->mUpload            = UploadBase::createFromRequest( $request );
-               $this->mUploadClicked     = $request->wasPosted() 
-                       && ( $request->getCheck( 'wpUpload' ) 
+               $this->mUploadClicked     = $request->wasPosted()
+                       && ( $request->getCheck( 'wpUpload' )
                                || $request->getCheck( 'wpUploadIgnoreWarning' ) );
 
                // Guess the desired name from the filename if not provided
                $this->mDesiredDestName   = $request->getText( 'wpDestFile' );
-               if( !$this->mDesiredDestName )
+               if( !$this->mDesiredDestName ) {
                        $this->mDesiredDestName = $request->getText( 'wpUploadFile' );
+               }
                $this->mComment           = $request->getText( 'wpUploadDescription' );
                $this->mLicense           = $request->getText( 'wpLicense' );
 
@@ -96,7 +96,7 @@ class SpecialUpload extends SpecialPage {
                } else {
                        $this->mTokenOk = $wgUser->matchEditToken( $token );
                }
-               
+
                $this->uploadFormTextTop = '';
                $this->uploadFormTextAfterSummary = '';
        }
@@ -106,8 +106,8 @@ class SpecialUpload extends SpecialPage {
         * Handle permission checking elsewhere in order to be able to show
         * custom error messages.
         *
-        * @param User $user
-        * @return bool
+        * @param $user User object
+        * @return Boolean
         */
        public function userCanExecute( $user ) {
                return UploadBase::isEnabled() && parent::userCanExecute( $user );
@@ -155,88 +155,103 @@ class SpecialUpload extends SpecialPage {
 
                # Unsave the temporary file in case this was a cancelled upload
                if ( $this->mCancelUpload ) {
-                       if ( !$this->unsaveUploadedFile() )
+                       if ( !$this->unsaveUploadedFile() ) {
                                # Something went wrong, so unsaveUploadedFile showed a warning
                                return;
+                       }
                }
 
                # Process upload or show a form
-               if ( $this->mTokenOk && !$this->mCancelUpload
-                               && ( $this->mUpload && $this->mUploadClicked ) ) {
+               if (
+                       $this->mTokenOk && !$this->mCancelUpload &&
+                       ( $this->mUpload && $this->mUploadClicked )
+               )
+               {
                        $this->processUpload();
                } else {
                        # Backwards compatibility hook
-                       if( !wfRunHooks( 'UploadForm:initial', array( &$this ) ) )
-                       {
+                       if( !wfRunHooks( 'UploadForm:initial', array( &$this ) ) ) {
                                wfDebug( "Hook 'UploadForm:initial' broke output of the upload form" );
                                return;
                        }
-                       
+
                        $this->showUploadForm( $this->getUploadForm() );
                }
 
                # Cleanup
-               if ( $this->mUpload )
+               if ( $this->mUpload ) {
                        $this->mUpload->cleanupTempFile();
+               }
        }
 
        /**
-        * Show the main upload form and optionally add the session key to the
-        * output. This hides the source selection.
+        * Show the main upload form
         *
-        * @param string $message HTML message to be shown at top of form
-        * @param string $sessionKey Session key of the stashed upload
+        * @param $form Mixed: an HTMLForm instance or HTML string to show
         */
        protected function showUploadForm( $form ) {
                # Add links if file was previously deleted
-               if ( !$this->mDesiredDestName )
+               if ( !$this->mDesiredDestName ) {
                        $this->showViewDeletedLinks();
+               }
+
+               if ( $form instanceof HTMLForm ) {
+                       $form->show();
+               } else {
+                       global $wgOut;
+                       $wgOut->addHTML( $form );
+               }
 
-               $form->show();
        }
 
        /**
         * Get an UploadForm instance with title and text properly set.
         *
-        * @param string $message HTML string to add to the form
-        * @param string $sessionKey Session key in case this is a stashed upload
+        * @param $message String: HTML string to add to the form
+        * @param $sessionKey String: session key in case this is a stashed upload
+        * @param $hideIgnoreWarning Boolean: whether to hide "ignore warning" check box
         * @return UploadForm
         */
        protected function getUploadForm( $message = '', $sessionKey = '', $hideIgnoreWarning = false ) {
                global $wgOut;
-               
+
                # Initialize form
                $form = new UploadForm( array(
-                       'watch' => $this->getWatchCheck(), 
-                       'forreupload' => $this->mForReUpload, 
+                       'watch' => $this->getWatchCheck(),
+                       'forreupload' => $this->mForReUpload,
                        'sessionkey' => $sessionKey,
                        'hideignorewarning' => $hideIgnoreWarning,
                        'destwarningack' => (bool)$this->mDestWarningAck,
-                       
+
                        'texttop' => $this->uploadFormTextTop,
                        'textaftersummary' => $this->uploadFormTextAfterSummary,
                ) );
                $form->setTitle( $this->getTitle() );
 
                # Check the token, but only if necessary
-               if( !$this->mTokenOk && !$this->mCancelUpload
-                               && ( $this->mUpload && $this->mUploadClicked ) ) {
+               if(
+                       !$this->mTokenOk && !$this->mCancelUpload &&
+                       ( $this->mUpload && $this->mUploadClicked )
+               )
+               {
                        $form->addPreText( wfMsgExt( 'session_fail_preview', 'parseinline' ) );
                }
 
                # Add text to form
-               $form->addPreText( '<div id="uploadtext">' . wfMsgExt( 'uploadtext', 'parse' ) . '</div>');
+               $form->addPreText( '<div id="uploadtext">' . 
+                       wfMsgExt( 'uploadtext', 'parse', array( $this->mDesiredDestName ) ) . 
+                       '</div>' );
                # Add upload error message
                $form->addPreText( $message );
-               
+
                # Add footer to form
                $uploadFooter = wfMsgNoTrans( 'uploadfooter' );
                if ( $uploadFooter != '-' && !wfEmptyMsg( 'uploadfooter', $uploadFooter ) ) {
                        $form->addPostText( '<div id="mw-upload-footer-message">'
                                . $wgOut->parse( $uploadFooter ) . "</div>\n" );
                }
-               
-               return $form;           
+
+               return $form;
 
        }
 
@@ -278,13 +293,13 @@ class SpecialUpload extends SpecialPage {
         * essentially means that UploadBase::VERIFICATION_ERROR and
         * UploadBase::EMPTY_FILE should not be passed here.
         *
-        * @param string $message HTML message to be passed to mainUploadForm
+        * @param $message String: HTML message to be passed to mainUploadForm
         */
        protected function showRecoverableUploadError( $message ) {
                $sessionKey = $this->mUpload->stashSession();
                $message = '<h2>' . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" .
                        '<div class="error">' . $message . "</div>\n";
-               
+
                $form = $this->getUploadForm( $message, $sessionKey );
                $form->setSubmitText( wfMsg( 'upload-tryagain' ) );
                $this->showUploadForm( $form );
@@ -293,43 +308,45 @@ class SpecialUpload extends SpecialPage {
         * Stashes the upload, shows the main form, but adds an "continue anyway button".
         * Also checks whether there are actually warnings to display.
         *
-        * @param array $warnings
-        * @return boolean true if warnings were displayed, false if there are no 
+        * @param $warnings Array
+        * @return boolean true if warnings were displayed, false if there are no
         *      warnings and the should continue processing like there was no warning
         */
        protected function showUploadWarning( $warnings ) {
-               global $wgUser;
-
-               # If there are no warnings, or warnings we can ignore, return early
+               # If there are no warnings, or warnings we can ignore, return early.
+               # mDestWarningAck is set when some javascript has shown the warning
+               # to the user. mForReUpload is set when the user clicks the "upload a
+               # new version" link.
                if ( !$warnings || ( count( $warnings ) == 1 && 
-                                isset( $warnings['exists']) && $this->mDestWarningAck ) ) {
-                       return false;                                   
+                       isset( $warnings['exists'] ) && 
+                       ( $this->mDestWarningAck || $this->mForReUpload ) ) )
+               {
+                       return false;
                }
 
                $sessionKey = $this->mUpload->stashSession();
 
-               $sk = $wgUser->getSkin();
-
                $warningHtml = '<h2>' . wfMsgHtml( 'uploadwarning' ) . "</h2>\n"
                        . '<ul class="warning">';
                foreach( $warnings as $warning => $args ) {
-                               $msg = '';
-                               if( $warning == 'exists' ) {
-                                       $msg = "\t<li>" . self::getExistsWarning( $args ) . "</li>\n";
-                               } elseif( $warning == 'duplicate' ) {
-                                       $msg = self::getDupeWarning( $args );
-                               } elseif( $warning == 'duplicate-archive' ) {
-                                       $msg = "\t<li>" . wfMsgExt( 'file-deleted-duplicate', 'parseinline',
-                                                       array( Title::makeTitle( NS_FILE, $args )->getPrefixedText() ) )
-                                               . "</li>\n";
-                               } else {
-                                       if ( $args === true )
-                                               $args = array();
-                                       elseif ( !is_array( $args ) )
-                                               $args = array( $args );
-                                       $msg = "\t<li>" . wfMsgExt( $warning, 'parseinline', $args ) . "</li>\n";
+                       $msg = '';
+                       if( $warning == 'exists' ) {
+                               $msg = "\t<li>" . self::getExistsWarning( $args ) . "</li>\n";
+                       } elseif( $warning == 'duplicate' ) {
+                               $msg = self::getDupeWarning( $args );
+                       } elseif( $warning == 'duplicate-archive' ) {
+                               $msg = "\t<li>" . wfMsgExt( 'file-deleted-duplicate', 'parseinline',
+                                               array( Title::makeTitle( NS_FILE, $args )->getPrefixedText() ) )
+                                       . "</li>\n";
+                       } else {
+                               if ( $args === true ) {
+                                       $args = array();
+                               } elseif ( !is_array( $args ) ) {
+                                       $args = array( $args );
                                }
-                               $warningHtml .= $msg;
+                               $msg = "\t<li>" . wfMsgExt( $warning, 'parseinline', $args ) . "</li>\n";
+                       }
+                       $warningHtml .= $msg;
                }
                $warningHtml .= "</ul>\n";
                $warningHtml .= wfMsgExt( 'uploadwarning-text', 'parse' );
@@ -340,7 +357,7 @@ class SpecialUpload extends SpecialPage {
                $form->addButton( 'wpCancelUpload', wfMsg( 'reuploaddesc' ) );
 
                $this->showUploadForm( $form );
-               
+
                # Indicate that we showed a form
                return true;
        }
@@ -348,7 +365,7 @@ class SpecialUpload extends SpecialPage {
        /**
         * Show the upload form with error message, but do not stash the file.
         *
-        * @param string $message
+        * @param $message HTML string
         */
        protected function showUploadError( $message ) {
                $message = '<h2>' . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" .
@@ -373,13 +390,12 @@ class SpecialUpload extends SpecialPage {
                // Fetch the file if required
                $status = $this->mUpload->fetchFile();
                if( !$status->isOK() ) {
-                       $this->showUploadForm( $this->getUploadForm( $wgOut->parse( $status->getWikiText() ) ) );
+                       $this->showUploadError( $wgOut->parse( $status->getWikiText() ) );
                        return;
                }
 
                // Deprecated backwards compatibility hook
-               if( !wfRunHooks( 'UploadForm:BeforeProcessing', array( &$this ) ) )
-               {
+               if( !wfRunHooks( 'UploadForm:BeforeProcessing', array( &$this ) ) ) {
                        wfDebug( "Hook 'UploadForm:BeforeProcessing' broke processing the file.\n" );
                        return array( 'status' => UploadBase::BEFORE_PROCESSING );
                }
@@ -416,9 +432,9 @@ class SpecialUpload extends SpecialPage {
                }
 
                // Success, redirect to description page
+               $this->mUploadSuccessful = true;
                wfRunHooks( 'SpecialUploadComplete', array( &$this ) );
                $wgOut->redirect( $this->mLocalFile->getTitle()->getFullURL() );
-
        }
 
        /**
@@ -431,15 +447,15 @@ class SpecialUpload extends SpecialPage {
                        if ( $license != '' ) {
                                $licensetxt = '== ' . wfMsgForContent( 'license-header' ) . " ==\n" . '{{' . $license . '}}' . "\n";
                        }
-                       $pageText = '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n" .
-                         '== ' . wfMsgForContent ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" .
-                         "$licensetxt" .
-                         '== ' . wfMsgForContent ( 'filesource' ) . " ==\n" . $source ;
+                       $pageText = '== ' . wfMsgForContent( 'filedesc' ) . " ==\n" . $comment . "\n" .
+                               '== ' . wfMsgForContent( 'filestatus' ) . " ==\n" . $copyStatus . "\n" .
+                               "$licensetxt" .
+                               '== ' . wfMsgForContent( 'filesource' ) . " ==\n" . $source;
                } else {
                        if ( $license != '' ) {
-                               $filedesc = $comment == '' ? '' : '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n";
-                                $pageText = $filedesc .
-                                        '== ' . wfMsgForContent ( 'license-header' ) . " ==\n" . '{{' . $license . '}}' . "\n";
+                               $filedesc = $comment == '' ? '' : '== ' . wfMsgForContent( 'filedesc' ) . " ==\n" . $comment . "\n";
+                                       $pageText = $filedesc .
+                                       '== ' . wfMsgForContent( 'license-header' ) . " ==\n" . '{{' . $license . '}}' . "\n";
                        } else {
                                $pageText = $comment;
                        }
@@ -480,7 +496,7 @@ class SpecialUpload extends SpecialPage {
        /**
         * Provides output to the user for a result of UploadBase::verifyUpload
         *
-        * @param array $details Result of UploadBase::verifyUpload
+        * @param $details Array: result of UploadBase::verifyUpload
         */
        protected function processVerificationError( $details ) {
                global $wgFileExtensions, $wgLang;
@@ -506,7 +522,10 @@ class SpecialUpload extends SpecialPage {
 
                        /** Statuses that require reuploading **/
                        case UploadBase::EMPTY_FILE:
-                               $this->showUploadForm( $this->getUploadForm( wfMsgHtml( 'emptyfile' ) ) );
+                               $this->showUploadError( wfMsgHtml( 'emptyfile' ) );
+                               break;
+                       case UploadBase::FILESIZE_TOO_LARGE:
+                               $this->showUploadError( wfMsgHtml( 'largefileserver' ) );
                                break;
                        case UploadBase::FILETYPE_BADTYPE:
                                $finalExt = $details['finalExt'];
@@ -545,15 +564,16 @@ class SpecialUpload extends SpecialPage {
 
        /**
         * Remove a temporarily kept file stashed by saveTempUploadedFile().
-        * @access private
-        * @return success
+        *
+        * @return Boolean: success
         */
        protected function unsaveUploadedFile() {
                global $wgOut;
-               if ( !( $this->mUpload instanceof UploadFromStash ) )
+               if ( !( $this->mUpload instanceof UploadFromStash ) ) {
                        return true;
+               }
                $success = $this->mUpload->unsaveUploadedFile();
-               if ( ! $success ) {
+               if ( !$success ) {
                        $wgOut->showFileDeleteError( $this->mUpload->getTempPath() );
                        return false;
                } else {
@@ -567,14 +587,15 @@ class SpecialUpload extends SpecialPage {
         * Formats a result of UploadBase::getExistsWarning as HTML
         * This check is static and can be done pre-upload via AJAX
         *
-        * @param array $exists The result of UploadBase::getExistsWarning
-        * @return string Empty string if there is no warning or an HTML fragment
+        * @param $exists Array: the result of UploadBase::getExistsWarning
+        * @return String: empty string if there is no warning or an HTML fragment
         */
        public static function getExistsWarning( $exists ) {
                global $wgUser, $wgContLang;
 
-               if ( !$exists )
+               if ( !$exists ) {
                        return '';
+               }
 
                $file = $exists['file'];
                $filename = $file->getTitle()->getPrefixedText();
@@ -623,8 +644,8 @@ class SpecialUpload extends SpecialPage {
        /**
         * Get a list of warnings
         *
-        * @param string local filename, e.g. 'file exists', 'non-descriptive filename'
-        * @return array list of warning messages
+        * @param $filename String: local filename, e.g. 'file exists', 'non-descriptive filename'
+        * @return Array: list of warning messages
         */
        public static function ajaxGetExistsWarning( $filename ) {
                $file = wfFindFile( $filename );
@@ -644,40 +665,21 @@ class SpecialUpload extends SpecialPage {
                return $s;
        }
 
-       /**
-        * Render a preview of a given license for the AJAX preview on upload
-        *
-        * @param string $license
-        * @return string
-        */
-       public static function ajaxGetLicensePreview( $license ) {
-               global $wgParser, $wgUser;
-               $text = '{{' . $license . '}}';
-               $title = Title::makeTitle( NS_FILE, 'Sample.jpg' );
-               $options = ParserOptions::newFromUser( $wgUser );
-
-               // Expand subst: first, then live templates...
-               $text = $wgParser->preSaveTransform( $text, $title, $wgUser, $options );
-               $output = $wgParser->parse( $text, $title, $options );
-
-               return $output->getText();
-       }
-
        /**
         * Construct a warning and a gallery from an array of duplicate files.
         */
        public static function getDupeWarning( $dupes ) {
                if( $dupes ) {
                        global $wgOut;
-                       $msg = "<gallery>";
+                       $msg = '<gallery>';
                        foreach( $dupes as $file ) {
                                $title = $file->getTitle();
                                $msg .= $title->getPrefixedText() .
-                                       "|" . $title->getText() . "\n";
+                                       '|' . $title->getText() . "\n";
                        }
-                       $msg .= "</gallery>";
-                       return "<li>" .
-                               wfMsgExt( "file-exists-duplicate", array( "parse" ), count( $dupes ) ) .
+                       $msg .= '</gallery>';
+                       return '<li>' .
+                               wfMsgExt( 'file-exists-duplicate', array( 'parse' ), count( $dupes ) ) .
                                $wgOut->parse( $msg ) .
                                "</li>\n";
                } else {
@@ -696,22 +698,20 @@ class UploadForm extends HTMLForm {
        protected $mSessionKey;
        protected $mHideIgnoreWarning;
        protected $mDestWarningAck;
-       
+
        protected $mTextTop;
        protected $mTextAfterSummary;
-       
+
        protected $mSourceIds;
 
        public function __construct( $options = array() ) {
-               global $wgLang;
-
                $this->mWatch = !empty( $options['watch'] );
                $this->mForReUpload = !empty( $options['forreupload'] );
-               $this->mSessionKey = isset( $options['sessionkey'] ) 
+               $this->mSessionKey = isset( $options['sessionkey'] )
                                ? $options['sessionkey'] : '';
                $this->mHideIgnoreWarning = !empty( $options['hideignorewarning'] );
                $this->mDestWarningAck = !empty( $options['destwarningack'] );
-               
+
                $this->mTextTop = $options['texttop'];
                $this->mTextAfterSummary = $options['textaftersummary'];
 
@@ -720,7 +720,7 @@ class UploadForm extends HTMLForm {
                        + $this->getDescriptionSection()
                        + $this->getOptionsSection();
 
-               wfRunHooks( 'UploadFormInitDescriptor', array( $descriptor ) );
+               wfRunHooks( 'UploadFormInitDescriptor', array( &$descriptor ) );
                parent::__construct( $descriptor, 'upload' );
 
                # Set some form properties
@@ -732,20 +732,22 @@ class UploadForm extends HTMLForm {
                # Build a list of IDs for javascript insertion
                $this->mSourceIds = array();
                foreach ( $sourceDescriptor as $key => $field ) {
-                       if ( !empty( $field['id'] ) )
+                       if ( !empty( $field['id'] ) ) {
                                $this->mSourceIds[] = $field['id'];
+                       }
                }
 
        }
 
        /**
-        * Get the descriptor of the fieldset that contains the file source 
+        * Get the descriptor of the fieldset that contains the file source
         * selection. The section is 'source'
-        * 
-        * @return array Descriptor array
+        *
+        * @return Array: descriptor array
         */
        protected function getSourceSection() {
                global $wgLang, $wgUser, $wgRequest;
+               global $wgMaxUploadSize;
 
                if ( $this->mSessionKey ) {
                        return array(
@@ -773,25 +775,28 @@ class UploadForm extends HTMLForm {
                                'raw' => true,
                        );
                }
-               
+
                $descriptor['UploadFile'] = array(
-                               'class' => 'UploadSourceField',
-                               'section' => 'source',
-                               'type' => 'file',
-                               'id' => 'wpUploadFile',
-                               'label-message' => 'sourcefilename',
-                               'upload-type' => 'File',
-                               'radio' => &$radio,
-                               'help' => wfMsgExt( 'upload-maxfilesize',
-                                               array( 'parseinline', 'escapenoentities' ),
-                                               $wgLang->formatSize(
-                                                       wfShorthandToInteger( ini_get( 'upload_max_filesize' ) )
-                                               )
-                                       ) . ' ' . wfMsgHtml( 'upload_source_file' ),
-                               'checked' => $selectedSourceType == 'file',
+                       'class' => 'UploadSourceField',
+                       'section' => 'source',
+                       'type' => 'file',
+                       'id' => 'wpUploadFile',
+                       'label-message' => 'sourcefilename',
+                       'upload-type' => 'File',
+                       'radio' => &$radio,
+                       'help' => wfMsgExt( 'upload-maxfilesize',
+                                       array( 'parseinline', 'escapenoentities' ),
+                                       $wgLang->formatSize(
+                                               wfShorthandToInteger( min( 
+                                                       wfShorthandToInteger(
+                                                               ini_get( 'upload_max_filesize' )
+                                                       ), $wgMaxUploadSize
+                                               ) )
+                                       )
+                               ) . ' ' . wfMsgHtml( 'upload_source_file' ),
+                       'checked' => $selectedSourceType == 'file',
                );
                if ( $canUploadByUrl ) {
-                       global $wgMaxUploadSize;
                        $descriptor['UploadFileURL'] = array(
                                'class' => 'UploadSourceField',
                                'section' => 'source',
@@ -817,11 +822,10 @@ class UploadForm extends HTMLForm {
                return $descriptor;
        }
 
-
        /**
         * Get the messages indicating which extensions are preferred and prohibitted.
-        * 
-        * @return string HTML string containing the message
+        *
+        * @return String: HTML string containing the message
         */
        protected function getExtensionsMessage() {
                # Print a list of allowed file extensions, if so configured.  We ignore
@@ -857,8 +861,8 @@ class UploadForm extends HTMLForm {
        /**
         * Get the descriptor of the fieldset that contains the file description
         * input. The section is 'description'
-        * 
-        * @return array Descriptor array
+        *
+        * @return Array: descriptor array
         */
        protected function getDescriptionSection() {
                global $wgUser, $wgOut;
@@ -895,7 +899,7 @@ class UploadForm extends HTMLForm {
                                'raw' => true,
                        );
                }
-               
+
                $descriptor += array(
                        'EditTools' => array(
                                'type' => 'edittools',
@@ -909,8 +913,9 @@ class UploadForm extends HTMLForm {
                                'label-message' => 'license',
                        ),
                );
-               if ( $this->mForReUpload )
+               if ( $this->mForReUpload ) {
                        $descriptor['DestFile']['readonly'] = true;
+               }
 
                global $wgUseCopyrightUpload;
                if ( $wgUseCopyrightUpload ) {
@@ -932,25 +937,26 @@ class UploadForm extends HTMLForm {
        }
 
        /**
-        * Get the descriptor of the fieldset that contains the upload options, 
+        * Get the descriptor of the fieldset that contains the upload options,
         * such as "watch this file". The section is 'options'
-        * 
-        * @return array Descriptor array
+        *
+        * @return Array: descriptor array
         */
        protected function getOptionsSection() {
-               global $wgUser, $wgOut;
+               global $wgUser;
 
-               if( $wgUser->isLoggedIn() ) {
+               if ( $wgUser->isLoggedIn() ) {
                        $descriptor = array(
                                'Watchthis' => array(
                                        'type' => 'check',
                                        'id' => 'wpWatchthis',
                                        'label-message' => 'watchthisupload',
                                        'section' => 'options',
+                                       'default' => $wgUser->getOption( 'watchcreations' ),
                                )
                        );
                }
-               if( !$this->mHideIgnoreWarning ) {
+               if ( !$this->mHideIgnoreWarning ) {
                        $descriptor['IgnoreWarning'] = array(
                                'type' => 'check',
                                'id' => 'wpIgnoreWarning',
@@ -964,9 +970,16 @@ class UploadForm extends HTMLForm {
                        'id' => 'wpDestFileWarningAck',
                        'default' => $this->mDestWarningAck ? '1' : '',
                );
+               
+               if ( $this->mForReUpload ) {
+                       $descriptor['wpForReUpload'] = array(
+                               'type' => 'hidden',
+                               'id' => 'wpForReUpload',
+                               'default' => '1',
+                       );
+               }
 
                return $descriptor;
-
        }
 
        /**
@@ -979,26 +992,23 @@ class UploadForm extends HTMLForm {
 
        /**
         * Add upload JS to $wgOut
-        * 
-        * @param bool $autofill Whether or not to autofill the destination
-        *      filename text box
         */
-       protected function addUploadJS( ) {
-               global $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview;
+       protected function addUploadJS() {
+               global $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview, $wgEnableAPI;
                global $wgOut;
 
                $useAjaxDestCheck = $wgUseAjax && $wgAjaxUploadDestCheck;
-               $useAjaxLicensePreview = $wgUseAjax && $wgAjaxLicensePreview;
+               $useAjaxLicensePreview = $wgUseAjax && $wgAjaxLicensePreview && $wgEnableAPI;
 
                $scriptVars = array(
-                       'wgAjaxUploadDestCheck' => $wgUseAjax && $wgAjaxUploadDestCheck,
-                       'wgAjaxLicensePreview' => $wgUseAjax && $wgAjaxLicensePreview,
+                       'wgAjaxUploadDestCheck' => $useAjaxDestCheck,
+                       'wgAjaxLicensePreview' => $useAjaxLicensePreview,
                        'wgUploadAutoFill' => !$this->mForReUpload,
                        'wgUploadSourceIds' => $this->mSourceIds,
                );
 
                $wgOut->addScript( Skin::makeVariablesScript( $scriptVars ) );
-               
+
                // For <charinsert> support
                $wgOut->addScriptFile( 'edit.js' );
                $wgOut->addScriptFile( 'upload.js' );
@@ -1006,7 +1016,7 @@ class UploadForm extends HTMLForm {
 
        /**
         * Empty function; submission is handled elsewhere.
-        * 
+        *
         * @return bool false
         */
        function trySubmit() {
@@ -1021,7 +1031,7 @@ class UploadForm extends HTMLForm {
 class UploadSourceField extends HTMLTextField {
        function getLabelHtml() {
                $id = "wpSourceType{$this->mParams['upload-type']}";
-               $label = Html::rawElement( 'label', array( 'for' => $id ), $this->mLabel  );
+               $label = Html::rawElement( 'label', array( 'for' => $id ), $this->mLabel );
 
                if ( !empty( $this->mParams['radio'] ) ) {
                        $attribs = array(
@@ -1030,13 +1040,15 @@ class UploadSourceField extends HTMLTextField {
                                'id' => $id,
                                'value' => $this->mParams['upload-type'],
                        );
-                       if ( !empty( $this->mParams['checked'] ) )
+                       if ( !empty( $this->mParams['checked'] ) ) {
                                $attribs['checked'] = 'checked';
+                       }
                        $label .= Html::element( 'input', $attribs );
                }
 
                return Html::rawElement( 'td', array( 'class' => 'mw-label' ), $label );
        }
+
        function getSize() {
                return isset( $this->mParams['size'] )
                        ? $this->mParams['size']