From 25a4a3b348acdc09af1ff8f106a6acf49b957e87 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 22 Dec 2020 22:28:17 +0900 Subject: [PATCH 1/7] Fix warning in PHP 8.0 --- classes/extravar/Extravar.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php index ddda833a7..823effc5b 100644 --- a/classes/extravar/Extravar.class.php +++ b/classes/extravar/Extravar.class.php @@ -58,7 +58,7 @@ class ExtraVar foreach($extra_keys as $val) { - $obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value, $val->eid); + $obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value ?? null, $val->eid); $this->keys[$val->idx] = $obj; } } From 9732290515a08c78fa384b77989714ab07ad7a06 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 22 Dec 2020 22:37:20 +0900 Subject: [PATCH 2/7] Fix warnings in PHP 8.0 --- modules/board/board.view.php | 6 +++--- modules/document/document.model.php | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/board/board.view.php b/modules/board/board.view.php index b82bd8b05..da400c562 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -35,8 +35,8 @@ class boardView extends board { $this->page_count = $this->module_info->page_count; } - $this->except_notice = $this->module_info->except_notice == 'N' ? FALSE : TRUE; - $this->include_modules = $this->module_info->include_modules ? explode(',', $this->module_info->include_modules) : []; + $this->except_notice = ($this->module_info->except_notice ?? '') == 'N' ? FALSE : TRUE; + $this->include_modules = ($this->module_info->include_modules ?? []) ? explode(',', $this->module_info->include_modules) : []; if (count($this->include_modules) && !in_array($this->module_info->module_srl, $this->include_modules)) { $this->include_modules[] = $this->module_info->module_srl; @@ -546,7 +546,7 @@ class boardView extends board } // setup the list count to be serach list count, if the category or search keyword has been set - if($args->category_srl || $args->search_keyword) + if($args->category_srl ?? null || $args->search_keyword ?? null) { $args->list_count = $this->search_list_count; } diff --git a/modules/document/document.model.php b/modules/document/document.model.php index b396cdc0a..eed9cf3dc 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -707,7 +707,10 @@ class documentModel extends document // Cleanup of category $document_category = array(); - self::_arrangeCategory($document_category, $menu->list, 0); + if (isset($menu) && isset($menu->list)) + { + self::_arrangeCategory($document_category, $menu->list, 0); + } return $document_category; } From 49ea6700b34cb5007e04556f1a7ca111f07ffd0e Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 22 Dec 2020 22:42:31 +0900 Subject: [PATCH 3/7] Fix warnings in PHP 8.0 --- common/framework/parsers/dbquery/variablebase.php | 5 +++++ modules/document/document.controller.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/framework/parsers/dbquery/variablebase.php b/common/framework/parsers/dbquery/variablebase.php index 255fcc375..fb9d40b9d 100644 --- a/common/framework/parsers/dbquery/variablebase.php +++ b/common/framework/parsers/dbquery/variablebase.php @@ -309,6 +309,11 @@ class VariableBase { list($is_expression, $value) = $this->getDefaultValue(); } + else + { + $is_expression = null; + $value = null; + } return [$is_expression, $value]; } diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 7caa3946d..c17b1dca7 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -2463,7 +2463,7 @@ class documentController extends document $list[$category_srl] = $category_list[$i]; } // Create the xml file without node data if no data is obtained - if(!$list) + if(!isset($list) || !$list) { $xml_buff = ""; FileHandler::writeFile($xml_file, $xml_buff); From b125b4684a5e85a5bdde25f776b822d3a9c1bafc Mon Sep 17 00:00:00 2001 From: Min-Soo Kim Date: Wed, 23 Dec 2020 21:28:53 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=ED=86=B5=ED=95=A9=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=97=90=EC=84=9C=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=96=B4=EA=B0=80=20=EC=9D=B4=EC=A4=91=EC=9C=BC=EB=A1=9C=20esc?= =?UTF-8?q?ape=20=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#1518)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 통합검색 모듈에서 검색어가 이중으로 escape 되는 문제 수정 * 파일 검색시에도 'search' operator 사용하도록 수정 --- modules/file/file.admin.model.php | 20 +++++++++---------- modules/file/queries/getFileList.xml | 8 ++++---- .../queries/getFileListByTargetStatus.xml | 10 +++++----- .../integration_search.view.php | 7 ++++--- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index 1bb074c63..b164d5458 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -10,7 +10,7 @@ class fileAdminModel extends file * Initialization * @return void */ - function init() + public function init() { } @@ -62,7 +62,7 @@ class fileAdminModel extends file * @param array $columnList Column list to get from DB * @return Object Object contains query result */ - function getFileList($obj, $columnList = array()) + public function getFileList($obj, $columnList = array()) { $args = new stdClass(); $this->_makeSearchParam($obj, $args); @@ -75,9 +75,9 @@ class fileAdminModel extends file elseif($obj->direct_download == 'N') $args->direct_download= 'N'; // Set variables $args->sort_index = $obj->sort_index; - $args->page = $obj->page?$obj->page:1; - $args->list_count = $obj->list_count?$obj->list_count:20; - $args->page_count = $obj->page_count?$obj->page_count:10; + $args->page = $obj->page?? 1; + $args->list_count = $obj->list_count?? 20; + $args->page_count = $obj->page_count?? 10; $args->s_module_srl = $obj->module_srl; $args->exclude_module_srl = $obj->exclude_module_srl; if(toBool($obj->exclude_secret)) @@ -124,7 +124,7 @@ class fileAdminModel extends file * @param object $obj Search options (not used...) * @return array */ - function getFilesCountByGroupValid($obj = '') + public function getFilesCountByGroupValid($obj = '') { //$this->_makeSearchParam($obj, $args); @@ -138,7 +138,7 @@ class fileAdminModel extends file * @param string $date Date string * @return int */ - function getFilesCountByDate($date = '') + public function getFilesCountByDate($date = '') { $args = new stdClass(); if($date) @@ -162,11 +162,11 @@ class fileAdminModel extends file * @param object $args Result searach options * @return void */ - function _makeSearchParam(&$obj, &$args) + protected function _makeSearchParam(&$obj, &$args) { // Search options - $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target')); - $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword')); + $search_target = $obj->search_target ?? trim(Context::get('search_target')); + $search_keyword = $obj->search_keyword ?? trim(Context::get('search_keyword')); if($search_target && $search_keyword) { diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml index 9faf6fb1e..43461e9fd 100644 --- a/modules/file/queries/getFileList.xml +++ b/modules/file/queries/getFileList.xml @@ -20,15 +20,15 @@ - + - - - + + + diff --git a/modules/file/queries/getFileListByTargetStatus.xml b/modules/file/queries/getFileListByTargetStatus.xml index 7092da25f..999d87e02 100644 --- a/modules/file/queries/getFileListByTargetStatus.xml +++ b/modules/file/queries/getFileListByTargetStatus.xml @@ -1,4 +1,4 @@ - +
@@ -35,15 +35,15 @@ - + - - - + + + diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php index 2b9ec9b5e..080b79f2e 100644 --- a/modules/integration_search/integration_search.view.php +++ b/modules/integration_search/integration_search.view.php @@ -23,7 +23,7 @@ class integration_searchView extends integration_search * * @return void */ - function init() + public function init() { } @@ -32,7 +32,7 @@ class integration_searchView extends integration_search * * @return Object */ - function IS() + public function IS() { $oFile = getClass('file'); $oModuleModel = getModel('module'); @@ -114,7 +114,8 @@ class integration_searchView extends integration_search // Set a variable for search keyword $is_keyword = Context::get('is_keyword'); - $is_keyword = escape(trim(utf8_normalize_spaces($is_keyword))); + // As the variables from GET or POST will be escaped by setRequestArguments method at Context class, the double_escape variable should be "FALSE", and also the escape function might be useful when this method was called from the other way (for not escaped keyword). + $is_keyword = escape(trim(utf8_normalize_spaces($is_keyword)), false); if (mb_strlen($is_keyword, 'UTF-8') > 40) { $is_keyword = mb_substr($is_keyword, 0, 40); From ae71a4569168ee13877d5b6bb8dae0246f8df917 Mon Sep 17 00:00:00 2001 From: Min-Soo Kim Date: Wed, 23 Dec 2020 21:52:51 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EC=9D=98=EB=AF=B8=EA=B0=80=20=EB=8B=AC?= =?UTF-8?q?=EB=9D=BC=EC=A7=80=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EC=9E=AC?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/file/file.admin.model.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index 89daed2bc..ba615727d 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -75,9 +75,9 @@ class fileAdminModel extends file elseif($obj->direct_download == 'N') $args->direct_download= 'N'; // Set variables $args->sort_index = $obj->sort_index; - $args->page = $obj->page?? 1; - $args->list_count = $obj->list_count?? 20; - $args->page_count = $obj->page_count?? 10; + $args->page = $obj->page?$obj->page:1; + $args->list_count = $obj->list_count?$obj->list_count:20; + $args->page_count = $obj->page_count?$obj->page_count:10; $args->s_module_srl = $obj->module_srl; $args->exclude_module_srl = $obj->exclude_module_srl; if(toBool($obj->exclude_secret)) @@ -165,8 +165,8 @@ class fileAdminModel extends file protected function _makeSearchParam(&$obj, &$args) { // Search options - $search_target = $obj->search_target ?? trim(Context::get('search_target')); - $search_keyword = $obj->search_keyword ?? trim(Context::get('search_keyword')); + $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target')); + $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword')); if($search_target && $search_keyword) { From 97fc096fbdd96d8a613f24a5682f308b0a1076c2 Mon Sep 17 00:00:00 2001 From: Min-Soo Kim Date: Wed, 23 Dec 2020 21:57:56 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=AA=A8=EB=93=88?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B2=80=EC=83=89=EC=8B=9C=EC=97=90=20sea?= =?UTF-8?q?rch=20operator=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20(#1519)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 통합검색 모듈에서 검색어가 이중으로 escape 되는 문제 수정 * 파일 검색시에도 'search' operator 사용하도록 수정 * XML 쿼리 파일 내의 id가 실제 쿼리 id와 다르게 작성되어 있던 오타를 수정합니다. --- modules/file/file.admin.model.php | 1 - modules/file/queries/getFilesCountByGroupValid.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index b164d5458..89daed2bc 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -173,7 +173,6 @@ class fileAdminModel extends file switch($search_target) { case 'filename' : - if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword); $args->s_filename = $search_keyword; break; case 'filesize_more' : diff --git a/modules/file/queries/getFilesCountByGroupValid.xml b/modules/file/queries/getFilesCountByGroupValid.xml index 869d7a3fd..509a4d0c6 100644 --- a/modules/file/queries/getFilesCountByGroupValid.xml +++ b/modules/file/queries/getFilesCountByGroupValid.xml @@ -1,4 +1,4 @@ - +
@@ -12,7 +12,7 @@ - + From 5d39fe938ac93948ae412b96745c70369ea17890 Mon Sep 17 00:00:00 2001 From: Min-Soo Kim Date: Wed, 23 Dec 2020 22:14:31 +0900 Subject: [PATCH 7/7] Fix unintended change at file searching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #1518 에서 지적 받은 내용 수정 --- modules/file/file.admin.model.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php index 89daed2bc..d48a1ea1e 100644 --- a/modules/file/file.admin.model.php +++ b/modules/file/file.admin.model.php @@ -75,9 +75,9 @@ class fileAdminModel extends file elseif($obj->direct_download == 'N') $args->direct_download= 'N'; // Set variables $args->sort_index = $obj->sort_index; - $args->page = $obj->page?? 1; - $args->list_count = $obj->list_count?? 20; - $args->page_count = $obj->page_count?? 10; + $args->page = isset($obj->page) ? ($obj->page ? $obj->page : 1) : 1; + $args->list_count = isset($obj->list_count) ? ($obj->list_count? $obj->list_count : 20) : 20; + $args->page_count = isset($obj->page_count) ? ($obj->page_count? $obj->page_count : 10) : 10; $args->s_module_srl = $obj->module_srl; $args->exclude_module_srl = $obj->exclude_module_srl; if(toBool($obj->exclude_secret)) @@ -165,8 +165,8 @@ class fileAdminModel extends file protected function _makeSearchParam(&$obj, &$args) { // Search options - $search_target = $obj->search_target ?? trim(Context::get('search_target')); - $search_keyword = $obj->search_keyword ?? trim(Context::get('search_keyword')); + $search_target = isset($obj->search_target)? ($obj->search_target? $obj->search_target : trim(Context::get('search_target'))) : trim(Context::get('search_target')); + $search_keyword = isset($obj->search_keyword)? ($obj->search_keyword? $obj->search_keyword : trim(Context::get('search_keyword'))) : trim(Context::get('search_keyword')); if($search_target && $search_keyword) {