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);