diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js
index 564b46b40..042cbe45e 100644
--- a/common/js/plugins/jquery.fileupload/js/main.js
+++ b/common/js/plugins/jquery.fileupload/js/main.js
@@ -103,7 +103,7 @@
if(result.error == 0) {
if(/\.(jpe?g|png|gif)$/i.test(result.source_filename)) {
- temp_code += '
';
+ temp_code += '
';
temp_code += "\r\n
\r\n";
}
@@ -244,10 +244,10 @@
if(!fileinfo) return;
if(/\.(jpe?g|png|gif)$/i.test(fileinfo.source_filename)) {
- temp_code += '
';
+ temp_code += '
';
temp_code += "\r\n
\r\n";
} else {
- temp_code += '' + fileinfo.source_filename + "\n";
+ temp_code += '' + fileinfo.source_filename + "\n";
}
});
@@ -379,6 +379,3 @@
return u;
};
})(jQuery);
-
-
-
diff --git a/modules/editor/skins/ckeditor/js/xe_interface.js b/modules/editor/skins/ckeditor/js/xe_interface.js
index 454e3d055..2639e7ee4 100755
--- a/modules/editor/skins/ckeditor/js/xe_interface.js
+++ b/modules/editor/skins/ckeditor/js/xe_interface.js
@@ -19,8 +19,6 @@ function editorGetContent(editor_sequence) {
//Replace html content to editor
function editorReplaceHTML(iframe_obj, content) {
- content = editorReplacePath(content);
-
var editor_sequence = parseInt(iframe_obj.id.replace(/^.*_/, ''), 10);
_getCkeInstance(editor_sequence).insertHtml(content, "unfiltered_html");
@@ -29,16 +27,3 @@ function editorReplaceHTML(iframe_obj, content) {
function editorGetIFrame(editor_sequence) {
return jQuery('#ckeditor_instance_' + editor_sequence).get(0);
}
-
-
-function editorReplacePath(content) {
- // 태그 내 src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
- content = content.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig, function(m0,m1,m2,m3,m4,m5,m6) {
- if(m2=="url(") { m3=''; m5=')'; } else { if(typeof(m3)=='undefined') m3 = '"'; if(typeof(m5)=='undefined') m5 = '"'; if(typeof(m6)=='undefined') m6 = ''; }
- var val = jQuery.trim(m4).replace(/^\.\//,'');
- if(/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(val)) return m0;
- return '<'+m1+m2+m3+request_uri+val+m5+m6;
- });
-
- return content;
-}
diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js
index e2b97cc0a..3d8884403 100644
--- a/modules/editor/skins/xpresseditor/js/xe_interface.js
+++ b/modules/editor/skins/xpresseditor/js/xe_interface.js
@@ -41,9 +41,6 @@ function editorStart_xe(editor_sequence, primary_key, content_key, editor_height
var content = form[content_key].value;
if(xFF && !content) content = '
';
- // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
- content = editorReplacePath(content);
-
form[content_key].value = content;
jQuery("#xpress-editor-"+editor_sequence).val(content);
@@ -203,24 +200,10 @@ function editorGetIframe(srl) {
}
function editorReplaceHTML(iframe_obj, content) {
- // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
- content = editorReplacePath(content);
-
var srl = parseInt(iframe_obj.id.replace(/^.*_/,''),10);
editorRelKeys[srl]["pasteHTML"](content);
}
-function editorReplacePath(content) {
- // 태그 내 src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
- content = content.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig, function(m0,m1,m2,m3,m4,m5,m6) {
- if(m2=="url(") { m3=''; m5=')'; } else { if(typeof(m3)=='undefined') m3 = '"'; if(typeof(m5)=='undefined') m5 = '"'; if(typeof(m6)=='undefined') m6 = ''; }
- var val = jQuery.trim(m4).replace(/^\.\//,'');
- if(/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(val)) return m0;
- return '<'+m1+m2+m3+request_uri+val+m5+m6;
- });
- return content;
-}
-
function editorGetAutoSavedDoc(form) {
var param = new Array();
param['mid'] = current_mid;
diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.js b/modules/editor/skins/xpresseditor/js/xpresseditor.js
index 5688cdcb4..e2f1d82ee 100644
--- a/modules/editor/skins/xpresseditor/js/xpresseditor.js
+++ b/modules/editor/skins/xpresseditor/js/xpresseditor.js
@@ -5868,9 +5868,6 @@ function editorStart_xe(editor_sequence, primary_key, content_key, editor_height
var content = form[content_key].value;
if(xFF && !content) content = '
';
- // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
- content = editorReplacePath(content);
-
form[content_key].value = content;
jQuery("#xpress-editor-"+editor_sequence).val(content);
@@ -6030,24 +6027,10 @@ function editorGetIframe(srl) {
}
function editorReplaceHTML(iframe_obj, content) {
- // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
- content = editorReplacePath(content);
-
var srl = parseInt(iframe_obj.id.replace(/^.*_/,''),10);
editorRelKeys[srl]["pasteHTML"](content);
}
-function editorReplacePath(content) {
- // 태그 내 src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
- content = content.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig, function(m0,m1,m2,m3,m4,m5,m6) {
- if(m2=="url(") { m3=''; m5=')'; } else { if(typeof(m3)=='undefined') m3 = '"'; if(typeof(m5)=='undefined') m5 = '"'; if(typeof(m6)=='undefined') m6 = ''; }
- var val = jQuery.trim(m4).replace(/^\.\//,'');
- if(/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(val)) return m0;
- return '<'+m1+m2+m3+request_uri+val+m5+m6;
- });
- return content;
-}
-
function editorGetAutoSavedDoc(form) {
var param = new Array();
param['mid'] = current_mid;
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index 76cbc63df..94ae7b6ce 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -46,12 +46,12 @@ class fileController extends file
$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
Context::setResponseMethod('JSON');
- $this->add('file_srl',$output->get('file_srl'));
- $this->add('file_size',$output->get('file_size'));
- $this->add('direct_download',$output->get('direct_download'));
- $this->add('source_filename',$output->get('source_filename'));
- $this->add('download_url',$output->get('uploaded_filename'));
- $this->add('upload_target_srl',$output->get('upload_target_srl'));
+ $this->add('file_srl', $output->get('file_srl'));
+ $this->add('file_size', $output->get('file_size'));
+ $this->add('direct_download', $output->get('direct_download'));
+ $this->add('source_filename', $output->get('source_filename'));
+ $this->add('download_url', $output->get('uploaded_filename'));
+ $this->add('upload_target_srl', $output->get('upload_target_srl'));
if($output->error != '0') $this->stop($output->message);
}
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index a58a0f411..cf27f85c1 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -48,7 +48,7 @@ class fileModel extends file
$obj->file_size = $file_info->file_size;
$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
- else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+ else $obj->download_url = $file_info->uploaded_filename;
$obj->direct_download = $file_info->direct_download;
$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
$files[] = $obj;
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 68dea693c..c23414bd2 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -200,7 +200,6 @@ function doSyncPageContent() {
if(!fo_obj.document_srl || fo_obj.document_srl.value == '0') {
try {
var content = Base64.decode(xInnerHtml(obj));
- content = editorReplacePath(content);
get_by_id("content_fo").content.value = content;
xe.Editors["1"].exec("SET_IR", [content]);
}