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
2013-11-12 14:20:56 +09:00
parent 4ef22669d1 d29e4ccbc2
commit b2c377d85d
89 changed files with 249 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adm/board_form.php
View File

@ -56,8 +56,7 @@ if (!isset($board['bo_use_sns'])) {
for ($i=0; $row=sql_fetch_array($result); $i++) {
sql_query(" ALTER TABLE `{$g5['write_prefix']}{$row['bo_table']}`
ADD `wr_facebook_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_ip`,
ADD `wr_twitter_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_facebook_user`,
ADD `wr_me2day_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_twitter_user` ", false);
ADD `wr_twitter_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_facebook_user` ", false);
}
}

9
adm/config_form.php
View File

@ -54,8 +54,7 @@ if(!isset($config['cf_facebook_appid'])) {
ADD `cf_facebook_appid` VARCHAR(255) NOT NULL AFTER `cf_googl_shorturl_apikey`,
ADD `cf_facebook_secret` VARCHAR(255) NOT NULL AFTER `cf_facebook_appid`,
ADD `cf_twitter_key` VARCHAR(255) NOT NULL AFTER `cf_facebook_secret`,
ADD `cf_twitter_secret` VARCHAR(255) NOT NULL AFTER `cf_twitter_key`,
ADD `cf_me2day_key` VARCHAR(255) NOT NULL AFTER `cf_twitter_secret` ", true);
ADD `cf_twitter_secret` VARCHAR(255) NOT NULL AFTER `cf_twitter_key` ", true);
}
// uniqid 테이블이 없을 경우 생성
@ -939,12 +938,6 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
<input type="text" name="cf_twitter_secret" value="<?php echo $config['cf_twitter_secret'] ?>" id="cf_twitter_secret" class="frm_input" size="35">
</td>
</tr>
<tr>
<th scope="row"><label for="cf_me2day_key">미투데이 Key</label></th>
<td colspan="3">
<input type="text" name="cf_me2day_key" value="<?php echo $config['cf_me2day_key'] ?>" id="cf_me2day_key" class="frm_input"> <a href="http://me2day.net/me2/app/get_appkey" target="_blank" class="btn_frmline">앱 등록하기</a>
</td>
</tr>
<tr>
<th scope="row"><label for="cf_googl_shorturl_apikey">구글 짧은주소 API Key</label></th>
<td>

1
adm/config_form_update.php
View File

@ -125,7 +125,6 @@ $sql = " update {$g5['config_table']}
cf_facebook_secret = '{$_POST['cf_facebook_secret']}',
cf_twitter_key = '{$_POST['cf_twitter_key']}',
cf_twitter_secret = '{$_POST['cf_twitter_secret']}',
cf_me2day_key = '{$_POST['cf_me2day_key']}',
cf_1_subj = '{$_POST['cf_1_subj']}',
cf_2_subj = '{$_POST['cf_2_subj']}',
cf_3_subj = '{$_POST['cf_3_subj']}',

2
adm/shop_admin/orderform.php
View File

@ -15,7 +15,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
//------------------------------------------------------------------------------
$keep_term = $default['de_cart_keep_term'];
if (!$keep_term) $keep_term = 15; // 기본값 15일
$beforetime = date('Y-m-d H:i:s', ( G5_SERVER_TIME - (86400 * $keep_term) ) );
$beforetime = date('Y-m-d H:i:s', ( G5_SERVER_TIME - (86400 * ($keep_term - 1)) ) );
$sql = " delete from {$g5['g5_shop_cart_table']} where ct_status = '쇼핑' and ct_time <= '$beforetime' ";
sql_query($sql);
//------------------------------------------------------------------------------

11
adm/shop_admin/orderlistupdate.php
View File

@ -239,6 +239,17 @@ for ($i=0; $i<count($_POST['chk']); $i++)
case '배송' :
if ($change_status != '완료') continue;
change_status($od_id, '배송', '완료');
// 완료인 경우에만 상품구입 합계수량을 상품테이블에 저장한다.
$sql2 = " select ct_id, ct_qty from {$g5['g5_shop_cart_table']} where od_id = '$od_id' ";
$result2 = sql_query($sql2);
for ($k=0; $row2=sql_fetch_array($result2); $k++) {
$sql3 = " select it_id, sum(ct_qty) as sum_qty from {$g5['g5_shop_cart_table']} where ct_id = '{$row2['ct_id']}' ";
$row3 = sql_fetch($sql3);
$sql4 = " update {$g5['g5_shop_item_table']} set it_sum_qty = '{$row3['sum_qty']}' where it_id = '{$row3['it_id']}' ";
sql_query($sql4);
}
break;
} // switch end

1
adm/sql_write.sql
View File

@ -29,7 +29,6 @@ CREATE TABLE `__TABLE_NAME__` (
`wr_ip` varchar(255) NOT NULL,
`wr_facebook_user` varchar(255) NOT NULL,
`wr_twitter_user` varchar(255) NOT NULL,
`wr_me2day_user` varchar(255) NOT NULL,
`wr_1` varchar(255) NOT NULL,
`wr_2` varchar(255) NOT NULL,
`wr_3` varchar(255) NOT NULL,