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

Conflicts: adm/config_form.php
2013-04-25 18:39:48 +09:00
parent 5d7c4c57aa 099d879ac5
commit 15fc3e7087
10 changed files with 106 additions and 43 deletions
--- a/adm/admin.lib.php
+++ b/adm/admin.lib.php
@ -263,4 +263,7 @@ if (isset($sfl))  $arr_query[] = 'sfl='.$sfl;
 if (isset($stx))  $arr_query[] = 'stx='.$stx;
 if (isset($page)) $arr_query[] = 'page='.$page;
 $qstr = implode("&amp;", $arr_query);
+
+// 관리자에서는 추가 스크립트는 사용하지 않는다.
+$config['cf_add_script'] = '';
 ?>
--- a/adm/board_form.php
+++ b/adm/board_form.php
@ -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>
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@ -85,6 +85,7 @@ $sql_common = " gr_id               = '{$_POST['gr_id']}',
                bo_use_list_view    = '{$_POST['bo_use_list_view']}',
                bo_use_list_content = '{$_POST['bo_use_list_content']}',
                bo_use_email        = '{$_POST['bo_use_email']}',
+                bo_use_cert         = '{$_POST['bo_use_cert']}',
                bo_table_width      = '{$_POST['bo_table_width']}',
                bo_subject_len      = '{$_POST['bo_subject_len']}',
                bo_mobile_subject_len      = '{$_POST['bo_mobile_subject_len']}',
@ -261,6 +262,7 @@ if (is_checked('chk_grp_use_ip_view'))          $grp_fields .= " , bo_use_ip_vie
 if (is_checked('chk_grp_use_list_view'))        $grp_fields .= " , bo_use_list_view = '{$bo_use_list_view}' ";
 if (is_checked('chk_grp_use_list_content'))     $grp_fields .= " , bo_use_list_content = '{$bo_use_list_content}' ";
 if (is_checked('chk_grp_use_email'))            $grp_fields .= " , bo_use_email = '{$bo_use_email}' ";
+if (is_checked('chk_grp_use_cert'))             $grp_fields .= " , bo_use_cert = '{$bo_use_cert}' ";
 if (is_checked('chk_grp_skin'))                 $grp_fields .= " , bo_skin = '{$bo_skin}' ";
 if (is_checked('chk_grp_mobile_skin'))          $grp_fields .= " , bo_mobile_skin = '{$bo_mobile_skin}' ";
 if (is_checked('chk_grp_gallery_cols'))         $grp_fields .= " , bo_gallery_cols = '{$bo_gallery_cols}' ";
@ -343,6 +345,7 @@ if (is_checked('chk_all_use_ip_view'))          $all_fields .= " , bo_use_ip_vie
 if (is_checked('chk_all_use_list_view'))        $all_fields .= " , bo_use_list_view = '{$bo_use_list_view}' ";
 if (is_checked('chk_all_use_list_content'))     $all_fields .= " , bo_use_list_content = '{$bo_use_list_content}' ";
 if (is_checked('chk_all_use_email'))            $all_fields .= " , bo_use_email = '{$bo_use_email}' ";
+if (is_checked('chk_all_use_cert'))             $all_fields .= " , bo_use_cert = '{$bo_use_cert}' ";
 if (is_checked('chk_all_skin'))                 $all_fields .= " , bo_skin = '{$bo_skin}' ";
 if (is_checked('chk_all_mobile_skin'))          $all_fields .= " , bo_mobile_skin = '{$bo_mobile_skin}' ";
 if (is_checked('chk_all_gallery_cols'))         $all_fields .= " , bo_gallery_cols = '{$bo_gallery_cols}' ";
--- a/adm/config_form.php
+++ b/adm/config_form.php
@ -531,7 +531,11 @@ $pg_anchor = '<ul class="anchor">
 <section id="anc_cf_cert" class="cbox">
    <h2>본인확인</h2>
    <?php echo $pg_anchor ?>
-    <p>회원가입 시 본인확인 수단을 설정합니다.</p>
+    <p>
+        회원가입 시 본인확인 수단을 설정합니다.<br>
+        실명과 휴대폰 번호 그리고 본인확인 당시에 성인인지의 여부만을 저장하며 생일, 성별 등의 정보는 저장하지 않습니다.<br>
+        게시판의 경우 본인확인 또는 성인여부를 따져 게시물을 조회할 수 권한을 줄 수 있습니다.
+    </p>

    <table class="frm_tbl">
    <colgroup>
@ -544,15 +548,15 @@ $pg_anchor = '<ul class="anchor">
        <td>
            <?php echo help('KCP 사이트코드가 없으면 테스트만 가능합니다.') ?>
            <select name="cf_kcpcert_use" id="cf_kcpcert_use">
-                <option value="none"    <?php echo get_selected($config['cf_kcpcert_use'], 'none'   ); ?>>사용안함</option>
-                <option value="test"    <?php echo get_selected($config['cf_kcpcert_use'], 'test'   ); ?>>테스트</option>
-                <option value="service" <?php echo get_selected($config['cf_kcpcert_use'], 'service'); ?>>실서비스</option>
+                <?php echo option_selected("none",    $config['cf_kcpcert_use'], "사용안함"); ?>
+                <?php echo option_selected("test",    $config['cf_kcpcert_use'], "테스트"); ?>
+                <?php echo option_selected("service", $config['cf_kcpcert_use'], "실서비스"); ?>
            </select>
        </td>
    </tr>
-    <tr id="kcpcert1">
-        <th scope="row"><label for="cf_kcpcert_site_cd">KCP 사이트코드</label></th>
-        <td colspan="3">
+    <tr>
+        <th scope="row" class="cf_cert_kcp"><label for="cf_kcpcert_site_cd">KCP 사이트코드</label></th>
+        <td colspan="3" class="cf_cert_kcp">
            <?php echo help('SM으로 시작하는 5자리 사이트 코드중 뒤의 3자리만 입력해 주십시오.<br>서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 사이트코드를 발급 받으실 수 있습니다.') ?>
            <span class="sitecode">SM</span>
            <input type="text" name="cf_kcpcert_site_cd" value="<?php echo $config['cf_kcpcert_site_cd'] ?>" id="cf_kcpcert_site_cd" class="frm_input" size="3"> <a href="http://sir.co.kr/main/g4s/kcpcert.html" target="_blank" class="btn_frmline">본인확인 서비스 신청페이지</a>
@ -738,6 +742,21 @@ $pg_anchor = '<ul class="anchor">
 </form>

 <script>
+$(function(){
+    <?php if($config['cf_kcpcert_use'] != 'service') { ?>
+    $(".cf_cert_kcp").addClass("cf_cert_kcp_hide");
+    <?php } ?>
+    $("#cf_kcpcert_use").change(function(){
+        var cf_cert_kcp_sel = $("#cf_kcpcert_use option:selected").val();
+        if (cf_cert_kcp_sel == "service")
+        {
+            $(".cf_cert_kcp").removeClass("cf_cert_kcp_hide");
+        } else {
+            $(".cf_cert_kcp").addClass("cf_cert_kcp_hide");
+        }
+    });
+});
+
 function fconfigform_submit(f)
 {
    f.action = "./config_form_update.php";
--- a/adm/popular_rank.php
+++ b/adm/popular_rank.php
@ -1,6 +1,7 @@
 <?php
 $sub_menu = "300400";
 include_once('./_common.php');
+include_once(G4_PLUGIN_PATH.'/jquery-ui/datepicker.php');

 auth_check($auth[$sub_menu], 'r');

@ -36,6 +37,12 @@ include_once('./admin.head.php');
 $colspan = 3;
 ?>

+<script>
+$(function(){
+    $("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yy-mm-dd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" }); 
+});
+</script>
+
 <form name="fsearch" id="fsearch" method="get">
 <fieldset>
    <legend>인기검색어 검색</legend>
@ -44,8 +51,8 @@ $colspan = 3;
        건수 <?php echo number_format($total_count) ?>개
    </span>
    <label for="fr_date">기간설정</label>
-    <input type="text" name="fr_date" value="<?php echo $fr_date ?>" id="fr_date" title="구간시작일" class="frm_input" maxlength="10"> 부터
-    <input type="text" name="to_date" value="<?php echo $to_date ?>" id="to_date" title="구간종료일" class="frm_input" maxlength="10"> 까지
+    <input type="text" name="fr_date" value="<?php echo $fr_date ?>" id="fr_date" title="구간시작일" class="frm_input" size="11" maxlength="10"> 부터
+    <input type="text" name="to_date" value="<?php echo $to_date ?>" id="to_date" title="구간종료일" class="frm_input" size="11" maxlength="10"> 까지
    <input type="submit" class="btn_submit" value="검색">
 </fieldset>
 </form>
--- a/css/admin.css
+++ b/css/admin.css
@ -1,4 +1,4 @@
-/* SIR SOFT 지운아빠 Mar. 2013 */
+/* SIR 지운아빠 */

 /* 초기화 */
 html {overflow-y:scroll}
@ -280,6 +280,9 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 .txt_true {color:#e8180c}
 .txt_false {color:#ccc}

+/* 환경설정 */
+.cf_cert_kcp_hide {display:none}
+
 /* 관리권한설정 */
 #add_admin fieldset {margin-top:20px}

--- a/css/default.css
+++ b/css/default.css
@ -1,4 +1,4 @@
-/* SIR SOFT 지운아빠 Mar. 2013 */
+/* SIR 지운아빠 */

 /* 초기화 */
 html {overflow-y:scroll}
--- a/css/mobile.css
+++ b/css/mobile.css
@ -1,4 +1,4 @@
-/* SIR SOFT 지운아빠 Mar. 2013 */
+/* SIR 지운아빠 */

 /* 초기화 */
 html {overflow-y:scroll}
--- a/head.sub.php
+++ b/head.sub.php
@ -32,19 +32,23 @@ header("Pragma: no-cache"); // HTTP/1.0
 <html lang="ko">
 <head>
 <meta charset="utf-8">
-<?php if (G4_IS_MOBILE) { ?>
-<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=0,maximum-scale=10,user-scalable=yes">
-<meta name="HandheldFriendly" content="true">
-<meta name="format-detection" content="telephone=no">
-<?php }  ?>
-<title><?php echo $g4_head_title ?></title>
-<?php if (defined('G4_IS_ADMIN')) {  ?>
-<link rel="stylesheet" href="<?php echo G4_CSS_URL ?>/admin.css">
-<?php } else {  ?>
-<link rel="stylesheet" href="<?php echo G4_CSS_URL ?>/<?php echo (G4_IS_MOBILE?'mobile':'default') ?>.css">
-<?php } ?>
-<!-- <meta http-equiv="imagetoolbar" content="no"> -->
-<!-- <meta http-equiv="X-UA-Compatible" content="IE=Edge" /> -->
+<?php
+if (G4_IS_MOBILE) {
+    echo '<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=0,maximum-scale=10,user-scalable=yes">'.PHP_EOL;
+    echo '<meta name="HandheldFriendly" content="true">'.PHP_EOL;
+    echo '<meta name="format-detection" content="telephone=no">'.PHP_EOL;
+}
+?>
+<title><?php echo $g4_head_title; ?></title>
+<?php 
+if (defined('G4_IS_ADMIN')) {
+    echo '<link rel="stylesheet" href="'.G4_CSS_URL.'/admin.css">'.PHP_EOL;
+} else {
+    echo '<link rel="stylesheet" href="'.G4_CSS_URL.'/'.(G4_IS_MOBILE?'mobile':'default').'.css">'.PHP_EOL;
+}
+// echo '<meta http-equiv="imagetoolbar" content="no">';
+// echo '<meta http-equiv="X-UA-Compatible" content="IE=Edge" />';
+?>
 <!--[if lte IE 8]>
 <script src="<?php echo G4_JS_URL ?>/html5.js"></script>
 <![endif]-->
@ -58,19 +62,22 @@ var g4_is_mobile = "<?php echo G4_IS_MOBILE ?>";
 var g4_bo_table  = "<?php echo isset($bo_table)?$bo_table:''; ?>";
 var g4_sca       = "<?php echo isset($sca)?$sca:''; ?>";
 var g4_cookie_domain = "<?php echo G4_COOKIE_DOMAIN ?>";
-<?php if ($is_admin) { echo 'var g4_admin_url = "'.G4_ADMIN_URL.'";'; }
+<?php 
+if ($is_admin) {
+    echo 'var g4_admin_url = "'.G4_ADMIN_URL.'";'.PHP_EOL; 
+} 
 ?>
 </script>
 <script src="<?php echo G4_JS_URL ?>/jquery-1.8.3.min.js"></script>
 <script src="<?php echo G4_JS_URL ?>/jquery.menu.js"></script>
 <script src="<?php echo G4_JS_URL ?>/common.js"></script>
 <script src="<?php echo G4_JS_URL ?>/wrest.js"></script>
-<?php if(G4_IS_MOBILE) {  ?>
-<script>
-    set_cookie("device_width", screen.width, 6, g4_cookie_domain);
-</script>
-<?php }  ?>
-<?php echo $config['cf_add_script'];  ?>
+<?php 
+if(G4_IS_MOBILE) {
+    echo '<script> set_cookie("device_width", screen.width, 6, g4_cookie_domain); </script>'.PHP_EOL;
+}
+echo $config['cf_add_script'];  
+?>
 </head>
 <body>
 <?php
@ -78,6 +85,8 @@ if ($is_member) { // 회원이라면 로그인 중이라는 메세지를 출력
    if ($is_admin == 'super') $sr_admin_msg = "최고관리자 ";
    else if ($is_admin == 'group') $sr_admin_msg = "그룹관리자 ";
    else if ($is_admin == 'board') $sr_admin_msg = "게시판관리자 ";
-?>
-    <div id="hd_login_msg"><?php echo $sr_admin_msg ?><?php echo $member['mb_nick'] ?>님 로그인 중 <a href="<?php echo G4_URL ?>/bbs/logout.php">로그아웃</a></div>
-<?php }  ?>
+
+    echo '<div id="hd_login_msg">'.$sr_admin_msg.$member['mb_nick'].'님 로그인 중 ';
+    echo '<a href="'.G4_BBS_URL.'/logout.php">로그아웃</a></div>';
+}
+?>
--- a/tail.sub.php
+++ b/tail.sub.php
@ -20,13 +20,6 @@ $(function() {
 </script>
 <![endif]-->

-<script>
-
-</script>
-
 </body>
 </html>
-<?php
-// HTML 마지막 처리 함수 : 반드시 넣어주시기 바랍니다.
-echo html_end();
-?>
+<?php echo html_end(); // HTML 마지막 처리 함수 : 반드시 넣어주시기 바랍니다. ?>