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

Conflicts: adm/config_form.php
2021-09-15 12:21:46 +09:00
parent 20bb92025f 7a9e66542b
commit 6f30fed6fa
59 changed files with 2693 additions and 920 deletions
--- a/adm/config_form.php
+++ b/adm/config_form.php
@ -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>
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@ -22,7 +22,7 @@ check_admin_token();

 $cf_social_servicelist = !empty($_POST['cf_social_servicelist']) ? implode(',', $_POST['cf_social_servicelist']) : '';

-$check_keys = array('cf_lg_mid', 'cf_lg_mert_key', 'cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret');
+$check_keys = array('cf_lg_mid', 'cf_lg_mert_key', 'cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret','cf_cert_kg_cd','cf_cert_kg_mid');

 foreach( $check_keys as $key ){
    if ( isset($_POST[$key]) && $_POST[$key] ){
@ -99,8 +99,10 @@ $check_keys = array(
 'cf_social_login_use' => 'int',
 'cf_cert_req' => 'int',
 'cf_cert_use' => 'int',
+'cf_cert_find' => 'int',
 'cf_cert_ipin' => 'char',
 'cf_cert_hp' => 'char',
+'cf_cert_sa' => 'char',
 'cf_admin_email' => 'char',
 'cf_admin_email_name' => 'char',
 'cf_add_script' => 'text',
@ -171,12 +173,13 @@ foreach( $check_keys as $k => $v ){
 }

 // 본인확인을 사용할 경우 아이핀, 휴대폰인증 중 하나는 선택되어야 함
-if($_POST['cf_cert_use'] && !$_POST['cf_cert_ipin'] && !$_POST['cf_cert_hp'])
-    alert('본인확인을 위해 아이핀 또는 휴대폰 본인확인 서비스를 하나이상 선택해 주십시오');
+if($_POST['cf_cert_use'] && !$_POST['cf_cert_ipin'] && !$_POST['cf_cert_hp'] && !$_POST['cf_cert_sa'])
+    alert('본인확인을 위해 아이핀, 휴대폰 본인확인, KG이니시스 통합인증 서비스 중 하나이상 선택해 주십시오');

 if(!$_POST['cf_cert_use']) {
    $posts[$key] = $_POST['cf_cert_ipin'] = '';
    $posts[$key] = $_POST['cf_cert_hp'] = '';
+    $posts[$key] = $_POST['cf_cert_sa'] = '';
 }

 $sql = " update {$g5['config_table']}
@ -274,8 +277,12 @@ $sql = " update {$g5['config_table']}
                cf_captcha_mp3 = '{$_POST['cf_captcha_mp3']}',
                cf_editor = '{$_POST['cf_editor']}',
                cf_cert_use = '{$_POST['cf_cert_use']}',
+                cf_cert_find = '{$_POST['cf_cert_find']}',
                cf_cert_ipin = '{$_POST['cf_cert_ipin']}',
                cf_cert_hp = '{$_POST['cf_cert_hp']}',
+                cf_cert_sa = '{$_POST['cf_cert_sa']}',
+                cf_cert_kg_cd = '{$_POST['cf_cert_kg_cd']}',
+                cf_cert_kg_mid = '{$_POST['cf_cert_kg_mid']}',
                cf_cert_kcb_cd = '{$_POST['cf_cert_kcb_cd']}',
                cf_cert_kcp_cd = '{$_POST['cf_cert_kcp_cd']}',
                cf_lg_mid = '{$_POST['cf_lg_mid']}',
--- a/adm/member_list.php
+++ b/adm/member_list.php
@ -194,6 +194,10 @@ $colspan = 16;
                $mb_certify_case = '아이핀';
                $mb_certify_val = '';
                break;
+            case 'sa':
+                $mb_certify_case = '통합인증';
+                $mb_certify_val = '';
+                break;
            case 'admin':
                $mb_certify_case = '관리자';
                $mb_certify_val = 'admin';
--- a/adm/sms_admin/num_book.php
+++ b/adm/sms_admin/num_book.php
@ -178,7 +178,8 @@ function no_hp_click(val)
    }
    $line = 0;
    $qry = sql_query("select * from {$g5['sms5_book_table']} where 1 $sql_group $sql_search $sql_korean $sql_no_hp order by bk_no desc limit $page_start, $page_size");
-    while($res = sql_fetch_array($qry))
+    // while($res = sql_fetch_array($qry))
+    for ($i=0; $res = sql_fetch_array($qry); $i++) 
    {
        $bg = 'bg'.($line++%2);