From 52dbc4b6e752d8e8eea9b4e697f75efe71ace4c7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 21 Jul 2014 09:53:46 +0900 Subject: [PATCH 1/9] =?UTF-8?q?bo=5Fnotice=20=ED=95=84=EB=93=9C=EC=97=90?= =?UTF-8?q?=20=ED=95=84=EC=9A=94=EC=B9=98=EC=95=8A=EB=8A=94=20=EC=BD=A4?= =?UTF-8?q?=EB=A7=88=20=EC=B6=94=EA=B0=80=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/write_update.php b/bbs/write_update.php index ced4dbff6..507f15e54 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -361,7 +361,7 @@ if ($w == '' || $w == 'r') { // 쓰기 포인트 부여 if ($w == '') { if ($notice) { - $bo_notice = $wr_id.",".$board['bo_notice']; + $bo_notice = $wr_id.($board['bo_notice'] ? ",".$board['bo_notice'] : ''); sql_query(" update {$g5['board_table']} set bo_notice = '{$bo_notice}' where bo_table = '{$bo_table}' "); } From 7bdec88efcc751492df7bf3ece01a02a92913306 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 21 Jul 2014 13:09:28 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=EC=8A=A4=EB=A7=88=ED=8A=B8=20=EC=97=90?= =?UTF-8?q?=EB=94=94=ED=84=B02=20=EA=B3=B5=EB=B0=B1=20=EC=82=BD=EC=9E=85?= =?UTF-8?q?=20=EC=86=8C=EC=8A=A4=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/editor/smarteditor2/editor.lib.php | 6 +++--- .../photo_uploader/plugin/hp_SE2M_AttachQuickPhoto.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) 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); From 25af73bee859f505f21464d2ee124de44f7abebd Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 21 Jul 2014 13:25:51 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EC=97=90=EC=84=9C=20HTTP=5FHOST=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 6a939480c92e77a241b17d81befe1a60125fd8b6 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 21 Jul 2014 18:09:32 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EC=8A=A4=EB=A7=88=ED=8A=B8=20=EC=97=90?= =?UTF-8?q?=EB=94=94=ED=84=B0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=9C=A0=ED=9A=A8=EC=84=B1=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=EB=A1=9C=EB=B9=88=EC=95=84=EB=B9=A0=EB=8B=98?= =?UTF-8?q?=EC=9D=B4=20=EC=95=8C=EB=A0=A4=EC=A3=BC=EC=8B=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/editor/smarteditor2/photo_uploader/popup/js/basic.js | 2 +- .../smarteditor2/photo_uploader/popup/php/UploadHandler.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugin/editor/smarteditor2/photo_uploader/popup/js/basic.js b/plugin/editor/smarteditor2/photo_uploader/popup/js/basic.js index 07261305c..2de8dfc56 100644 --- a/plugin/editor/smarteditor2/photo_uploader/popup/js/basic.js +++ b/plugin/editor/smarteditor2/photo_uploader/popup/js/basic.js @@ -152,7 +152,7 @@ jQuery(function ($) { _done : function(e, data){ var othis = this; $.each(data.result.files, function (index, file) { - if (file.url) { + if (file.url && !file.error) { var ret = othis.get_ratio( file.width, file.height ), node = $(data.context.children()[index]), size_text = file.width+" x "+file.height, diff --git a/plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php b/plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php index 40bb7422f..33ff9a8b3 100644 --- a/plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php +++ b/plugin/editor/smarteditor2/photo_uploader/popup/php/UploadHandler.php @@ -1086,6 +1086,9 @@ class UploadHandler $image_width_height = $this->get_image_size($file_path); $file->width = $image_width_height[0]; $file->height = $image_width_height[1]; + } else { //로빈아빠님이 알려주심, 이미지 업로드 체크 + unlink($file_path); + $file->error = $this->get_error_message('accept_file_types'); } } else { $file->size = $file_size; From 0018ffb5bb30830c5f14ee137cf175c851dd665b Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 22 Jul 2014 09:25:27 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.php b/common.php index ba387c86f..857c8a949 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['HTTP_HOST'].$port.$user.$root; + $result['url'] = $http.(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']).$port.$user.$root; return $result; } From 12b298abd69a71809ab50df273358f6bcb9ad3e8 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 25 Jul 2014 09:36:40 +0900 Subject: [PATCH 6/9] =?UTF-8?q?datepicker=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?add=5Fstylesheet=20=ED=95=A8=EC=88=98=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/jquery-ui/datepicker.php | 10 +++------- plugin/jquery-ui/style.css | 6 ++++++ 2 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 plugin/jquery-ui/style.css diff --git a/plugin/jquery-ui/datepicker.php b/plugin/jquery-ui/datepicker.php index 7c962864c..6c5a3a9e1 100644 --- a/plugin/jquery-ui/datepicker.php +++ b/plugin/jquery-ui/datepicker.php @@ -1,14 +1,10 @@ ', 0); +add_stylesheet('', 0); ?> - -