From d69aaab3a4a99e56f22d9816d6b6d041429181ec Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 18 Mar 2013 14:41:33 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=9C=88=EB=8F=84=EC=9A=B0=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=ED=95=9C=EA=B8=80=ED=8C=8C=EC=9D=BC=20=EC=97=85?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=EC=8B=9C=20=EC=98=A4=EB=A5=98=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/ckeditor/upload.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/bbs/ckeditor/upload.php b/bbs/ckeditor/upload.php index 091246f60..7d8a40d09 100644 --- a/bbs/ckeditor/upload.php +++ b/bbs/ckeditor/upload.php @@ -14,13 +14,18 @@ $CKEditor = $_GET['CKEditor'] ; $langCode = $_GET['langCode'] ; if(isset($_FILES['upload']['tmp_name'])) { - $file_name = $_FILES['upload']['name']; - $ext = substr($file_name, (strrpos($file_name, '.') + 1)); - if (!preg_match("/\.(jpe?g|gif|png)$/i", $file_name)) { - echo '이미지만 가능'; + $file = $_FILES['upload']['name']; + $pos = strrpos($file, '.'); + $filename = substr($file, 0, $pos); + $extension = substr($file, $pos, strlen($file) - $pos); + + if (!preg_match("/\.(jpe?g|gif|png)$/i", $extension)) { + echo '이미지 파일만 가능합니다.'; return false; } - + + // 윈도우에서 한글파일명으로 업로드 되지 않는 오류 해결 + $file_name = sprintf('%u', ip2long($_SERVER['REMOTE_ADDR'])).'_'.get_microtime().$extension; $save_dir = sprintf('%s/%s', $data_dir, $file_name); $save_url = sprintf('%s/%s', $data_url, $file_name); From b128d7e245c38fec1d60245212d0737ff01e285c Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 18 Mar 2013 14:47:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B7=B0=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 8 ++++---- css/default.css | 4 +--- lib/common.lib.php | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/css/admin.css b/css/admin.css index b392c868b..e4fa02603 100644 --- a/css/admin.css +++ b/css/admin.css @@ -305,14 +305,14 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9 #admin_confirm .frm_input {border-color:#000} /* 사이드뷰 */ -.sv_wrap {display:inline-block;position:relative;font-weight:normal} -.sv_wrap .sv {z-index:5;display:none;margin:5px 0 0;border:1px solid #283646;background:#334356} -.sv_js_off .sv {display:block} +.sv_wrap {display:inline-block;position:relative;font-weight:normal;font-size:1em} +.sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646;background:#111} .sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important} .sv_wrap a:focus, .sv_wrap a:hover, .sv_wrap a:active {text-decoration:none !important} -.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important;background:#ddd} +.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important} +.sv_nojs .sv {display:block} /* pagination */ .pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center} diff --git a/css/default.css b/css/default.css index 0049695db..2633a179f 100644 --- a/css/default.css +++ b/css/default.css @@ -229,17 +229,15 @@ input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important #validation_check h1 {margin-bottom:20px;font-size:1.3em} #validation_check p {margin-bottom:20px;padding:30px 20px} -/* 스킨별 스타일 */ - /* 사이드뷰 */ .sv_wrap {display:inline-block;position:relative;font-weight:normal} .sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646;background:#111} -.sv_js_off {display:block} .sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important} .sv_wrap a:focus, .sv_wrap a:hover, .sv_wrap a:active {text-decoration:none !important} .sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important} +.sv_nojs .sv {display:block} /* pagination */ .pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center} diff --git a/lib/common.lib.php b/lib/common.lib.php index 8c4b425e1..bfca25780 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1003,7 +1003,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') $str .= $tmp_name."\n"; if(!G4_IS_MOBILE) { - $str2 = "\n"; + $str2 = "\n"; if($mb_id) $str2 .= "쪽지보내기\n"; if($email) @@ -1025,7 +1025,8 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') $str2 .= "포인트내역\n"; } $str2 .= "\n"; - $str .= $str2;//."\n"; + $str .= $str2; + $str .= "\n"; } $str .= ""; From 2570af2ac05e2fc18bdf626a1753d0d59ce826a8 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 18 Mar 2013 14:53:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC,=20basic=20-=20gallery=20=EB=91=98=EB=8B=A4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/board/basic/style.css | 11 +++++++++++ mobile/skin/board/gallery/style.css | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css index 4b3c92b2f..413feb58a 100644 --- a/mobile/skin/board/basic/style.css +++ b/mobile/skin/board/basic/style.css @@ -1,5 +1,16 @@ /* 게시판 목록 */ #bo_list_title {padding:0 1em} + +#bo_cate h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden} +#bo_cate ul {margin:0.5em 1em;padding-left:1px;zoom:1} +#bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""} +#bo_cate li {float:left;margin-bottom:-1px;width:25%} +#bo_cate a {display:block;position:relative;margin-left:-1px;padding:0.4em 0;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;text-decoration:none;letter-spacing:-0.1em} +#bo_cate a:focus, +#bo_cate a:hover, +#bo_cate a:active {text-decoration:none} +#bo_cate #bo_cate_on {z-index:2;border:1px solid #565e60;background:#fff;color:#565e60;font-weight:bold} + .bo_list table {margin-bottom:1.5em;width:100%;border-collapse:collapse;border-spacing:0} .bo_list th {} diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css index ee58749b4..71d5693a0 100644 --- a/mobile/skin/board/gallery/style.css +++ b/mobile/skin/board/gallery/style.css @@ -2,6 +2,17 @@ #bo_img h2 {margin:0;padding:0;width:0;height:0;font-size:0;line-height:0;overflow:hidden} #bo_img_list {margin:1em 0 0;padding:0 1em;list-style:none} #bo_img_list:after {display:block;visibility:hidden;clear:both;content:""} + +#bo_cate h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden} +#bo_cate ul {margin:0.5em 1em;padding-left:1px;zoom:1} +#bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""} +#bo_cate li {float:left;margin-bottom:-1px;width:25%} +#bo_cate a {display:block;position:relative;margin-left:-1px;padding:0.4em 0;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;text-decoration:none;letter-spacing:-0.1em} +#bo_cate a:focus, +#bo_cate a:hover, +#bo_cate a:active {text-decoration:none} +#bo_cate #bo_cate_on {z-index:2;border:1px solid #565e60;background:#fff;color:#565e60;font-weight:bold} + .bo_img_list_li {float:left;margin:0 0 2em} .bo_img_con {margin:0;padding:0;list-style:none}