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

Remove unnecessary site_srl from member module

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

23
modules/member/member.admin.controller.php
View file

@ -706,7 +706,6 @@ class memberAdminController extends member
$group_srl = Context::get('group_srl'); $group_srl = Context::get('group_srl');
$args = Context::gets('group_srl','title','description','is_default','image_mark'); $args = Context::gets('group_srl','title','description','is_default','image_mark');
$args->site_srl = 0;
$output = $this->updateGroup($args); $output = $this->updateGroup($args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
@ -913,7 +912,6 @@ class memberAdminController extends member
{ {
if(count($groups) > 0) if(count($groups) > 0)
{ {
$args->site_srl = 0;
// One of its members to delete all the group // One of its members to delete all the group
$output = executeQuery('member.deleteMemberGroupMember', $args); $output = executeQuery('member.deleteMemberGroupMember', $args);
if(!$output->toBool()) if(!$output->toBool())
@ -1231,7 +1229,7 @@ class memberAdminController extends member
$args->target_group_srl = $target_group_srl; $args->target_group_srl = $target_group_srl;
$output = executeQuery('member.changeGroup', $args); $output = executeQuery('member.changeGroup', $args);
$this->_deleteMemberGroupCache($site_srl); $this->_deleteMemberGroupCache();
return $output; return $output;
} }
@ -1243,8 +1241,6 @@ class memberAdminController extends member
*/ */
function insertGroup($args) function insertGroup($args)
{ {
if(!$args->site_srl) $args->site_srl = 0;
// Call trigger (before) // Call trigger (before)
$trigger_output = ModuleHandler::triggerCall('member.insertGroup', 'before', $args); $trigger_output = ModuleHandler::triggerCall('member.insertGroup', 'before', $args);
if(!$trigger_output->toBool()) if(!$trigger_output->toBool())
@ -1271,7 +1267,7 @@ class memberAdminController extends member
if(!$args->group_srl) $args->group_srl = getNextSequence(); if(!$args->group_srl) $args->group_srl = getNextSequence();
$args->list_order = $args->group_srl; $args->list_order = $args->group_srl;
$output = executeQuery('member.insertGroup', $args); $output = executeQuery('member.insertGroup', $args);
$this->_deleteMemberGroupCache($args->site_srl); $this->_deleteMemberGroupCache();
// Call trigger (after) // Call trigger (after)
ModuleHandler::triggerCall('member.insertGroup', 'after', $args); ModuleHandler::triggerCall('member.insertGroup', 'after', $args);
@ -1286,7 +1282,6 @@ class memberAdminController extends member
*/ */
function updateGroup($args) function updateGroup($args)
{ {
if(!$args->site_srl) $args->site_srl = 0;
if(!$args->group_srl) throw new Rhymix\Framework\Exceptions\TargetNotFound; if(!$args->group_srl) throw new Rhymix\Framework\Exceptions\TargetNotFound;
// Call trigger (before) // Call trigger (before)
@ -1308,7 +1303,7 @@ class memberAdminController extends member
} }
$output = executeQuery('member.updateGroup', $args); $output = executeQuery('member.updateGroup', $args);
$this->_deleteMemberGroupCache($args->site_srl); $this->_deleteMemberGroupCache();
// Call trigger (after) // Call trigger (after)
ModuleHandler::triggerCall('member.updateGroup', 'after', $args); ModuleHandler::triggerCall('member.updateGroup', 'after', $args);
@ -1319,10 +1314,9 @@ class memberAdminController extends member
/** /**
* Delete a Group * Delete a Group
* @param int $group_srl * @param int $group_srl
* @param int $site_srl
* @return Object * @return Object
*/ */
function deleteGroup($group_srl, $site_srl = 0) function deleteGroup($group_srl)
{ {
// Create a member model object // Create a member model object
$oMemberModel = getModel('member'); $oMemberModel = getModel('member');
@ -1342,8 +1336,7 @@ class memberAdminController extends member
} }
// Get groups where is_default == 'Y' // Get groups where is_default == 'Y'
$columnList = array('site_srl', 'group_srl'); $default_group = $oMemberModel->getDefaultGroup();
$default_group = $oMemberModel->getDefaultGroup($site_srl, $columnList);
$default_group_srl = $default_group->group_srl; $default_group_srl = $default_group->group_srl;
// Change to default_group_srl // Change to default_group_srl
@ -1352,7 +1345,7 @@ class memberAdminController extends member
$args = new stdClass; $args = new stdClass;
$args->group_srl = $group_srl; $args->group_srl = $group_srl;
$output = executeQuery('member.deleteGroup', $args); $output = executeQuery('member.deleteGroup', $args);
$this->_deleteMemberGroupCache($site_srl); $this->_deleteMemberGroupCache();
if (!$output->toBool()) if (!$output->toBool())
{ {
return $output; return $output;
@ -1438,7 +1431,7 @@ class memberAdminController extends member
executeQuery('member.updateMemberGroupListOrder', $args); executeQuery('member.updateMemberGroupListOrder', $args);
} }
$this->_deleteMemberGroupCache($vars->site_srl); $this->_deleteMemberGroupCache();
$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList')); $this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList'));
} }
@ -1447,7 +1440,7 @@ class memberAdminController extends member
* Delete cached group data * Delete cached group data
* @return void * @return void
*/ */
function _deleteMemberGroupCache($site_srl = 0) function _deleteMemberGroupCache()
{ {
//remove from cache //remove from cache
Rhymix\Framework\Cache::clearGroup('member'); Rhymix\Framework\Cache::clearGroup('member');

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

@ -165,10 +165,9 @@ class memberAdminModel extends member
* *
* @return array * @return array
*/ */
function getSiteMemberList($site_srl, $page = 1) function getSiteMemberList($site_srl = 0, $page = 1)
{ {
$args = new stdClass(); $args = new stdClass();
$args->site_srl = $site_srl;
$args->page = $page; $args->page = $page;
$args->list_count = 40; $args->list_count = 40;
$args->page_count = 10; $args->page_count = 10;

6
modules/member/member.admin.view.php
View file

@ -204,11 +204,7 @@ class memberAdminView extends member
$mid = $config->redirect_mid; $mid = $config->redirect_mid;
} }
$siteModuleInfo = Context::get('site_module_info'); $moduleInfo = ModuleModel::getModuleInfoByMid($mid);
$oModuleModel = getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int)$siteModuleInfo->site_srl);
$config->redirect_url = $moduleInfo->module_srl; $config->redirect_url = $moduleInfo->module_srl;
Context::set('config', $config); Context::set('config', $config);
} }

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

@ -32,11 +32,6 @@ class member extends ModuleObject {
{ {
// Register action forward (to use in administrator mode) // Register action forward (to use in administrator mode)
$oModuleController = getController('module'); $oModuleController = getController('module');
$oDB = DB::getInstance();
$oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
$oModuleModel = getModel('module');
$config = ModuleModel::getModuleConfig('member'); $config = ModuleModel::getModuleConfig('member');
if(empty($config)) if(empty($config))

26
modules/member/member.controller.php
View file

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

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

@ -340,7 +340,7 @@ class memberModel extends member
* *
* @return object * @return object
*/ */
public static function getMemberInfoByMemberSrl($member_srl, $site_srl = 0) public static function getMemberInfoByMemberSrl($member_srl)
{ {
if(!$member_srl) return new stdClass; if(!$member_srl) return new stdClass;
@ -362,7 +362,7 @@ class memberModel extends member
return new stdClass; return new stdClass;
} }
$member_info = self::arrangeMemberInfo($output->data, $site_srl); $member_info = self::arrangeMemberInfo($output->data);
if($output->toBool()) if($output->toBool())
{ {
Rhymix\Framework\Cache::set($cache_key, $member_info); Rhymix\Framework\Cache::set($cache_key, $member_info);
@ -387,7 +387,7 @@ class memberModel extends member
/** /**
* @brief Add member info from extra_vars and other information * @brief Add member info from extra_vars and other information
*/ */
public static function arrangeMemberInfo($info, $site_srl = 0) public static function arrangeMemberInfo($info)
{ {
if(!isset($GLOBALS['__member_info__'])) if(!isset($GLOBALS['__member_info__']))
{ {
@ -402,10 +402,10 @@ class memberModel extends member
$info->image_mark = self::getImageMark($info->member_srl); $info->image_mark = self::getImageMark($info->member_srl);
if($config->group_image_mark=='Y') if($config->group_image_mark=='Y')
{ {
$info->group_mark = self::getGroupImageMark($info->member_srl,$site_srl); $info->group_mark = self::getGroupImageMark($info->member_srl);
} }
$info->signature = self::getSignature($info->member_srl); $info->signature = self::getSignature($info->member_srl);
$info->group_list = self::getMemberGroups($info->member_srl, $site_srl); $info->group_list = self::getMemberGroups($info->member_srl);
$info->is_site_admin = ModuleModel::isSiteAdmin($info) ? true : false; $info->is_site_admin = ModuleModel::isSiteAdmin($info) ? true : false;
$extra_vars = unserialize($info->extra_vars); $extra_vars = unserialize($info->extra_vars);
@ -539,7 +539,7 @@ class memberModel extends member
public static function getMemberGroups($member_srl, $site_srl = 0, $force_reload = false) public static function getMemberGroups($member_srl, $site_srl = 0, $force_reload = false)
{ {
// cache controll // cache controll
$cache_key = sprintf('member:member_groups:%d:site:%d', $member_srl, $site_srl); $cache_key = sprintf('member:member_groups:%d', $member_srl);
$group_list = Rhymix\Framework\Cache::get($cache_key); $group_list = Rhymix\Framework\Cache::get($cache_key);
if(!isset($GLOBALS['__member_groups__'][$member_srl]) || $force_reload) if(!isset($GLOBALS['__member_groups__'][$member_srl]) || $force_reload)
@ -548,13 +548,12 @@ class memberModel extends member
{ {
$args = new stdClass(); $args = new stdClass();
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
$args->site_srl = $site_srl;
$output = executeQueryArray('member.getMemberGroups', $args); $output = executeQueryArray('member.getMemberGroups', $args);
$group_list = $output->data; $group_list = $output->data;
if (!count($group_list)) if (!count($group_list))
{ {
$default_group = self::getDefaultGroup($site_srl); $default_group = self::getDefaultGroup(0);
MemberController::getInstance()->addMemberToGroup($member_srl, $default_group->group_srl, $site_srl); MemberController::getInstance()->addMemberToGroup($member_srl, $default_group->group_srl);
$group_list[$default_group->group_srl] = $default_group->title; $group_list[$default_group->group_srl] = $default_group->title;
} }
//insert in cache //insert in cache
@ -577,11 +576,10 @@ class memberModel extends member
/** /**
* @brief Get a list of groups which member_srls belong to * @brief Get a list of groups which member_srls belong to
*/ */
public static function getMembersGroups($member_srls, $site_srl = 0) public static function getMembersGroups($member_srls)
{ {
$args = new stdClass; $args = new stdClass;
$args->member_srls = implode(',',$member_srls); $args->member_srls = implode(',',$member_srls);
$args->site_srl = $site_srl;
$args->sort_index = 'list_order'; $args->sort_index = 'list_order';
$output = executeQueryArray('member.getMembersGroups', $args); $output = executeQueryArray('member.getMembersGroups', $args);
if(!$output->data) return array(); if(!$output->data) return array();
@ -597,15 +595,14 @@ class memberModel extends member
/** /**
* @brief Get a default group * @brief Get a default group
*/ */
public static function getDefaultGroup($site_srl = 0) public static function getDefaultGroup()
{ {
$cache_key = sprintf('member:default_group:site:%d', $site_srl); $cache_key = sprintf('member:default_group');
$default_group = Rhymix\Framework\Cache::get($cache_key); $default_group = Rhymix\Framework\Cache::get($cache_key);
if(!$default_group) if(!$default_group)
{ {
$args = new stdClass(); $args = new stdClass();
$args->site_srl = $site_srl;
$output = executeQuery('member.getDefaultGroup', $args); $output = executeQuery('member.getDefaultGroup', $args);
$default_group = $output->data; $default_group = $output->data;
if($output->toBool()) if($output->toBool())
@ -641,30 +638,23 @@ class memberModel extends member
/** /**
* @brief Get a list of groups * @brief Get a list of groups
*/ */
public static function getGroups($site_srl = 0) public static function getGroups()
{ {
if(!isset($GLOBALS['__group_info__'][$site_srl])) if(!isset($GLOBALS['__group_info__'][0]))
{ {
$result = array(); $result = array();
$group_list = Rhymix\Framework\Cache::get('member:member_group');
if(!isset($site_srl))
{
$site_srl = 0;
}
$group_list = Rhymix\Framework\Cache::get("member:member_groups:site:$site_srl");
if(!$group_list) if(!$group_list)
{ {
$args = new stdClass(); $args = new stdClass();
$args->site_srl = $site_srl;
$args->sort_index = 'list_order'; $args->sort_index = 'list_order';
$args->order_type = 'asc'; $args->order_type = 'asc';
$output = executeQueryArray('member.getGroups', $args); $output = executeQueryArray('member.getGroups', $args);
$group_list = $output->data; $group_list = $output->data;
if($output->toBool()) if($output->toBool())
{ {
Rhymix\Framework\Cache::set("member:member_groups:site:$site_srl", $group_list, 0, true); Rhymix\Framework\Cache::set('member:member_groups', $group_list, 0, true);
} }
} }
@ -678,9 +668,9 @@ class memberModel extends member
$result[$val->group_srl] = $val; $result[$val->group_srl] = $val;
} }
$GLOBALS['__group_info__'][$site_srl] = $result; $GLOBALS['__group_info__'][0] = $result;
} }
return $GLOBALS['__group_info__'][$site_srl]; return $GLOBALS['__group_info__'][0];
} }
/** /**
@ -1095,7 +1085,7 @@ class memberModel extends member
/** /**
* @brief Get the image mark of the group * @brief Get the image mark of the group
*/ */
public static function getGroupImageMark($member_srl,$site_srl=0) public static function getGroupImageMark($member_srl)
{ {
if(!isset($GLOBALS['__member_info__'])) if(!isset($GLOBALS['__member_info__']))
{ {
@ -1114,8 +1104,8 @@ class memberModel extends member
} }
$info = null; $info = null;
$member_group = self::getMemberGroups($member_srl, $site_srl); $member_group = self::getMemberGroups($member_srl);
$groups_info = self::getGroups($site_srl); $groups_info = self::getGroups();
if(count($member_group) > 0 && is_array($member_group)) if(count($member_group) > 0 && is_array($member_group))
{ {
$memberGroups = array_keys($member_group); $memberGroups = array_keys($member_group);
@ -1300,13 +1290,13 @@ class memberModel extends member
return true; return true;
} }
public static function getAdminGroupSrl($site_srl = 0) public static function getAdminGroupSrl()
{ {
$groupSrl = 0; $groupSrl = 0;
$output = self::getGroups($site_srl); $output = self::getGroups();
if(is_array($output)) if(is_array($output))
{ {
foreach($output AS $key=>$value) foreach($output AS $value)
{ {
if($value->is_admin == 'Y') if($value->is_admin == 'Y')
{ {

4
modules/member/member.view.php
View file

@ -72,9 +72,7 @@ class memberView extends member
return $this->dispMemberSignUpForm(); return $this->dispMemberSignUpForm();
} }
$site_module_info = Context::get('site_module_info'); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl);
$columnList = array('member_srl', 'user_id', 'email_address', 'user_name', 'nick_name', 'homepage', 'blog', 'birthday', 'regdate', 'last_login', 'extra_vars');
$member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl, $columnList);
unset($member_info->password); unset($member_info->password);
unset($member_info->email_id); unset($member_info->email_id);
unset($member_info->email_host); unset($member_info->email_host);

2
modules/member/queries/deleteMemberGroupMember.xml
View file

@ -5,6 +5,6 @@
<conditions> <conditions>
<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" /> <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
<condition operation="equal" column="group_srl" var="group_srl" filter="number" pipe="and" /> <condition operation="equal" column="group_srl" var="group_srl" filter="number" pipe="and" />
<condition operation="equal" column="site_srl" var="site_srl" filter="number" pipe="and" /> <condition operation="equal" column="site_srl" var="site_srl" filter="number" default="0" pipe="and" />
</conditions> </conditions>
</query> </query>

2
modules/member/queries/getDefaultGroup.xml
View file

@ -7,6 +7,6 @@
</columns> </columns>
<conditions> <conditions>
<condition operation="equal" column="is_default" default="Y" /> <condition operation="equal" column="is_default" default="Y" />
<condition operation="equal" column="site_srl" var="site_srl" pipe="and" /> <condition operation="equal" column="site_srl" var="site_srl" default="0" pipe="and" />
</conditions> </conditions>
</query> </query>

2
modules/member/queries/getGroups.xml
View file

@ -6,6 +6,6 @@
<index var="sort_index" default="list_order" order="order_type" /> <index var="sort_index" default="list_order" order="order_type" />
</navigation> </navigation>
<conditions> <conditions>
<condition operation="equal" column="site_srl" var="site_srl" /> <condition operation="equal" column="site_srl" var="site_srl" default="0" />
</conditions> </conditions>
</query> </query>

2
modules/member/queries/getMemberGroups.xml
View file

@ -10,7 +10,7 @@
<conditions> <conditions>
<condition operation="equal" column="b.member_srl" var="member_srl" filter="number" notnull="notnull" /> <condition operation="equal" column="b.member_srl" var="member_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="b.group_srl" default="a.group_srl" pipe="and" /> <condition operation="equal" column="b.group_srl" default="a.group_srl" pipe="and" />
<condition operation="equal" column="a.site_srl" var="site_srl" pipe="and" /> <condition operation="equal" column="a.site_srl" var="site_srl" default="0" pipe="and" />
</conditions> </conditions>
<navigation> <navigation>
<index var="sort_index" default="a.list_order" order="asc" /> <index var="sort_index" default="a.list_order" order="asc" />

2
modules/member/queries/getMembersGroup.xml
View file

@ -11,6 +11,6 @@
<conditions> <conditions>
<condition operation="in" column="b.member_srl" var="member_srl" filter="number" notnull="notnull" /> <condition operation="in" column="b.member_srl" var="member_srl" filter="number" notnull="notnull" />
<condition operation="equal" column="b.group_srl" default="a.group_srl" pipe="and" /> <condition operation="equal" column="b.group_srl" default="a.group_srl" pipe="and" />
<condition operation="equal" column="a.site_srl" var="site_srl" pipe="and" /> <condition operation="equal" column="a.site_srl" var="site_srl" default="0" pipe="and" />
</conditions> </conditions>
</query> </query>

2
modules/member/queries/getSiteMemberList.xml
View file

@ -9,7 +9,7 @@
<column name="member_group_member.regdate" alias="regdate" /> <column name="member_group_member.regdate" alias="regdate" />
</columns> </columns>
<conditions> <conditions>
<condition operation="equal" column="member_group.site_srl" var="site_srl" notnull="notnull" /> <condition operation="equal" column="member_group.site_srl" var="site_srl" default="0" notnull="notnull" />
<condition operation="equal" column="member_group_member.group_srl" default="member_group.group_srl" notnull="notnull" pipe="and" /> <condition operation="equal" column="member_group_member.group_srl" default="member_group.group_srl" notnull="notnull" pipe="and" />
<condition operation="equal" column="member.member_srl" var="member_group_member.member_srl" pipe="and" /> <condition operation="equal" column="member.member_srl" var="member_group_member.member_srl" pipe="and" />
</conditions> </conditions>