From 7571142555de30ad04991e9ea898dc474640bdb0 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 2 Apr 2007 01:05:38 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@857
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/addon/addon.class.php     | 4 +---
 modules/addon/addon.model.php     | 4 +---
 modules/addon/tpl/addon_list.html | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php
index 526790470..224beb92b 100644
--- a/modules/addon/addon.class.php
+++ b/modules/addon/addon.class.php
@@ -16,10 +16,8 @@
             // action forward에 등록 (관리자 모드에서 사용하기 위함)
             $oModuleController = &getController('module');
             $oModuleController->insertActionForward('addon', 'view', 'dispAddonAdminIndex');
-            $oModuleController->insertActionForward('addon', 'view', 'dispAddonAdminInfo');
-            $oModuleController->insertActionForward('addon', 'controller', 'procAddonAdminToggleActivate');
             
-            // 몇가진 애드온을 기본으로 설치 상태로 지정
+            // 몇가지 애드온을 기본으로 설치 상태로 지정
             $oAddonController = &getController('addon');
             $oAddonController->doActivate('spamfilter');
             $oAddonController->doActivate('message');
diff --git a/modules/addon/addon.model.php b/modules/addon/addon.model.php
index 7d5103f67..4882cbfb6 100644
--- a/modules/addon/addon.model.php
+++ b/modules/addon/addon.model.php
@@ -33,9 +33,7 @@
             $oDB = &DB::getInstance();
 
             // 다운받은 애드온과 설치된 애드온의 목록을 구함
-            $downloaded_list = FileHandler::readDir('./files/addons');
-            $installed_list = FileHandler::readDir('./addons');
-            $searched_list = array_merge($downloaded_list, $installed_list);
+            $searched_list = FileHandler::readDir('./addons');
             $searched_count = count($searched_list);
             if(!$searched_count) return;
 
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index b1f23712b..53ef2afd9 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -28,7 +28,7 @@
     <td><a href="#" onclick="window.open('{$val->author->homepage}')">{$val->author->name}</a></td>
     <td>{$val->author->date}</td>
     <td>{$val->path}</td>
-    <td rowspan="2"><a href="#" onclick="winopen('{getUrl('','module','addon','act','dispAddonAdminInfo','selected_addon',$val->addon)}','addon_info','width=10,height=10,toolbars=no,scrollbars=yes,resizable=yes');return false">{$lang->cmd_view}</a></td>
+    <td rowspan="2"><a href="#" onclick="popopen('{getUrl('','module','addon','act','dispAddonAdminInfo','selected_addon',$val->addon)}','addon_info');return false">{$lang->cmd_view}</a></td>
     <td rowspan="2">
         <!--@if($val->activated)-->
         <a href="#" onclick="doToggleAddon('{$val->addon}');return false;">{$lang->notuse}</a>