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

Merge branch 'rhymix:develop' into develop

Browse source
This commit is contained in:
Lastorder 2024-10-12 16:08:02 +09:00 • committed by GitHub
commit 88b5281094
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
111 changed files with 2542 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -307,6 +307,10 @@ class MemberAdminModel extends Member
$id_list = implode(',',$list);
Context::set('id_list',$id_list);
$extravar_types = lang('common.column_type_list');
unset($extravar_types['file']);
Context::set('extravar_types', $extravar_types);
$oTemplate = TemplateHandler::getInstance();
$tpl = $oTemplate->compile($this->module_path.'tpl', 'insert_join_form');

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

@ -657,8 +657,7 @@ class Member extends ModuleObject
if($error == 0) return new BaseObject($error, $message);
// Create a member model object
$oMemberModel = getModel('member');
$config = $oMemberModel->getMemberConfig();
$config = MemberModel::getMemberConfig();
// Check if there is recoding table.
$oDB = DB::getInstance();
@ -681,8 +680,6 @@ class Member extends ModuleObject
{
$args->count = 1;
}
unset($oMemberModel);
unset($config);
$output = executeQuery('member.updateLoginCountByIp', $args);
}
else
@ -714,6 +711,10 @@ class Member extends ModuleObject
{
//update
$content = unserialize($output->data->content);
if (is_array($content) && count($content) >= 250)
{
$content = array_slice($content, -200);
}
$content[] = array(\RX_CLIENT_IP, lang($message), \RX_TIME);
$args->content = serialize($content);
$output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args);

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

@ -2575,7 +2575,7 @@ class MemberController extends Member
}
else
{
$refused_reason = $member_info->refused_reason ? ('<br>' . lang('refused_reason') . ': ' . $member_info->refused_reason) : '';
$refused_reason = $member_info->refused_reason ? ("\n" . lang('refused_reason') . ': ' . $member_info->refused_reason) : '';
return new BaseObject(-1, lang('msg_user_denied') . $refused_reason);
}
}
@ -2583,7 +2583,7 @@ class MemberController extends Member
// Notify if user is limited
if($member_info->limit_date && substr($member_info->limit_date,0,8) >= date("Ymd"))
{
$limited_reason = $member_info->limited_reason ? ('<br>' . lang('refused_reason') . ': ' . $member_info->limited_reason) : '';
$limited_reason = $member_info->limited_reason ? ("\n" . lang('refused_reason') . ': ' . $member_info->limited_reason) : '';
return new BaseObject(-9, sprintf(lang('msg_user_limited'), zdate($member_info->limit_date,"Y-m-d")) . $limited_reason);
}

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

@ -74,7 +74,7 @@ class MemberView extends Member
{
$this->member_config = MemberModel::getMemberConfig();
}
if (!$this->member_config->mid || !$this->member_config->force_mid)
if (empty($this->member_config->mid) || empty($this->member_config->force_mid))
{
return true;
}

2
modules/member/tpl/insert_join_form.html
View file

@ -22,7 +22,7 @@
<label for="columnType" class="x_control-label"><em style="color:red">*</em> {$lang->column_type}</label>
<div class="x_controls">
<select id="columnType" class="typeSelect" name="column_type">
<option loop="$lang->column_type_list=>$key,$type_info" value="{$key}" selected="selected"|cond="$formInfo->column_type == $key" >{$lang->column_type_list[$key]}</option>
<option loop="$extravar_types=>$key,$type_info" value="{$key}" selected="selected"|cond="$formInfo->column_type == $key" >{$lang->column_type_list[$key]}</option>
</select>
</div>
</div>

4
modules/member/tpl/signup_config.html
View file

@ -251,8 +251,8 @@
<td style="text-align:center"><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"|cond="$item->isUse" /></td>
<td style="text-align:center"><input type="checkbox" name="is_{$item->name}_public" value="Y" checked="checked"|cond="$item->isPublic == 'Y'" disabled="disabled"|cond="!$item->isUse" /></td>
<td class="nowr">
<label for="{$item->name}_re" class="x_inline"><input type="radio" id="{$item->name}_re" name="{$item->name}" value="required" checked="checked"|cond="$item->required" disabled="disabled"|cond="!$item->isUse"/> {$lang->cmd_required}</label>
<label for="{$item->name}_op" class="x_inline"><input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" checked="checked"|cond="$item->isUse && !$item->required" disabled="disabled"|cond="!$item->isUse" /> {$lang->cmd_optional}</label>
<label for="{$item->name}_re" class="x_inline"><input type="radio" id="{$item->name}_re" name="{$item->name}" class="item_required" value="required" checked="checked"|cond="$item->required" disabled="disabled"|cond="!$item->isUse" /> {$lang->cmd_required}</label>
<label for="{$item->name}_op" class="x_inline"><input type="radio" id="{$item->name}_op" name="{$item->name}" class="item_optional" value="option" checked="checked"|cond="$item->isUse && !$item->required" disabled="disabled"|cond="!$item->isUse" /> {$lang->cmd_optional}</label>
</td>
<td class="desc" title="{$item->description}">{$item->description}</td>
<td id="{$item->member_join_form_srl}" class="nowr" style="text-align:center"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->cmd_edit}</a> <i>|</i> <a href="#" class="_extendFormDelete">{$lang->cmd_delete}</a></td>