g4s merge 충돌 수정

2013-05-29 09:06:13 +09:00
parent 93848e4819 b1dcfd185c
commit 158eccb534
104 changed files with 10830 additions and 654 deletions
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@ -95,6 +95,8 @@ $sql = " insert into {$g4['board_table']}
                bo_notice = '{$board['bo_notice']}',
                bo_upload_count = '{$board[bo_upload_count]}',
                bo_use_email = '{$board[bo_use_email]}',
+                bo_use_cert = '{$board[bo_use_cert]}',
+                bo_use_sns = '{$board[bo_use_sns]}',
                bo_sort_field = '{$board['bo_sort_field']}',
                bo_1_subj = '{$board['bo_1_subj']}',
                bo_2_subj = '{$board['bo_2_subj']}',
--- a/adm/board_delete.php
+++ b/adm/board_delete.php
@ -1,28 +0,0 @@
-<?php
-$sub_menu = "300100";
-include_once('./_common.php');
-
-check_demo();
-
-if ($is_admin != 'super')
-    alert("게시판 삭제는 최고관리자만 가능합니다.");
-
-auth_check($auth[$sub_menu], 'd');
-
-check_token();
-
-// _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
-define('_BOARD_DELETE_', TRUE);
-
-// include 전에 $bo_table 값을 반드시 넘겨야 함
-$tmp_bo_table = escape_trim($_GET['bo_table']);
-$sql = " select * from {$g4['board_table']} where bo_table = '{$tmp_bo_table}' ";
-$row = sql_fetch($sql);
-if (!$row) {
-    alert('게시판을 삭제할 수 없습니다.');
-}
-
-include_once ('./board_delete.inc.php');
-
-goto_url('./board_list.php?'.$qstr.'&amp;page='.$page);
-?>
--- a/adm/board_form.php
+++ b/adm/board_form.php
@ -49,6 +49,15 @@ if (!isset($board['bo_use_cert'])) {
    sql_query(" ALTER TABLE `{$g4['board_table']}`  ADD `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' AFTER `bo_use_email` ", false);
 }

+if (!isset($board['bo_use_sns'])) {
+    sql_query(" ALTER TABLE `{$g4['board_table']}`  ADD `bo_use_sns` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_cert` ", false);
+
+    $result = sql_query(" select bo_table from `{$g4['board_table']}` ");
+    for ($i=0; $row=sql_fetch_array($result); $i++) {
+        sql_query(" ALTER TABLE `{$g4['write_prefix']}{$row['bo_table']}` ADD `wr_sns` SET( 'fb', 'tw', 'me', 'gp' ) NOT NULL AFTER `wr_ip` ", false);
+    }
+}
+
 sql_query(" ALTER TABLE `{$g4['board_table']}` CHANGE `bo_use_cert` `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' ", false);

 $required = "";
@ -668,6 +677,20 @@ $pg_anchor = '<ul class="anchor">
            <label for="chk_all_comment_max">전체적용</label>
        </td>
    </tr>
+    <tr>
+        <th scope="row"><label for="bo_use_sns">SNS 사용</label></th>
+        <td>
+            <?php echo help("사용에 체크하시면 소셜네트워크서비스(SNS)에 글을 퍼가거나 댓글을 동시에 등록할수 있습니다.<br>기본환경설정의 SNS 설정을 하셔야 사용이 가능합니다.") ?>
+            <input type="checkbox" name="bo_use_sns" value="1" id="bo_use_sns" <?php echo $board['bo_use_sns']?'checked':''; ?>>
+            사용
+        </td>
+        <td class="group_setting">
+            <input type="checkbox" name="chk_grp_use_sns" value="1" id="chk_grp_use_sns">
+            <label for="chk_grp_use_sns">그룹적용</label>
+            <input type="checkbox" name="chk_all_use_sns" value="1" id="chk_all_use_sns">
+            <label for="chk_all_use_sns">전체적용</label>
+        </td>
+    </tr>
    <tr>
        <th scope="row"><label for="bo_use_search">전체 검색 사용</label></th>
        <td>
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@ -77,6 +77,7 @@ $sql_common = " gr_id               = '{$_POST['gr_id']}',
                bo_use_list_content = '{$_POST['bo_use_list_content']}',
                bo_use_email        = '{$_POST['bo_use_email']}',
                bo_use_cert         = '{$_POST['bo_use_cert']}',
+                bo_use_sns          = '{$_POST['bo_use_sns']}',
                bo_table_width      = '{$_POST['bo_table_width']}',
                bo_subject_len      = '{$_POST['bo_subject_len']}',
                bo_mobile_subject_len      = '{$_POST['bo_mobile_subject_len']}',
@ -254,6 +255,7 @@ if (is_checked('chk_grp_use_list_view'))        $grp_fields .= " , bo_use_list_v
 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_use_sns'))              $grp_fields .= " , bo_use_sns = '{$bo_use_sns}' ";
 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}' ";
@ -337,6 +339,7 @@ if (is_checked('chk_all_use_list_view'))        $all_fields .= " , bo_use_list_v
 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_use_sns'))              $all_fields .= " , bo_use_sns = '{$bo_use_sns}' ";
 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/board_list.php
+++ b/adm/board_list.php
@ -103,6 +103,7 @@ $colspan = 15;
        <th scope="col">쓰기P<span class="sound_only">포인트</span></th>
        <th scope="col">댓글P<span class="sound_only">포인트</span></th>
        <th scope="col">다운P<span class="sound_only">포인트</span></th>
+        <th scope="col"><?php echo subject_sort_link('bo_use_sns') ?>SNS<br>사용</a></th>
        <th scope="col"><?php echo subject_sort_link('bo_use_search') ?>검색<br>사용</a></th>
        <th scope="col"><?php echo subject_sort_link('bo_show_menu') ?>메뉴<br>보임</a></th>
        <th scope="col"><?php echo subject_sort_link('bo_order') ?>출력<br>순서</a></th>
@ -143,6 +144,7 @@ $colspan = 15;
        <td><input type="text" name="bo_write_point[<?php echo $i ?>]" value="<?php echo $row['bo_write_point'] ?>" title="쓰기포인트" class="frm_input" size="2"></td>
        <td><input type="text" name="bo_comment_point[<?php echo $i ?>]" value="<?php echo $row['bo_comment_point'] ?>" title="댓글포인트" class="frm_input" size="2"></td>
        <td><input type="text" name="bo_download_point[<?php echo $i ?>]" value="<?php echo $row['bo_download_point'] ?>" title="다운포인트" class="frm_input" size="2"></td>
+        <td><input type="checkbox" name="bo_use_sns[<?php echo $i ?>]" value="1" id="bo_use_sns<?php echo $i ?>" <?php echo $row['bo_use_sns']?"checked":"" ?> title="선택시 SNS 사용"></td>
        <td><input type="checkbox" name="bo_use_search[<?php echo $i ?>]" value="1" id="bo_use_search_<?php echo $i ?>" <?php echo $row['bo_use_search']?"checked":"" ?> title="선택시 검색사용"></td>
        <td><input type="checkbox" name="bo_show_menu[<?php echo $i ?>]" value="1" id="bo_show_menu_<?php echo $i ?>" <?php echo $row['bo_show_menu']?"checked":"" ?> title="선택시 메뉴보이기"></td>
        <td><input type="text" name="bo_order[<?php echo $i ?>]" value="<?php echo $row['bo_order'] ?>" id="bo_order<?php echo $i ?>" title="출력순서" class="frm_input" size="2"></td>
--- a/adm/board_list_update.php
+++ b/adm/board_list_update.php
@ -38,6 +38,7 @@ if ($_POST['act_button'] == "선택수정") {
                        bo_comment_point    = '{$_POST['bo_comment_point'][$k]}',
                        bo_download_point   = '{$_POST['bo_download_point'][$k]}',
                        bo_use_search       = '{$_POST['bo_use_search'][$k]}',
+                        bo_use_sns          = '{$_POST['bo_use_sns'][$k]}',
                        bo_show_menu        = '{$_POST['bo_show_menu'][$k]}',
                        bo_order            = '{$_POST['bo_order'][$k]}'
                  where bo_table            = '{$_POST['board_table'][$k]}' ";
--- a/adm/boardgroup_delete.php
+++ b/adm/boardgroup_delete.php
@ -1,35 +0,0 @@
-<?php
-$sub_menu = "300200";
-include_once('./_common.php');
-
-check_demo();
-
-auth_check($auth[$sub_menu], 'd');
-
-$gr_id = mysql_real_escape_string(trim($_POST['gr_id']));
-$row = sql_fetch(" select count(*) as cnt from {$g4['board_table']} where gr_id = '{$gr_id}' ");
-if ($row['cnt'])
-    alert('이 그룹에 속한 게시판이 존재하여 게시판 그룹을 삭제할 수 없습니다.\\n\\n이 그룹에 속한 게시판을 먼저 삭제하여 주십시오.', './board_list.php?sfl=gr_id&amp;stx='.$gr_id);
-
-
-/*
-// _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
-define("_BOARD_DELETE_", TRUE);
-
-$sql = " select * from $g4['board_table'] where gr_id = '$gr_id' ";
-$result = sql_query($sql);
-while ($row = sql_fetch_array($result)) {
-    $tmp_bo_table = $row['bo_table'];
-
-    include ('./board_delete.inc.php');
-}
-*/
-
-// 그룹 삭제
-sql_query(" delete from {$g4['group_table']} where gr_id = '{$gr_id}' ");
-
-// 그룹접근 회원 삭제
-sql_query(" delete from {$g4['group_member_table']} where gr_id = '{$gr_id}' ");
-
-goto_url('boardgroup_list.php?'.$qstr);
-?>
--- a/adm/config_form.php
+++ b/adm/config_form.php
@ -30,6 +30,11 @@ if(!isset($config['cf_gcaptcha_mp3'])) {
                    ADD `cf_gcaptcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", true);
 }

+if(!isset($config['cf_googl_shorturl_apikey'])) {
+    sql_query(" ALTER TABLE `{$g4['config_table']}`
+                    ADD `cf_googl_shorturl_apikey` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_gcaptcha_mp3` ", true);
+}
+
 if(!isset($config['cf_kcpcert_site_cd'])) {
    sql_query(" ALTER TABLE `{$g4['config_table']}`
                    ADD `cf_kcpcert_site_cd` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", true);
@ -48,6 +53,15 @@ if(!isset($config['cf_mobile_pages'])) {
    sql_query(" UPDATE `{$g4['config_table']}` SET cf_mobile_pages = '5' ", true);
 }

+if(!isset($config['cf_facebook_appid'])) {
+    sql_query(" ALTER TABLE `{$g4['config_table']}`
+                    ADD `cf_facebook_appid` VARCHAR(255) NOT NULL AFTER `cf_kcpcert_use`,  
+                    ADD `cf_facebook_secret` VARCHAR(255) NOT NULL AFTER `cf_facebook_appid`,
+                    ADD `cf_twitter_key` VARCHAR(255) NOT NULL AFTER `cf_facebook_secret`,
+                    ADD `cf_twitter_secret` VARCHAR(255) NOT NULL AFTER `cf_twitter_key`,
+                    ADD `cf_me2day_key` VARCHAR(255) NOT NULL AFTER `cf_twitter_secret` ", true);
+}
+
 // uniqid 테이블이 없을 경우 생성
 if(!sql_query(" select uq_id from {$g4['uniqid_table']} limit 1 ", false)) {
    sql_query(" CREATE TABLE IF NOT EXISTS `{$g4['uniqid_table']}` (
@ -68,6 +82,7 @@ $pg_anchor = '<ul class="anchor">
    <li><a href="#anc_cf_article_mail">글작성메일</a></li>
    <li><a href="#anc_cf_join_mail">가입메일</a></li>
    <li><a href="#anc_cf_vote_mail">투표메일</a></li>
+    <li><a href="#anc_cf_sns">SNS</a></li>
    <li><a href="#anc_cf_extra">여분필드</a></li>
 </ul>';
 ?>
@ -701,6 +716,56 @@ $pg_anchor = '<ul class="anchor">
    </table>
 </section>

+
+<section id="anc_cf_sns" class="cbox">
+    <h2>소셜네트워크서비스(SNS : Social Network Service)</h2>
+    <?php echo $pg_anchor ?>
+
+    <table class="frm_tbl">
+    <colgroup>
+        <col class="grid_3">
+        <col class="grid_6">
+        <col class="grid_3">
+        <col class="grid_6">
+    </colgroup>
+    <tbody>
+    <tr>
+        <th scope="row"><label for="cf_facebook_appid">페이스북 앱 ID</label></th>
+        <td>
+            <input type="text" name="cf_facebook_appid" value="<?php echo $config['cf_facebook_appid'] ?>" id="cf_facebook_appid" class="frm_input"> <a href="https://developers.facebook.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
+        </td>
+        <th scope="row"><label for="cf_facebook_secret">페이스북 앱 Secret</label></th>
+        <td>
+            <input type="text" name="cf_facebook_secret" value="<?php echo $config['cf_facebook_secret'] ?>" id="cf_facebook_secret" class="frm_input" size="35">
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="cf_twitter_key">트위터 컨슈머 Key</label></th>
+        <td>
+            <input type="text" name="cf_twitter_key" value="<?php echo $config['cf_twitter_key'] ?>" id="cf_twitter_key" class="frm_input"> <a href="https://dev.twitter.com/apps" target="_blank" class="btn_frmline">앱 등록하기</a>
+        </td>
+        <th scope="row"><label for="cf_twitter_secret">트위터 컨슈머 Secret</label></th>
+        <td>
+            <input type="text" name="cf_twitter_secret" value="<?php echo $config['cf_twitter_secret'] ?>" id="cf_twitter_secret" class="frm_input" size="35">
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="cf_me2day_key">미투데이 Key</label></th>
+        <td colspan="3">
+            <input type="text" name="cf_me2day_key" value="<?php echo $config['cf_me2day_key'] ?>" id="cf_me2day_key" class="frm_input"> <a href="http://me2day.net/me2/app/get_appkey" target="_blank" class="btn_frmline">앱 등록하기</a>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="cf_googl_shorturl_apikey">구글 짧은주소 API Key</label></th>
+        <td>
+            <input type="text" name="cf_googl_shorturl_apikey" value="<?php echo $config['cf_googl_shorturl_apikey'] ?>" id="cf_googl_shorturl_apikey" class="frm_input"> <a href="http://code.google.com/apis/console/" target="_blank" class="btn_frmline">API Key 등록하기</a>
+        </td>
+    </tr>
+    </tbody>
+    </table>
+</section>
+
+
 <section id="anc_cf_extra" class="cbox">
    <h2>여분필드 기본 설정</h2>
    <?php echo $pg_anchor ?>
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@ -96,13 +96,19 @@ $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']}',
-                 cf_kcpcert_use = '{$_POST['cf_kcpcert_use']}',
-                 cf_kcpcert_site_cd = '{$_POST['cf_kcpcert_site_cd']}',
                 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_gcaptcha_mp3 = '{$_POST['cf_gcaptcha_mp3']}',
+                 cf_googl_shorturl_apikey = '{$_POST['cf_googl_shorturl_apikey']}',
+                 cf_kcpcert_site_cd = '{$_POST['cf_kcpcert_site_cd']}',
+                 cf_kcpcert_use = '{$_POST['cf_kcpcert_use']}',
+                 cf_facebook_appid = '{$_POST['cf_facebook_appid']}',
+                 cf_facebook_secret = '{$_POST['cf_facebook_secret']}',
+                 cf_twitter_key = '{$_POST['cf_twitter_key']}',
+                 cf_twitter_secret = '{$_POST['cf_twitter_secret']}',
+                 cf_me2day_key = '{$_POST['cf_me2day_key']}',
                 cf_1_subj = '{$_POST['cf_1_subj']}',
                 cf_2_subj = '{$_POST['cf_2_subj']}',
                 cf_3_subj = '{$_POST['cf_3_subj']}',