git-svn-id: http://xe-core.googlecode.com/svn/trunk@147 201d5d3c-b55e-5fd7-737f-ddc643e51545

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');
         }
     }
 ?>

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>

modules/admin/tpl/filter/filter.login.xml

@@ -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>

modules/admin/tpl/filter/filter.logout.xml

@@ -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>

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>

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>

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();
 }

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>

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>

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>