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

Fix #1299, Fix #1346 implement proper file size limit for messages

Browse source
This commit is contained in:
Kijin Sung 2023-11-06 08:26:01 +09:00
parent a647fff6b8
commit 7a659737cc
5 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/communication/communication.admin.controller.php
View file

@ -15,7 +15,7 @@ class CommunicationAdminController extends communication
function procCommunicationAdminInsertConfig()
{
// get the default information
$args = Context::gets('enable_message', 'enable_friend', 'enable_attachment', 'skin', 'colorset', 'editor_skin', 'sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl', 'grant_send_default','grant_send_group');
$args = Context::gets('enable_message', 'enable_friend', 'enable_attachment', 'attachment_size_limit', 'skin', 'colorset', 'editor_skin', 'sel_editor_colorset', 'mskin', 'mcolorset', 'layout_srl', 'mlayout_srl', 'grant_send_default','grant_send_group');
$args->editor_colorset = $args->sel_editor_colorset;
unset($args->sel_editor_colorset);
@ -23,6 +23,7 @@ class CommunicationAdminController extends communication
$args->grant_send = $oCommunicationModel->getGrantArray($args->grant_send_default, $args->grant_send_group);
unset($args->grant_send_default);
unset($args->grant_send_group);
$args->attachment_size_limit = intval($args->attachment_size_limit) ?? 0;
// create the module module Controller object
$oModuleController = getController('module');

1
modules/communication/communication.view.php
View file

@ -280,6 +280,7 @@ class CommunicationView extends communication
$option->primary_key_name = 'temp_srl';
$option->content_key_name = 'content';
$option->allow_fileupload = $this->config->enable_attachment === 'Y';
$option->allowed_filesize = $this->config->attachment_size_limit ?? 0;
$option->enable_autosave = FALSE;
$option->enable_default_component = TRUE; // FALSE;
$option->enable_component = FALSE;

1
modules/communication/lang/en.php
View file

@ -48,3 +48,4 @@ $lang->alert_new_message_arrived = 'You have %d new message(s). Do you want to c
$lang->enable_communication_friend = 'Friend Enable';
$lang->enable_communication_message = 'Message Enable';
$lang->enable_attachment = 'Allow Attachment';
$lang->attachment_size_limit = 'Attachment Size Limit';

1
modules/communication/lang/ko.php
View file

@ -48,6 +48,7 @@ $lang->alert_new_message_arrived = '%d개의 새로운 메시지가 도착하였
$lang->enable_communication_friend = '친구기능 사용';
$lang->enable_communication_message = '쪽지기능 사용';
$lang->enable_attachment = '파일첨부 허용';
$lang->attachment_size_limit = '첨부 용량 제한';
$lang->warning = '알려드립니다!';
$lang->msg_allow_message_friend = '현재 회원님은 친구에게만 수신 가능한 상태입니다.';
$lang->msg_allow_meesage_Block = '현재 회원님은 수신거부 상태입니다.';

6
modules/communication/tpl/index.html
View file

@ -53,6 +53,12 @@
</label>
</div>
</div>
<div class="x_control-group">
<label for="allowed_attach_size" class="x_control-label">{lang('communication.attachment_size_limit')}</label>
<div class="x_controls">
<input type="number" min="0" name="attachment_size_limit" id="attachment_size_limit" value="{$config->attachment_size_limit ?? ''}" /> MB
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="editor_skin">{$lang->editor_skin}</label>
<div class="x_controls">