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

Allow pre-setting upload_target_type for each editor

Browse source
This commit is contained in:
Kijin Sung 2023-11-19 21:29:15 +09:00
parent fdc9e1e98d
commit 9a6524d63d
6 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -297,6 +297,7 @@ class CommunicationView extends communication
if ($option->allow_fileupload) if ($option->allow_fileupload)
{ {
$option->module_srl = MemberView::getInstance()->getMemberModuleSrl(); $option->module_srl = MemberView::getInstance()->getMemberModuleSrl();
$option->upload_target_type = 'msg';
} }
$editor = $oEditorModel->getEditor(getNextSequence(), $option); $editor = $oEditorModel->getEditor(getNextSequence(), $option);
$editor = $editor . "\n" . '<input type="hidden" name="temp_srl" value="" />' . "\n"; $editor = $editor . "\n" . '<input type="hidden" name="temp_srl" value="" />' . "\n";

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

@ -263,13 +263,13 @@ class EditorModel extends Editor
// Set upload config in session // Set upload config in session
$upload_config = []; $upload_config = [];
if (isset($option->allowed_filesize) && $option->allowed_filesize > 0) $upload_config_keys = ['allowed_filesize', 'allowed_extensions', 'upload_target_type'];
foreach ($upload_config_keys as $key)
{ {
$upload_config['allowed_filesize'] = $option->allowed_filesize; if (isset($option->$key) && !empty($option->$key))
} {
if (isset($option->allowed_extensions) && !empty($option->allowed_extensions)) $upload_config[$key] = $option->$key;
{ }
$upload_config['allowed_extensions'] = $option->allowed_extensions;
} }
FileController::setUploadInfo($option->editor_sequence, $upload_target_srl, $option->module_srl ?? 0, $upload_config); FileController::setUploadInfo($option->editor_sequence, $upload_target_srl, $option->module_srl ?? 0, $upload_config);
@ -455,6 +455,16 @@ class EditorModel extends Editor
} }
} }
// Preset upload target type
if ($type === 'document')
{
$option->upload_target_type = 'doc';
}
elseif ($type === 'comment')
{
$option->upload_target_type = 'com';
}
// Other settings // Other settings
$option->primary_key_name = $primary_key_name; $option->primary_key_name = $primary_key_name;
$option->content_key_name = $content_key_name; $option->content_key_name = $content_key_name;

6
modules/file/file.controller.php
View file

@ -1042,6 +1042,12 @@ class FileController extends File
} }
} }
// Set upload target type
if ($editor_sequence && isset($_SESSION['upload_info'][$editor_sequence]->upload_target_type))
{
$args->upload_target_type = strval($_SESSION['upload_info'][$editor_sequence]->upload_target_type);
}
$oDB = DB::getInstance(); $oDB = DB::getInstance();
$oDB->begin(); $oDB->begin();

1
modules/file/queries/insertFile.xml
View file

@ -5,6 +5,7 @@
<columns> <columns>
<column name="file_srl" var="file_srl" notnull="notnull" /> <column name="file_srl" var="file_srl" notnull="notnull" />
<column name="upload_target_srl" var="upload_target_srl" filter="number" default="0" notnull="notnull" /> <column name="upload_target_srl" var="upload_target_srl" filter="number" default="0" notnull="notnull" />
<column name="upload_target_type" var="upload_target_type" />
<column name="sid" var="sid" /> <column name="sid" var="sid" />
<column name="module_srl" var="module_srl" filter="number" default="0" notnull="notnull" /> <column name="module_srl" var="module_srl" filter="number" default="0" notnull="notnull" />
<column name="member_srl" var="member_srl" default="0" /> <column name="member_srl" var="member_srl" default="0" />

1
modules/member/member.admin.view.php
View file

@ -440,6 +440,7 @@ class MemberAdminView extends Member
if ($option->allow_fileupload) if ($option->allow_fileupload)
{ {
$option->module_srl = MemberView::getInstance()->getMemberModuleSrl(); $option->module_srl = MemberView::getInstance()->getMemberModuleSrl();
$option->upload_target_type = 'sig';
} }
if ($member_config->member_max_filesize) if ($member_config->member_max_filesize)
{ {

2
modules/member/member.view.php
View file

@ -358,6 +358,7 @@ class MemberView extends Member
if ($option->allow_fileupload) if ($option->allow_fileupload)
{ {
$option->module_srl = $this->getMemberModuleSrl(); $option->module_srl = $this->getMemberModuleSrl();
$option->upload_target_type = 'sig';
} }
if ($member_config->member_max_filesize) if ($member_config->member_max_filesize)
{ {
@ -480,6 +481,7 @@ class MemberView extends Member
if ($option->allow_fileupload) if ($option->allow_fileupload)
{ {
$option->module_srl = $this->getMemberModuleSrl(); $option->module_srl = $this->getMemberModuleSrl();
$option->upload_target_type = 'sig';
} }
if ($member_config->member_max_filesize) if ($member_config->member_max_filesize)
{ {