diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 41040c135..c9e8bb3e9 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -767,6 +767,7 @@
// className, style attribute를 구해 놓음
$className = $vars->class;
$style = $vars->style;
+ unset($vars->module_srl);
unset($vars->class);
unset($vars->style);
unset($vars->src);
diff --git a/classes/plugin/PluginHandler.class.php b/classes/plugin/PluginHandler.class.php
index f251877fa..bc0d900d9 100644
--- a/classes/plugin/PluginHandler.class.php
+++ b/classes/plugin/PluginHandler.class.php
@@ -18,8 +18,7 @@
if(!$oPlugin) return;
// 플러그인 실행
- $output = $oPlugin->proc($args);
- return $output;
+ return $oPlugin->proc($args);
}
/**
diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php
index 7b326f184..858e89d66 100644
--- a/classes/xml/XmlQueryParser.class.php
+++ b/classes/xml/XmlQueryParser.class.php
@@ -281,7 +281,8 @@
$buff = sprintf('sprintf("%s like \'%%s%%%%\' ", $this->addQuotes($args->%s))', $column, $var);
break;
case 'in' :
- $buff = sprintf('sprintf("%s in (%%s) ", $this->addQuotes($args->%s))', $column, $var);
+ //$buff = sprintf('sprintf("%s in (%%s) ", $this->addQuotes($args->%s))', $column, $var);
+ $buff = sprintf('sprintf("%s in (%%s) ", $args->%s)', $column, $var);
break;
case 'notnull' :
case 'null' :
diff --git a/layouts/sample_layout/layout.html b/layouts/sample_layout/layout.html
index a926be4bb..d137263fa 100644
--- a/layouts/sample_layout/layout.html
+++ b/layouts/sample_layout/layout.html
@@ -72,8 +72,6 @@
-
-
{$content}
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 2797a440e..4996fec8f 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -117,8 +117,17 @@
if(!in_array($obj->sort_index, array('list_order', 'update_order'))) $obj->sort_index = 'list_order';
- // 변수 설정
- $args->module_srl = $obj->module_srl;
+ // module_srl 대신 mid가 넘어왔을 경우는 직접 module_srl을 구해줌
+ if($obj->mid) {
+ $oModuleModel = &getModel('module');
+ $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+ unset($obj->mid);
+ }
+
+ // 넘어온 module_srl은 array일 수도 있기에 array인지를 체크
+ if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+ else $args->module_srl = $obj->module_srl;
+
$args->category_srl = $obj->category_srl?$obj->category_srl:'';
$args->sort_index = $obj->sort_index;
diff --git a/modules/document/queries/getDocumentList.xml b/modules/document/queries/getDocumentList.xml
index 310129cd8..988279043 100644
--- a/modules/document/queries/getDocumentList.xml
+++ b/modules/document/queries/getDocumentList.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.js b/modules/editor/components/image_gallery/tpl/slide_gallery.js
index c91323810..a1fad958d 100644
--- a/modules/editor/components/image_gallery/tpl/slide_gallery.js
+++ b/modules/editor/components/image_gallery/tpl/slide_gallery.js
@@ -109,7 +109,6 @@ function display_gallery_image(obj, is_first_display) {
// 이미지 표시
var target_image = xGetElementById("slide_gallery_main_image_"+obj.srl);
- target_image.style.margin = "0px;";
target_image.style.marginLeft = x+"px";
target_image.src = obj.image.src;
diff --git a/modules/file/tpl.admin/file_list.html b/modules/file/tpl.admin/file_list.html
index 157ca13ef..184f91791 100644
--- a/modules/file/tpl.admin/file_list.html
+++ b/modules/file/tpl.admin/file_list.html
@@ -33,7 +33,7 @@
{$val->download_count} |
{zdate($val->regdate,"Y-m-d")} |
{$val->ipaddress} |
- {$lang->cmd_move} |
+ {$lang->cmd_move} |
{$lang->cmd_download} |
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 26ef088b4..404ece84d 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -126,6 +126,23 @@
return $mid_list;
}
+ /**
+ * @brief mid 목록에 대응하는 module_srl을 배열로 return
+ **/
+ function getModuleSrlByMid($mid) {
+ if(is_array($mid)) $mid = "'".implode("','",$mid)."'";
+ $oDB = &DB::getInstance();
+ $args->mid = $mid;
+ $output = $oDB->executeQuery('module.getModuleSrlByMid', $args);
+ if(!$output->toBool()) return $output;
+
+ $list = $output->data;
+ if(!$list) return;
+ if(!is_array($list)) $list = array($list);
+ foreach($list as $key => $val) $module_srl_list[] = $val->module_srl;
+ return $module_srl_list;
+ }
+
/**
* @brief 특정 모듈의 스킨의 정보를 구해옴
**/
diff --git a/modules/module/queries/getModuleSrlByMid.xml b/modules/module/queries/getModuleSrlByMid.xml
new file mode 100644
index 000000000..c7f51f45f
--- /dev/null
+++ b/modules/module/queries/getModuleSrlByMid.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/newest_document/newest_document.class.php b/plugins/newest_document/newest_document.class.php
index 5e181e137..b1f454962 100644
--- a/plugins/newest_document/newest_document.class.php
+++ b/plugins/newest_document/newest_document.class.php
@@ -12,11 +12,26 @@
/**
* @brief 플러그인의 실행 부분
* ./plugins/플러그인/conf/info.xml에 선언한 extra_vars를 args로 받는다
+ * 결과를 만든후 return 해주어야 한다
**/
function proc($args) {
+ // 플러그인 자체적으로 설정한 변수들을 체크
+ $title = $args->title;
+ $order_target = $args->order_target;
+ $order_type = $args->order_type;
+ $list_count = (int)$args->list_order;
+ if(!$list_count) $list_count = 5;
+ $mid_list = explode(",",$args->mid_list);
- return 12;
-
+ // DocumentModel::getDocumentList()를 이용하기 위한 변수 정리
+ $obj->mid = $mid_list;
+ $obj->sort_index = $order_target;
+ $obj->list_count = $list_count;
+
+ $oDocumentModel = &getModel('document');
+ $output = $oDocumentModel->getDocumentList($obj);
+
+ // 템플릿 파일을 지정
}
|