From 474ca4df06554e2933095aebfb087d2748273c3d Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 17 Jun 2008 02:16:49 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9D=98=20=EC=99=BC=EC=AA=BD=20=EB=A9=94?=
 =?UTF-8?q?=EB=89=B4=EC=9D=98=20=EC=84=A0=ED=83=9D=EB=90=9C=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=88=20=ED=91=9C=EC=8B=9C=20=EB=B0=A9=EC=8B=9D=EC=9D=84=20?=
 =?UTF-8?q?=EA=B0=81=20=EB=AA=A8=EB=93=88=EB=B3=84=20action=EA=B0=92?=
 =?UTF-8?q?=EA=B3=BC=20=EC=A0=95=ED=99=95=ED=9E=88=20=EB=A7=A4=EC=B9=98?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EA=B2=83=EC=9D=84=20=EB=8C=80=EC=83=81?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
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@4289 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/admin.admin.view.php | 18 +++++++++++-------
 modules/admin/tpl/layout.html      |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 0d6c53373..90dea6c00 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -27,16 +27,20 @@
             // 설치된 모듈 목록 가져오기
             $oModuleModel = &getModel('module');
             $installed_module_list = $oModuleModel->getModulesXmlInfo();
+            foreach($installed_module_list as $key => $val) {
+                $action_spec = $oModuleModel->getModuleActionXml($val->module);
+                $actions = array();
+                if($action_spec->default_index_act) $actions[] = $action_spec->default_index_act;
+                if($action_spec->admin_index_act) $actions[] = $action_spec->admin_index_act;
+                if($action_spec->action) foreach($action_spec->action as $k => $v) $actions[] = $k;
+                $installed_module_list[$key]->actions = $actions;
+            }
             Context::set('installed_module_list', $installed_module_list);
 
-            // 현재 실행중인 모듈을 구해 놓음
-            $running_module = strtolower(preg_replace('/([a-z]+)([A-Z]+)([a-z0-9]+)(.*)/', '\\2\\3', $this->act));
-            Context::set('running_module', $running_module);
-
             $db_info = Context::getDBInfo();
-
-            Context::set('time_zone_list', $GLOBALS['time_zone']);
-            Context::set('time_zone', $GLOBALS['_time_zone']);
+
+            Context::set('time_zone_list', $GLOBALS['time_zone']);
+            Context::set('time_zone', $GLOBALS['_time_zone']);
             Context::set('use_rewrite', $db_info->use_rewrite=='Y'?'Y':'N');
             Context::set('use_optimizer', $db_info->use_optimizer!='N'?'Y':'N');
             Context::set('qmail_compatibility', $db_info->qmail_compatibility=='Y'?'Y':'N');
diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html
index 7a380b402..e919d609f 100644
--- a/modules/admin/tpl/layout.html
+++ b/modules/admin/tpl/layout.html
@@ -32,7 +32,7 @@
             <!--@foreach($installed_module_list as $k => $v)-->
                 <!--@if($v->category == $key)-->
                     <!--@if($v->admin_index_act)-->
-                    <li <!--@if($running_module==$v->module)-->class="on"<!--@end--> onclick="location.href='{getUrl('','module','admin','act',$v->admin_index_act)}'; return false;">
+                    <li <!--@if(in_array($act, $v->actions))-->class="on"<!--@end--> onclick="location.href='{getUrl('','module','admin','act',$v->admin_index_act)}'; return false;">
                             <a href="{getUrl('','module','admin','act',$v->admin_index_act)}">{$v->title}</a>
                     </li>
                     <!--@end-->