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

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

Browse Source 
Conflicts:
	adm/config_form_update.php
This commit is contained in:
gnuboard
2013-02-27 15:34:35 +09:00
parent d90e14bd32 aa1bdc7e78
commit 2ae14ee5f8
9 changed files with 117 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
adm/config_form.php
View File

@ -10,9 +10,9 @@ if ($is_admin != 'super')
alert('최고관리자만 접근 가능합니다.');
if (!isset($config['cf_include_index'])) {
sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_include_index` VARCHAR(255) NOT NULL AFTER `cf_admin`,
ADD `cf_include_head` VARCHAR(255) NOT NULL AFTER `cf_include_index`,
sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_include_index` VARCHAR(255) NOT NULL AFTER `cf_admin`,
ADD `cf_include_head` VARCHAR(255) NOT NULL AFTER `cf_include_index`,
ADD `cf_include_tail` VARCHAR(255) NOT NULL AFTER `cf_include_head`,
ADD `cf_add_script` TEXT NOT NULL AFTER `cf_include_tail` ", true);
}
@ -25,6 +25,11 @@ if (!isset($config['cf_mobile_new_skin'])) {
ADD `cf_mobile_member_skin` VARCHAR(255) NOT NULL AFTER `cf_mobile_connect_skin` ", 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'] = '환경설정';
include_once ('./admin.head.php');
@ -413,6 +418,10 @@ $pg_anchor = "
<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>
</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>
<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>

4
adm/config_form_update.php
View File

@ -99,10 +99,14 @@ $sql = " update {$g4['config_table']}
cf_privacy = '{$_POST['cf_privacy']}',
cf_open_modify = '{$_POST['cf_open_modify']}',
cf_memo_send_point = '{$_POST['cf_memo_send_point']}',
<<<<<<< HEAD
cf_mobile_new_skin = '{$_POST['cf_mobile_new_skin']}',
cf_mobile_search_skin = '{$_POST['cf_mobile_search_skin']}',
cf_mobile_connect_skin = '{$_POST['cf_mobile_connect_skin']}',
cf_mobile_member_skin = '{$_POST['cf_mobile_member_skin']}',
=======
cf_adult_check = '{$_POST['cf_adult_check']}',
>>>>>>> aa1bdc7e789bc4b81151546f1180d34939329093
cf_1_subj = '{$_POST['cf_1_subj']}',
cf_2_subj = '{$_POST['cf_2_subj']}',
cf_3_subj = '{$_POST['cf_3_subj']}',

6
adm/member_form.php
View File

@ -80,6 +80,12 @@ if ($mb['mb_open']) {
$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'] = "차단된 ";
else $g4['title'] .= "";
$g4['title'] .= '회원 '.$html_title;