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

merge from 1.5.3.2 (~r11225)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/member/skins/default/filter/add_openid_to_member.xml
View file

@ -1,12 +0,0 @@
<filter name="add_openid_to_member" module="member" act="procMemberAddOpenIDToMember">
<form>
<node target="openid" required="true" minlength="2" maxlength="80" />
</form>
<parameter>
<param name="openid" target="openid" />
</parameter>
<response callback_func="completeModify">
<tag name="error" />
<tag name="message" />
</response>
</filter>

12
modules/member/skins/default/filter/delete_openid_from_member.xml
View file

@ -1,12 +0,0 @@
<filter name="delete_openid_from_member" module="member" act="procMemberDeleteOpenIDFromMember">
<form>
<node target="openid_to_delete" required="true" minlength="2" maxlength="80" />
</form>
<parameter>
<param name="openid_to_delete" target="openid_to_delete" />
</parameter>
<response callback_func="completeModify">
<tag name="error" />
<tag name="message" />
</response>
</filter>

8
modules/member/skins/default/filter/openid_leave_member.xml
View file

@ -1,8 +0,0 @@
<filter name="openid_leave_member" module="member" act="procMemberOpenIDLeave" confirm_msg_code="confirm_leave">
<form />
<parameter />
<response callback_func="completeLeave">
<tag name="error" />
<tag name="message" />
</response>
</filter>

11
modules/member/skins/default/filter/openid_login.xml
View file

@ -1,11 +0,0 @@
<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
<form>
<node target="openid" required="true" />
<node target="referer_url" required="true" />
</form>
<parameter />
<response callback_func="completeOpenIDLogin">
<tag name="error" />
<tag name="message" />
</response>
</filter>

19
modules/member/skins/default/js/member.js
View file

@ -77,12 +77,6 @@ function completeLogout(ret_obj) {
location.href = current_url.setQuery('act','');
}
/* 오픈아이디 로그인 후 */
function completeOpenIDLogin(ret_obj, response_tags) {
var redirect_url = ret_obj['redirect_url'];
location.href = redirect_url;
}
/* 인증 메일 재발송 후 */
function completeResendAuthMail(ret_obj, response_tags) {
var error = ret_obj['error'];
@ -166,16 +160,3 @@ function doDeleteSavedDocument(document_srl, confirm_message) {
function insertSelectedModule(id, module_srl, mid, browser_title) {
location.href = current_url.setQuery('selected_module_srl',module_srl);
}
/* 오픈아이디 연결 */
function doAddOpenIDToMember() {
var fo_obj = get_by_id("fo_insert_member");
procFilter(fo_obj, add_openid_to_member);
}
/* 오픈아이디 연결 해제 */
function doDeleteOpenIDFromMember(openid) {
var fo_obj = get_by_id("fo_insert_member");
fo_obj.openid_to_delete.value = openid;
procFilter(fo_obj, delete_openid_from_member);
}

43
modules/member/skins/default/member_info.html
View file

@ -2,47 +2,10 @@
<h1 class="h1">{$lang->member_info}</h1>
<div class="table even">
<table width="100%" border="1" cellspacing="0">
<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
<!--@if($formInfo->isUse && ($formInfo->name != 'password' && $formInfo->name != 'find_account_question'))-->
<!--@if($formInfo->isDefaultForm)-->
{@$title = Context::getLang($formInfo->name)}
{@$value = $memberInfo[$formInfo->name]}
<!--@if($formInfo->name == 'profile_image' && $memberInfo['profile_image'])-->
{@$target = $memberInfo['profile_image']}
{@$value = '<img src="'.$target->src.'" />'}
<!--@elseif($formInfo->name == 'image_name' && $memberInfo['image_name'])-->
{@$target = $memberInfo['image_name']}
{@$value = '<img src="'.$target->src.'" />'}
<!--@elseif($formInfo->name == 'image_mark' && $memberInfo['image_mark'])-->
{@$target = $memberInfo['image_mark']}
{@$value = '<img src="'.$target->src.'" />'}
<!--@end-->
<!--@else-->
{@$title = $extend_form_list[$formInfo->member_join_form_srl]->column_title}
{@$orgValue = $extend_form_list[$formInfo->member_join_form_srl]->value}
<!--@if($formInfo->type=='tel')-->
{@$value = $orgValue[0]}
<!--@if($orgValue[1])-->-<!--@end-->
{@$value .= $orgValue[1]}
<!--@if($orgValue[2])-->-<!--@end-->
{@$value .= $orgValue[2]}
<!--@elseif($formInfo->type=='kr_zip')-->
{@$value = $orgValue[0]}<!--@if($orgValue[1]&&$orgValue[0])--><br /><!--@end-->{@$value .= $orgValue[1]}
<!--@elseif($formInfo->type=='checkbox' && is_array($orgValue))-->
{@$value = implode(", ",$orgValue)}
<!--@elseif($formInfo->type=='date')-->
{@$value = zdate($orgValue, "Y-m-d")}
<!--@else-->
{@$value = nl2br($orgValue)}
<!--@end-->
<!--@end-->
<tr>
<th scope="row" >{$title} <em cond="$formInfo->required || $formInfo->mustRequired">*</em></th>
<td class="text">{$value}</td>
<tr loop="$displayDatas => $item">
<th scope="row" >{$item->title} <em cond="$item->required || $item->mustRequired">*</em></th>
<td class="text">{$item->value}</td>
</tr>
<!--@end-->
<!--@end-->
<tr>
<th scope="row">{$lang->member_group}</th>
<td class="text">{implode(', ', $memberInfo['group_list'])}</td>

21
modules/member/skins/default/openid_leave_form.html
View file

@ -1,21 +0,0 @@
<include target="./common_header.html" />
<load target="filter/openid_leave_member.xml" />
<h1 class="h1">{$member_title = $lang->msg_leave_member}</h1>
<form id="fo_insert_member" class="form" action="./" method="get" onsubmit="return procFilter(this, openid_leave_member)">
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="document_srl" value="{$document_srl}" />
<input type="hidden" name="page" value="{$page}" />
<ul>
<li>
<p class="q"><label for="oid">{$lang->user_id}</label></p>
<p class="a">
<input type="text" disabled="disabled" value="{$member_info->user_id}" id="oid" />
<span class="desc">{$lang->about_openid_leave}</span>
</p>
</li>
</ul>
<div class="btnArea">
<span class="btn"><input type="submit" value="{$lang->cmd_leave}" /></span>
</div>
</form>
<include target="./common_footer.html" />

25
modules/member/skins/default/rechecked_password.html Normal file
View file

@ -0,0 +1,25 @@
<include target="./common_header.html" />
<h1 class="h1">{$lang->msg_rechecked_password}</h1>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form class="form" action="./index.php" method="post" ruleset="recheckedPassword">
<input type="hidden" name="act" value="procMemberModifyInfoBefore" />
<input type="hidden" name="module" value="member" />
<ul>
<li>
<p class="q">{$identifierTitle}</p>
<p class="a">{$identifierValue}</p>
</li>
<li>
<p class="q">{$lang->password}</p>
<p class="a"><input type="password" name="password" /></p>
<p class="desc">{$lang->about_rechecked_password}</p>
</li>
</ul>
<div class="btnArea">
<span class="btn"><input type="submit" value="{$lang->cmd_confirm}" /></span>
<span class="btn"><a href="{getUrl('act','dispMemberInfo','member_srl','')}">{$lang->cmd_cancel}</a></span>
</div>
</form>
<include target="./common_footer.html" />

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

@ -5,6 +5,7 @@
<form ruleset="resendAuthMail" class="form" action="./" method="post">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberResendAuthMail" />
<input type="hidden" name="success_return_url" value="{getUrl(act, $act)}" />
<h1 class="h1">{$lang->cmd_resend_auth_mail}</h1>
<p>{$lang->about_resend_auth_mail}</p>
<ul>

29
modules/member/skins/default/reset_mail.html Normal file
View file

@ -0,0 +1,29 @@
<include target="./common_header.html" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="form">
<h1 class="h1">{$lang->cmd_resend_auth_mail}</h1>
<p>{sprintf($lang->about_reset_auth_mail, $memberInfo->email_address)}</p>
<ul>
<li>
<form action="./" method="post">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberResendAuthMail" />
<input type="hidden" name="email_address" value="{$memberInfo->email_address}" />
<p class="q"><label for="resend_button">{$lang->cmd_resend_auth_mail}</label></p>
<p class="a"><input type="text" readonly="readonly" disabled="disabled" value="{$memberInfo->email_address}"/> <span class="btn"><input type="submit" id="resend_button" name="" value="{$lang->cmd_resend_auth_mail}" /></span></p>
</form>
</li>
<li>
<form ruleset="resetAuthMail" action="./" method="post">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberResetAuthMail" />
<p class="q"><label for="email_address">{$lang->cmd_modify_new_auth_email_address}</label></p>
<p class="a"><input type="text" id="email_address" name="email_address" value="" /> <span class="btn"><input type="submit" value="{$lang->cmd_send_auth_new_emaill_address}" /></p>
<p>{$lang->about_reset_auth_mail_submit}</p>
</form>
</li>
</ul>
</div>
<include target="./common_footer.html" />