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

17497270: 17497245: 오픈아이디 관련 이슈 일괄 해결

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5021 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
araste 2008-11-28 07:32:50 +00:00
parent d254e6d8ae
commit 10c4a7ee0d
8 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,12 @@
require_once('./modules/member/openid_lib/libcurlemu.inc.php');
$user_id = Context::get('user_id');
if (!$user_id) $user_id = Context::get('openid');
$referer_url = Context::get('referer_url');
if (!$referer_url) $referer_url = $_SERVER['HTTP_REFERER'];
if (!$referer_url)
$referer_url = htmlspecialchars_decode(getRequestUri(RELEASE_SSL));
$openid = new SimpleOpenID();
@ -65,12 +71,17 @@
$error = $openid->GetError();
$this->setError(-1);
$this->setMessage($error['description']);
if (Context::getRequestMethod() == 'POST')
header("location:" . $referer_url);
} else {
$goto = urlencode(substr($_SERVER['HTTP_REFERER'],strlen(Context::getRequestUri(RELEASE_SSL))));
$goto = urlencode($referer_url);
$ApprovedURL = Context::getRequestUri(RELEASE_SSL) . "?module=member&act=procMemberOpenIDValidate&goto=" . $goto;
$openid->SetApprovedURL($ApprovedURL);
$url = $openid->GetRedirectURL();
$this->add('redirect_url', $url);
if (Context::getRequestMethod() == 'POST')
header("location:" . $url);
}
ob_clean();
}
@ -118,7 +129,7 @@
// 페이지 이동
if(Context::get('goto')){
$goto = Context::get('goto');
header("location:./" . $goto);
header("location:" . $goto);
}else{
header("location:./");
}

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

@ -201,6 +201,7 @@
**/
function dispMemberLoginForm() {
// 템플릿 파일 지정
Context::set('referer_url', $_SERVER['HTTP_REFERER']);
$this->setTemplateFile('login_form');
}

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

@ -1,6 +1,7 @@
<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
<form>
<node target="user_id" required="true" />
<node target="openid" required="true" />
<node target="referer_url" required="true" />
</form>
<parameter />
<response callback_func="completeOpenIDLogin">

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

@ -46,15 +46,16 @@
<h3>{$lang->openid}</h3>
</div>
<form action="./" method="post" onsubmit="return procFilter(this, openid_login)">
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)">
<fieldset class="login">
<dl>
<dt><label for="open_uid">{$lang->user_id}</label></dt>
<dd><input type="text" name="user_id" id="open_uid" value="" class="openid_user_id" /></dd>
<dd><input type="text" name="openid" id="open_uid" value="" class="openid_user_id" /></dd>
</dl>
<span class="button"><input type="submit" value="{$lang->cmd_login}" /></span>
</fieldset>
<input type="hidden" name="referer_url" value="{$referer_url}" />
</form>
<div class="help tLeft">{$lang->about_openid}</div>

2
widgets/login_info/skins/default/filter/openid_login.xml
View file

@ -1,6 +1,6 @@
<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
<form>
<node target="user_id" required="true" />
<node target="openid" required="true" />
</form>
<parameter />
<response callback_func="completeOpenIDLogin">

4
widgets/login_info/skins/default/login_form.html
View file

@ -50,12 +50,12 @@
<!-- OpenID -->
<!--@if($member_config->enable_openid=='Y')-->
<div class="default_login openid_login" id="openid_login">
<form action="./" method="post" onsubmit="return procFilter(this, openid_login)" id="fo_openid_login_widget">
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" id="fo_openid_login_widget">
<div class="form_field">
<div class="openIDTitle">
OpenID <input name="use_open_id_2" id="use_open_id_2" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" checked="true"/>
</div>
<input type="text" name="user_id" class="input" />
<input type="text" name="openid" class="input" />
</div>
<input type="submit" value=" " class="submit" />
</form>

2
widgets/login_info/skins/xe_official/filter/openid_login.xml
View file

@ -1,6 +1,6 @@
<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
<form>
<node target="user_id" required="true" />
<node target="openid" required="true" />
</form>
<parameter />
<response callback_func="completeOpenIDLogin">

4
widgets/login_info/skins/xe_official/login_form.html
View file

@ -53,11 +53,11 @@
<!--@if($member_config->enable_openid=='Y')-->
<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;">
<legend>{$lang->cmd_login}</legend>
<form action="./" method="post" onsubmit="return procFilter(this, openid_login)" >
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" >
<div class="idpwWrap">
<div class="idpw">
<p>{$lang->openid}</p>
<input type="text" name="user_id" class="openid_user_id" />
<input type="text" name="openid" class="openid_user_id" />
</div>
<input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
</div>