From 9e4b6c635acb21c4d788c7c6832cf7bdc7c689c3 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 6 Nov 2013 10:51:43 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=9D=98=20sms=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=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 --- adm/config_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/config_form.php b/adm/config_form.php index b51ba8207..234144c21 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -1069,7 +1069,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) { 충전 잔액 원. - 충전하기 + 충전하기 From dd15d039992e0871f19c4f204584c8c8052fa815 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 6 Nov 2013 10:57:52 +0900 Subject: [PATCH 2/5] =?UTF-8?q?sms=20=EC=84=A4=EC=A0=95=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=84=A4=EC=A0=95=EC=9C=BC=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=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/shop_admin/configform.php | 36 +++++++++++++-------------- adm/shop_admin/configformupdate.php | 14 +++++++---- adm/shop_admin/deliverylistupdate.php | 4 +-- adm/shop_admin/ordersms.inc.php | 8 +++--- adm/shop_admin/smssend.php | 4 +-- adm/shop_admin/smssendicode.php | 4 +-- install/gnuboard5shop.sql | 5 ---- mobile/shop/orderformupdate.php | 4 +-- shop/orderformupdate.php | 4 +-- 9 files changed, 41 insertions(+), 42 deletions(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index e3bb662ac..9743b7714 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -45,11 +45,11 @@ if (!function_exists("get_sock")) { } } -if (!$default['de_icode_server_ip']) $default['de_icode_server_ip'] = '211.172.232.124'; -if (!$default['de_icode_server_port']) $default['de_icode_server_port'] = '7295'; +if (!$config['cf_icode_server_ip']) $config['cf_icode_server_ip'] = '211.172.232.124'; +if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295'; -if ($default['de_icode_id'] && $default['de_icode_pw']) { - $res = get_sock('http://www.icodekorea.com/res/userinfo.php?userid='.$default['de_icode_id'].'&userpw='.$default['de_icode_pw']); +if ($config['cf_icode_id'] && $config['cf_icode_pw']) { + $res = get_sock('http://www.icodekorea.com/res/userinfo.php?userid='.$config['cf_icode_id'].'&userpw='.$config['cf_icode_pw']); $res = explode(';', $res); $userinfo = array( 'code' => $res[0], // 결과코드 @@ -998,12 +998,12 @@ function byte_check(el_cont, el_byte) - + - - + + @@ -1015,33 +1015,33 @@ function byte_check(el_cont, el_byte) - + - + - + - + 요금제 - + '; + echo ''; } else if ($userinfo['payment'] == 'C') { echo '정액제'; - echo ''; + echo ''; } else { echo '가입해주세요.'; - echo ''; + echo ''; } ?> @@ -1058,7 +1058,7 @@ function byte_check(el_cont, el_byte) 충전 잔액 원. - 충전하기 + 충전하기 diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index c844aa86c..86aa504ba 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -136,11 +136,6 @@ $sql = " update {$g5['g5_shop_default_table']} de_cart_keep_term = '$de_cart_keep_term', de_guest_cart_use = '$de_guest_cart_use', de_admin_buga_no = '$de_admin_buga_no', - de_sms_use = '$de_sms_use', - de_icode_id = '$de_icode_id', - de_icode_pw = '$de_icode_pw', - de_icode_server_ip = '$de_icode_server_ip', - de_icode_server_port = '$de_icode_server_port', de_vbank_use = '$de_vbank_use', de_kcp_site_key = '$de_kcp_site_key', de_taxsave_use = '$de_taxsave_use', @@ -154,5 +149,14 @@ sql_query($sql); // 환경설정 > 포인트 사용 sql_query(" update {$g5['config_table']} set cf_use_point = '$cf_use_point' "); +// 아이코드 설정 +$sql = " update {$g5['config_table']} + set cf_sms_use = '$cf_sms_use', + cf_icode_id = '$cf_icode_id', + cf_icode_pw = '$cf_icode_pw', + cf_icode_server_ip = '$cf_icode_server_ip', + cf_icode_server_port = '$cf_icode_server_port' "; +sql_query($sql); + goto_url("./configform.php"); ?> diff --git a/adm/shop_admin/deliverylistupdate.php b/adm/shop_admin/deliverylistupdate.php index 61927bfe3..f83d903cf 100644 --- a/adm/shop_admin/deliverylistupdate.php +++ b/adm/shop_admin/deliverylistupdate.php @@ -15,7 +15,7 @@ $admin = get_admin('super'); if ($default['de_sms_use'] == "icode") { $SMS = new SMS; - $SMS->SMS_con($default['de_icode_server_ip'], $default['de_icode_id'], $default['de_icode_pw'], $default['de_icode_server_port']); + $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); } if($_POST['send_escrow']) { @@ -99,7 +99,7 @@ for ($m=0; $mAdd($receive_number, $send_number, $default['de_icode_id'], stripslashes($sms_contents), ""); + $SMS->Add($receive_number, $send_number, $config['cf_icode_id'], stripslashes($sms_contents), ""); } } //--------------------------------------- diff --git a/adm/shop_admin/ordersms.inc.php b/adm/shop_admin/ordersms.inc.php index 1b5995d22..34d6e76cc 100644 --- a/adm/shop_admin/ordersms.inc.php +++ b/adm/shop_admin/ordersms.inc.php @@ -17,8 +17,8 @@ if ($default['de_sms_use']) { $sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents); $SMS = new SMS; - $SMS->SMS_con($default['de_icode_server_ip'], $default['de_icode_id'], $default['de_icode_pw'], $default['de_icode_server_port']); - $SMS->Add($receive_number, $send_number, $default['de_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_contents)), ""); + $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); + $SMS->Add($receive_number, $send_number, $config['cf_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_contents)), ""); $SMS->Send(); } } @@ -37,8 +37,8 @@ if ($default['de_sms_use']) { $sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents); $SMS = new SMS; - $SMS->SMS_con($default['de_icode_server_ip'], $default['de_icode_id'], $default['de_icode_pw'], $default['de_icode_server_port']); - $SMS->Add($receive_number, $send_number, $default['de_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_contents)), ""); + $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); + $SMS->Add($receive_number, $send_number, $config['cf_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_contents)), ""); $SMS->Send(); } } diff --git a/adm/shop_admin/smssend.php b/adm/shop_admin/smssend.php index 8910da53c..2532f17a0 100644 --- a/adm/shop_admin/smssend.php +++ b/adm/shop_admin/smssend.php @@ -12,7 +12,7 @@ $send_number = preg_replace("/[^0-9]/", "", $default['de_admin_company_tel']); ?>

SMS 문자전송 내용 입력

@@ -250,7 +250,7 @@ function smsform_check(f)

SMS 를 사용하지 않고 있기 때문에, 문자 전송을 할 수 없습니다.
- SMS 사용 설정은 쇼핑몰관리 > 쇼핑몰설정 > SMS설정 에서 하실 수 있습니다. + SMS 사용 설정은 쇼핑몰관리 > 쇼핑몰설정 > SMS설정 에서 하실 수 있습니다.

diff --git a/adm/shop_admin/smssendicode.php b/adm/shop_admin/smssendicode.php index 2dde37abf..f3d689bf9 100644 --- a/adm/shop_admin/smssendicode.php +++ b/adm/shop_admin/smssendicode.php @@ -9,12 +9,12 @@ auth_check($auth[$sub_menu], "w"); // SMS 연결 $SMS = new SMS; -$SMS->SMS_con($default['de_icode_server_ip'], $default['de_icode_id'], $default['de_icode_pw'], $default['de_icode_server_port']); +$SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); $recv = explode("\n", $receive_number); $tran_callback = preg_replace("/[^0-9]/", "", $send_number); -$sms_id = $default['de_icode_id']; +$sms_id = $config['cf_icode_id']; $tran_msg = iconv("utf-8", "euc-kr", stripslashes($sms_contents)); $tran_date = ""; if ($reserved_flag) // 예약전송 diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index bc4105295..1bf200068 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -295,11 +295,6 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` ( `de_cart_keep_term` int(11) NOT NULL DEFAULT '0', `de_guest_cart_use` tinyint(4) NOT NULL DEFAULT '0', `de_admin_buga_no` varchar(255) NOT NULL DEFAULT '', - `de_sms_use` varchar(255) NOT NULL DEFAULT '', - `de_icode_id` varchar(255) NOT NULL DEFAULT '', - `de_icode_pw` varchar(255) NOT NULL DEFAULT '', - `de_icode_server_ip` varchar(255) NOT NULL DEFAULT '', - `de_icode_server_port` varchar(255) NOT NULL DEFAULT '', `de_kcp_site_key` varchar(255) NOT NULL DEFAULT '', `de_vbank_use` varchar(255) NOT NULL DEFAULT '', `de_taxsave_use` tinyint(4) NOT NULL, diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index 0b9f78ed3..dfeb8124c 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -542,7 +542,7 @@ if($default['de_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3'] include_once(G5_LIB_PATH.'/icode.sms.lib.php'); $SMS = new SMS; // SMS 연결 - $SMS->SMS_con($default['de_icode_server_ip'], $default['de_icode_id'], $default['de_icode_pw'], $default['de_icode_server_port']); + $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); $sms_count = 0; for($s=0; $sAdd($recv_number, $send_number, $default['de_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_content)), ""); + $SMS->Add($recv_number, $send_number, $config['cf_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_content)), ""); $sms_count++; } } diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 4579ee71f..a24561a17 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -537,7 +537,7 @@ if($default['de_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3'] include_once(G5_LIB_PATH.'/icode.sms.lib.php'); $SMS = new SMS; // SMS 연결 - $SMS->SMS_con($default['de_icode_server_ip'], $default['de_icode_id'], $default['de_icode_pw'], $default['de_icode_server_port']); + $SMS->SMS_con($config'cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); $sms_count = 0; for($s=0; $sAdd($recv_number, $send_number, $default['de_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_content)), ""); + $SMS->Add($recv_number, $send_number, $config['cf_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_content)), ""); $sms_count++; } } From c0e7e09c11c3e55b0ce01b77f53578f52070e806 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 6 Nov 2013 11:07:23 +0900 Subject: [PATCH 3/5] =?UTF-8?q?sms=20=EC=84=A4=EC=A0=95=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=84=A4=EC=A0=95=EC=9C=BC=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=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/shop_admin/deliverylistupdate.php | 6 +++--- adm/shop_admin/orderform.php | 8 ++++---- adm/shop_admin/ordersms.inc.php | 2 +- adm/shop_admin/smssend.php | 2 +- mobile/shop/orderformupdate.php | 2 +- shop/orderformupdate.php | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/adm/shop_admin/deliverylistupdate.php b/adm/shop_admin/deliverylistupdate.php index f83d903cf..9ad245a8f 100644 --- a/adm/shop_admin/deliverylistupdate.php +++ b/adm/shop_admin/deliverylistupdate.php @@ -12,7 +12,7 @@ define("_ORDERMAIL_", true); $admin = get_admin('super'); -if ($default['de_sms_use'] == "icode") +if ($config['cf_sms_use'] == "icode") { $SMS = new SMS; $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); @@ -97,7 +97,7 @@ for ($m=0; $mAdd($receive_number, $send_number, $config['cf_icode_id'], stripslashes($sms_contents), ""); } @@ -124,7 +124,7 @@ for ($m=0; $mSend(); } diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index d8a727f53..c5fdd5137 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -406,7 +406,7 @@ $result = sql_query($sql); //------------------------------------------------------------------------------ // KCP(PG) 바로가기 //------------------------------------------------------------------------------ - if ($od['od_settle_case'] != '무통장') { + if ($od['od_settle_case'] != '무통장') { // PG사를 KCP 사용하면서 테스트 상점아이디라면 $pg_url = 'http://admin8.kcp.co.kr'; $pg_test = ''; @@ -417,7 +417,7 @@ $result = sql_query($sql); $pg_url = 'http://testadmin8.kcp.co.kr'; if ($default['de_escrow_use']) $pg_test = '에스크로 테스트 '; - else + else $pg_test = '일반 테스트 '; } echo "KCP {$pg_test}바로가기
"; @@ -559,7 +559,7 @@ $result = sql_query($sql); - +
@@ -630,7 +630,7 @@ $result = sql_query($sql); - +
diff --git a/adm/shop_admin/ordersms.inc.php b/adm/shop_admin/ordersms.inc.php index 34d6e76cc..be2ca432c 100644 --- a/adm/shop_admin/ordersms.inc.php +++ b/adm/shop_admin/ordersms.inc.php @@ -5,7 +5,7 @@ if (!defined("_ORDERSMS_")) exit; $receive_number = preg_replace("/[^0-9]/", "", $od_hp); // 수신자번호 (받는사람 핸드폰번호 ... 여기서는 주문자님의 핸드폰번호임) $send_number = preg_replace("/[^0-9]/", "", $default['de_admin_company_tel']); // 발신자번호 -if ($default['de_sms_use']) { +if ($config['cf_sms_use']) { if ($od_sms_ipgum_check) { if ($od_bank_account && $od_receipt_price && $od_deposit_name) diff --git a/adm/shop_admin/smssend.php b/adm/shop_admin/smssend.php index 2532f17a0..c2c9de1ea 100644 --- a/adm/shop_admin/smssend.php +++ b/adm/shop_admin/smssend.php @@ -206,7 +206,7 @@ function smsform_check(f) echo "return false;"; } - if ($default['de_sms_use'] == "") { + if ($config['cf_sms_use'] == "") { echo "alert('우선 SMS 환경을 설정하여 주십시오.');"; echo "return false;"; } diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index dfeb8124c..b67e6460e 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -534,7 +534,7 @@ include_once(G5_SHOP_PATH.'/ordermail2.inc.php'); // SMS BEGIN -------------------------------------------------------- // 주문고객과 쇼핑몰관리자에게 SMS 전송 -if($default['de_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3'])) { +if($config['cf_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3'])) { $sms_contents = array($default['de_sms_cont2'], $default['de_sms_cont3']); $recv_numbers = array($od_hp, $default['de_sms_hp']); $send_numbers = array($default['de_admin_company_tel'], $od_hp); diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index a24561a17..1ef483eb0 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -529,7 +529,7 @@ include_once(G5_SHOP_PATH.'/ordermail2.inc.php'); // SMS BEGIN -------------------------------------------------------- // 주문고객과 쇼핑몰관리자에게 SMS 전송 -if($default['de_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3'])) { +if($config['cf_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3'])) { $sms_contents = array($default['de_sms_cont2'], $default['de_sms_cont3']); $recv_numbers = array($od_hp, $default['de_sms_hp']); $send_numbers = array($default['de_admin_company_tel'], $od_hp); From 1903f74aafff608f110de9e42711c340295213ba Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 6 Nov 2013 11:15:41 +0900 Subject: [PATCH 4/5] =?UTF-8?q?db=20=ED=95=84=EB=93=9C=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 8b3e81de4..da1e909cd 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -652,6 +652,6 @@ if(stripos($row['Type'], 'enum') !== false) { // 상품테이블에 검색을 위하여 태그없는 상품설명 저장용 필드 추가 if(!sql_query(" select it_explan_strip_tags from {$g5['g5_shop_item_table']} limit 1 ", false)) { sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}` - ADD `it_explan_strip_tags` METIUMTEXT NOT NULL AFTER `it_explan` ", true); + ADD `it_explan_strip_tags` MEDIUMTEXT NOT NULL AFTER `it_explan` ", true); } ?> From 975dda6ba0f05e7f3f75921b98f382e5b1c3a880 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 6 Nov 2013 11:57:41 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=97=90=EC=8A=A4=ED=81=AC=EB=A1=9C=20?= =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=B2=98=EB=A6=AC=EC=97=90=20site=5Fkey=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderescrow.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/orderescrow.inc.php b/adm/shop_admin/orderescrow.inc.php index 70e5e7acc..ba21d44d5 100644 --- a/adm/shop_admin/orderescrow.inc.php +++ b/adm/shop_admin/orderescrow.inc.php @@ -25,6 +25,7 @@ else { } $g_conf_site_cd = $default['de_kcp_mid']; +$g_conf_site_key = $default['de_kcp_site_key']; $g_conf_home_dir = G5_SHOP_PATH.'/kcp'; $g_conf_key_dir = ''; $g_conf_log_dir = ''; @@ -72,7 +73,7 @@ for($i=0; $i<$tno_count; $i++) { $c_PayPlus->mf_set_modx_data( "deli_numb", $arr_numb[$i] ); $c_PayPlus->mf_set_modx_data( "deli_corp", $arr_corp[$i] ); - $c_PayPlus->mf_do_tx( $trace_no, $g_conf_home_dir, $g_conf_site_cd, "", $tran_cd, "", + $c_PayPlus->mf_do_tx( $trace_no, $g_conf_home_dir, $g_conf_site_cd, $g_conf_site_key, $tran_cd, "", $g_conf_gw_url, $g_conf_gw_port, "payplus_cli_slib", $ordr_idxx, $cust_ip, "3" , 0, 0, $g_conf_key_dir, $g_conf_log_dir); // 응답 전문 처리