From a5d927fff474eda55958ecfa1662fbf28db06322 Mon Sep 17 00:00:00 2001 From: JingeunYang Date: Tue, 14 Apr 2020 10:22:38 +0900 Subject: [PATCH] Eyoom Builder 4 - [4.2.4] --- adm/eyoom_admin/core/config/config_form.php | 7 +++ .../core/config/config_form_update.php | 3 + .../core/shop/configformupdate.php | 2 + adm/eyoom_admin/core/shop/orderlist.php | 6 +- adm/eyoom_admin/core/sms/config.php | 8 +++ adm/eyoom_admin/core/sms/config_update.php | 5 +- adm/eyoom_admin/core/sms/history_send.php | 4 +- adm/eyoom_admin/core/sms/sms_write_send.php | 54 ++++++++++++------ adm/eyoom_admin/inc/shop.index.php | 2 + .../theme/basic/admin.index.html.php | 8 ++- .../basic/skin/config/config_form.html.php | 47 +++++++++++----- .../theme/basic/skin/shop/configform.html.php | 55 +++++++++++++------ .../theme/basic/skin/sms/config.html.php | 54 ++++++++++++++---- .../basic/skin/sms/history_view.html.php | 7 ++- .../theme/basic/skin/sms/sms_write.html.php | 15 ++--- eyoom/extend/eyoom4.version.php | 2 +- .../skin/shop/basic/css/item_style.css | 2 +- .../skin/shop/basic/css/item_style_nr.css | 2 +- .../basic/orderform.sub.mobile.skin.html.php | 10 +++- .../shop/basic/orderform.sub.skin.html.php | 8 +++ .../shop/basic/orderinquiryview.skin.html.php | 4 +- 21 files changed, 220 insertions(+), 85 deletions(-) diff --git a/adm/eyoom_admin/core/config/config_form.php b/adm/eyoom_admin/core/config/config_form.php index ad3d0c24..1150da7f 100644 --- a/adm/eyoom_admin/core/config/config_form.php +++ b/adm/eyoom_admin/core/config/config_form.php @@ -299,6 +299,13 @@ ADD `mb_scrap_cnt` int(11) NOT NULL DEFAULT '0' AFTER `mb_memo_cnt`", true); } +// 아이코드 토큰키 추가 +if( ! isset($config['cf_icode_token_key']) ){ + $sql = "ALTER TABLE `{$g5['config_table']}` + ADD COLUMN `cf_icode_token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `cf_icode_server_port`; "; + sql_query($sql, false); +} + /** * FAQ 스킨설정 */ diff --git a/adm/eyoom_admin/core/config/config_form_update.php b/adm/eyoom_admin/core/config/config_form_update.php index 76d51fd9..94a35465 100644 --- a/adm/eyoom_admin/core/config/config_form_update.php +++ b/adm/eyoom_admin/core/config/config_form_update.php @@ -40,6 +40,8 @@ } } +$_POST['cf_icode_server_port'] = isset($_POST['cf_icode_server_port']) ? preg_replace('/[^0-9]/', '', $_POST['cf_icode_server_port']) : '7295'; + $sql = " update {$g5['config_table']} set cf_title = '{$_POST['cf_title']}', cf_admin = '{$_POST['cf_admin']}', @@ -154,6 +156,7 @@ cf_sms_type = '{$_POST['cf_sms_type']}', cf_icode_id = '{$_POST['cf_icode_id']}', cf_icode_pw = '{$_POST['cf_icode_pw']}', + cf_icode_token_key = '{$_POST['cf_icode_token_key']}', cf_icode_server_ip = '{$_POST['cf_icode_server_ip']}', cf_icode_server_port = '{$_POST['cf_icode_server_port']}', cf_googl_shorturl_apikey = '{$_POST['cf_googl_shorturl_apikey']}', diff --git a/adm/eyoom_admin/core/shop/configformupdate.php b/adm/eyoom_admin/core/shop/configformupdate.php index ce4451ba..a69d148f 100644 --- a/adm/eyoom_admin/core/shop/configformupdate.php +++ b/adm/eyoom_admin/core/shop/configformupdate.php @@ -278,6 +278,7 @@ if ($_FILES['mobile_logo_img2']['name']) upload_file($_FILES['mobile_logo_img2']['tmp_name'], "mobile_logo_img2", G5_DATA_PATH."/common"); $de_kcp_mid = substr($_POST['de_kcp_mid'],0,3); + $cf_icode_server_port = isset($cf_icode_server_port) ? preg_replace('/[^0-9]/', '', $cf_icode_server_port) : '7295'; // kcp 전자결제를 사용할 때 site key 입력체크 if($_POST['de_pg_service'] == 'kcp' && !$_POST['de_card_test'] && ($_POST['de_iche_use'] || $_POST['de_vbank_use'] || $_POST['de_hp_use'] || $_POST['de_card_use'])) { @@ -447,6 +448,7 @@ cf_icode_pw = '{$cf_icode_pw}', cf_icode_server_ip = '{$_POST['cf_icode_server_ip']}', cf_icode_server_port = '{$_POST['cf_icode_server_port']}', + cf_icode_token_key = '{$cf_icode_token_key}', cf_lg_mid = '{$cf_lg_mid}', cf_lg_mert_key = '{$cf_lg_mert_key}' "; sql_query($sql); diff --git a/adm/eyoom_admin/core/shop/orderlist.php b/adm/eyoom_admin/core/shop/orderlist.php index 23411ffa..77403ba0 100644 --- a/adm/eyoom_admin/core/shop/orderlist.php +++ b/adm/eyoom_admin/core/shop/orderlist.php @@ -55,10 +55,10 @@ } else { $where[] = " $sel_field like '%$search%' "; } -} -if ($save_search != $search) { - $page = 1; + if ($save_search != $search) { + $page = 1; + } } if ($od_status) { diff --git a/adm/eyoom_admin/core/sms/config.php b/adm/eyoom_admin/core/sms/config.php index c4ba21c3..1f52ea95 100644 --- a/adm/eyoom_admin/core/sms/config.php +++ b/adm/eyoom_admin/core/sms/config.php @@ -16,6 +16,14 @@ 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( ! isset($config['cf_icode_token_key']) ){ + $sql = "ALTER TABLE `{$g5['config_table']}` + ADD COLUMN `cf_icode_token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `cf_icode_server_port`; "; + sql_query($sql, false); + $config['cf_icode_token_key'] = ''; +} + if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) { $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']); diff --git a/adm/eyoom_admin/core/sms/config_update.php b/adm/eyoom_admin/core/sms/config_update.php index 7cc4eaee..82a119e9 100644 --- a/adm/eyoom_admin/core/sms/config_update.php +++ b/adm/eyoom_admin/core/sms/config_update.php @@ -20,6 +20,7 @@ alert('회신번호가 올바르지 않습니다.'); $userinfo = get_icode_userinfo($cf_icode_id, $cf_icode_pw); +$cf_icode_server_port = isset($cf_icode_server_port) ? preg_replace('/[^0-9]/', '', $cf_icode_server_port) : '7295'; if ($userinfo['code'] == '202') alert('아이코드 아이디와 패스워드가 맞지 않습니다.'); @@ -38,10 +39,12 @@ // 아이코드 설정 $sql = " update {$g5['config_table']} set cf_sms_use = '$cf_sms_use', + cf_sms_type = '$cf_sms_type', 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' "; + cf_icode_server_port = '$cf_icode_server_port', + cf_icode_token_key = '$cf_icode_token_key'"; sql_query($sql); goto_url(G5_ADMIN_URL . "/?dir=sms&pid=config"); \ No newline at end of file diff --git a/adm/eyoom_admin/core/sms/history_send.php b/adm/eyoom_admin/core/sms/history_send.php index 95bcff2d..61b8cd99 100644 --- a/adm/eyoom_admin/core/sms/history_send.php +++ b/adm/eyoom_admin/core/sms/history_send.php @@ -228,7 +228,7 @@ ?> \ No newline at end of file diff --git a/adm/eyoom_admin/core/sms/sms_write_send.php b/adm/eyoom_admin/core/sms/sms_write_send.php index 2f54bd65..f5b09501 100644 --- a/adm/eyoom_admin/core/sms/sms_write_send.php +++ b/adm/eyoom_admin/core/sms/sms_write_send.php @@ -11,8 +11,24 @@ check_admin_token(); +$result = sql_query("describe `{$g5['sms5_write_table']}`"); +while ($row = sql_fetch_array($result)){ + if( $row['Field'] === 'wr_message' && $row['Type'] === 'varchar(255)' ){ + sql_query("ALTER TABLE `{$g5['sms5_write_table']}` MODIFY wr_message TEXT NOT NULL;", false); + break; + } +} + $g5['title'] = "문자전송중"; +if ($config['cf_sms_use'] != 'icode') { + alert('기본환경설정에서 icode sms 사용이 비활성화 되어 있습니다.'); +} + +if ( ! (($config['cf_icode_id'] && $config['cf_icode_pw']) || $config['cf_icode_token_key']) ) { + alert('아이코드 설정값이 존재하지 않습니다.'); +} + $wr_reply = preg_replace('#[^0-9\-]#', '', trim($wr_reply)); $wr_message = clean_xss_tags(trim($wr_message)); @@ -99,12 +115,12 @@ $hp = get_hp($item[$i][1], 0); $name = $item[$i][0]; - if(!$hp) continue; + if(!$hp) continue 2; if ($wr_overlap && array_overlap($hps, $hp)) { $overlap++; array_push( $duplicate_data['hp'], $row['bk_hp'] ); - continue; + continue 2; } array_push($list, array('bk_hp' => $hp, 'bk_name' => $name)); @@ -116,12 +132,12 @@ $row = sql_fetch("select * from {$g5['sms5_book_table']} where bk_no='$item[$i]'"); $row['bk_hp'] = get_hp($row['bk_hp'], 0); - if(!$row['bk_hp']) continue; + if(!$row['bk_hp']) continue 2; if ($wr_overlap && array_overlap($hps, $row['bk_hp'])) { $overlap++; array_push( $duplicate_data['hp'], $row['bk_hp'] ); - continue; + continue 2; } array_push($list, $row); array_push($hps, $row['bk_hp']); @@ -146,14 +162,11 @@ $booking = ''; } -if ($config['cf_sms_use'] != 'icode') { - alert('기본환경설정에서 icode sms 사용이 비활성화 되어 있습니다.'); -} - //include_once(G5_ADMIN_PATH.'/admin.head.php'); $reply = str_replace('-', '', trim($wr_reply)); -$wr_message = conv_unescape_nl($wr_message); +$db_wr_message = conv_unescape_nl($wr_message); +$wr_message = conv_unescape_nl(stripslashes($wr_message)); $SMS = new SMS5; @@ -247,7 +260,7 @@ } } - sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum=0, wr_reply='$wr_reply', wr_message='$wr_message', wr_success='$wr_success', wr_failure='$wr_failure', wr_memo='$str_serialize', wr_booking='$wr_booking', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'"); + sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum=0, wr_reply='$wr_reply', wr_message='$db_wr_message', wr_success='$wr_success', wr_failure='$wr_failure', wr_memo='$str_serialize', wr_booking='$wr_booking', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'"); } } else { $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); @@ -265,7 +278,7 @@ else $wr_no = 1; - sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum=0, wr_reply='$wr_reply', wr_message='$wr_message', wr_booking='$wr_booking', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'"); + sql_query("insert into {$g5['sms5_write_table']} set wr_no='$wr_no', wr_renum=0, wr_reply='$wr_reply', wr_message='$db_wr_message', wr_booking='$wr_booking', wr_total='$wr_total', wr_datetime='".G5_TIME_YMDHIS."'"); $wr_success = 0; $wr_failure = 0; @@ -329,11 +342,16 @@ function win_close_alert($msg) { - $html = ""; + $html = ""; echo $html; exit; @@ -341,7 +359,7 @@ function win_close_alert($msg) { ?> \ No newline at end of file diff --git a/adm/eyoom_admin/inc/shop.index.php b/adm/eyoom_admin/inc/shop.index.php index 82e436ef..18386667 100644 --- a/adm/eyoom_admin/inc/shop.index.php +++ b/adm/eyoom_admin/inc/shop.index.php @@ -22,6 +22,7 @@ $item_qa[$i] = $row; $item_qa[$i]['mb_photo'] = $eb->mb_photo($row1['mb_id']); $item_qa[$i]['name'] = get_text($row1['mb_name']); + $item_qa[$i]['is_answer'] = $row['iq_answer'] ? true: false; } /** @@ -36,6 +37,7 @@ $item_use[$i] = $row; $item_use[$i]['mb_photo'] = $eb->mb_photo($row1['mb_id']); $item_use[$i]['name'] = get_text($row1['mb_name']); + $item_use[$i]['is_answer'] = $row['is_confirm'] == '1' ? true: false; } /** diff --git a/adm/eyoom_admin/theme/basic/admin.index.html.php b/adm/eyoom_admin/theme/basic/admin.index.html.php index ff1d3339..e1cea9be 100644 --- a/adm/eyoom_admin/theme/basic/admin.index.html.php +++ b/adm/eyoom_admin/theme/basic/admin.index.html.php @@ -315,7 +315,7 @@
- +
@@ -327,7 +327,7 @@

date_format('Y-m-d', $item_qa[$i]['iq_time']); ?>

- + @@ -351,7 +351,7 @@
- +
@@ -363,7 +363,9 @@

date_format('Y-m-d', $item_use[$i]['is_time']); ?>

+ + diff --git a/adm/eyoom_admin/theme/basic/skin/config/config_form.html.php b/adm/eyoom_admin/theme/basic/skin/config/config_form.html.php index 0160d84c..a276b6fb 100644 --- a/adm/eyoom_admin/theme/basic/skin/config/config_form.html.php +++ b/adm/eyoom_admin/theme/basic/skin/config/config_form.html.php @@ -31,6 +31,10 @@ .pg-anchor-in.tab-e2 .tab-bottom-line {display:none} } .cf_cert_hide {display:none;position:absolute;top:-20000px;left:-10000px} + +.icode_old_version th{background-color:#FFFCED !important;} +.icode_json_version th{background-color:#F6F1FF !important;} +.cf_tr_hide {display:none;}
@@ -1977,12 +1981,12 @@ -
Note: 전송유형을 SMS로 선택하시면 최대 80바이트까지 전송하실 수 있으며 LMS로 선택하시면 90바이트 이하는 SMS로,
그 이상은 1500바이트까지 LMS로 전송됩니다.
요금은 건당 SMS는 16원, LMS는 48원입니다.
+
Note: 전송유형을 SMS로 선택하시면 최대 80바이트까지 전송하실 수 있으며
LMS로 선택하시면 90바이트 이하는 SMS로, 그 이상은 ".G5_ICODE_LMS_MAX_LENGTH."바이트까지 LMS로 전송됩니다.
요금은 건당 SMS는 16원, LMS는 48원입니다.
- + - +