fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-31 17:19:59 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/recaptcha

Browse source
This commit is contained in:
Kijin Sung 2016-05-30 22:01:23 +09:00
commit 065d295011
47 changed files with 805 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/member/member.admin.model.php
View file

@ -157,6 +157,7 @@ class memberAdminModel extends member
*/
function getSiteMemberList($site_srl, $page = 1)
{
$args = new stdClass();
$args->site_srl = $site_srl;
$args->page = $page;
$args->list_count = 40;
@ -240,10 +241,17 @@ class memberAdminModel extends member
*/
function getMemberGroupMemberCountByDate($date = '')
{
if($date) $args->regDate = date('Ymd', strtotime($date));
$args = new stdClass();
if($date)
{
$args->regDate = date('Ymd', strtotime($date));
}
$output = executeQuery('member.getMemberGroupMemberCountByDate', $args);
if(!$output->toBool()) return 0;
if(!$output->toBool())
{
return 0;
}
return count($output->data);
}

1
modules/member/member.class.php
View file

@ -305,6 +305,7 @@ class member extends ModuleObject {
{
$oDB->addColumn("member", "list_order", "number", 11);
@set_time_limit(0);
$args = new stdClass();
$args->list_order = 'member_srl';
executeQuery('member.updateMemberListOrderAll',$args);
executeQuery('member.updateMemberListOrderAll');

2
modules/member/member.model.php
View file

@ -770,6 +770,7 @@ class memberModel extends member
*/
function getJoinForm($member_join_form_srl)
{
$args = new stdClass();
$args->member_join_form_srl = $member_join_form_srl;
$output = executeQuery('member.getJoinForm', $args);
$join_form = $output->data;
@ -797,6 +798,7 @@ class memberModel extends member
{
if(!$this->denied_id_list)
{
$args = new stdClass();
$args->sort_index = "list_order";
$args->page = Context::get('page');
$args->list_count = 40;