From d9dc99c577fd9c572831c205c86df47cf9866847 Mon Sep 17 00:00:00 2001 From: zero Date: Thu, 19 Jul 2007 23:01:37 +0000 Subject: [PATCH] =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=EC=9D=98?= =?UTF-8?q?=20=EB=B3=B8=EB=AC=B8=20=EC=82=BD=EC=9E=85=EC=8B=9C=20=EC=83=81?= =?UTF-8?q?=EB=8C=80=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=ED=95=98=EA=B3=A0=20=EC=B6=9C=EB=A0=A5?= =?UTF-8?q?=EC=8B=9C=20Rewrite=20mod=EC=97=90=20=EC=98=81=ED=96=A5?= =?UTF-8?q?=EC=9D=84=20=EB=B0=9B=EC=A7=80=20=EC=95=8A=EA=B2=8C=20=EC=A0=88?= =?UTF-8?q?=EB=8C=80=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/trunk@1961 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/display/DisplayHandler.class.php | 7 ++----- common/js/common.js | 3 ++- modules/editor/components/emoticon/tpl/popup.js | 3 ++- .../editor/components/image_gallery/tpl/list_gallery.js | 1 + modules/editor/components/image_gallery/tpl/popup.js | 4 ++-- .../editor/components/image_gallery/tpl/slide_gallery.js | 1 + modules/editor/components/image_link/tpl/popup.js | 1 + modules/editor/components/multimedia_link/tpl/popup.js | 1 + 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index 7b8dbe5fc..4f7b7ab9a 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -82,13 +82,10 @@ * @brief 최종 결과물의 출력 **/ function display($content) { - if(Context::getResponseMethod()=="XMLRPC") { - print $content; - return; - } - $path = str_replace('index.php','',$_SERVER['SCRIPT_NAME']); + // files로 시작되는 src나 href의 값을 절대경로로 변경 + $content = preg_replace('!(href|src)=("|\'){0,1}files!is', '\\1=\\2'.$path.'files', $content); print preg_replace('!(href|src)=("|\'){0,1}\.\/([a-zA-Z0-9\_^\/]+)\/!is', '\\1=\\2'.$path.'$3/', $content); } diff --git a/common/js/common.js b/common/js/common.js index 9aeffa87a..c9222f2b0 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -136,6 +136,7 @@ function toggleDisplay(obj, opt) { * @brief 멀티미디어 출력용 (IE에서 플래쉬/동영상 주변에 점선 생김 방지용) **/ function displayMultimedia(src, width, height, auto_start) { + if(src.indexOf('files')==0) src = request_uri+src; if(auto_start) auto_start = "true"; else auto_start = "false"; @@ -153,7 +154,7 @@ function displayMultimedia(src, width, height, auto_start) { ""+ "<\/object>"; } else if(/\.flv/i.test(src)) { - html = ""; + html = ""; } else { html = ""; } diff --git a/modules/editor/components/emoticon/tpl/popup.js b/modules/editor/components/emoticon/tpl/popup.js index a8972ed7e..e3a1598c3 100644 --- a/modules/editor/components/emoticon/tpl/popup.js +++ b/modules/editor/components/emoticon/tpl/popup.js @@ -1,7 +1,8 @@ function insertEmoticon(obj) { if(typeof(opener)=='undefined') return; - var text = "\"emoticon\""; + var url = obj.src.replace(request_uri,''); + var text = "\"emoticon\""; opener.editorFocus(opener.editorPrevSrl); diff --git a/modules/editor/components/image_gallery/tpl/list_gallery.js b/modules/editor/components/image_gallery/tpl/list_gallery.js index deaad9bb4..d92ab8c14 100644 --- a/modules/editor/components/image_gallery/tpl/list_gallery.js +++ b/modules/editor/components/image_gallery/tpl/list_gallery.js @@ -10,6 +10,7 @@ var list_gallery_images = new Array(); // 이미지갤러리쇼 이미지 목록에 추가 function list_gallery_add_image(srl, image_url) { if(!image_url) return; + if(image_url.indexOf('files')==0) image_url = request_uri+image_url; // 객체 생성 var obj = {"srl":0, "image_url":null, "image":null} diff --git a/modules/editor/components/image_gallery/tpl/popup.js b/modules/editor/components/image_gallery/tpl/popup.js index bf5addd3c..095b72977 100644 --- a/modules/editor/components/image_gallery/tpl/popup.js +++ b/modules/editor/components/image_gallery/tpl/popup.js @@ -50,7 +50,7 @@ function getSlideShow() { var opt = parent_list_obj.options[i]; var file_srl = opt.value; var file_obj = opener.uploaded_files[file_srl]; - var filename = file_obj.uploaded_filename; + var filename = file_obj.uploaded_filename.replace(request_uri,''); if((/(jpg|jpeg|gif|png)$/i).test(filename)) { var selected = false; if(selected_images.indexOf(filename)!=-1) selected = true; @@ -72,7 +72,7 @@ function insertSlideShow() { if(opt.selected) { var file_srl = opt.value; var file_obj = opener.uploaded_files[file_srl]; - var filename = file_obj.uploaded_filename; + var filename = file_obj.uploaded_filename.replace(request_uri,''); list[list.length] = filename; } } diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.js b/modules/editor/components/image_gallery/tpl/slide_gallery.js index 7aa09bbea..b56cfa3ac 100644 --- a/modules/editor/components/image_gallery/tpl/slide_gallery.js +++ b/modules/editor/components/image_gallery/tpl/slide_gallery.js @@ -11,6 +11,7 @@ var thumbnail_zone_height = new Array(); // 이미지갤러리쇼 이미지 목록에 추가 function slide_gallery_add_image(srl, image_url) { if(!image_url) return; + if(image_url.indexOf('files')==0) image_url = request_uri+image_url; // 객체 생성 var obj = {"srl":0, "thumbnail_url":null, "thumbnail":null, "image_url":null, "image":null} diff --git a/modules/editor/components/image_link/tpl/popup.js b/modules/editor/components/image_link/tpl/popup.js index 0f4fc1b39..3730c5fd2 100644 --- a/modules/editor/components/image_link/tpl/popup.js +++ b/modules/editor/components/image_link/tpl/popup.js @@ -72,6 +72,7 @@ function insertImage(obj) { return; } + url = url.replace(request_uri,''); var text = "