From f3c8c35f3959968008ddb53d65b8a5f427c89448 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 6 Dec 2013 16:05:13 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20frm=5Finpu?= =?UTF-8?q?t,=20textarea=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EA=B5=AC?= =?UTF-8?q?=EB=B6=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 5fd6e4548..c7f48b618 100644 --- a/css/default.css +++ b/css/default.css @@ -190,7 +190,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .tbl_frm01 table {width:100%;border-collapse:collapse;border-spacing:0} .tbl_frm01 th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f5f8f9;text-align:left} .tbl_frm01 td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} -.tbl_frm01 textarea, .frm_input {height:22px;border:1px solid #e4eaec;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em} +.tbl_frm01 textarea, .frm_input {border:1px solid #e4eaec;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em} +.tbl_frm01 textarea {padding:2px 2px 3px} +.frm_input {height:22px} .tbl_frm01 textarea {width:98%;height:100px} .tbl_frm01 a {text-decoration:none} .tbl_frm01 .frm_address {display:block;margin-top:5px} From ab2c38e8828a51ae56f5f2fc5a67d44913a9d6a0 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 6 Dec 2013 17:13:56 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=86=A8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20db=20=EC=84=A4=EC=A0=95=20=EC=8B=A4?= =?UTF-8?q?=ED=8C=A8=20=EA=B4=80=EB=A0=A8=20=EB=A7=88=ED=81=AC=EC=97=85=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 --- install/install_db.php | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/install/install_db.php b/install/install_db.php index e78df7ba5..dd2c7b440 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -25,17 +25,29 @@ $admin_email = $_POST['admin_email']; $dblink = @mysql_connect($mysql_host, $mysql_user, $mysql_pass); if (!$dblink) { - echo ''.PHP_EOL; - echo '
MySQL Host, User, Password 를 확인해 주십시오.
'.PHP_EOL; - echo '
뒤로가기
'.PHP_EOL; +?> + +
+

MySQL Host, User, Password 를 확인해 주십시오.

+
뒤로가기
+
+ +'.PHP_EOL; - echo '
MySQL DB 를 확인해 주십시오.
'.PHP_EOL; - echo '
뒤로가기
'.PHP_EOL; +?> + +
+

MySQL DB 를 확인해 주십시오.

+
뒤로가기
+
+ + Date: Fri, 6 Dec 2013 17:39:06 +0900 Subject: [PATCH 03/11] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=A1=9C?= =?UTF-8?q?=EA=B3=A0=20alt=20=ED=99=88=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=ED=83=80=EC=9D=B4=ED=8B=80=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/head.php b/head.php index 334a2fa83..c90509b42 100644 --- a/head.php +++ b/head.php @@ -32,7 +32,7 @@ if ($config['cf_include_head']) {
From ab26411136ad6c31093c567d2454397d867534ab Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 9 Dec 2013 09:01:41 +0900 Subject: [PATCH 04/11] =?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=20=EC=B6=94=EA=B0=80/=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9D=BC=EB=B6=80=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_form.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/adm/board_form.php b/adm/board_form.php index 4223285ce..485fa9a2d 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -535,7 +535,7 @@ $pg_anchor = '
    > 사용 - + @@ -548,7 +548,7 @@ $pg_anchor = '
      > 사용 - + @@ -562,7 +562,7 @@ $pg_anchor = '
        > 사용 (사용시 속도가 느려질 수 있습니다.) - + @@ -576,7 +576,7 @@ $pg_anchor = '
          > 사용 (사용시 속도가 느려질 수 있습니다.) - + @@ -589,7 +589,7 @@ $pg_anchor = '
            > 사용 - + @@ -602,7 +602,7 @@ $pg_anchor = '
              > 사용 - + @@ -625,7 +625,7 @@ $pg_anchor = '
                ?> - + @@ -638,7 +638,7 @@ $pg_anchor = '
                  - + @@ -657,7 +657,7 @@ $pg_anchor = '
                    업로드 파일 한개당 bytes 이하 - + @@ -669,7 +669,7 @@ $pg_anchor = '
                      >사용 - + @@ -682,7 +682,7 @@ $pg_anchor = '
                        - + @@ -695,7 +695,7 @@ $pg_anchor = '
                          - + @@ -708,7 +708,7 @@ $pg_anchor = '
                            - + @@ -721,7 +721,7 @@ $pg_anchor = '
                              - + @@ -735,7 +735,7 @@ $pg_anchor = '
                                > 사용 - + @@ -748,7 +748,7 @@ $pg_anchor = '
                                  > 사용 - + @@ -762,7 +762,7 @@ $pg_anchor = '
                                    > 사용 - + @@ -775,7 +775,7 @@ $pg_anchor = '
                                      - + From 14fe0a4e03281c9ee097bb53b84efcba81975e89 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 9 Dec 2013 09:02:24 +0900 Subject: [PATCH 05/11] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=ED=8C=8C=EC=9D=BC=EC=82=AC=EC=9A=A9=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EC=A0=81=EC=9A=A9=20=EC=98=A4=EB=A5=98=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/board_form_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/board_form_update.php b/adm/board_form_update.php index bcb674469..99ff23265 100644 --- a/adm/board_form_update.php +++ b/adm/board_form_update.php @@ -337,7 +337,7 @@ if (is_checked('chk_all_use_name')) $all_fields .= " , bo_use_name = if (is_checked('chk_all_use_signature')) $all_fields .= " , bo_use_signature = '{$bo_use_signature}' "; if (is_checked('chk_all_use_ip_view')) $all_fields .= " , bo_use_ip_view = '{$bo_use_ip_view}' "; if (is_checked('chk_all_use_list_view')) $all_fields .= " , bo_use_list_view = '{$bo_use_list_view}' "; -if (is_checked('chk_all_use_list_file')) $all_fields .= " , bo_use_list_view = '{$bo_use_list_file}' "; +if (is_checked('chk_all_use_list_file')) $all_fields .= " , bo_use_list_file = '{$bo_use_list_file}' "; if (is_checked('chk_all_use_list_content')) $all_fields .= " , bo_use_list_content = '{$bo_use_list_content}' "; if (is_checked('chk_all_use_email')) $all_fields .= " , bo_use_email = '{$bo_use_email}' "; if (is_checked('chk_all_use_cert')) $all_fields .= " , bo_use_cert = '{$bo_use_cert}' "; From 206cff9d340a0aaa72f10cdb952e179f72e87ab2 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 9 Dec 2013 09:07:12 +0900 Subject: [PATCH 06/11] =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install.inc.php | 10 ++++++---- install/install_config.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/install/install.inc.php b/install/install.inc.php index 90165216f..13977884d 100644 --- a/install/install.inc.php +++ b/install/install.inc.php @@ -18,13 +18,13 @@ if (!$title) $title = G5_VERSION." 설치"; INSTALLATION
-

- +

프로그램이 이미 설치되어 있습니다.

+

프로그램이 이미 설치되어 있습니다.
새로 설치하시려면 다음 파일을 삭제 하신 후 새로고침 하십시오.

    @@ -42,6 +42,8 @@ $exists_data_dir = true; if (!is_dir($data_path)) { ?> +

    설치를 위해 아래 내용을 확인해 주십시오.

    +

    루트 디렉토리에 아래로 디렉토리를 생성하여 주십시오.
    @@ -60,8 +62,8 @@ if (!is_dir($data_path)) $write_data_dir = true; // data 디렉토리에 파일 생성 가능한지 검사. if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') { - $sapi_type = php_sapi_name(); - if (substr($sapi_type, 0, 3) == 'cgi') { + $sapi_type = php_sapi_name(); + if (substr($sapi_type, 0, 3) == 'cgi') { if (!(is_readable($data_path) && is_executable($data_path))) { ?> diff --git a/install/install_config.php b/install/install_config.php index 7ff4b3678..bb9f66d5d 100644 --- a/install/install_config.php +++ b/install/install_config.php @@ -10,7 +10,7 @@ include_once ('../config.php'); $title = G5_VERSION." 초기환경설정 2/3"; include_once ('./install.inc.php'); -if (isset($_POST['agree']) && $_POST['agree'] != '동의함') { +if (!isset($_POST['agree']) || $_POST['agree'] != '동의함') { echo "

    라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.
    ".PHP_EOL; echo "".PHP_EOL; exit; From f6dc1ec7a8d2a8f6de1b9fac99c7b874741e6a45 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 9 Dec 2013 09:24:38 +0900 Subject: [PATCH 07/11] =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=86=A8:=20=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EC=84=BC=EC=8A=A4=20=EB=8F=99=EC=9D=98=20=EC=95=88?= =?UTF-8?q?=EB=82=B4=20=EB=82=B4=EC=9A=A9=20=EC=8A=A4=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/install_config.php b/install/install_config.php index bb9f66d5d..f2dc74836 100644 --- a/install/install_config.php +++ b/install/install_config.php @@ -10,9 +10,9 @@ include_once ('../config.php'); $title = G5_VERSION." 초기환경설정 2/3"; include_once ('./install.inc.php'); -if (!isset($_POST['agree']) || $_POST['agree'] != '동의함') { - echo "
    라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.
    ".PHP_EOL; - echo "".PHP_EOL; +if (!isset($_POST['agree']) && $_POST['agree'] != '동의함') { + echo "

    라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.

    ".PHP_EOL; + echo "
    뒤로가기
    ".PHP_EOL; exit; } ?> From 92b6c975bd2d72b5070c5efc1ce633e129a30c3b Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 9 Dec 2013 09:25:31 +0900 Subject: [PATCH 08/11] =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=86=A8:=20=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EC=84=BC=EC=8A=A4=20=EB=8F=99=EC=9D=98=20=EC=95=88?= =?UTF-8?q?=EB=82=B4=20=EB=82=B4=EC=9A=A9=20=EC=BD=94=EB=93=9C=20=EB=B3=B5?= =?UTF-8?q?=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install_config.php b/install/install_config.php index f2dc74836..ba0a464e5 100644 --- a/install/install_config.php +++ b/install/install_config.php @@ -10,7 +10,7 @@ include_once ('../config.php'); $title = G5_VERSION." 초기환경설정 2/3"; include_once ('./install.inc.php'); -if (!isset($_POST['agree']) && $_POST['agree'] != '동의함') { +if (!isset($_POST['agree']) || $_POST['agree'] != '동의함') { echo "

    라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.

    ".PHP_EOL; echo "
    뒤로가기
    ".PHP_EOL; exit; From 1b16512ddbc18fb36b53b8112011ea871b315586 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 9 Dec 2013 11:22:08 +0900 Subject: [PATCH 09/11] =?UTF-8?q?=EC=83=81=ED=92=88=EC=BF=A0=ED=8F=B0=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=ED=9B=84=20=EC=A3=BC=EB=AC=B8=EC=BF=A0?= =?UTF-8?q?=ED=8F=B0=20=EC=A0=81=EC=9A=A9=EC=8B=9C=20=EA=B8=88=EC=95=A1=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 --- mobile/shop/orderform.php | 2 +- shop/orderform.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 96d02c7d8..5d0f4eb58 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -908,7 +908,7 @@ $(function() { $("#od_coupon_btn").click(function() { $("#od_coupon_frm").remove(); var $this = $(this); - var price = parseInt($("input[name=org_od_price]").val()); + var price = parseInt($("input[name=org_od_price]").val()) - parseInt($("input[name=item_coupon]").val()); $.post( "./ordercoupon.php", { price: price }, diff --git a/shop/orderform.php b/shop/orderform.php index feae24756..1e736968e 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -1171,7 +1171,7 @@ $(function() { $("#od_coupon_btn").click(function() { $("#od_coupon_frm").remove(); var $this = $(this); - var price = parseInt($("input[name=org_od_price]").val()); + var price = parseInt($("input[name=org_od_price]").val()) - parseInt($("input[name=item_coupon]").val()); $.post( "./ordercoupon.php", { price: price }, From 153b19b1f815aa3bc45e612ca45f271ebe9e7fd0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 9 Dec 2013 11:39:16 +0900 Subject: [PATCH 10/11] =?UTF-8?q?=EC=83=81=ED=92=88=EA=B8=88=EC=95=A1?= =?UTF-8?q?=EC=9D=B4=200=EC=9B=90=EC=9D=BC=20=EB=95=8C=20=EC=BF=A0?= =?UTF-8?q?=ED=8F=B0=20=EC=A0=81=EC=9A=A9=20=EC=98=A4=EB=A5=98=20=EC=95=88?= =?UTF-8?q?=EB=82=B4=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderform.php | 4 ++++ shop/ordercoupon.php | 5 ++++- shop/orderform.php | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 5d0f4eb58..11ebff5cb 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -909,6 +909,10 @@ $(function() { $("#od_coupon_frm").remove(); var $this = $(this); var price = parseInt($("input[name=org_od_price]").val()) - parseInt($("input[name=item_coupon]").val()); + if(price <= 0) { + alert('상품금액이 0원이므로 쿠폰을 사용할 수 없습니다.'); + return false; + } $.post( "./ordercoupon.php", { price: price }, diff --git a/shop/ordercoupon.php b/shop/ordercoupon.php index 2a24a1e33..c64a27a18 100644 --- a/shop/ordercoupon.php +++ b/shop/ordercoupon.php @@ -4,7 +4,10 @@ include_once('./_common.php'); if($is_guest) exit; -$price = $_POST['price']; +$price = (int)$_POST['price']; + +if($price <= 0) + echo '상품금액이 0원이므로 쿠폰을 사용할 수 없습니다.'; // 쿠폰정보 $sql = " select * diff --git a/shop/orderform.php b/shop/orderform.php index 1e736968e..cc3f2c47b 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -1172,6 +1172,10 @@ $(function() { $("#od_coupon_frm").remove(); var $this = $(this); var price = parseInt($("input[name=org_od_price]").val()) - parseInt($("input[name=item_coupon]").val()); + if(price <= 0) { + alert('상품금액이 0원이므로 쿠폰을 사용할 수 없습니다.'); + return false; + } $.post( "./ordercoupon.php", { price: price }, From 8eb22243bcfc650ac70845ef6c5a7be1b829b2e1 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 9 Dec 2013 11:43:44 +0900 Subject: [PATCH 11/11] =?UTF-8?q?=EC=83=81=ED=92=88=EA=B8=88=EC=95=A1?= =?UTF-8?q?=EC=9D=B4=200=EC=9B=90=EC=9D=BC=20=EB=95=8C=20=EC=BF=A0?= =?UTF-8?q?=ED=8F=B0=20=EC=A0=81=EC=9A=A9=20=EC=98=A4=EB=A5=98=20=EC=95=88?= =?UTF-8?q?=EB=82=B4=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/ordercoupon.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shop/ordercoupon.php b/shop/ordercoupon.php index c64a27a18..df5eba08f 100644 --- a/shop/ordercoupon.php +++ b/shop/ordercoupon.php @@ -7,7 +7,7 @@ if($is_guest) $price = (int)$_POST['price']; if($price <= 0) - echo '상품금액이 0원이므로 쿠폰을 사용할 수 없습니다.'; + die('상품금액이 0원이므로 쿠폰을 사용할 수 없습니다.'); // 쿠폰정보 $sql = " select *