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

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-08-29 23:53:31 +09:00
commit ffe9cda5e0
37 changed files with 2047 additions and 1931 deletions
Download patch file Download diff file Expand all files Collapse all files

45
modules/module/module.controller.php
View file

@ -795,21 +795,26 @@ class moduleController extends module
*/
function insertAdminId($module_srl, $admin_id)
{
$member_config = MemberModel::getMemberConfig();
if($member_config->identifier == 'email_address')
if (strpos($admin_id, '@') !== false)
{
$member_info = MemberModel::getMemberInfoByEmailAddress($admin_id);
}
else
{
$member_info = MemberModel::getMemberInfoByUserID($admin_id);
if(!$member_info->member_srl) return;
Rhymix\Framework\Cache::delete("site_and_module:module_admins:$module_srl");
}
if (!$member_info || !$member_info->member_srl)
{
return;
}
$args = new stdClass();
$args->module_srl = $module_srl;
$args->module_srl = intval($module_srl);
$args->member_srl = $member_info->member_srl;
return executeQuery('module.insertAdminId', $args);
$output = executeQuery('module.insertAdminId', $args);
Rhymix\Framework\Cache::delete("site_and_module:module_admins:" . intval($module_srl));
return $output;
}
/**
@ -818,17 +823,27 @@ class moduleController extends module
function deleteAdminId($module_srl, $admin_id = '')
{
$args = new stdClass();
$args->module_srl = $module_srl;
$args->module_srl = intval($module_srl);
if($admin_id)
{
$member_info = MemberModel::getMemberInfoByUserID($admin_id);
if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
if (strpos($admin_id, '@') !== false)
{
$member_info = MemberModel::getMemberInfoByEmailAddress($admin_id);
}
else
{
$member_info = MemberModel::getMemberInfoByUserID($admin_id);
}
if ($member_info && $member_info->member_srl)
{
$args->member_srl = $member_info->member_srl;
}
}
Rhymix\Framework\Cache::delete("site_and_module:module_admins:$module_srl");
return executeQuery('module.deleteAdminId', $args);
$output = executeQuery('module.deleteAdminId', $args);
Rhymix\Framework\Cache::delete("site_and_module:module_admins:" . intval($module_srl));
return $output;
}
/**