fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

통합검색 모듈에서 검색어가 이중으로 escape 되는 문제 수정 (#1518)

Browse source 
* 통합검색 모듈에서 검색어가 이중으로 escape 되는 문제 수정
* 파일 검색시에도 'search' operator 사용하도록 수정
This commit is contained in:
Min-Soo Kim 2020-12-23 21:28:53 +09:00 • committed by GitHub
parent 49ea6700b3
commit b125b4684a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/file/file.admin.model.php
View file

@ -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)
{