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 = "