From 99ca20908eda820e80e00170aa2304d6db43e49e Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 14 Mar 2007 08:47:06 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@420 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/layout/layout.model.php | 4 ++-- modules/module/module.model.php | 17 +++++++++++++++++ modules/module/queries/getMidList.xml | 11 +++++++++++ modules/plugin/plugin.model.php | 6 +++--- modules/plugin/plugin.view.php | 5 +++++ modules/plugin/tpl.admin/plugin_make_code.html | 11 ++++++++++- plugins/newest_document/conf/info.xml | 4 ++-- 7 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 modules/module/queries/getMidList.xml diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index d8d50f189..d69a1a402 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -148,8 +148,8 @@ 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"] = "%s";', $var->attrs->id, $options[$i]->value->body, $options[$i]->name->body); + for($j=0;$j<$options_count;$j++) { + $buff .= sprintf('$layout_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->id, $options[$j]->value->body, $options[$j]->name->body); } } diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 126a36686..f74b3ef2a 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -108,6 +108,23 @@ return $module_info; } + /** + * @brief DB에 생성된 mid목록을 구해옴 + **/ + function getMidList() { + $oDB = &DB::getInstance(); + $output = $oDB->executeQuery('module.getMidList'); + if(!$output->toBool()) return $output; + + $list = $output->data; + if(!$list) return; + if(!is_array($list)) $list = array($list); + foreach($list as $val) { + $mid_list[$val->mid] = $val; + } + return $mid_list; + } + /** * @brief 특정 모듈의 스킨의 정보를 구해옴 **/ diff --git a/modules/module/queries/getMidList.xml b/modules/module/queries/getMidList.xml new file mode 100644 index 000000000..4fc253ad8 --- /dev/null +++ b/modules/module/queries/getMidList.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/modules/plugin/plugin.model.php b/modules/plugin/plugin.model.php index b77ee9927..efa1c8d9d 100644 --- a/modules/plugin/plugin.model.php +++ b/modules/plugin/plugin.model.php @@ -70,7 +70,6 @@ $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; } @@ -101,6 +100,7 @@ if(!is_array($xml_obj->extra_vars->var)) $extra_vars[] = $xml_obj->extra_vars->var; else $extra_vars = $xml_obj->extra_vars->var; $extra_var_count = count($extra_vars); + $buff .= sprintf('$plugin_info->extra_var_count = "%s";', $extra_var_count); for($i=0;$i<$extra_var_count;$i++) { unset($var); @@ -116,8 +116,8 @@ 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"] = "%s";', $var->attrs->id, $options[$i]->value->body, $options[$i]->name->body); + for($j=0;$j<$options_count;$j++) { + $buff .= sprintf('$plugin_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->id, $options[$j]->value->body, $options[$j]->name->body); } } diff --git a/modules/plugin/plugin.view.php b/modules/plugin/plugin.view.php index f4ba77f01..79880381d 100644 --- a/modules/plugin/plugin.view.php +++ b/modules/plugin/plugin.view.php @@ -51,6 +51,11 @@ $plugin_info = $oPluginModel->getPluginInfo(Context::get('selected_plugin')); Context::set('plugin_info', $plugin_info); + // mid 목록을 가져옴 + $oModuleModel = &getModel('module'); + $mid_list = $oModuleModel->getMidList(); + Context::set('mid_list', $mid_list); + // 플러그인을 팝업으로 지정 $this->setLayoutFile('popup_layout'); diff --git a/modules/plugin/tpl.admin/plugin_make_code.html b/modules/plugin/tpl.admin/plugin_make_code.html index a6ffb3510..03c7b2ed9 100644 --- a/modules/plugin/tpl.admin/plugin_make_code.html +++ b/modules/plugin/tpl.admin/plugin_make_code.html @@ -1,4 +1,3 @@ -
@@ -12,6 +11,7 @@ + @@ -24,6 +24,15 @@ + + diff --git a/plugins/newest_document/conf/info.xml b/plugins/newest_document/conf/info.xml index 6d1a95b99..33090173e 100644 --- a/plugins/newest_document/conf/info.xml +++ b/plugins/newest_document/conf/info.xml @@ -49,10 +49,10 @@ list_counttext - + 대상 모듈 target modules - module_list + mid_list
{$var->name} + +
+ + +
+ +