fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-05 01:52:17 +09:00
Code Issues Projects Releases Packages Wiki Activity

Enforce php.ini limits when not using CKEditor + jQuery File Upload

Browse source
This commit is contained in:
Kijin Sung 2016-12-17 23:44:18 +09:00
parent 73d4ea842f
commit d981b649c1
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/js/plugins/jquery.fileupload/js/main.js
View file

@ -343,6 +343,7 @@
var obj = {}; var obj = {};
obj.mid = window.current_mid; obj.mid = window.current_mid;
obj.editor_sequence = data.editorSequence; obj.editor_sequence = data.editorSequence;
obj.allow_chunks = 'Y';
$.exec_json('file.getFileList', obj, function(res){ $.exec_json('file.getFileList', obj, function(res){
data.uploadTargetSrl = res.upload_target_srl; data.uploadTargetSrl = res.upload_target_srl;

7
modules/editor/editor.model.php
View file

@ -326,6 +326,13 @@ class editorModel extends editor
$file_config->allowed_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size'))); $file_config->allowed_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')));
$file_config->allowed_chunk_size = 0; $file_config->allowed_chunk_size = 0;
} }
// Do not allow chunked uploads in XpressEditor.
if (starts_with($option->skin, 'xpresseditor'))
{
$file_config->allowed_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')));
$file_config->allowed_chunk_size = 0;
}
Context::set('file_config',$file_config); Context::set('file_config',$file_config);
// Configure upload status such as file size // Configure upload status such as file size

11
modules/file/file.model.php
View file

@ -309,6 +309,15 @@ class fileModel extends file
function getUploadStatus($attached_size = 0) function getUploadStatus($attached_size = 0)
{ {
$file_config = $this->getUploadConfig(); $file_config = $this->getUploadConfig();
if (Context::get('allow_chunks') === 'Y')
{
$allowed_filesize = $file_config->allowed_filesize * 1024 * 1024;
}
else
{
$allowed_filesize = min(FileHandler::returnBytes(ini_get('upload_max_filesize')), FileHandler::returnBytes(ini_get('post_max_size')));
}
// Display upload status // Display upload status
$upload_status = sprintf( $upload_status = sprintf(
'%s : %s/ %s<br /> %s : %s (%s : %s)', '%s : %s/ %s<br /> %s : %s (%s : %s)',
@ -316,7 +325,7 @@ class fileModel extends file
FileHandler::filesize($attached_size), FileHandler::filesize($attached_size),
FileHandler::filesize($file_config->allowed_attach_size*1024*1024), FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
lang('allowed_filesize'), lang('allowed_filesize'),
FileHandler::filesize($file_config->allowed_filesize*1024*1024), FileHandler::filesize($allowed_filesize),
lang('allowed_filetypes'), lang('allowed_filetypes'),
$file_config->allowed_filetypes $file_config->allowed_filetypes
); );