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

merge from 1.5.1.8

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 07:42:16 +00:00
parent 2d3dfe7bc7
commit 90c18a8bb8
42 changed files with 3249 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/member/lang/lang.xml
View file

@ -2409,7 +2409,7 @@ Bạn có thể quản lý thành viên bằng cách tạo những nhóm mới,
</item>
<item name="msg_groups_exist">
<value xml:lang="ko"><![CDATA[개 그룹이 존재합니다.]]></value>
<value xml:lang="en"><![CDATA[groups are exist.]]></value>
<value xml:lang="en"><![CDATA[groups exist.]]></value>
</item>
<item name="cmd_member_config">
<value xml:lang="ko"><![CDATA[회원 설정]]></value>

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

@ -139,10 +139,10 @@
$disableColumns = array('password', 'find_account_question');
Context::set('disableColumns', $disableColumns);
$security = new Security();
$security->encodeHTML('member_config..');
$security->encodeHTML('memberInfo.user_name', 'memberInfo.nick_name', 'memberInfo.description','memberInfo.group_list..');
$security->encodeHTML('memberInfo.user_name', 'memberInfo.nick_name', 'memberInfo.find_account_answer', 'memberInfo.description','memberInfo.group_list..');
$security->encodeHTML('extend_form_list...');
$this->setTemplateFile('member_info');

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

@ -1681,12 +1681,16 @@
if(!$args->group_srl_list) {
$columnList = array('site_srl', 'group_srl');
$default_group = $oMemberModel->getDefaultGroup(0, $columnList);
// Add to the default group
$output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
if(!$output->toBool()) {
$oDB->rollback();
return $output;
}
if ($default_group)
{
// Add to the default group
$output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
if(!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
// If the value is the value of the group entered the group registration
} else {
for($i=0;$i<count($group_srl_list);$i++) {

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

@ -629,8 +629,10 @@
/**
* @brief Get the image mark of the group
**/
function getGroupImageMark($member_srl,$site_srl=0) {
if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl])) {
function getGroupImageMark($member_srl,$site_srl=0)
{
if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
{
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($config->group_image_mark!='Y'){
@ -638,20 +640,23 @@
}
$member_group = $this->getMemberGroups($member_srl,$site_srl);
$groups_info = $this->getGroups($site_srl);
$image_mark_info = null;
if(count($member_group) > 0 && is_array($member_group)){
$group_srl = array_keys($member_group);
}
if(count($member_group) > 0 && is_array($member_group))
{
$memberGroups = array_keys($member_group);
$i = 0;
while($i < count($group_srl)){
$target = $groups_info[$group_srl[$i++]];
if ($target->image_mark)
foreach($groups_info as $group_srl=>$group_info)
{
$info->title = $target->title;
$info->description = $target->description;
$info->src = $target->image_mark;
$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info;
if(in_array($group_srl, $memberGroups))
{
if($group_info->image_mark)
{
$info->title = $group_info->title;
$info->description = $group_info->description;
$info->src = $group_info->image_mark;
$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info;
break;
}
}
}
}
if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';

1
modules/member/skins/default/login_form.html
View file

@ -6,6 +6,7 @@
<h1 class="h1">{$lang->cmd_login}</h1>
<form ruleset="@login" action="./" method="post" id="fo_member_login" class="form">
<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
<input type="hidden" name="act" value="procMemberLogin" />
<ul>
<li>
<p class="q"><label for="uid">{$lang->user_id}</label></p>

5
modules/member/skins/default/signup_form.html
View file

@ -8,10 +8,8 @@
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="@insertMember" id="fo_insert_member" class="form" action="./" method="post" enctype="multipart/form-data">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberInsert" />
<!--@if(!$is_logged && $member_config->agreement)-->
<div class="agreement">
<div class="agreement" cond="$member_config->agreement">
<div class="text">
{$member_config->agreement}
</div>
@ -20,7 +18,6 @@
<label for="accept_agree">{$lang->about_accept_agreement}</label>
</div>
</div>
<!--@end-->
<ul>
<li>
<p class="q">{$identifierForm->title} <em style="color:red">*</em></p>