moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-44626-master' of git://github.com/andrewnicols/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-02-15 10:36:20 +00:00
commit 220f8115d9
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lang/en/repository.php
View file

@ -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';

11
lib/form/dndupload.js
View file

@ -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;
}

2
lib/moodlelib.php
View file

@ -6192,7 +6192,7 @@ function get_user_max_upload_file_size($context, $sitebytes = 0, $coursebytes =
}
if (has_capability('moodle/course:ignorefilesizelimits', $context, $user)) {
return USER_CAN_IGNORE_FILE_SIZE_LIMITS;
return get_max_upload_file_size(USER_CAN_IGNORE_FILE_SIZE_LIMITS);
}
return get_max_upload_file_size($sitebytes, $coursebytes, $modulebytes);

4
webservice/tests/externallib_test.php
View file

@ -151,7 +151,9 @@ class core_webservice_externallib_testcase extends externallib_advanced_testcase
$siteinfo = external_api::clean_returnvalue(core_webservice_external::get_site_info_returns(), $siteinfo);
$this->assertEquals(0, $siteinfo['userquota']);
$this->assertEquals(USER_CAN_IGNORE_FILE_SIZE_LIMITS, $siteinfo['usermaxuploadfilesize']);
// The max_size is dependant upon the post_max_size, and upload_max_filesize values in php.ini.
$this->assertEquals(get_max_upload_file_size(USER_CAN_IGNORE_FILE_SIZE_LIMITS), $siteinfo['usermaxuploadfilesize']);
$this->assertEquals(true, $siteinfo['usercanmanageownfiles']);
$this->assertEquals(HOMEPAGE_SITE, $siteinfo['userhomepage']);