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

Conflicts:
	adm/config_form.php
This commit is contained in:
gnuboard
2013-04-25 18:39:48 +09:00
10 changed files with 106 additions and 43 deletions

View File

@ -45,6 +45,10 @@ if (!isset($board['bo_mobile_content_head'])) {
sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_mobile_content_head` TEXT NOT NULL AFTER `bo_content_head`, ADD `bo_mobile_content_tail` TEXT NOT NULL AFTER `bo_content_tail`", false);
}
if (!isset($board['bo_use_cert'])) {
sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_cert` ENUM('none','cert','adult') NOT NULL DEFAULT 'none' AFTER `bo_use_email` ", false);
}
$required = "";
$readonly = "";
if ($w == '') {
@ -87,6 +91,7 @@ if ($w == '') {
$board['bo_include_head'] = '_head.php';
$board['bo_include_tail'] = '_tail.php';
$board['bo_show_menu'] = true;
$board['bo_use_cert'] = 'none';
} else if ($w == 'u') {
@ -544,6 +549,27 @@ $pg_anchor = '<ul class="anchor">
<label for="chk_all_use_email">전체적용</label>
</td>
</tr>
<tr>
<th scope="row"><label for="bo_use_cert">휴대폰 본인확인 사용</label></th>
<td>
<?php echo help("본인확인 여부에 따라 게시물을 조회 할 수 있도록 합니다."); ?>
<select id="bo_use_cert" name="bo_use_cert">
<?php
echo option_selected("none", $board['bo_use_cert'], "사용안함");
if ($config['cf_kcpcert_use'] != 'none') {
echo option_selected("cert", $board['bo_use_cert'], "본인확인된 회원전체");
echo option_selected("adult", $board['bo_use_cert'], "본인확인된 성인회원만");
}
?>
</select>
</td>
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_cert" value="1" id="chk_grp_use_cert">
<label for="chk_grp_use_cert">그룹적용</label>
<input type="checkbox" name="chk_all_use_cert" value="1" id="chk_all_use_cert">
<label for="chk_all_use_cert">전체적용</label>
</td>
</tr>
<tr>
<th scope="row"><label for="bo_upload_count">파일 업로드 갯수<strong class="sound_only">필수</strong></label></th>
<td>