firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/yc4s

Browse Source
This commit is contained in:
whitedot
2014-01-20 10:12:12 +09:00
parent fcff17b71e 704af0f9c9
commit fe3c31edfd
16 changed files with 67 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adm/member_form.php
View File

@ -208,8 +208,10 @@ include_once('./admin.head.php');
<tr>
<th scope="row"><label for="mb_zip1">주소</label></th>
<td colspan="3" style="line-height:2em">
<input type="text" name="mb_zip1" value="<?php echo $mb['mb_zip1'] ?>" id="mb_zip1" title="우편번호 앞자리" class="frm_input readonly" size="3" maxlength="3"> -
<input type="text" name="mb_zip2" value="<?php echo $mb['mb_zip2'] ?>" id="mb_zip2" title="우편번호 뒷자리" class="frm_input readonly" size="3" maxlength="3">
<label for="mb_zip1" class="sound_only">우편번호 앞자리</label>
<input type="text" name="mb_zip1" value="<?php echo $mb['mb_zip1'] ?>" id="mb_zip1" class="frm_input readonly" size="3" maxlength="3"> -
<label for="mb_zip2" class="sound_only">우편번호 뒷자리</label>
<input type="text" name="mb_zip2" value="<?php echo $mb['mb_zip2'] ?>" id="mb_zip2" class="frm_input readonly" size="3" maxlength="3">
<a href="<?php echo G5_BBS_URL ?>/zip.php?frm_name=fmember&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2&amp;frm_addr3=mb_addr3&amp;frm_jibeon=mb_addr_jibeon" id="win_zip" class="win_zip_find btn_frmline" target="_blank">주소 검색</a><br>
<input type="text" name="mb_addr1" value="<?php echo $mb['mb_addr1'] ?>" id="mb_addr1" class="frm_input readonly" size="60">
<label for="mb_addr1">기본주소</label><br>

8
adm/shop_admin/categoryform.php
View File

@ -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;

15
adm/shop_admin/configform.php
View File

@ -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');

52
install/install_db.php
View File

@ -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 = '<b>배송 안내 입력전입니다.</b>',
de_change_content = '<b>교환/반품 안내 입력전입니다.</b>',
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',

BIN
mobile/shop/kcp/bin/pp_cli
View File

Binary file not shown.

BIN
mobile/shop/kcp/bin/pp_cli_exe.exe
View File

Binary file not shown.

BIN
mobile/shop/kcp/bin/pp_cli_x64.tar.gz
View File

Binary file not shown.

5
mobile/shop/kcp/bin/pub.key
View File

@ -1,5 +0,0 @@
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAMEn9niy+ZB7GGn9JOA9csyJo2vTpd3/ieHW8nCfiDf77YJvEtUmudCU
JXMNQ1uBuHq7+IzajoJhhvGXyOHVr9w+Oq/d8XZPPe7X2agh1WAMDV4mjQNaAncr
DU1qxlTFuAdKRkK7qkqyWSHHtq0HaW/zmBmcIoGn4RwY9y7oKFBpAgMBAAE=
-----END RSA PUBLIC KEY-----

11
mobile/shop/kcp/pp_ax_hub_lib.php
View File

@ -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 . "," .

6
mobile/shop/settle_kcp.inc.php
View File

@ -1,7 +1,7 @@
<?php
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
$g_conf_home_dir = G5_MSHOP_PATH.'/kcp'; // BIN 절대경로 입력 (bin전까지)
$g_conf_home_dir = G5_SHOP_PATH.'/kcp'; // BIN 절대경로 입력 (bin전까지)
$g_conf_site_name = $default['de_admin_company_name'];
$g_conf_log_level = '3'; // 변경불가
$g_conf_gw_port = '8090'; // 포트번호(변경불가)
@ -10,8 +10,8 @@ $g_conf_key_dir = '';
$g_conf_log_dir = '';
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
{
$g_conf_key_dir = G5_MSHOP_PATH.'/kcp/bin/pub.key';
$g_conf_log_dir = G5_MSHOP_PATH.'/kcp/log';
$g_conf_key_dir = G5_SHOP_PATH.'/kcp/bin/pub.key';
$g_conf_log_dir = G5_SHOP_PATH.'/kcp/log';
}
if ($default['de_card_test']) {

1
mobile/skin/member/basic/zip.skin.php
View File

@ -41,6 +41,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</div>
</div>
<!-- } 검색어 입력 끝 -->
</form>
<div id="result"><span id="result_b4">검색어를 입력해주세요.</span></div>
</div>

BIN
shop/kcp/bin/pp_cli_x64 Executable file
View File

Binary file not shown.

BIN
shop/kcp/bin/pp_cli_x64.tar.gz
View File

Binary file not shown.

11
shop/kcp/pp_ax_hub_lib.php
View File

@ -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 . "," .

2
shop/ordermail1.inc.php
View File

@ -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;

2
shop/ordermail2.inc.php
View File

@ -76,7 +76,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
$options .= '</ul>';
$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'];