diff --git a/adm/member_form.php b/adm/member_form.php index ddfd8acb7..f7e6baa53 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -208,8 +208,10 @@ include_once('./admin.head.php'); - - - + + - + + 주소 검색

diff --git a/adm/shop_admin/categoryform.php b/adm/shop_admin/categoryform.php index 32fea7ed4..29497a2bd 100644 --- a/adm/shop_admin/categoryform.php +++ b/adm/shop_admin/categoryform.php @@ -52,10 +52,10 @@ if ($w == "") $html_title = "1단계분류추가"; $ca['ca_use'] = 1; $ca['ca_explan_html'] = 1; - $ca['ca_img_width'] = $default['de_mimg_width']; - $ca['ca_img_height'] = $default['de_mimg_height']; - $ca['ca_mobile_img_width'] = $default['de_mimg_width']; - $ca['ca_mobile_img_height'] = $default['de_mimg_height']; + $ca['ca_img_width'] = $default['de_simg_width']; + $ca['ca_img_height'] = $default['de_simg_height']; + $ca['ca_mobile_img_width'] = $default['de_simg_width']; + $ca['ca_mobile_img_height'] = $default['de_simg_height']; $ca['ca_list_mod'] = 3; $ca['ca_list_row'] = 5; $ca['ca_mobile_list_mod'] = 10; diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 0307e706a..657365d0f 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -1191,17 +1191,16 @@ if($default['de_iche_use'] || $default['de_vbank_use'] || $default['de_hp_use'] $is_linux = false; $exe = '/kcp/bin/'; - if($is_linux) - $exe .= 'pp_cli'; - else + if($is_linux) { + if(PHP_INT_MAX == 2147483647) // 32-bit + $exe .= 'pp_cli'; + else + $exe .= 'pp_cli_x64'; + } else { $exe .= 'pp_cli_exe.exe'; + } echo module_exec_check(G5_SHOP_PATH.$exe, 'pp_cli'); - - // 모바일 결제 모듈 체크 - if(defined('G5_USE_MOBILE') && G5_USE_MOBILE == true) { - echo module_exec_check(G5_MSHOP_PATH.$exe, 'pp_cli'); - } } include_once (G5_ADMIN_PATH.'/admin.tail.php'); diff --git a/install/install_db.php b/install/install_db.php index ca52f9e94..6f33c7e28 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -232,57 +232,57 @@ if($g5_shop_install) { de_type1_list_skin = 'main.10.skin.php', de_type1_list_mod = '3', de_type1_list_row = '2', - de_type1_img_width = '$mimg_width', - de_type1_img_height = '$mimg_height', + de_type1_img_width = '$simg_width', + de_type1_img_height = '$simg_height', de_type2_list_use = '1', de_type2_list_skin = 'main.10.skin.php', de_type2_list_mod = '3', de_type2_list_row = '2', - de_type2_img_width = '$mimg_width', - de_type2_img_height = '$mimg_height', + de_type2_img_width = '$simg_width', + de_type2_img_height = '$simg_height', de_type3_list_use = '1', de_type3_list_skin = 'main.10.skin.php', de_type3_list_mod = '1', de_type3_list_row = '3', - de_type3_img_width = '$mimg_width', - de_type3_img_height = '$mimg_height', + de_type3_img_width = '$simg_width', + de_type3_img_height = '$simg_height', de_type4_list_use = '1', de_type4_list_skin = 'main.10.skin.php', de_type4_list_mod = '3', de_type4_list_row = '1', - de_type4_img_width = '$mimg_width', - de_type4_img_height = '$mimg_height', + de_type4_img_width = '$simg_width', + de_type4_img_height = '$simg_height', de_type5_list_use = '1', de_type5_list_skin = 'main.10.skin.php', de_type5_list_mod = '3', de_type5_list_row = '1', - de_type5_img_width = '$mimg_width', - de_type5_img_height = '$mimg_height', + de_type5_img_width = '$simg_width', + de_type5_img_height = '$simg_height', de_mobile_type1_list_use = '1', de_mobile_type1_list_skin = 'main.10.skin.php', de_mobile_type1_list_mod = '3', - de_mobile_type1_img_width = '$mimg_width', - de_mobile_type1_img_height = '$mimg_height', + de_mobile_type1_img_width = '$simg_width', + de_mobile_type1_img_height = '$simg_height', de_mobile_type2_list_use = '1', de_mobile_type2_list_skin = 'main.10.skin.php', de_mobile_type2_list_mod = '3', - de_mobile_type2_img_width = '$mimg_width', - de_mobile_type2_img_height = '$mimg_height', + de_mobile_type2_img_width = '$simg_width', + de_mobile_type2_img_height = '$simg_height', de_mobile_type3_list_use = '1', de_mobile_type3_list_skin = 'main.10.skin.php', de_mobile_type3_list_mod = '3', - de_mobile_type3_img_width = '$mimg_width', - de_mobile_type3_img_height = '$mimg_height', + de_mobile_type3_img_width = '$simg_width', + de_mobile_type3_img_height = '$simg_height', de_mobile_type4_list_use = '1', de_mobile_type4_list_skin = 'main.10.skin.php', de_mobile_type4_list_mod = '3', - de_mobile_type4_img_width = '$mimg_width', - de_mobile_type4_img_height = '$mimg_height', + de_mobile_type4_img_width = '$simg_width', + de_mobile_type4_img_height = '$simg_height', de_mobile_type5_list_use = '1', de_mobile_type5_list_skin = 'main.10.skin.php', de_mobile_type5_list_mod = '3', - de_mobile_type5_img_width = '$mimg_width', - de_mobile_type5_img_height = '$mimg_height', + de_mobile_type5_img_width = '$simg_width', + de_mobile_type5_img_height = '$simg_height', de_bank_use = '1', de_bank_account = 'OO은행 12345-67-89012 예금주명', de_vbank_use = '0', @@ -303,16 +303,16 @@ if($g5_shop_install) { de_baesong_content = '배송 안내 입력전입니다.', de_change_content = '교환/반품 안내 입력전입니다.', de_rel_list_mod = '3', - de_rel_img_width = '$mimg_width', - de_rel_img_height = '$mimg_height', + de_rel_img_width = '$simg_width', + de_rel_img_height = '$simg_height', de_search_list_skin = 'list.10.skin.php', - de_search_img_width = '$mimg_width', - de_search_img_height = '$mimg_height', + de_search_img_width = '$simg_width', + de_search_img_height = '$simg_height', de_search_list_mod = '3', de_search_list_row = '5', de_mobile_search_list_skin = 'list.10.skin.php', - de_mobile_search_img_width = '$mimg_width', - de_mobile_search_img_height = '$mimg_height', + de_mobile_search_img_width = '$simg_width', + de_mobile_search_img_height = '$simg_height', de_mobile_search_list_mod = '10', de_simg_width = '$simg_width', de_simg_height = '$simg_height', diff --git a/mobile/shop/kcp/bin/pp_cli b/mobile/shop/kcp/bin/pp_cli deleted file mode 100755 index cfe783538..000000000 Binary files a/mobile/shop/kcp/bin/pp_cli and /dev/null differ diff --git a/mobile/shop/kcp/bin/pp_cli_exe.exe b/mobile/shop/kcp/bin/pp_cli_exe.exe deleted file mode 100644 index cb05cd57a..000000000 Binary files a/mobile/shop/kcp/bin/pp_cli_exe.exe and /dev/null differ diff --git a/mobile/shop/kcp/bin/pp_cli_x64.tar.gz b/mobile/shop/kcp/bin/pp_cli_x64.tar.gz deleted file mode 100644 index 5486008a7..000000000 Binary files a/mobile/shop/kcp/bin/pp_cli_x64.tar.gz and /dev/null differ diff --git a/mobile/shop/kcp/bin/pub.key b/mobile/shop/kcp/bin/pub.key deleted file mode 100644 index 8b0c51e4e..000000000 --- a/mobile/shop/kcp/bin/pub.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAMEn9niy+ZB7GGn9JOA9csyJo2vTpd3/ieHW8nCfiDf77YJvEtUmudCU -JXMNQ1uBuHq7+IzajoJhhvGXyOHVr9w+Oq/d8XZPPe7X2agh1WAMDV4mjQNaAncr -DU1qxlTFuAdKRkK7qkqyWSHHtq0HaW/zmBmcIoGn4RwY9y7oKFBpAgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/mobile/shop/kcp/pp_ax_hub_lib.php b/mobile/shop/kcp/pp_ax_hub_lib.php index 50cf76958..3bc658aa7 100644 --- a/mobile/shop/kcp/pp_ax_hub_lib.php +++ b/mobile/shop/kcp/pp_ax_hub_lib.php @@ -165,7 +165,16 @@ } else { - $res_data = $this->mf_exec( $home_dir . "/bin/pp_cli", + if(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') { + if(PHP_INT_MAX == 2147483647) // 32-bit + $bin_exe = $home_dir.'/bin/pp_cli'; + else + $bin_exe = $home_dir.'/bin/pp_cli_x64'; + } else { + $bin_exe = $home_dir.'/bin/pp_cli_exe.exe'; + } + + $res_data = $this->mf_exec( $bin_exe, "-h", "home=" . $home_dir . "," . "site_cd=" . $site_cd . "," . diff --git a/mobile/shop/settle_kcp.inc.php b/mobile/shop/settle_kcp.inc.php index de65b1dc4..76f60fa2a 100644 --- a/mobile/shop/settle_kcp.inc.php +++ b/mobile/shop/settle_kcp.inc.php @@ -1,7 +1,7 @@ +
검색어를 입력해주세요.
diff --git a/shop/kcp/bin/pp_cli_x64 b/shop/kcp/bin/pp_cli_x64 new file mode 100755 index 000000000..d557b209a Binary files /dev/null and b/shop/kcp/bin/pp_cli_x64 differ diff --git a/shop/kcp/bin/pp_cli_x64.tar.gz b/shop/kcp/bin/pp_cli_x64.tar.gz deleted file mode 100644 index 5486008a7..000000000 Binary files a/shop/kcp/bin/pp_cli_x64.tar.gz and /dev/null differ diff --git a/shop/kcp/pp_ax_hub_lib.php b/shop/kcp/pp_ax_hub_lib.php index 50cf76958..3bc658aa7 100644 --- a/shop/kcp/pp_ax_hub_lib.php +++ b/shop/kcp/pp_ax_hub_lib.php @@ -165,7 +165,16 @@ } else { - $res_data = $this->mf_exec( $home_dir . "/bin/pp_cli", + if(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') { + if(PHP_INT_MAX == 2147483647) // 32-bit + $bin_exe = $home_dir.'/bin/pp_cli'; + else + $bin_exe = $home_dir.'/bin/pp_cli_x64'; + } else { + $bin_exe = $home_dir.'/bin/pp_cli_exe.exe'; + } + + $res_data = $this->mf_exec( $bin_exe, "-h", "home=" . $home_dir . "," . "site_cd=" . $site_cd . "," . diff --git a/shop/ordermail1.inc.php b/shop/ordermail1.inc.php index 47960f3f1..8c84590e0 100644 --- a/shop/ordermail1.inc.php +++ b/shop/ordermail1.inc.php @@ -56,7 +56,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) $list[$i]['g_dir'] = G5_URL; $list[$i]['it_id'] = $row['it_id']; - $list[$i]['it_simg'] = get_it_image($row['it_id'], $default['de_simg_width'], $default['de_simg_height']); + $list[$i]['it_simg'] = get_it_image($row['it_id'], 70, 70); $list[$i]['it_name'] = $row['it_name']; $list[$i]['it_origin'] = $row['it_origin']; $list[$i]['it_opt'] = $options; diff --git a/shop/ordermail2.inc.php b/shop/ordermail2.inc.php index 393e96f7e..d138bb646 100644 --- a/shop/ordermail2.inc.php +++ b/shop/ordermail2.inc.php @@ -76,7 +76,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) $options .= ''; $list[$i]['it_id'] = $row['it_id']; - $list[$i]['it_simg'] = get_it_image($row['it_id'], $default['de_simg_width'], $default['de_simg_height']); + $list[$i]['it_simg'] = get_it_image($row['it_id'], 70, 70); $list[$i]['it_name'] = $row['it_name']; $list[$i]['it_opt'] = $options; $list[$i]['ct_price'] = $sum['price'];