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

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2025-08-27 17:08:18 +09:00 • committed by GitHub
commit ef9967fc1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
81 changed files with 923 additions and 726 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,6 +80,10 @@ class MemberAdminController extends Member
{
$output = executeQuery('member.getMemberInfoByMemberSrl', ['member_srl' => $args->member_srl], ['extra_vars']);
$extra_vars = ($output->data && $output->data->extra_vars) ? unserialize($output->data->extra_vars) : new stdClass;
if (!is_object($extra_vars))
{
$extra_vars = new stdClass;
}
foreach(self::NOUSE_EXTRA_VARS as $key)
{
unset($extra_vars->$key);

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

@ -1820,23 +1820,13 @@ class MemberController extends Member
Context::set('auth_args', $args);
$memberInfo = array();
if(is_array($member_config->signupForm))
if (in_array('user_id', $member_config->identifiers))
{
$exceptForm=array('password', 'find_account_question');
foreach($member_config->signupForm as $form)
{
if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
{
$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
}
}
$memberInfo[$lang->user_id] = $member_info->user_id;
}
else
if (in_array('email_address', $member_config->identifiers))
{
$memberInfo[$lang->user_id] = $args->user_id;
$memberInfo[$lang->user_name] = $args->user_name;
$memberInfo[$lang->nick_name] = $args->nick_name;
$memberInfo[$lang->email_address] = $args->email_address;
$memberInfo[$lang->email_address] = $member_info->email_address;
}
Context::set('memberInfo', $memberInfo);

7
modules/member/skins/default/filter/logout.xml
View file

@ -1,7 +0,0 @@
<filter name="logout" module="member" act="procMemberLogout">
<form />
<response callback_func="completeLogout">
<tag name="error" />
<tag name="message" />
</response>
</filter>

9
modules/member/skins/default/logout.html
View file

@ -1,9 +0,0 @@
<include target="./common_header.html" />
<import target="filter/logout.xml" />
<form action="./" method="get" onsubmit="return procFilter(this, logout)">
<input type="hidden" name="mid" value="{$mid}" />
<h1>{$lang->cmd_logout}</h1>
<p>{$lang->confirm_logout}</p>
<p><input type="submit" value="{$lang->cmd_logout}" class="btn btn-inverse" /></p>
</form>
<include target="./common_footer.html" />