From c51012c13155367d6ea1497a8bc22f87018091cc Mon Sep 17 00:00:00 2001 From: kagla Date: Tue, 24 Dec 2013 11:19:46 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20=EC=BA=A1?= =?UTF-8?q?=EC=B1=A0=20=EB=B9=84=EA=B5=90=20=EC=BD=94=EB=93=9C=20=EB=B3=B5?= =?UTF-8?q?=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kcaptcha/kcaptcha.lib.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugin/kcaptcha/kcaptcha.lib.php b/plugin/kcaptcha/kcaptcha.lib.php index e45b3cbd0..26c2bd532 100644 --- a/plugin/kcaptcha/kcaptcha.lib.php +++ b/plugin/kcaptcha/kcaptcha.lib.php @@ -269,14 +269,10 @@ function chk_captcha() if (!isset($_POST['captcha_key'])) return false; if (!trim($_POST['captcha_key'])) return false; - /* if ($_POST['captcha_key'] != get_session('ss_captcha_key')) { $_SESSION['ss_captcha_count'] = $captcha_count + 1; - $sql = " insert _error set er_datetime = NOW(), er_ip = '{$_SERVER['REMOTE_ADDR']}', er_user_agent = '{$_SERVER['HTTP_USER_AGENT']}', er_request = 'POST(".$_POST['captcha_key'].')!=SESSION('.get_session('ss_captcha_key').")' "; - sql_query($sql); return false; } - */ return true; } ?> \ No newline at end of file From fb5261a24c48e5d75dd3aef8de25c3fac2d0590c Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 24 Dec 2013 13:23:13 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=EC=82=AD=EC=A0=9C=20=EC=95=88=EB=82=B4=EB=A9=94?= =?UTF-8?q?=EC=84=B8=EC=A7=80=EC=97=90=20=EB=8B=B5=EB=B3=80=EA=B8=80=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=82=B4=EC=9A=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/board/basic/list.skin.php | 2 +- mobile/skin/board/gallery/list.skin.php | 2 +- skin/board/basic/list.skin.php | 2 +- skin/board/gallery/list.skin.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/skin/board/basic/list.skin.php b/mobile/skin/board/basic/list.skin.php index 941aa8cf2..7d2d690aa 100644 --- a/mobile/skin/board/basic/list.skin.php +++ b/mobile/skin/board/basic/list.skin.php @@ -192,7 +192,7 @@ function fboardlist_submit(f) { } if(document.pressed == "선택삭제") { - if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다")) + if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다\n\n답변글이 있는 게시글을 선택하신 경우\n답변글도 선택하셔야 게시글이 삭제됩니다.")) return false; f.removeAttribute("target"); diff --git a/mobile/skin/board/gallery/list.skin.php b/mobile/skin/board/gallery/list.skin.php index f131a3af5..41300481f 100644 --- a/mobile/skin/board/gallery/list.skin.php +++ b/mobile/skin/board/gallery/list.skin.php @@ -216,7 +216,7 @@ function fboardlist_submit(f) { } if(document.pressed == "선택삭제") { - if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다")) + if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다\n\n답변글이 있는 게시글을 선택하신 경우\n답변글도 선택하셔야 게시글이 삭제됩니다.")) return false; f.removeAttribute("target"); diff --git a/skin/board/basic/list.skin.php b/skin/board/basic/list.skin.php index c497db765..9d631c63d 100644 --- a/skin/board/basic/list.skin.php +++ b/skin/board/basic/list.skin.php @@ -221,7 +221,7 @@ function fboardlist_submit(f) { } if(document.pressed == "선택삭제") { - if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다")) + if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다\n\n답변글이 있는 게시글을 선택하신 경우\n답변글도 선택하셔야 게시글이 삭제됩니다.")) return false; f.removeAttribute("target"); diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php index 3f8a5878c..a3904a81a 100644 --- a/skin/board/gallery/list.skin.php +++ b/skin/board/gallery/list.skin.php @@ -215,7 +215,7 @@ function fboardlist_submit(f) { } if(document.pressed == "선택삭제") { - if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다")) + if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다\n\n답변글이 있는 게시글을 선택하신 경우\n답변글도 선택하셔야 게시글이 삭제됩니다.")) return false; f.removeAttribute("target"); From 16fa0eb1e1397eab715ee03e6a56419a28151415 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 24 Dec 2013 13:24:15 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=ED=95=B4=EB=8B=B9=EC=9D=BC=EC=9D=98=20=ED=8F=AC=EC=9D=B8?= =?UTF-8?q?=ED=8A=B8=ED=95=A9=20=EC=B6=9C=EB=A0=A5=ED=95=98=EB=8F=84?= =?UTF-8?q?=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 --- adm/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/index.php b/adm/index.php index 4535da574..4cdc404dd 100644 --- a/adm/index.php +++ b/adm/index.php @@ -289,7 +289,7 @@ $colspan = 7; - + Date: Tue, 24 Dec 2013 13:30:48 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EB=B6=80=EC=82=B0=20=EC=82=AC=EC=83=81?= =?UTF-8?q?=EA=B5=AC=20=EC=82=AC=ED=95=98=EA=B5=AC=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/zip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/zip.js b/js/zip.js index 870090b90..0068e0fc3 100644 --- a/js/zip.js +++ b/js/zip.js @@ -24,7 +24,7 @@ var sido = new Array( var sigungu = new Array(); sigungu['서울특별시'] = '강남구,강동구,강북구,강서구,관악구,광진구,구로구,금천구,노원구,도봉구,동대문구,동작구,마포구,서대문구,서초구,성동구,성북구,송파구,양천구,영등포구,용산구,은평구,종로구,중구,중랑구'; -sigungu['부산광역시'] = '강서구,금정구,기장군,남구,동구,동래구,부산진구,북구,사상구 사하구,서구,수영구,연제구,영도구,중구,해운대구'; +sigungu['부산광역시'] = '강서구,금정구,기장군,남구,동구,동래구,부산진구,북구,사상구,사하구,서구,수영구,연제구,영도구,중구,해운대구'; sigungu['대구광역시'] = '남구,달서구,달성군,동구,북구,서구,수성구,중구'; sigungu['인천광역시'] = '강화군,계양구,남구,남동구,동구,부평구,서구,연수구,옹진군,중구'; sigungu['광주광역시'] = '광산구,남구,동구,북구,서구'; From e5d17442d3a21517de5101fdbe9393fe4d4ad2a2 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 24 Dec 2013 13:47:22 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EB=93=B1=EB=A1=9D=EB=90=9C=20=EB=B6=84?= =?UTF-8?q?=EB=A5=98=EC=97=86=EC=9D=8C=20=EC=95=88=EB=82=B4=20=ED=9B=84=20?= =?UTF-8?q?=EB=B6=84=EB=A5=98=EA=B4=80=EB=A6=AC=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=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 --- adm/shop_admin/itemform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php index 94bc0f528..818be22b3 100644 --- a/adm/shop_admin/itemform.php +++ b/adm/shop_admin/itemform.php @@ -22,7 +22,7 @@ if ($w == "") $sql = " select ca_id from {$g5['g5_shop_category_table']} order by ca_id limit 1 "; $row = sql_fetch($sql); if (!$row['ca_id']) - alert("등록된 분류가 없습니다. 우선 분류를 등록하여 주십시오."); + alert("등록된 분류가 없습니다. 우선 분류를 등록하여 주십시오.", './categorylist.php'); $it['ca_id'] = $row['ca_id']; } //$it[it_maker] = stripslashes($_COOKIE[ck_maker]); From bfa2f63ab5bec6b148ce1208bb806c1959da61a7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 24 Dec 2013 15:26:14 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=B9=B4?= =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EA=B8=B0=EB=B3=B8=EC=8A=A4?= =?UTF-8?q?=ED=82=A8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shop/list.php b/shop/list.php index 6c4d29800..d6799c395 100644 --- a/shop/list.php +++ b/shop/list.php @@ -47,7 +47,7 @@ var itemlist_ca_id = ""; // 상단 HTML echo '
'.stripslashes($ca['ca_head_html']).'
'; - include G5_SHOP_SKIN_PATH.'/listcategory3.skin.php'; + include G5_SHOP_SKIN_PATH.'/listcategory.skin.php'; // 상품 출력순서가 있다면 if ($sort != "")