diff --git a/common.php b/common.php index 4a6a4d37d..ba387c86f 100644 --- a/common.php +++ b/common.php @@ -35,7 +35,7 @@ function g5_path() $port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : ''; $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://'; $user = str_replace(str_replace($document_root, '', $_SERVER['SCRIPT_FILENAME']), '', $_SERVER['SCRIPT_NAME']); - $result['url'] = $http.$_SERVER['SERVER_NAME'].$port.$user.$root; + $result['url'] = $http.$_SERVER['HTTP_HOST'].$port.$user.$root; return $result; } diff --git a/plugin/editor/smarteditor2/editor.lib.php b/plugin/editor/smarteditor2/editor.lib.php index 94ffc30f8..8ef0c9ccf 100644 --- a/plugin/editor/smarteditor2/editor.lib.php +++ b/plugin/editor/smarteditor2/editor.lib.php @@ -38,7 +38,7 @@ function editor_html($id, $content, $is_dhtml_editor=true) } $smarteditor_class = $is_dhtml_editor ? "smarteditor2" : ""; - $html .= "\n"; + $html .= "\n"; $html .= "\n웹 에디터 끝"; return $html; } @@ -48,7 +48,7 @@ function editor_html($id, $content, $is_dhtml_editor=true) function get_editor_js($id, $is_dhtml_editor=true) { if ($is_dhtml_editor) { - return "var {$id}_editor_data = oEditors.getById['{$id}'].getIR();\noEditors.getById['{$id}'].exec('UPDATE_CONTENTS_FIELD', []);\n"; + return "var {$id}_editor_data = oEditors.getById['{$id}'].getIR();\noEditors.getById['{$id}'].exec('UPDATE_CONTENTS_FIELD', []);\nif(jQuery.inArray(document.getElementById('{$id}').value.toLowerCase().replace(/^\s*|\s*$/g, ''), [' ','

 

','


','

','

','
','']) != -1){document.getElementById('{$id}').value='';}\n"; } else { return "var {$id}_editor = document.getElementById('{$id}');\n"; } @@ -59,7 +59,7 @@ function get_editor_js($id, $is_dhtml_editor=true) function chk_editor_js($id, $is_dhtml_editor=true) { if ($is_dhtml_editor) { - return "if (!{$id}_editor_data || {$id}_editor_data == ' ' || {$id}_editor_data == '

 

' || {$id}_editor_data == '


' || {$id}_editor_data == '

') { alert(\"내용을 입력해 주십시오.\"); oEditors.getById['{$id}'].exec('FOCUS'); return false; }\n"; + return "if (!{$id}_editor_data || jQuery.inArray({$id}_editor_data.toLowerCase(), [' ','

 

','


','

','
']) != -1) { alert(\"내용을 입력해 주십시오.\"); oEditors.getById['{$id}'].exec('FOCUS'); return false; }\n"; } else { return "if (!{$id}_editor.value) { alert(\"내용을 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n"; } diff --git a/plugin/editor/smarteditor2/photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js b/plugin/editor/smarteditor2/photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js index 6af6c3f10..21d03b80f 100644 --- a/plugin/editor/smarteditor2/photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js +++ b/plugin/editor/smarteditor2/photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js @@ -32,7 +32,8 @@ nhn.husky.SE2M_AttachQuickPhoto = jindo.$Class({ */ $ON_ATTACHPHOTO_OPEN_WINDOW : function(){ this.htPopupOption.sUrl = this.makePopupURL(); - this.htPopupOption.sProperties = "left=0,top=0,width=640,height=459,scrollbars=yes,location=no,status=0,resizable=no"; + //this.htPopupOption.sProperties = "left=0,top=0,width=640,height=459,scrollbars=yes,location=no,status=0,resizable=no"; + this.htPopupOption.sProperties = "left="+(screen.width-640)/2+", top="+(screen.height-459)/2+",width=640,height=459,scrollbars=yes,location=no,status=0,resizable=no"; this.oPopupWindow = this.oPopupMgr.openWindow(this.htPopupOption);