From ac3c60cf941aff32a5a6c588f4415a15e6c9a537 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 21 Feb 2007 09:22:15 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@147
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 common/js/xml_handler.js                   |  2 ++
 common/js/xml_js_filter.js                 |  1 -
 modules/admin/admin.controller.php         |  5 ++++-
 modules/admin/conf/module.xml              |  2 ++
 modules/admin/tpl/filter/filter.login.xml  | 10 ----------
 modules/admin/tpl/filter/filter.logout.xml | 12 ------------
 modules/admin/tpl/filter/login.xml         | 10 ++++++++++
 modules/admin/tpl/filter/logout.xml        |  7 +++++++
 modules/admin/tpl/js/admin.js              | 12 ++----------
 modules/admin/tpl/layout.html              |  2 +-
 modules/admin/tpl/login_form.html          |  7 +++----
 modules/admin/tpl/logout.html              |  5 ++---
 12 files changed, 33 insertions(+), 42 deletions(-)
 delete mode 100644 modules/admin/tpl/filter/filter.login.xml
 delete mode 100644 modules/admin/tpl/filter/filter.logout.xml
 create mode 100644 modules/admin/tpl/filter/login.xml
 create mode 100644 modules/admin/tpl/filter/logout.xml

diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js
index cb257f0a2..72830a662 100644
--- a/common/js/xml_handler.js
+++ b/common/js/xml_handler.js
@@ -15,6 +15,8 @@ function exec_xml(module, act, params, callback_func, response_tags, callback_fu
   oXml.addParam('module', module);
   oXml.addParam('act', act);
 
+  response_tags[response_tags.length] = 'redirect_url';
+
   var waiting_obj = document.getElementById('waitingforserverresponse');
   waiting_obj.style.visibility = 'visible';
   oXml.request(xml_response_filter, oXml, callback_func, response_tags, callback_func_arg);
diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js
index 5c236909b..767633626 100644
--- a/common/js/xml_js_filter.js
+++ b/common/js/xml_js_filter.js
@@ -228,7 +228,6 @@ function XmlJsFilterProc(confirm_msg) {
 
     var params = this.getParameterParam();
     var response = this.response;
-
     if(confirm_msg && !confirm(confirm_msg)) return false;
     if(!this.act) {
       this.user_func(this.fo_obj, params);
diff --git a/modules/admin/admin.controller.php b/modules/admin/admin.controller.php
index 8eb6b67e6..1010d8b21 100644
--- a/modules/admin/admin.controller.php
+++ b/modules/admin/admin.controller.php
@@ -31,7 +31,10 @@
         function procLogout() {
             // member controller 객체 생성
             $oMemberController = &getController('member');
-            return $oMemberController->doLogout();
+            $output = $oMemberController->doLogout();
+            if(!$output->toBool()) return $output;
+
+            $this->setRedirectUrl('./?module=admin');
         }
     }
 ?>
diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml
index 3dab593e7..4cb3249d0 100644
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@@ -4,5 +4,7 @@
         <action name="dispAdminIndex" type="view" grant="root" />
         <action name="dispLogin" type="view" grant="guest" />
         <action name="dispLogout" type="view" grant="root" />
+        <action name="procLogin" type="controller" grant="guest" />
+        <action name="procLogout" type="controller" grant="guest" />
     </actions>
 </module>
diff --git a/modules/admin/tpl/filter/filter.login.xml b/modules/admin/tpl/filter/filter.login.xml
deleted file mode 100644
index 26ec5aab1..000000000
--- a/modules/admin/tpl/filter/filter.login.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<filter id="login">
-  <field>
-    <item target="user_id" required="true" filter="user_id"/>
-    <item target="password" required="true" />
-  </field>
-  <response>
-    <item name="error" />
-    <item name="message" />
-  </response>
-</filter>
diff --git a/modules/admin/tpl/filter/filter.logout.xml b/modules/admin/tpl/filter/filter.logout.xml
deleted file mode 100644
index 3c1f3a9f1..000000000
--- a/modules/admin/tpl/filter/filter.logout.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<filter id="logout">
-  <field>
-    <item target="act" required="true" />
-  </field>
-  <parameter>
-    <item param="act" target="act" />
-  </parameter>
-  <response>
-    <item name="error" />
-    <item name="message" />
-  </response>
-</filter>
diff --git a/modules/admin/tpl/filter/login.xml b/modules/admin/tpl/filter/login.xml
new file mode 100644
index 000000000..955f12908
--- /dev/null
+++ b/modules/admin/tpl/filter/login.xml
@@ -0,0 +1,10 @@
+<filter name="login" module="admin" act="procLogin">
+  <form>
+    <node target="user_id" required="true" filter="user_id"/>
+    <node target="password" required="true" />
+  </form>
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/modules/admin/tpl/filter/logout.xml b/modules/admin/tpl/filter/logout.xml
new file mode 100644
index 000000000..25ab7fde4
--- /dev/null
+++ b/modules/admin/tpl/filter/logout.xml
@@ -0,0 +1,7 @@
+<filter name="logout" module="admin" act="procLogout">
+  <form />
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index 109f9c9e7..e105b2596 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -4,16 +4,8 @@
  * @desc   : admin 모듈의 javascript
  **/
 
-// 현재 페이지 reload
-function procReload(ret_obj, response_tags) {
-  var error = ret_obj['error'];
-  var message = ret_obj['message'];
-
-  location.href = location.href;
-}
-
 // 로그아웃
-function procLogout(ret_obj, response_tags) {
+function completeLogout(ret_obj) {
   var error = ret_obj['error'];
   var message = ret_obj['message'];
 
@@ -21,7 +13,7 @@ function procLogout(ret_obj, response_tags) {
 }
 
 // 로그인폼에서 아이디 포커스
-function procAdminLoginFocus() {
+function doAdminLoginFocus() {
   var fo = xGetElementById('user_id');
   if(fo) fo.focus();
 }
diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html
index b58a6776c..b30f45005 100644
--- a/modules/admin/tpl/layout.html
+++ b/modules/admin/tpl/layout.html
@@ -3,7 +3,7 @@
 
 <!--#include("./common/tpl/common_header.html")-->
 
-<div id="admin_title"><a href="./admin.php">zeroboard5</a></div>
+<div id="admin_title"><a href="./?module=admin">zeroboard5</a></div>
 <div id="admin_info">
   <a href="{getUrl('act','dispLogout')}">{$lang->cmd_logout}</a>
 </div>
diff --git a/modules/admin/tpl/login_form.html b/modules/admin/tpl/login_form.html
index fe228544b..d8aa4a252 100644
--- a/modules/admin/tpl/login_form.html
+++ b/modules/admin/tpl/login_form.html
@@ -1,9 +1,8 @@
-<!--%import("filter/filter.login.xml")-->
+<!--%import("filter/login.xml")-->
 <!--%import("js/admin.js")-->
 
-<form action="./" method="get" onsubmit="return procFormFilter(this, login, procReload)">
+<form action="./" method="get" onsubmit="return procFilter(this, login)">
   <input type="hidden" name="sid" value="{$sid}" />
-  <input type="hidden" name="act" value="procLogin" />
   <table>
   <col width="120" />
   <col width="*" />
@@ -26,5 +25,5 @@
 </form>
 
 <script type="text/javascript">
-  xAddEventListener(window, 'load', procAdminLoginFocus);
+  xAddEventListener(window, 'load', doAdminLoginFocus);
 </script>
diff --git a/modules/admin/tpl/logout.html b/modules/admin/tpl/logout.html
index 9c271b427..f46b794a9 100644
--- a/modules/admin/tpl/logout.html
+++ b/modules/admin/tpl/logout.html
@@ -1,8 +1,7 @@
-<!--%import("filter/filter.logout.xml")-->
+<!--%import("filter/logout.xml")-->
 <!--%import("js/admin.js")-->
 
-<form action="./admin.php" method="get" onsubmit="return procFormFilter(this, logout, procLogout)">
-  <input type="hidden" name="act" value="procLogout" />
+<form action="./admin.php" method="get" onsubmit="return procFilter(this, logout)">
   <table>
   <tr>
     <th>{$lang->cmd_logout}</th>