From 28784b65409f25eb6867d887ae6e48f0b184c2f8 Mon Sep 17 00:00:00 2001 From: Malmani <123142729+malmani@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:46:05 +0900 Subject: [PATCH 01/95] Update ModuleHandler.class.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Notice: Undefined property: stdClass::$menu_count 오류가 발생하는 부분을 수정합니다. --- classes/module/ModuleHandler.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index b7c893b95..cfe24b7d6 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -1122,7 +1122,7 @@ class ModuleHandler extends Handler if($layout_info) { // Input extra_vars into $layout_info - if($layout_info->extra_var_count) + if(isset($layout_info->extra_var_count) && $layout_info->extra_var_count) { foreach($layout_info->extra_var as $var_id => $val) @@ -1138,7 +1138,7 @@ class ModuleHandler extends Handler } } // Set menus into context - if($layout_info->menu_count) + if(isset($layout_info->menu_count) && $layout_info->menu_count) { $oMenuAdminController = getAdminController('menu'); $homeMenuCacheFile = null; From aa55a0d60c96846f19aece08b186ca4051ac5b5e Mon Sep 17 00:00:00 2001 From: Malmani <123142729+malmani@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:49:04 +0900 Subject: [PATCH 02/95] Update content.class.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Notice: Undefined variable: category_lists 오류를 수정합니다. --- widgets/content/content.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php index 6555251b1..7b3f76d2b 100644 --- a/widgets/content/content.class.php +++ b/widgets/content/content.class.php @@ -358,7 +358,7 @@ class content extends WidgetHandler $attribute = $oDocument->getObjectVars(); $browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title; $domain = $args->module_srls_info[$attribute->module_srl]->domain; - $category = $category_lists[$attribute->module_srl]->text; + $category = isset($category_lists[$attribute->module_srl]) ? $category_lists[$attribute->module_srl]->text : ''; $content = $oDocument->getSummary($args->content_cut_size); $url = sprintf('%s#%s', $oDocument->getPermanentUrl(), $oDocument->getCommentCount()); $thumbnail = $oDocument->getThumbnail($args->thumbnail_width,$args->thumbnail_height,$args->thumbnail_type); From 9c26552e3dee85519b389212ac8e4d9ff9c22292 Mon Sep 17 00:00:00 2001 From: dewekk <60457472+dewekk@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:52:38 +0900 Subject: [PATCH 03/95] Add extra vars to solapi --- common/framework/drivers/sms/solapi.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/framework/drivers/sms/solapi.php b/common/framework/drivers/sms/solapi.php index 9cef5dbd7..b87f8e6cf 100644 --- a/common/framework/drivers/sms/solapi.php +++ b/common/framework/drivers/sms/solapi.php @@ -132,6 +132,11 @@ class SolAPI extends Base implements \Rhymix\Framework\Drivers\SMSInterface } } + foreach ($original->getExtraVars() as $key => $value) + { + $options->$key = $value; + } + $data['messages'][] = $options; } } From 3b309b6392509f905022d3384ee76d464ee39ffe Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 21 Aug 2024 10:14:00 +0900 Subject: [PATCH 04/95] Add guzzlehttp/psr7 to dependency list --- common/composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/common/composer.json b/common/composer.json index 6eec88035..73bd37b07 100644 --- a/common/composer.json +++ b/common/composer.json @@ -33,6 +33,7 @@ "ezyang/htmlpurifier": "4.16.*", "google/auth": "1.26.*", "guzzlehttp/guzzle": "7.8.*", + "guzzlehttp/psr7": "2.6.*", "jbbcode/jbbcode": "1.4.*", "leafo/lessphp": "dev-master", "league/html-to-markdown": "5.1.*", From 925891fb703a7ca103992ad9f7c23235c55dac42 Mon Sep 17 00:00:00 2001 From: dewekk <60457472+dewekk@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:19:25 +0900 Subject: [PATCH 05/95] =?UTF-8?q?=EA=B0=80=EC=9E=85=20=ED=8F=BC=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=ED=95=B4=EC=A0=9C=20=EC=8B=9C=20=ED=95=98?= =?UTF-8?q?=EC=9C=84=20=ED=95=84=EC=88=98/=EC=84=A0=ED=83=9D=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=9D=84=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/tpl/signup_config.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/member/tpl/signup_config.html b/modules/member/tpl/signup_config.html index f65fddb76..f6d490b51 100644 --- a/modules/member/tpl/signup_config.html +++ b/modules/member/tpl/signup_config.html @@ -251,8 +251,8 @@ - - + + {$item->description} {$lang->cmd_edit} | {$lang->cmd_delete} From 81ae8de155e9c902a864bd254522318bdae5cc22 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 21 Aug 2024 19:44:04 +0900 Subject: [PATCH 06/95] Fix #2393 make add() a true alias to set() --- classes/object/Object.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php index 728e0acb3..6c574b4be 100644 --- a/classes/object/Object.class.php +++ b/classes/object/Object.class.php @@ -210,8 +210,7 @@ class BaseObject */ public function add($key, $val) { - $this->variables[$key] = $val; - return $this; + return $this->set($key, $val); } /** From 311a35c9558e9c77a42dee59b40c8a14de0dee89 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 21 Aug 2024 19:54:59 +0900 Subject: [PATCH 07/95] Fix #2396 display warning if exec() function is disabled --- modules/file/file.admin.view.php | 1 + modules/file/lang/en.php | 1 + modules/file/lang/ko.php | 1 + modules/file/tpl/upload_config.html | 3 +++ 4 files changed, 6 insertions(+) diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php index 6a5a4788a..c1e79603e 100644 --- a/modules/file/file.admin.view.php +++ b/modules/file/file.admin.view.php @@ -224,6 +224,7 @@ class FileAdminView extends File Context::set('config', $config); Context::set('is_ffmpeg', function_exists('exec') && !empty($config->ffmpeg_command) && Rhymix\Framework\Storage::isExecutable($config->ffmpeg_command) && !empty($config->ffprobe_command) && Rhymix\Framework\Storage::isExecutable($config->ffprobe_command)); Context::set('is_magick', function_exists('exec') && !empty($config->magick_command) && Rhymix\Framework\Storage::isExecutable($config->magick_command)); + Context::set('is_exec_available', function_exists('exec')); // Set a template file $this->setTemplatePath($this->module_path.'tpl'); diff --git a/modules/file/lang/en.php b/modules/file/lang/en.php index 7fd2b2630..1fd6d25fd 100644 --- a/modules/file/lang/en.php +++ b/modules/file/lang/en.php @@ -128,6 +128,7 @@ $lang->ffprobe_path = 'Absolute Path to ffprobe'; $lang->magick_path = 'Absolute Path to magick'; $lang->about_ffmpeg_path = 'Rhymix uses ffmpeg to convert video files.'; $lang->about_magick_path = 'Rhymix uses magick to convert newer image formats such as AVIF and HEIC.
Note that the \'convert\' command from previous versions of ImageMagick doesn\'t support these formats.
The latest version can be downloaded from their official site.'; +$lang->msg_cannot_use_exec = 'The exec() function is disabled on this server.'; $lang->msg_cannot_use_ffmpeg = 'In order to use this feature, PHP must be able to execute \'ffmpeg\' and \'ffprobe\' commands.'; $lang->msg_cannot_use_exif = 'In order to use this feature, PHP must be installed with the \'exif\' extension.'; $lang->msg_need_magick = 'In order to handle AVIF and HEIC formats, PHP must be able to execute the \'magick\' command from ImageMagick 7.x or higher.'; diff --git a/modules/file/lang/ko.php b/modules/file/lang/ko.php index 53ee8e429..192a2649f 100644 --- a/modules/file/lang/ko.php +++ b/modules/file/lang/ko.php @@ -131,6 +131,7 @@ $lang->ffprobe_path = 'ffprobe 절대경로'; $lang->magick_path = 'magick 절대경로'; $lang->about_ffmpeg_path = '동영상 변환에 사용합니다.'; $lang->about_magick_path = 'AVIF, HEIC 등 일부 이미지 변환에 사용합니다.
구 버전 ImageMagick의 convert 명령은 이러한 포맷을 지원하지 않습니다.
새 버전은 공식 사이트에서 다운받을 수 있습니다.'; +$lang->msg_cannot_use_exec = '이 서버에서 exec() 함수를 사용할 수 없습니다.'; $lang->msg_cannot_use_ffmpeg = '이 기능을 사용하려면 PHP에서 ffmpeg 및 ffprobe 명령을 실행할 수 있어야 합니다.'; $lang->msg_cannot_use_exif = '이 기능을 사용하려면 PHP exif 확장모듈이 필요합니다.'; $lang->msg_need_magick = 'AVIF, HEIC 변환을 위해서는 PHP에서 ImageMagick 7.x 이상의 magick 명령을 실행할 수 있어야 합니다.'; diff --git a/modules/file/tpl/upload_config.html b/modules/file/tpl/upload_config.html index 724094a40..f13a544fa 100644 --- a/modules/file/tpl/upload_config.html +++ b/modules/file/tpl/upload_config.html @@ -253,6 +253,7 @@

{$lang->about_ffmpeg_path}

+

{$lang->msg_cannot_use_exec}

@@ -260,6 +261,7 @@

{$lang->about_ffmpeg_path}

+

{$lang->msg_cannot_use_exec}

@@ -267,6 +269,7 @@

{$lang->about_magick_path}

+

{$lang->msg_cannot_use_exec}

From cec158ba410afa7ba0be00b66c857ad83da57ee6 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 21 Aug 2024 19:59:38 +0900 Subject: [PATCH 08/95] Remove HTML/CSS editing function from site design setup --- modules/layout/conf/module.xml | 7 ++- modules/layout/layout.admin.model.php | 67 --------------------------- modules/menu/tpl/sitemap.html | 67 --------------------------- 3 files changed, 3 insertions(+), 138 deletions(-) diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml index 60b2ea8f3..b5278c856 100644 --- a/modules/layout/conf/module.xml +++ b/modules/layout/conf/module.xml @@ -5,7 +5,7 @@ - + @@ -14,11 +14,10 @@ - + - - + diff --git a/modules/layout/layout.admin.model.php b/modules/layout/layout.admin.model.php index ced111288..547f49e90 100644 --- a/modules/layout/layout.admin.model.php +++ b/modules/layout/layout.admin.model.php @@ -92,73 +92,6 @@ class LayoutAdminModel extends Layout Context::set('selected_layout', $layout_info); } - public function getLayoutAdminSetHTMLCSS() - { - // Set the layout with its information - $layout_srl = Context::get('layout_srl'); - // Get layout information - $oLayoutModel = getModel('layout'); - $layout_info = $oLayoutModel->getLayout($layout_srl); - // Error appears if there is no layout information is registered - if(!$layout_info) - { - return $this->dispLayoutAdminInstalledList(); - } - - // Get Layout Code - if($oLayoutModel->useDefaultLayout($layout_info->layout_srl)) - { - $layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout); - $layout_css_file = $oLayoutModel->getDefaultLayoutCss($layout_info->layout); - } - else - { - $layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl); - $layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl); - - if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html'; - if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css'; - } - - if(file_exists($layout_css_file)) - { - $layout_code_css = FileHandler::readFile($layout_css_file); - Context::set('layout_code_css', $layout_code_css); - } - - $layout_code = FileHandler::readFile($layout_file); - Context::set('layout_code', $layout_code); - - // set User Images - $layout_image_list = $oLayoutModel->getUserLayoutImageList($layout_info->layout_srl); - Context::set('layout_image_list', $layout_image_list); - - $layout_image_path = $oLayoutModel->getUserLayoutImagePath($layout_info->layout_srl); - Context::set('layout_image_path', $layout_image_path); - // Set widget list - $oWidgetModel = getModel('widget'); - $widget_list = $oWidgetModel->getDownloadedWidgetList(); - Context::set('widget_list', $widget_list); - - $security = new Security($layout_info); - $layout_info = $security->encodeHTML('.', '.author..'); - Context::set('selected_layout', $layout_info); - - //Security - $security = new Security(); - $security->encodeHTML('layout_list..'); - $security->encodeHTML('layout_list..author..'); - - $security = new Security(); - $security->encodeHTML('layout_code_css', 'layout_code', 'widget_list..title'); - - $script = ''; - $oTemplate = TemplateHandler::getInstance(); - $html = $oTemplate->compile($this->module_path.'tpl/', 'layout_html_css_view'); - - $this->add('html', $script.$html); - } - public function getLayoutAdminSiteDefaultLayout() { $type = Context::get('type'); diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index 891f3cfbf..e68a6ee49 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -498,7 +498,6 @@ @@ -523,16 +522,6 @@ - -