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

This commit is contained in:
whitedot
2013-02-27 14:43:20 +09:00
4 changed files with 21 additions and 3 deletions

View File

@ -18,6 +18,11 @@ if (!isset($config['cf_include_index'])) {
", TRUE); ", TRUE);
} }
if(!isset($config['cf_adult_check'])) {
sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_adult_check` TINYINT(4) NOT NULL DEFAULT '0' AFTER `cf_memo_send_point` ", TRUE);
}
$g4['title'] = '환경설정'; $g4['title'] = '환경설정';
include_once ('./admin.head.php'); include_once ('./admin.head.php');
@ -364,6 +369,10 @@ $pg_anchor = "
<th scope="row"><label for="cf_register_point">회원가입시 포인트</label></th> <th scope="row"><label for="cf_register_point">회원가입시 포인트</label></th>
<td><input type="text" id="cf_register_point" name="cf_register_point" class="frm_input" value="<?=$config['cf_register_point']?>" size="5"> 점</td> <td><input type="text" id="cf_register_point" name="cf_register_point" class="frm_input" value="<?=$config['cf_register_point']?>" size="5"> 점</td>
</tr> </tr>
<tr>
<th scope='row' id="th310"><label for='cf_adult_check'>성인인증 사용</label></th>
<td colspan="3"><input type="checkbox" id="cf_adult_check" name="cf_adult_check" value="1" <?=$config['cf_adult_check']?'checked':'';?>> 사용</td>
</tr>
<tr> <tr>
<th scope='row' id="th310"><label for='cf_leave_day'>회원탈퇴후 삭제일</label></th> <th scope='row' id="th310"><label for='cf_leave_day'>회원탈퇴후 삭제일</label></th>
<td colspan="3"><input type="text" id="cf_leave_day" name="cf_leave_day" class="frm_input" value="<?=$config['cf_leave_day']?>" size="2"> 일 후 자동 삭제</td> <td colspan="3"><input type="text" id="cf_leave_day" name="cf_leave_day" class="frm_input" value="<?=$config['cf_leave_day']?>" size="2"> 일 후 자동 삭제</td>

View File

@ -99,6 +99,7 @@ $sql = " update {$g4['config_table']}
cf_privacy = '{$_POST['cf_privacy']}', cf_privacy = '{$_POST['cf_privacy']}',
cf_open_modify = '{$_POST['cf_open_modify']}', cf_open_modify = '{$_POST['cf_open_modify']}',
cf_memo_send_point = '{$_POST['cf_memo_send_point']}', cf_memo_send_point = '{$_POST['cf_memo_send_point']}',
cf_adult_check = '{$_POST['cf_adult_check']}',
cf_1_subj = '{$_POST['cf_1_subj']}', cf_1_subj = '{$_POST['cf_1_subj']}',
cf_2_subj = '{$_POST['cf_2_subj']}', cf_2_subj = '{$_POST['cf_2_subj']}',
cf_3_subj = '{$_POST['cf_3_subj']}', cf_3_subj = '{$_POST['cf_3_subj']}',

View File

@ -80,6 +80,12 @@ if ($mb['mb_open']) {
$open_no_checked = 'checked="checked"'; $open_no_checked = 'checked="checked"';
} }
if(!isset($mb['mb_adult'])) {
sql_query(" ALTER TABLE `{$g4['member_table']}`
ADD `mb_adult` ENUM('Y', 'N') NOT NULL DEFAULT 'N' AFTER `mb_birth`,
ADD `mb_hp_certify` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `mb_lost_certify` ", FALSE);
}
if ($mb['mb_intercept_date']) $g4['title'] = "차단된 "; if ($mb['mb_intercept_date']) $g4['title'] = "차단된 ";
else $g4['title'] .= ""; else $g4['title'] .= "";
$g4['title'] .= '회원 '.$html_title; $g4['title'] .= '회원 '.$html_title;

View File

@ -260,6 +260,7 @@ CREATE TABLE IF NOT EXISTS `g4s_config` (
`cf_privacy` text NOT NULL, `cf_privacy` text NOT NULL,
`cf_open_modify` int(11) NOT NULL default '0', `cf_open_modify` int(11) NOT NULL default '0',
`cf_memo_send_point` int(11) NOT NULL default '0', `cf_memo_send_point` int(11) NOT NULL default '0',
`cf_adult_check` tinyint(4) NOT NULL default '0',
`cf_1_subj` varchar(255) NOT NULL default '', `cf_1_subj` varchar(255) NOT NULL default '',
`cf_2_subj` varchar(255) NOT NULL default '', `cf_2_subj` varchar(255) NOT NULL default '',
`cf_3_subj` varchar(255) NOT NULL default '', `cf_3_subj` varchar(255) NOT NULL default '',
@ -391,6 +392,7 @@ CREATE TABLE IF NOT EXISTS `g4s_member` (
`mb_jumin` varchar(255) NOT NULL default '', `mb_jumin` varchar(255) NOT NULL default '',
`mb_sex` char(1) NOT NULL default '', `mb_sex` char(1) NOT NULL default '',
`mb_birth` varchar(255) NOT NULL default '', `mb_birth` varchar(255) NOT NULL default '',
`mb_adult` enum('Y','N') NOT NULL default 'N',
`mb_tel` varchar(255) NOT NULL default '', `mb_tel` varchar(255) NOT NULL default '',
`mb_hp` varchar(255) NOT NULL default '', `mb_hp` varchar(255) NOT NULL default '',
`mb_zip1` char(3) NOT NULL default '', `mb_zip1` char(3) NOT NULL default '',