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

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