Merge branch 'inicis-cert-sa' of https://github.com/seeoya/gnuboard5 into inicis-cert-sa

Conflicts:
	adm/config_form.php
This commit is contained in:
seeoya
2021-09-15 12:21:46 +09:00
59 changed files with 2693 additions and 920 deletions

View File

@ -272,12 +272,25 @@ if(!isset($member['mb_scrap_cnt'])) {
}
// 아이코드 토큰키 추가
if( ! isset($config['cf_icode_token_key']) ){
if(!isset($config['cf_icode_token_key']) ){
$sql = "ALTER TABLE `{$g5['config_table']}`
ADD COLUMN `cf_icode_token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `cf_icode_server_port`; ";
sql_query($sql, false);
}
// 아이디/비밀번호 찾기에 본인확인 사용 여부 필드 추가
if(!isset($config['cf_cert_find']) ){
$sql = "ALTER TABLE `{$g5['config_table']}`
ADD COLUMN `cf_cert_find` TINYINT(4) NOT NULL DEFAULT '0' AFTER `cf_cert_use`; ";
sql_query($sql, false);
}
// 통합인증 필드 추가
if(!isset($config['cf_cert_sa']) ){
$sql = "ALTER TABLE `{$g5['config_table']}`
ADD COLUMN `cf_cert_sa` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_cert_hp`,
ADD COLUMN `cf_cert_kg_cd` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_cert_sa`,
ADD COLUMN `cf_cert_kg_mid` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_cert_kg_cd`; ";
sql_query($sql, false);
}
if(!$config['cf_faq_skin']) $config['cf_faq_skin'] = "basic";
if(!$config['cf_mobile_faq_skin']) $config['cf_mobile_faq_skin'] = "basic";
@ -836,16 +849,15 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
<?php echo option_selected("1", $config['cf_cert_use'], "테스트"); ?>
<?php echo option_selected("2", $config['cf_cert_use'], "실서비스"); ?>
</select>
<input type="checkbox" name="cf_cert_find" id="cf_cert_find"><label for="cf_cert_find">아이디/비밀번호 찾기에 사용하기</label>
<input type="checkbox" name="cf_cert_find" id="cf_cert_find" value="1" <?php if($config['cf_cert_find'] == 1) { ?> checked <?php } ?>><label for="cf_cert_find">아이디/비밀번호 찾기에 사용하기</label>
</td>
</tr>
<tr>
<th scope="row" class="cf_cert_service"><label for="cf_cert_sa">통합인증</label></th>
<td class="cf_cert_service">
<select name="cf_cert_sa" id="cf_cert_sa">
<!-- #TODO config 수정 필요 -->
<?php echo option_selected("0", $config['cf_cert_sa'], "사용안함"); ?>
<?php echo option_selected("1", $config['cf_cert_sa'], "KG이니시스 통합인증"); ?>
<?php echo option_selected("", $config['cf_cert_sa'], "사용안함"); ?>
<?php echo option_selected("sa", $config['cf_cert_sa'], "KG이니시스 통합인증"); ?>
</select>
</td>
</tr>
@ -875,10 +887,10 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
<td class="cf_cert_service">
<span class="sitecode title">MID</span>
<span class="sitecode">SRA</span>
<input type="text" name="cf_cert_kg_cd" value="<?php echo get_sanitize_input($config['cf_cert_kg_cd']); ?>" id="cf_cert_kg_cd" class="frm_input" size="20" minlength="7" maxlength="7"><br>
<input type="text" name="cf_cert_kg_mid" value="<?php echo get_sanitize_input($config['cf_cert_kg_mid']); ?>" id="cf_cert_kg_mid" class="frm_input" size="20" minlength="7" maxlength="7"><br>
<br>
<span class="sitecode title">API Key</span>
<input type="text" name="cf_cert_kg_mid" value="<?php echo get_sanitize_input($config['cf_cert_kg_mid']); ?>" id="cf_cert_kg_mid" class="frm_input" size="40">
<input type="text" name="cf_cert_kg_cd" value="<?php echo get_sanitize_input($config['cf_cert_kg_cd']); ?>" id="cf_cert_kg_cd" class="frm_input" size="40">
</td>
</tr>
<tr>