From 10c4a7ee0db3701c54f90ef6617b70b8db763f21 Mon Sep 17 00:00:00 2001 From: araste Date: Fri, 28 Nov 2008 07:32:50 +0000 Subject: [PATCH] =?UTF-8?q?17497270:=2017497245:=20=EC=98=A4=ED=94=88?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=20=EA=B4=80=EB=A0=A8=20=EC=9D=B4?= =?UTF-8?q?=EC=8A=88=20=EC=9D=BC=EA=B4=84=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5021 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.controller.php | 15 +++++++++++++-- modules/member/member.view.php | 1 + .../member/skins/default/filter/openid_login.xml | 3 ++- modules/member/skins/default/login_form.html | 5 +++-- .../skins/default/filter/openid_login.xml | 2 +- widgets/login_info/skins/default/login_form.html | 4 ++-- .../skins/xe_official/filter/openid_login.xml | 2 +- .../login_info/skins/xe_official/login_form.html | 4 ++-- 8 files changed, 25 insertions(+), 11 deletions(-) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index f0df9c090..22c0881e4 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -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:./"); } diff --git a/modules/member/member.view.php b/modules/member/member.view.php index eef077373..1fa34e041 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -201,6 +201,7 @@ **/ function dispMemberLoginForm() { // 템플릿 파일 지정 + Context::set('referer_url', $_SERVER['HTTP_REFERER']); $this->setTemplateFile('login_form'); } diff --git a/modules/member/skins/default/filter/openid_login.xml b/modules/member/skins/default/filter/openid_login.xml index 61bba2ff2..2557ca8ee 100644 --- a/modules/member/skins/default/filter/openid_login.xml +++ b/modules/member/skins/default/filter/openid_login.xml @@ -1,6 +1,7 @@
- + + diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html index f86f47352..f26dfa61e 100644 --- a/modules/member/skins/default/login_form.html +++ b/modules/member/skins/default/login_form.html @@ -46,15 +46,16 @@

{$lang->openid}

-
+ +
{$lang->about_openid}
diff --git a/widgets/login_info/skins/default/filter/openid_login.xml b/widgets/login_info/skins/default/filter/openid_login.xml index 61bba2ff2..bf0ce028c 100644 --- a/widgets/login_info/skins/default/filter/openid_login.xml +++ b/widgets/login_info/skins/default/filter/openid_login.xml @@ -1,6 +1,6 @@
- + diff --git a/widgets/login_info/skins/default/login_form.html b/widgets/login_info/skins/default/login_form.html index db0b3cf5b..10c59e8be 100644 --- a/widgets/login_info/skins/default/login_form.html +++ b/widgets/login_info/skins/default/login_form.html @@ -50,12 +50,12 @@