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

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'];