From 3c34981ed1674388c7c37aca34e8965065d3de51 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 7 Jun 2007 10:06:02 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1568
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/member/member.controller.php          |   2 +-
 modules/member/skins/default/css/module.css   |   1 -
 plugins/login_info/login_info.class.php       |   5 +++++
 .../skins/default/filter/openid_login.xml     |  10 +++++++++
 .../skins/default/images/login-bg.gif         | Bin 0 -> 237 bytes
 plugins/login_info/skins/default/js/login.js  |   5 +++++
 .../login_info/skins/default/login_form.html  |  19 ++++++++++++++++++
 .../login_info/skins/default/normal/style.css |   9 ++++++++-
 8 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 plugins/login_info/skins/default/filter/openid_login.xml
 create mode 100644 plugins/login_info/skins/default/images/login-bg.gif

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index a66fa1cbe..aa0a5a9c7 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -52,7 +52,6 @@
 
             $openid->SetRequiredFields(array('email','fullname'));
             $openid->SetOptionalFields(array('dob'));
-            ob_clean();
 
             if (!$openid->GetOpenIDServer()) {
                 $error = $openid->GetError();
@@ -63,6 +62,7 @@
                 $url = $openid->GetRedirectURL();
                 $this->add('redirect_url', $url);
             }
+            ob_clean();
         }
 
         /** 
diff --git a/modules/member/skins/default/css/module.css b/modules/member/skins/default/css/module.css
index a3a14ad85..0626b3399 100644
--- a/modules/member/skins/default/css/module.css
+++ b/modules/member/skins/default/css/module.css
@@ -1,6 +1,5 @@
 @charset "utf-8";
 
-/* pathNavigation */
 .openid_user_id { 
     background: url(../images/login-bg.gif) left no-repeat;
     background-color: #ffffff; 
diff --git a/plugins/login_info/login_info.class.php b/plugins/login_info/login_info.class.php
index e0c32eab9..390916c9f 100644
--- a/plugins/login_info/login_info.class.php
+++ b/plugins/login_info/login_info.class.php
@@ -27,6 +27,11 @@
             if(Context::get('is_logged')) $tpl_file = 'login_info';
             else $tpl_file = 'login_form';
 
+            // 회원 관리 정보를 받음
+            $oModuleModel = &getModel('module');
+            $this->member_config = $oModuleModel->getModuleConfig('member');
+            Context::set('member_config', $this->member_config);
+
             // 템플릿 컴파일
             $oTemplate = &TemplateHandler::getInstance();
             return $oTemplate->compile($tpl_path, $tpl_file);
diff --git a/plugins/login_info/skins/default/filter/openid_login.xml b/plugins/login_info/skins/default/filter/openid_login.xml
new file mode 100644
index 000000000..61bba2ff2
--- /dev/null
+++ b/plugins/login_info/skins/default/filter/openid_login.xml
@@ -0,0 +1,10 @@
+<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
+    <form>
+        <node target="user_id" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeOpenIDLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/plugins/login_info/skins/default/images/login-bg.gif b/plugins/login_info/skins/default/images/login-bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cde836c893f64bcfec04b9c817e3371ff122fe19
GIT binary patch
literal 237
zcmV<J022R4Nk%w1VGsZi0K@<Q?d|R1;o{25%KZHN{%H*VYY@`X(*O4G|Ml+G)z#6&
zyzubw&CSjE`T5=5-Tq?(-qOnX@94+N&Bw>b{bmUKcqz}))c5uC(7v?)v4a2P)ZNa-
z@$&T2)z|&~{r~^}A^8LV00000EC2ui01yBW000GQ;3tk`X`bk)Wk@<6#nZYULKH{p
zEx|?+kif!I0vIL|#ZMubBmjWH2OtmxIFVa~6JQ7!1CK!f5W#StOTv&C3=E8h2vI1s
n+#cd5;2fT3B_0kF0v!+!GARoV78n&7dMN`JIW(4+BOw4gP{MS*

literal 0
HcmV?d00001

diff --git a/plugins/login_info/skins/default/js/login.js b/plugins/login_info/skins/default/js/login.js
index 7ba0a16e6..da278dc3b 100644
--- a/plugins/login_info/skins/default/js/login.js
+++ b/plugins/login_info/skins/default/js/login.js
@@ -26,6 +26,11 @@ function completeLogin(ret_obj, response_tags, params, fo_obj) {
     location.href = url;
 }
 
+/* 오픈아이디 로그인 후 */
+function completeOpenIDLogin(ret_obj, response_tags) {
+    var redirect_url =  ret_obj['redirect_url'];
+    location.href = redirect_url;
+}
 
 
 
diff --git a/plugins/login_info/skins/default/login_form.html b/plugins/login_info/skins/default/login_form.html
index 2125435b9..4165bbe5c 100644
--- a/plugins/login_info/skins/default/login_form.html
+++ b/plugins/login_info/skins/default/login_form.html
@@ -4,6 +4,7 @@
 <!--@end-->
 
 <!--%import("./filter/login.xml")-->
+<!--%import("./filter/openid_login.xml")-->
 <!--%import("./js/login.js")-->
 
 <div class="login_plugin">
@@ -32,4 +33,22 @@
     <script type="text/javascript">
         xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_plugin"); });
     </script>
+
+    <!-- OpenID -->
+    <!--@if($member_config->enable_openid=='Y')-->
+    <form action="./" method="post" onsubmit="return procFilter(this, openid_login)">
+        <table border="1">
+        <tr>
+            <th>{$lang->openid}</th>
+        </tr>
+        <tr>
+            <td>
+                <input type="text" name="user_id" tabindex="1" class="openid_user_id" />
+                <input type="submit" value="{$lang->cmd_login}" tabindex="2" />
+            </td>
+        </tr>
+        </table>
+    </form>
+    <!--@end-->
+
 </div>
diff --git a/plugins/login_info/skins/default/normal/style.css b/plugins/login_info/skins/default/normal/style.css
index 07072513e..000d5d046 100644
--- a/plugins/login_info/skins/default/normal/style.css
+++ b/plugins/login_info/skins/default/normal/style.css
@@ -1,7 +1,6 @@
 .login_plugin {
     border:3px solid #DDDDDD;
     padding:6px;
-    height:80px;
     margin-bottom:10px;
 }
 
@@ -149,3 +148,11 @@
     color:#000000;
     font-weight:bold;
 }
+
+.openid_user_id { 
+    background: url(../images/login-bg.gif) left no-repeat;
+    background-color: #ffffff; 
+    background-position: 0 50%;
+    color: #000;
+    padding-left: 18px; 
+}