diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 4a1085938..cd8bf09c3 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -706,7 +706,8 @@ **/ function transContent($content) { // 에디터 컴포넌트를 찾아서 결과 코드로 변환 - $content = preg_replace_callback('!<(div|img)([^\>]*)editor_component=([^\>]*?)>!is', array($this,'_transEditorComponent'), $content); + $content = preg_replace_callback('!]*)editor_component=([^\>]*?)>([^\>]*?)\<\/div\>!is', array($this,'_transEditorComponent'), $content); + $content = preg_replace_callback('!]*)editor_component=([^\>]*?)\>!is', array($this,'_transEditorComponent'), $content); //
코드 변환 $content = preg_replace('/\/]*)(\/>|>)/i','', $content); @@ -729,6 +730,7 @@ // 플러그인에서 생성된 코드 (img, div태그내에 plugin코드 존재)의 parameter를 추출 $oXmlParser = new XmlParser(); $xml_doc = $oXmlParser->parse($buff); + if($xml_doc->div) $xml_doc = $xml_doc->div; // plugin attribute가 없으면 return $editor_component = $xml_doc->attrs->editor_component; diff --git a/classes/plugin/PluginHandler.class.php b/classes/plugin/PluginHandler.class.php index 976ec463b..3277780b6 100644 --- a/classes/plugin/PluginHandler.class.php +++ b/classes/plugin/PluginHandler.class.php @@ -17,8 +17,8 @@ $oPlugin = PluginHandler::getObject($plugin); // 플러그인 실행 - $output = $oPlugin->proc($args); - print $output; + //$output = $oPlugin->proc($args); + //print $output; } /** diff --git a/modules/editor/components/multimedia_link/multimedia_link.class.php b/modules/editor/components/multimedia_link/multimedia_link.class.php index 5d375df34..82ec0d971 100644 --- a/modules/editor/components/multimedia_link/multimedia_link.class.php +++ b/modules/editor/components/multimedia_link/multimedia_link.class.php @@ -57,7 +57,7 @@ $src = str_replace(array('&','"'), array('&','&qout;'), $src); - return sprintf("
", $src, $width, $height, $auto_start); + return sprintf("
", $src, $width, $height, $auto_start); } } ?> diff --git a/modules/editor/components/multimedia_link/tpl/popup.js b/modules/editor/components/multimedia_link/tpl/popup.js index 9a45d7d9f..894bfbcd6 100644 --- a/modules/editor/components/multimedia_link/tpl/popup.js +++ b/modules/editor/components/multimedia_link/tpl/popup.js @@ -19,8 +19,8 @@ function getMultimedia() { xGetElementById("multimedia_url").value = url; xGetElementById("multimedia_caption").value = caption; - xGetElementById("multimedia_width").value = width; - xGetElementById("multimedia_height").value = height; + xGetElementById("multimedia_width").value = width-6; + xGetElementById("multimedia_height").value = height-6; if(auto_start=="true") xGetElementById("multimedia_auto_start").checked = true; } diff --git a/modules/editor/components/naver_map/naver_map.class.php b/modules/editor/components/naver_map/naver_map.class.php index c7ac5355e..085670eb7 100644 --- a/modules/editor/components/naver_map/naver_map.class.php +++ b/modules/editor/components/naver_map/naver_map.class.php @@ -101,7 +101,7 @@ $width = $xml_obj->attrs->width; $height = $xml_obj->attrs->height; - $body_code = sprintf('
', $width, $height, Context::getRequestUri(), $width, $height, $x, $y, $width, $height); + $body_code = sprintf('
', $width, $height, Context::getRequestUri(), $width, $height, $x, $y, $width, $height); return $body_code; } diff --git a/modules/editor/components/quotation/quotation.class.php b/modules/editor/components/quotation/quotation.class.php index b536153f9..5860cbd04 100644 --- a/modules/editor/components/quotation/quotation.class.php +++ b/modules/editor/components/quotation/quotation.class.php @@ -54,6 +54,7 @@ $border_thickness = $xml_obj->attrs->border_thickness; $border_color = $xml_obj->attrs->border_color; $bg_color = $xml_obj->attrs->bg_color; + $body = $xml_obj->body; $output = ""; $style = sprintf('margin:%spx;padding:%spx;background-color:#%s;', $margin, $padding, $bg_color); @@ -97,10 +98,9 @@ $output .= sprintf('', $folder_id, $folder_margin, $class, $folder_id, $folder_opener); $output .= sprintf('', $folder_id, $folder_margin, $class, $folder_id, $folder_closer); - $output .= sprintf('
', $style, $folder_id); - debugPrint($output); + $output .= sprintf('
%s
', $style, $folder_id,$body); } else { - $output .= sprintf('
', $style); + $output .= sprintf('
%s
', $style, $body); } return $output; } diff --git a/modules/editor/components/slide_show/slide_show.class.php b/modules/editor/components/slide_show/slide_show.class.php index 9283d1d9c..df5378251 100644 --- a/modules/editor/components/slide_show/slide_show.class.php +++ b/modules/editor/components/slide_show/slide_show.class.php @@ -43,10 +43,22 @@ function transHTML($xml_obj) { $width = $xml_obj->attrs->width; $height = $xml_obj->attrs->height; + $make_thumbnail = $xml_obj->attrs->make_thumbnail; $body = $xml_obj->body; + $image_list = explode("\n",$body); - $output = sprintf('
%s
', $width, $height, $body); - return $output; + Context::set("slide_show_width", $width); + Context::set("slide_show_height", $height); + Context::set("slide_show_images", $image_list); + Context::set("slide_show_srl", rand(111111,999999)); + + $tpl_path = $this->component_path.'tpl'; + $tpl_file = 'slide_show.html'; + + Context::set("tpl_path", $tpl_path); + require_once("./classes/template/TemplateHandler.class.php"); + $oTemplate = new TemplateHandler(); + return $oTemplate->compile($tpl_path, $tpl_file); } } diff --git a/modules/editor/components/slide_show/tpl/slide_show.html b/modules/editor/components/slide_show/tpl/slide_show.html index a0f88e084..4022edfc3 100644 --- a/modules/editor/components/slide_show/tpl/slide_show.html +++ b/modules/editor/components/slide_show/tpl/slide_show.html @@ -1,23 +1,22 @@ + -
-