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

modules/addon/addon.admin.controller.php

@@ -31,13 +31,16 @@
 
             // 모듈에서 애드온을 사용하기 위한 캐시 파일 생성
             $buff = "";
-            $addon_list = $oAddonModel->getActivatedAddons();
-            $addon_count = count($addon_list);
-            for($i=0;$i<$addon_count;$i++) {
-                $addon = trim($addon_list[$i]);
-                if(!$addon) continue;
+            $addon_list = $oAddonModel->getInsertedAddons();
+            foreach($addon_list as $addon=> $val) {
+                if($val->is_used != 'Y') continue;
 
-                $buff .= sprintf(' if(file_exists("./addons/%s/%s.addon.php")) { $addon_path = "./addons/%s/"; @include("./addons/%s/%s.addon.php"); }', $addon, $addon, $addon, $addon, $addon);
+                if($val->extra_vars) {
+                    unset($extra_vars);
+                    $extra_vars = base64_encode($val->extra_vars);
+                }
+
+                $buff .= sprintf(' if(file_exists("./addons/%s/%s.addon.php")) { unset($addon_info); $addon_info = unserialize(base64_decode("%s")); $addon_path = "./addons/%s/"; @include("./addons/%s/%s.addon.php"); }', $addon, $addon, $extra_vars, $addon, $addon, $addon);
             }
 
             $buff = sprintf('<?if(!defined("__ZBXE__"))exit(); %s ?>', $buff);
@@ -45,6 +48,19 @@
             FileHandler::writeFile($this->cache_file, $buff);
         }
 
+        /**
+         * @brief 애드온 설정 정보 입력
+         **/
+        function procAddonAdminSetupAddon() {
+            $args = Context::getRequestVars();
+            $addon_name = $args->addon_name;
+            unset($args->module);
+            unset($args->act);
+            unset($args->addon_name);
+
+            $this->doSetup($addon_name, $args);
+        }
+
         /**
          * @brief 애드온 추가
          * DB에 애드온을 추가함

modules/addon/addon.admin.model.php

@@ -27,7 +27,7 @@
          **/
         function getAddonList() {
             // activated된 애드온 목록을 구함
-            $inserted_addons = $this->getInsertedAddon();
+            $inserted_addons = $this->getInsertedAddons();
 
             // 다운받은 애드온과 설치된 애드온의 목록을 구함
             $searched_list = FileHandler::readDir('./addons');
@@ -86,6 +86,7 @@
             $info->title = $xml_obj->title->body;
 
             // 작성자 정보
+            $addon_info->addon_name = $addon;
             $addon_info->title = $xml_obj->title->body;
             $addon_info->version = $xml_obj->attrs->version;
             $addon_info->author->name = $xml_obj->author->name->body;
@@ -110,6 +111,13 @@
 
             // 확장변수
             if($xml_obj->extra_vars) {
+
+                // DB에 설정된 내역을 가져온다
+                $db_args->addon = $addon;
+                $output = executeQuery('addon.getAddonInfo',$db_args);
+                $extra_vals = unserialize($output->data->extra_vars);
+
+                // 확장변수를 정리
                 if(!is_array($xml_obj->extra_vars->var)) $extra_vars[] = $xml_obj->extra_vars->var;
                 else $extra_vars = $xml_obj->extra_vars->var;
 
@@ -118,6 +126,7 @@
                     $obj->name = $val->attrs->name;
                     $obj->title = $val->title->body;
                     $obj->description = $val->description->body;
+                    $obj->value = $extra_vals->{$obj->name};
                     $addon_info->extra_vars[] = $obj;
                 }
             }
@@ -128,7 +137,7 @@
         /**
          * @brief 활성화된 애드온 목록을 구해옴
          **/
-        function getInsertedAddon() {
+        function getInsertedAddons() {
             $args->list_order = 'addon';
             $output = executeQuery('addon.getAddons', $args);
             if(!$output->data) return array();

modules/addon/addon.admin.view.php

@@ -27,6 +27,25 @@
             $this->setTemplateFile('addon_list');
         }
 
+        /**
+         * @biref 애드온 세부 설정 팝업 출력
+         **/
+        function dispAddonAdminSetup() {
+            // 요청된 애드온을 구함
+            $selected_addon = Context::get('selected_addon');
+
+            // 요청된 애드온의 정보를 구함
+            $oAddonModel = &getAdminModel('addon');
+            $addon_info = $oAddonModel->getAddonInfoXml($selected_addon);
+            Context::set('addon_info', $addon_info);
+
+            // 레이아웃을 팝업으로 지정
+            $this->setLayoutFile('popup_layout');
+
+            // 템플릿 패스 및 파일을 지정
+            $this->setTemplateFile('setup_addon');
+        }
+
         /**
          * @brief 애드온의 상세 정보(conf/info.xml)를 팝업 출력
          **/

modules/addon/conf/module.xml

@@ -3,6 +3,8 @@
     <actions>
         <action name="dispAddonAdminIndex" type="view" standalone="true" admin_index="true" />
         <action name="dispAddonAdminInfo" type="view" standalone="true" />
+        <action name="dispAddonAdminSetup" type="view" standalone="true" />
         <action name="procAddonAdminToggleActivate" type="controller" standalone="true" />
+        <action name="procAddonAdminSetupAddon" type="controller" standalone="true" />
     </actions>
 </module>

modules/addon/queries/getAddonInfo.xml

@@ -0,0 +1,9 @@
+<query id="getAddonInfo" action="select">
+    <tables>
+      <table name="addons" />
+    </tables>
+    <columns />
+    <conditions>
+      <condition operation="equal" column="addon" var="addon" notnull="notnull" />
+    </conditions>
+</query>

modules/addon/tpl/filter/setup_addon.xml

@@ -0,0 +1,8 @@
+<filter name="setup_addon" module="addon" act="procAddonAdminSetupAddon" confirm_msg_code="confirm_submit">
+    <form />
+    <parameter />
+    <response>
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>

modules/addon/tpl/setup_addon.html

@@ -0,0 +1,41 @@
+<!--%import("filter/setup_addon.xml")-->
+
+<div style="width:400px">
+    <form action="./" method="get" onsubmit="return procFilter(this, setup_addon);">
+        <input type="hidden" name="addon_name" value="{$addon_info->addon_name}" />
+        <table border="1" width="100%">
+        <tr>
+            <th>{$lang->title}</th>
+            <td>{$addon_info->title} ver. {$addon_info->version}</td>
+        </tr>
+        <tr>
+            <th>{$lang->author}</th>
+            <td>{$addon_info->author->name}</td>
+        </tr>
+        <tr>
+            <th>{$lang->homepage}</th>
+            <td><a href="#" onclick="winopen('{$addon_info->author->homepage}');return false;">{$addon_info->author->homepage}</a></td>
+        </tr>
+        <tr>
+            <th colspan="2">{$lang->extra_vars}</th>
+        </tr>
+
+        <!--@foreach($addon_info->extra_vars as $key => $val)-->
+        <tr>
+            <th rowspan="2">{$val->title}</th>
+            <td><input type="text" name="{$val->name}" value="{$val->value}" class="editor_input" /></td>
+        </tr>
+        <tr>
+            <td>{$val->description}</td>
+        </tr>
+        <!--@end-->
+
+        <tr>
+            <td colspan="2">
+                <input type="submit" value="{$lang->cmd_apply}" class="editor_button" />
+                <input type="button" value="{$lang->cmd_close}" class="editor_button" onclick="window.close();"/>
+            </td>
+        </tr>
+        </table>
+    </form>
+</div>