Remove unnecessary site_srl from member module

This commit is contained in:
Kijin Sung 2021-01-18 15:21:00 +09:00
parent 9a2cbb8b93
commit 972fbc9ca6
13 changed files with 55 additions and 86 deletions

View file

@ -2179,21 +2179,17 @@ class memberController extends member
*
* @param int $member_srl
* @param int $group_srl
* @param int $site_srl
*
* @return Object
*/
function addMemberToGroup($member_srl, $group_srl, $site_srl=0)
function addMemberToGroup($member_srl, $group_srl)
{
$args = new stdClass();
$args->member_srl = $member_srl;
$args->group_srl = $group_srl;
if($site_srl) $args->site_srl = $site_srl;
// Add
$output = executeQuery('member.addMemberToGroup',$args);
$output = executeQuery('member.addMemberToGroup', $args);
ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args);
self::clearMemberCache($member_srl);
return $output;
@ -2210,11 +2206,16 @@ class memberController extends member
function replaceMemberGroup($args)
{
$obj = new stdClass;
$obj->site_srl = $args->site_srl;
$obj->member_srl = implode(',',$args->member_srl);
$obj->member_srl = $args->member_srl;
$output = executeQueryArray('member.getMembersGroup', $obj);
if($output->data) foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
if($output->data)
{
foreach($output->data as $key => $val)
{
$date[$val->member_srl] = $val->regdate;
}
}
$output = executeQuery('member.deleteMembersGroup', $obj);
if(!$output->toBool()) return $output;
@ -2229,7 +2230,6 @@ class memberController extends member
$obj = new stdClass;
$obj->member_srl = $val;
$obj->group_srl = $args->group_srl;
$obj->site_srl = $args->site_srl;
$obj->regdate = $date[$obj->member_srl];
$output = executeQuery('member.addMemberToGroup', $obj);
if(!$output->toBool()) return $output;
@ -2823,8 +2823,7 @@ class memberController extends member
// If no value is entered the default group, the value of group registration
if(!$args->group_srl_list)
{
$columnList = array('site_srl', 'group_srl');
$default_group = MemberModel::getDefaultGroup(0, $columnList);
$default_group = MemberModel::getDefaultGroup(0);
if($default_group)
{
// Add to the default group
@ -3151,7 +3150,6 @@ class memberController extends member
// If the group information, group information changes
if(count($group_srl_list) > 0)
{
$args->site_srl = 0;
// One of its members to delete all the group
$output = executeQuery('member.deleteMemberGroupMember', $args);
if(!$output->toBool())
@ -3927,7 +3925,7 @@ class memberController extends member
* @deprecated
* @return void
*/
public static function _clearMemberCache($member_srl, $site_srl = 0)
public static function _clearMemberCache($member_srl)
{
self::clearMemberCache($member_srl);
}