From 0a0ff36b415b79d4227d496a1419a80eb620ea53 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 13 Jun 2013 17:01:19 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=EC=97=90=EB=94=94=ED=84=B0=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=B2=A8=EB=B6=80=EB=90=9C=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EC=BD=98=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EA=B0=80=20=EC=8D=B8?= =?UTF-8?q?=EB=84=A4=EC=9D=BC=20=EC=83=9D=EC=84=B1=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=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 --- lib/thumbnail.lib.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index 1c8b2f6e6..5daeaaab4 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -34,6 +34,9 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ else $data_path = $p['path']; + if(!preg_match('/^\/'.G4_DATA_DIR.'/', $data_path)) + continue; + $srcfile = G4_PATH.$data_path; if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) { @@ -107,6 +110,9 @@ function get_view_thumbnail($contents) else $data_path = $p['path']; + if(!preg_match('/^\/'.G4_DATA_DIR.'/', $data_path)) + continue; + $srcfile = G4_PATH.$data_path; if(is_file($srcfile)) { From 9c7a388fcde4609fedf2aa45dfc56c5fa04a0247 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 14:10:02 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EA=B8=B0=EB=B3=B8=EC=83=89=EC=83=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 2421b9edf..f3f452f13 100644 --- a/css/default.css +++ b/css/default.css @@ -125,7 +125,7 @@ a:active {color:#000;text-decoration:underline} /* 버튼 */ .btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc;background:#fafafa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn01:focus, .btn01:hover {text-decoration:none !important} -.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #333;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #00a2ff;background:#00a8ff;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn02:focus, .btn02:hover {text-decoration:none !important} .btn_confirm {text-align:center} /* 서식단계 진행 */ .btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} From 8bbd1250df103124fc74f9261c392b029e9d9fc2 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 14:12:16 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EA=B8=B0=EB=B3=B8=EC=83=89=EC=83=81=20=EC=9E=AC?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index f3f452f13..f2d14339c 100644 --- a/css/default.css +++ b/css/default.css @@ -144,7 +144,7 @@ button.btn_frmline {font-size:1em} /* 게시판용 버튼 */ .btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9ded9;background:#f5f6fa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b01:focus, .btn_b01:hover {text-decoration:none !important} -.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #eee;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #007eff;background:#008aff;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b02:focus, .btn_b02:hover {text-decoration:none !important} .btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c;background:#e8180c;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */ .btn_admin:focus, .btn_admin:hover {text-decoration:none !important} From 32dc378de1af5f849628be2423ad56f71cd8c823 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 14:15:52 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EA=B8=B0=EB=B3=B8=EC=83=89=EC=83=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=B7=A8=EC=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/default.css b/css/default.css index f2d14339c..9d94cc2a1 100644 --- a/css/default.css +++ b/css/default.css @@ -125,7 +125,7 @@ a:active {color:#000;text-decoration:underline} /* 버튼 */ .btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc;background:#fafafa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn01:focus, .btn01:hover {text-decoration:none !important} -.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #00a2ff;background:#00a8ff;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #000;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn02:focus, .btn02:hover {text-decoration:none !important} .btn_confirm {text-align:center} /* 서식단계 진행 */ .btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} @@ -144,7 +144,7 @@ button.btn_frmline {font-size:1em} /* 게시판용 버튼 */ .btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9ded9;background:#f5f6fa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b01:focus, .btn_b01:hover {text-decoration:none !important} -.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #007eff;background:#008aff;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #000;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b02:focus, .btn_b02:hover {text-decoration:none !important} .btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c;background:#e8180c;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */ .btn_admin:focus, .btn_admin:hover {text-decoration:none !important} From 5b37e4d5c4e04be6fb35d41972d473d0e7eb93ed Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 16:30:10 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=EA=B7=B8=EB=A3=B9=20=EC=9E=85=EB=A0=A5/?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/boardgroup_form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php index a31dacb9c..d8dc747ad 100644 --- a/adm/boardgroup_form.php +++ b/adm/boardgroup_form.php @@ -58,7 +58,7 @@ include_once('./admin.head.php'); if ($w=='') echo '영문자, 숫자, _ 만 가능 (공백없이)'; else - echo '게시판그룹 바로가기'; + echo '게시판그룹 바로가기'; ?> @@ -68,7 +68,7 @@ include_once('./admin.head.php'); 게시판생성'; + echo '게시판생성'; ?> From bf6e4454c779f3cd0433f2ce89ea3373000c520f Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 16:43:30 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20gnb=20=ED=82=A4?= =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=EC=9A=B4=EC=9A=A9=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=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 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/admin.css b/css/admin.css index b868e880d..145844801 100644 --- a/css/admin.css +++ b/css/admin.css @@ -41,7 +41,7 @@ h2 {font-size:1.2em} /* gnb js off */ #gnb {z-index:12;background:#383a3f} -#gnb h2 {margin:0;padding:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} +#gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} #gnb_1dul {margin:0 auto;padding:0;width:1000px;zoom:1} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1dli {z-index:13;clear:both;zoom:1} @@ -59,10 +59,10 @@ h2 {font-size:1.2em} .gnb_js .gnb_1dli a {color:#fff;text-align:center} .gnb_js .gnb_1dli_air a {float:none;background:#f5f6fa;color:#000} .gnb_js .gnb_1dli_on a {float:none;background:#fff;color:#000} -.gnb_js .gnb_2dul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden} +.gnb_js .gnb_2dul {display:none;position:absolute;top:35px} .gnb_js .gnb_2dli a {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left} -.gnb_1dli_over .gnb_2dul {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff} -.gnb_1dli_over2 .gnb_2dul {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff} +.gnb_1dli_over .gnb_2dul {display:block;left:-1px;width:181px;border:1px solid #c3c7c5;border-top:0;background:#fff} +.gnb_1dli_over2 .gnb_2dul {display:block;right:-1px;width:181px;border:1px solid #c3c7c5;border-top:0;background:#fff} .gnb_js .gnb_grp_style {background:#f7f7f7 !important} .gnb_js .gnb_grp_div {border-top:1px solid #eee} diff --git a/css/default.css b/css/default.css index 9d94cc2a1..3fd62bd54 100644 --- a/css/default.css +++ b/css/default.css @@ -41,7 +41,7 @@ a:active {color:#000;text-decoration:underline} /* gnb js off */ #gnb {position:relative;margin:-1px 0 0;border-bottom:1px solid #c3c7c5;background:#f0f4f8} -#gnb h2 {position:absolute;margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} +#gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} #gnb_1dul {margin:0 auto;padding:0;width:980px;zoom:1} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1dli {z-index:10;clear:both;zoom:1} @@ -60,10 +60,10 @@ a:active {color:#000;text-decoration:underline} .gnb_js .gnb_1da {text-align:center} .gnb_js .gnb_1dli_air a {float:none;background:#333;color:#fff} .gnb_js .gnb_1dli_on a {float:none;background:#333;color:#fff} -.gnb_js .gnb_2dul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden} +.gnb_js .gnb_2dul {display:none;position:absolute;top:35px} .gnb_js .gnb_2da {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left} -.gnb_1dli_over .gnb_2dul {left:0;width:180px;height:auto;background:#fff} -.gnb_1dli_over2 .gnb_2dul {right:0;width:180px;height:auto;background:#fff} +.gnb_1dli_over .gnb_2dul {display:block;left:0;background:#fff} +.gnb_1dli_over2 .gnb_2dul {display:block;right:0;width:180px;background:#fff} .gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em} From 640ef708247a4be7aa9ee80a0a4f33ccbb9a34a8 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 17:47:31 +0900 Subject: [PATCH 7/8] .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 33e6af57b..1c8837ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ skin/latest/basic2 rankiss* thumb.lib.php test.php +itzimara* From d3d6e9a0e0277d7823ceb323e1f730c286ff8200 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 18 Jun 2013 09:14:19 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20FF=20?= =?UTF-8?q?=EC=97=90=EC=84=9C=20table=20=EB=B0=80=EB=A6=AC=EB=8A=94=20?= =?UTF-8?q?=ED=98=84=EC=83=81=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index 145844801..29fcb7a65 100644 --- a/css/admin.css +++ b/css/admin.css @@ -184,7 +184,7 @@ fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#f #sort_mb {width:800px} /* 테이블 */ -table {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} +table {clear:both;margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} caption {padding:10px 0 15px;font-weight:bold;text-align:left} thead th {padding:12px 0 8px;border-bottom:1px solid #666;background:#565e60;color:#fff} thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */