From 0d529ef682aad724badc4fcd104648fdc87407a3 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 13 Dec 2023 22:35:22 +0900 Subject: [PATCH] Disable procFileImageResize and related ruleset --- .../admin/controllers/maintenance/Cleanup.php | 1 + modules/file/conf/module.xml | 2 +- modules/file/file.controller.php | 35 ++----------------- modules/file/ruleset/imageResize.xml | 7 ---- 4 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 modules/file/ruleset/imageResize.xml diff --git a/modules/admin/controllers/maintenance/Cleanup.php b/modules/admin/controllers/maintenance/Cleanup.php index 26595408f..5bda91920 100644 --- a/modules/admin/controllers/maintenance/Cleanup.php +++ b/modules/admin/controllers/maintenance/Cleanup.php @@ -354,6 +354,7 @@ class Cleanup extends Base 'modules/editor/skins/xpresseditor/' => 'deleted:xe', 'modules/editor/styles/' => 'deleted:xe', 'modules/editor/tpl/preview.html' => 'deleted', + 'modules/file/ruleset/imageResize.xml' => 'deleted', 'modules/module/schemas/site_admin.xml' => 'deleted', 'modules/module/tpl/css/module_admin.less' => 'deleted', 'modules/page/page.wap.php' => 'deleted:xe', diff --git a/modules/file/conf/module.xml b/modules/file/conf/module.xml index da48c735a..3b0d1da9c 100644 --- a/modules/file/conf/module.xml +++ b/modules/file/conf/module.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 17c8ad602..359a35dbd 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -235,42 +235,11 @@ class FileController extends File /** * Image resize * - * @return void + * @deprecated */ function procFileImageResize() { - $file_srl = Context::get('file_srl'); - $width = Context::get('width'); - $height = Context::get('height'); - - if(!$file_srl || !$width) - { - throw new Rhymix\Framework\Exceptions\InvalidRequest; - } - - $fileInfo = FileModel::getFile($file_srl); - if(!$fileInfo || $fileInfo->direct_download != 'Y') - { - throw new Rhymix\Framework\Exceptions\InvalidRequest; - } - - $source_src = $fileInfo->uploaded_filename; - $output_src = $source_src . '.resized' . strrchr($source_src,'.'); - - if(!$height) $height = $width-1; - - if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio')) - { - $output = new stdClass(); - $output->info = getimagesize($output_src); - $output->src = $output_src; - } - else - { - throw new Rhymix\Framework\Exceptions\InvalidRequest; - } - - $this->add('resized_info',$output); + throw new Rhymix\Framework\Exceptions\FeatureDisabled; } /** diff --git a/modules/file/ruleset/imageResize.xml b/modules/file/ruleset/imageResize.xml deleted file mode 100644 index ad0ab675c..000000000 --- a/modules/file/ruleset/imageResize.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -