MDL-44626 repository: Correct error message when uploading large files

diff --git a/lang/en/repository.php b/lang/en/repository.php
index 60e4628..a0e32a3 100644 (file)
--- a/lang/en/repository.php
+++ b/lang/en/repository.php
@@ -111,7 +111,7 @@ $string['error'] = 'An unknown error occurred!';
 $string['errordoublereference'] = 'Unable to overwrite file with a shortcut/alias because shortcuts to this file already exist.';
 $string['errornotyourfile'] = 'You cannot pick file which is not added by your';
 $string['erroruniquename'] = 'Repository instance name should be unique';
-$string['errorpostmaxsize'] = 'The uploaded file may exceed the post_max_size directive in php.ini.';
+$string['errorpostmaxsize'] = 'The file you tried to upload is too large for the server to process.';
 $string['errorwhilecommunicatingwith'] = 'Error while communicating with the repository \'{$a}\'.';
 $string['errorwhiledownload'] = 'An error occurred while downloading the file: {$a}';
 $string['existingrepository'] = 'This repository already exists';

diff --git a/lib/form/dndupload.js b/lib/form/dndupload.js
index e29d3c0..de0ee97 100644 (file)
--- a/lib/form/dndupload.js
+++ b/lib/form/dndupload.js
@@ -876,7 +876,6 @@ M.form_dndupload.init = function(Y, options) {
 
             // Prepare the data to send
             var formdata = new FormData();
-            formdata.append('action', 'upload');
             formdata.append('repo_upload_file', file); // The FormData class allows us to attach a file
             formdata.append('sesskey', M.cfg.sesskey);
             formdata.append('repo_id', this.repositoryid);
@@ -905,8 +904,14 @@ M.form_dndupload.init = function(Y, options) {
                 formdata.append('accepted_types[]', this.options.acceptedtypes);
             }
 
-            // Send the file & required details
-            xhr.open("POST", this.api, true);
+            // Send the file & required details.
+            var uploadUrl = this.api;
+            if (uploadUrl.indexOf('?') !== -1) {
+                uploadUrl += '&action=upload';
+            } else {
+                uploadUrl += '?action=upload';
+            }
+            xhr.open("POST", uploadUrl, true);
             xhr.send(formdata);
             return true;
         }