From 5dfec5a0c4065359e1552b9ff2169c24db866182 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 14 Mar 2007 08:23:12 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@419
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 layouts/sample_layout/conf/info.xml           | 96 ++++++++++---------
 modules/layout/layout.model.php               |  8 +-
 modules/layout/tpl.admin/layout_info.html     |  2 +-
 modules/plugin/plugin.model.php               |  9 +-
 .../plugin/tpl.admin/plugin_make_code.html    |  3 +-
 plugins/newest_document/conf/info.xml         | 89 ++++++++++-------
 6 files changed, 118 insertions(+), 89 deletions(-)

diff --git a/layouts/sample_layout/conf/info.xml b/layouts/sample_layout/conf/info.xml
index 93ec3819e..a29fe5728 100644
--- a/layouts/sample_layout/conf/info.xml
+++ b/layouts/sample_layout/conf/info.xml
@@ -1,49 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout version="0.1">
-  <title xml:lang="ko">견본 레이아웃</title>
-  <title xml:lang="en">sample layout</title>
-  <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
-    <name xml:lang="ko">제로</name>
-    <name xml:lang="en">zero</name>
-    <description xml:lang="ko">
-        견본 레이아웃입니다.
-        가장 기본적인 기능으로 이루어져 있습니다.
-    </description>
-    <description xml:lang="en">sample layout</description>
-  </author>
-  <extra_vars>
-    <var id="top_title">
-      <name xml:lang="ko">상단 제목</name>
-      <name xml:lang="en">top title</name>
-      <type>text</type>
-    </var>
-    <var id="main_menu_name">
-      <name xml:lang="ko">메인 메뉴 명</name>
-      <name xml:lang="en">main_menu_name</name>
-      <type>text</type>
-    </var>
-    <var id="colorset">
-      <name xml:lang="ko">컬러셋</name>
-      <name xml:lang="en">colorset</name>
-      <type>select</type>
-      <options>
-        <value>red</value>
-        <value>blue</value>
-        <value>green</value>
-        <value>rightred</value>
-      </options>
-    </var>
-  </extra_vars>
-  <menus>
-    <menu id="main_menu">
-        <name xml:lang="ko">주메뉴</name>
-        <name xml:lang="en">main menu</name>
-        <maxdepth>2</maxdepth>
-    </menu>
-    <menu id="bottom_menu">
-        <name xml:lang="ko">하단 메뉴 </name>
-        <name xml:lang="en">bottom menu</name>
-        <maxdepth>1</maxdepth>
-    </menu>
-  </menus>
+    <title xml:lang="ko">견본 레이아웃</title>
+    <title xml:lang="en">sample layout</title>
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
+        <name xml:lang="ko">제로</name>
+        <name xml:lang="en">zero</name>
+        <description xml:lang="ko">
+            견본 레이아웃입니다.
+            가장 기본적인 기능으로 이루어져 있습니다.
+        </description>
+        <description xml:lang="en">sample layout</description>
+    </author>
+    <extra_vars>
+        <var id="top_title">
+            <name xml:lang="ko">상단 제목</name>
+            <name xml:lang="en">top title</name>
+            <type>text</type>
+        </var>
+        <var id="main_menu_name">
+            <name xml:lang="ko">메인 메뉴 명</name>
+            <name xml:lang="en">main_menu_name</name>
+            <type>text</type>
+        </var>
+        <var id="colorset">
+            <name xml:lang="ko">컬러셋</name>
+            <name xml:lang="en">colorset</name>
+            <type>select</type>
+            <options>
+                <name xml:lang="ko">적색</name>
+                <name xml:lang="en">red</name>
+                <value>red</value>
+            </options>
+            <options>
+                <name xml:lang="ko">청색</name>
+                <name xml:lang="en">blue</name>
+                <value>blue</value>
+            </options>
+        </var>
+    </extra_vars>
+    <menus>
+        <menu id="main_menu">
+            <name xml:lang="ko">주메뉴</name>
+            <name xml:lang="en">main menu</name>
+            <maxdepth>2</maxdepth>
+        </menu>
+        <menu id="bottom_menu">
+            <name xml:lang="ko">하단 메뉴 </name>
+            <name xml:lang="en">bottom menu</name>
+            <maxdepth>1</maxdepth>
+        </menu>
+    </menus>
 </layout>
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index b48b1c7cf..d8d50f189 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -136,23 +136,23 @@
             $buff .= sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
             for($i=0;$i<$extra_var_count;$i++) {
                 unset($var);
+                unset($options);
                 $var = $extra_vars[$i];
 
                 $buff .= sprintf('$layout_info->extra_var->%s->name = "%s";', $var->attrs->id, $var->name->body);
                 $buff .= sprintf('$layout_info->extra_var->%s->type = "%s";', $var->attrs->id, $var->type->body);
                 $buff .= sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $var->attrs->id, $var->attrs->id);
 
-                $options = $var->options->value;
+                $options = $var->options;
                 if(!$options) continue;
+
                 if(!is_array($options)) $options = array($options);
                 $options_count = count($options);
                 for($i=0;$i<$options_count;$i++) {
-                    $buff .= sprintf('$layout_info->extra_var->%s->options[] = "%s";', $var->attrs->id, $options[$i]->body);
-
+                    $buff .= sprintf('$layout_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->id, $options[$i]->value->body, $options[$i]->name->body);
                 }
             }
 
-
             // 메뉴
             if(!is_array($xml_obj->menus->menu)) $menus[] = $xml_obj->menus->menu;
             else $menus = $xml_obj->menus->menu;
diff --git a/modules/layout/tpl.admin/layout_info.html b/modules/layout/tpl.admin/layout_info.html
index a2ddaf0bd..22e199aeb 100644
--- a/modules/layout/tpl.admin/layout_info.html
+++ b/modules/layout/tpl.admin/layout_info.html
@@ -59,7 +59,7 @@
     <td>
       <select name="{$id}">
         <!--@foreach($var->options as $key => $val)-->
-        <option value="{$val}" <!--@if($val==$var->value)-->selected="true"<!--@end-->>{$val}</option>
+        <option value="{$key}" <!--@if($key==$var->value)-->selected="true"<!--@end-->>{$val}</option>
         <!--@end-->
       </select>
     <!--@end-->
diff --git a/modules/plugin/plugin.model.php b/modules/plugin/plugin.model.php
index f74741e68..b77ee9927 100644
--- a/modules/plugin/plugin.model.php
+++ b/modules/plugin/plugin.model.php
@@ -70,6 +70,7 @@
             $cache_file = sprintf('./files/cache/plugin/%s.cache.php', $plugin);
             if(file_exists($cache_file)&&filectime($cache_file)>filectime($xml_file)) {
                 include $cache_file;
+                debugPrint($plugin_info);
                 return $plugin_info;
             }
 
@@ -103,20 +104,22 @@
             $buff .= sprintf('$plugin_info->extra_var_count = "%s";', $extra_var_count);
             for($i=0;$i<$extra_var_count;$i++) {
                 unset($var);
+                unset($options);
                 $var = $extra_vars[$i];
 
                 $buff .= sprintf('$plugin_info->extra_var->%s->name = "%s";', $var->attrs->id, $var->name->body);
                 $buff .= sprintf('$plugin_info->extra_var->%s->type = "%s";', $var->attrs->id, $var->type->body);
                 $buff .= sprintf('$plugin_info->extra_var->%s->value = $vars->%s;', $var->attrs->id, $var->attrs->id);
 
-                $options = $var->options->value;
+                $options = $var->options;
                 if(!$options) continue;
+
                 if(!is_array($options)) $options = array($options);
                 $options_count = count($options);
                 for($i=0;$i<$options_count;$i++) {
-                    $buff .= sprintf('$plugin_info->extra_var->%s->options[] = "%s";', $var->attrs->id, $options[$i]->body);
-
+                    $buff .= sprintf('$plugin_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->id, $options[$i]->value->body, $options[$i]->name->body);
                 }
+
             }
 
             $buff = '<?php if(!__ZB5__) exit(); '.$buff.' ?>';
diff --git a/modules/plugin/tpl.admin/plugin_make_code.html b/modules/plugin/tpl.admin/plugin_make_code.html
index 15ac5f22e..a6ffb3510 100644
--- a/modules/plugin/tpl.admin/plugin_make_code.html
+++ b/modules/plugin/tpl.admin/plugin_make_code.html
@@ -20,9 +20,10 @@
     <td>
       <select name="{$id}">
         <!--@foreach($var->options as $key => $val)-->
-        <option value="{$val}" <!--@if($val==$var->value)-->selected="true"<!--@end-->>{$val}</option>
+        <option value="{$key}" <!--@if($key==$var->value)-->selected="true"<!--@end-->>{$val}</option>
         <!--@end-->
       </select>
+    </td>
     <!--@end-->
   </tr>
   <!--@end-->
diff --git a/plugins/newest_document/conf/info.xml b/plugins/newest_document/conf/info.xml
index 1ac8ca28a..6d1a95b99 100644
--- a/plugins/newest_document/conf/info.xml
+++ b/plugins/newest_document/conf/info.xml
@@ -1,37 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin version="0.1">
-  <title xml:lang="ko">최근 문서</title>
-  <title xml:lang="en">newest document </title>
-  <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
-    <name xml:lang="ko">제로</name>
-    <name xml:lang="en">zero</name>
-    <description xml:lang="ko">최근 문서 (document)를 출력하는 플러그인입니다.</description>
-    <description xml:lang="en">display newest document</description>
-  </author>
-  <extra_vars>
-    <var id="title">
-      <name xml:lang="ko">제목</name>
-      <name xml:lang="en">title</name>
-      <type>text</type>
-    </var>
-    <var id="order_type">
-      <name xml:lang="ko">정렬 방법</name>
-      <name xml:lang="en">order type</name>
-      <type>select</type>
-      <options>
-        <value>regdate</value>
-        <value>last update</value>
-      </options>
-    </var>
-    <var id="list_count">
-      <name xml:lang="ko">목록수</name>
-      <name xml:lang="en">list_count</name>
-      <type>text</type>
-    </var>
-    <var id="module_srls">
-      <name xml:lang="ko">대상 모듈</name>
-      <name xml:lang="en">target modules</name>
-      <type>module_list</type>
-    </var>
-  </extra_vars>
+    <title xml:lang="ko">최근 문서</title>
+    <title xml:lang="en">newest document </title>
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
+        <name xml:lang="ko">제로</name>
+        <name xml:lang="en">zero</name>
+        <description xml:lang="ko">최근 문서 (document)를 출력하는 플러그인입니다.</description>
+        <description xml:lang="en">display newest document</description>
+    </author>
+    <extra_vars>
+        <var id="title">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="en">title</name>
+            <type>text</type>
+        </var>
+        <var id="order_target">
+            <name xml:lang="ko">정렬 대상</name>
+            <name xml:lang="en">order target</name>
+            <type>select</type>
+            <options>
+                <name xml:lang="ko">시간순</name>
+                <name xml:lang="en">regdate</name>
+                <value>list_order</value>
+            </options>
+            <options>
+                <name xml:lang="ko">업데이트순</name>
+                <name xml:lang="en">last update</name>
+                <value>update_order</value>
+            </options>
+        </var>
+        <var id="order_type">
+            <name xml:lang="ko">정렬 방법</name>
+            <name xml:lang="en">order type</name>
+            <type>select</type>
+            <options>
+                <name xml:lang="ko">내림차순</name>
+                <name xml:lang="en">desc</name>
+                <value>desc</value>
+            </options>
+            <options>
+                <name xml:lang="ko">올림차순</name>
+                <name xml:lang="en">asc</name>
+                <value>asc</value>
+            </options>
+        </var>
+        <var id="list_count">
+            <name xml:lang="ko">목록수</name>
+            <name xml:lang="en">list_count</name>
+            <type>text</type>
+        </var>
+        <var id="module_srls">
+            <name xml:lang="ko">대상 모듈</name>
+            <name xml:lang="en">target modules</name>
+            <type>module_list</type>
+        </var>
+    </extra_vars>
 </plugin>