Clean up legacy code

This commit is contained in:
Kijin Sung 2023-07-06 22:54:38 +09:00
parent f329b542d2
commit cda1eab702

View file

@ -478,9 +478,7 @@ class MemberAdminView extends Member
*/ */
function _getMemberInputTag($memberInfo = null, $isAdmin = false) function _getMemberInputTag($memberInfo = null, $isAdmin = false)
{ {
$logged_info = Context::get('logged_info'); $extend_form_list = MemberModel::getCombineJoinForm($memberInfo);
$oMemberModel = getModel('member');
$extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
$security = new Security($extend_form_list); $security = new Security($extend_form_list);
$security->encodeHTML('..column_title', '..description', '..default_value.'); $security->encodeHTML('..column_title', '..description', '..default_value.');
@ -498,7 +496,7 @@ class MemberAdminView extends Member
$member_config = $this->memberConfig; $member_config = $this->memberConfig;
if(!$this->memberConfig) if(!$this->memberConfig)
{ {
$member_config = $this->memberConfig = $oMemberModel->getMemberConfig(); $member_config = $this->memberConfig = MemberModel::getMemberConfig();
} }
$identifiers = $member_config->identifiers ?? [$member_config->identifier]; $identifiers = $member_config->identifiers ?? [$member_config->identifier];
$identifiers = array_intersect($identifiers, ['user_id', 'email_address']); $identifiers = array_intersect($identifiers, ['user_id', 'email_address']);
@ -506,7 +504,7 @@ class MemberAdminView extends Member
global $lang; global $lang;
$formTags = array(); $formTags = array();
foreach($member_config->signupForm as $no=>$formInfo) foreach($member_config->signupForm as $formInfo)
{ {
if(!$formInfo->isUse || (in_array($formInfo->name, $identifiers) && $formInfo->name === array_first($identifiers)) || $formInfo->name == 'password') if(!$formInfo->isUse || (in_array($formInfo->name, $identifiers) && $formInfo->name === array_first($identifiers)) || $formInfo->name == 'password')
{ {