fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3 from misol/IS_escape_fix

Browse source 
파일 검색에 라이믹스 operator 적용 등
This commit is contained in:
Min-Soo Kim 2020-12-23 21:11:47 +09:00 • committed by GitHub
commit 1693d61ba1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 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 * Initialization
* @return void * @return void
*/ */
function init() public function init()
{ {
} }
@ -62,7 +62,7 @@ class fileAdminModel extends file
* @param array $columnList Column list to get from DB * @param array $columnList Column list to get from DB
* @return Object Object contains query result * @return Object Object contains query result
*/ */
function getFileList($obj, $columnList = array()) public function getFileList($obj, $columnList = array())
{ {
$args = new stdClass(); $args = new stdClass();
$this->_makeSearchParam($obj, $args); $this->_makeSearchParam($obj, $args);
@ -75,9 +75,9 @@ class fileAdminModel extends file
elseif($obj->direct_download == 'N') $args->direct_download= 'N'; elseif($obj->direct_download == 'N') $args->direct_download= 'N';
// Set variables // Set variables
$args->sort_index = $obj->sort_index; $args->sort_index = $obj->sort_index;
$args->page = $obj->page?$obj->page:1; $args->page = $obj->page?? 1;
$args->list_count = $obj->list_count?$obj->list_count:20; $args->list_count = $obj->list_count?? 20;
$args->page_count = $obj->page_count?$obj->page_count:10; $args->page_count = $obj->page_count?? 10;
$args->s_module_srl = $obj->module_srl; $args->s_module_srl = $obj->module_srl;
$args->exclude_module_srl = $obj->exclude_module_srl; $args->exclude_module_srl = $obj->exclude_module_srl;
if(toBool($obj->exclude_secret)) if(toBool($obj->exclude_secret))
@ -124,7 +124,7 @@ class fileAdminModel extends file
* @param object $obj Search options (not used...) * @param object $obj Search options (not used...)
* @return array * @return array
*/ */
function getFilesCountByGroupValid($obj = '') public function getFilesCountByGroupValid($obj = '')
{ {
//$this->_makeSearchParam($obj, $args); //$this->_makeSearchParam($obj, $args);
@ -138,7 +138,7 @@ class fileAdminModel extends file
* @param string $date Date string * @param string $date Date string
* @return int * @return int
*/ */
function getFilesCountByDate($date = '') public function getFilesCountByDate($date = '')
{ {
$args = new stdClass(); $args = new stdClass();
if($date) if($date)
@ -162,11 +162,11 @@ class fileAdminModel extends file
* @param object $args Result searach options * @param object $args Result searach options
* @return void * @return void
*/ */
function _makeSearchParam(&$obj, &$args) protected function _makeSearchParam(&$obj, &$args)
{ {
// Search options // Search options
$search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target')); $search_target = $obj->search_target ?? trim(Context::get('search_target'));
$search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword')); $search_keyword = $obj->search_keyword ?? trim(Context::get('search_keyword'));
if($search_target && $search_keyword) if($search_target && $search_keyword)
{ {

8
modules/file/queries/getFileList.xml
View file

@ -20,15 +20,15 @@
<condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" /> <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
<condition operation="below" column="files.regdate" var="regdate_before" pipe="and" /> <condition operation="below" column="files.regdate" var="regdate_before" pipe="and" />
<group pipe="and"> <group pipe="and">
<condition operation="like" column="files.source_filename" var="s_filename" pipe="or" /> <condition operation="search" column="files.source_filename" var="s_filename" pipe="or" />
<condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" /> <condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" />
<condition operation="less" column="files.file_size" var="s_filesize_less" pipe="or" /> <condition operation="less" column="files.file_size" var="s_filesize_less" pipe="or" />
<condition operation="more" column="files.download_count" var="s_download_count" pipe="or" /> <condition operation="more" column="files.download_count" var="s_download_count" pipe="or" />
<condition operation="like_prefix" column="files.regdate" var="s_regdate" pipe="or" /> <condition operation="like_prefix" column="files.regdate" var="s_regdate" pipe="or" />
<condition operation="like_prefix" column="files.ipaddress" var="s_ipaddress" pipe="or" /> <condition operation="like_prefix" column="files.ipaddress" var="s_ipaddress" pipe="or" />
<condition operation="like" column="member.user_id" var="s_user_id" pipe="or" /> <condition operation="search" column="member.user_id" var="s_user_id" pipe="or" />
<condition operation="like" column="member.user_name" var="s_user_name" pipe="or" /> <condition operation="search" column="member.user_name" var="s_user_name" pipe="or" />
<condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" /> <condition operation="search" column="member.nick_name" var="s_nick_name" pipe="or" />
</group> </group>
</conditions> </conditions>
<navigation> <navigation>