mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-06-17 10:07:13 +09:00
Merge branch 'rhymix:master' into master
This commit is contained in:
commit
1eab5cdfab
69 changed files with 456 additions and 394 deletions
|
|
@ -607,9 +607,7 @@ class FileController extends File
|
|||
{
|
||||
// Basic variable setting(upload_target_srl and module_srl set)
|
||||
$editor_sequence = Context::get('editor_sequence');
|
||||
$file_srl = Context::get('file_srl');
|
||||
$file_srls = Context::get('file_srls');
|
||||
if($file_srls) $file_srl = $file_srls;
|
||||
$file_srls = explode(',', Context::get('file_srls') ?: Context::get('file_srl'));
|
||||
|
||||
// Exit a session if there is neither upload permission nor information
|
||||
if (!$_SESSION['upload_info'][$editor_sequence]->enabled)
|
||||
|
|
@ -623,26 +621,43 @@ class FileController extends File
|
|||
}
|
||||
$module_srl = $_SESSION['upload_info'][$editor_sequence]->module_srl ?? 0;
|
||||
|
||||
$srls = explode(',',$file_srl);
|
||||
if(!count($srls)) return;
|
||||
|
||||
for($i=0;$i<count($srls);$i++)
|
||||
$valid_file_srls = [];
|
||||
foreach ($file_srls as $file_srl)
|
||||
{
|
||||
$srl = (int)$srls[$i];
|
||||
if(!$srl) continue;
|
||||
$file_srl = (int)$file_srl;
|
||||
if (!$file_srl)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$args = new stdClass;
|
||||
$args->file_srl = $srl;
|
||||
$args->file_srl = $file_srl;
|
||||
$output = executeQuery('file.getFile', $args);
|
||||
if(!$output->toBool()) continue;
|
||||
|
||||
if (!$output->toBool())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
$file_info = $output->data;
|
||||
if(!$file_info || $file_info->upload_target_srl != $upload_target_srl) continue;
|
||||
if (!$file_info || $file_info->upload_target_srl != $upload_target_srl)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
//if($module_srl && $file_info->module_srl != $module_srl) continue;
|
||||
if(!FileModel::isDeletable($file_info)) continue;
|
||||
$output = $this->deleteFile($file_srl);
|
||||
if (!FileModel::isDeletable($file_info))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$valid_file_srls[] = $file_srl;
|
||||
}
|
||||
|
||||
if (!count($valid_file_srls))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
$output = $this->deleteFile($valid_file_srls);
|
||||
|
||||
// Add upload status (getFileList)
|
||||
try
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue