From c8a69b054e530a07b039cda0b87dca13cc80fc2c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 10 Jun 2014 16:10:17 +0900
Subject: [PATCH] =?UTF-8?q?sns=20=EC=82=AC=EC=9A=A9=20=EB=95=8C=20?=
 =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EB=B3=B4=EA=B8=B0=20=EB=A1=9C?=
 =?UTF-8?q?=EB=94=A9=20=EC=86=8D=EB=8F=84=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/write.php                                 |   2 +-
 mobile/skin/board/basic/view_comment.skin.php |  16 +-
 .../skin/board/gallery/view_comment.skin.php  |  16 +-
 plugin/sns/_common.php                        |   3 +
 plugin/sns/view.sns.skin.php                  |  11 +-
 plugin/sns/view_comment_write.sns.skin.php    | 194 +++++++++---------
 skin/board/basic/view_comment.skin.php        |  16 +-
 skin/board/gallery/view_comment.skin.php      |  16 +-
 8 files changed, 166 insertions(+), 108 deletions(-)
 create mode 100644 plugin/sns/_common.php

diff --git a/bbs/write.php b/bbs/write.php
index 37faff604..e03fe4996 100644
--- a/bbs/write.php
+++ b/bbs/write.php
@@ -98,7 +98,7 @@ if ($w == '') {
         if ($member['mb_id'])
             alert('글을 답변할 권한이 없습니다.');
         else
-            alert('글을 답변할 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?$qstr&amp;url='.urlencode($_SERVER['PHP_SELF'].'?bo_table='.$bo_table));
+            alert('답변글을 작성할 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&amp;url='.urlencode($_SERVER['PHP_SELF'].'?bo_table='.$bo_table));
     }
 
     $tmp_point = isset($member['mb_point']) ? $member['mb_point'] : 0;
diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php
index a901968a2..7ebcce47d 100644
--- a/mobile/skin/board/basic/view_comment.skin.php
+++ b/mobile/skin/board/basic/view_comment.skin.php
@@ -117,7 +117,14 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             </tr>
             <?php } ?>
             <?php
-            include(G5_SNS_PATH."/view_comment_write.sns.skin.php");
+            if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) {
+            ?>
+            <tr>
+                <th scope="row">SNS 동시등록</th>
+                <td id="bo_vc_send_sns"></td>
+            </tr>
+            <?php
+            }
             ?>
             <tr>
                 <th scope="row">내용</th>
@@ -298,5 +305,12 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     }
 
     comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님)
+
+    <?php if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) { ?>
+    // sns 등록
+    $(function() {
+        $("#bo_vc_send_sns").load( "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>" );
+    });
+    <?php } ?>
     </script>
     <?php } ?>
diff --git a/mobile/skin/board/gallery/view_comment.skin.php b/mobile/skin/board/gallery/view_comment.skin.php
index a901968a2..7ebcce47d 100644
--- a/mobile/skin/board/gallery/view_comment.skin.php
+++ b/mobile/skin/board/gallery/view_comment.skin.php
@@ -117,7 +117,14 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
             </tr>
             <?php } ?>
             <?php
-            include(G5_SNS_PATH."/view_comment_write.sns.skin.php");
+            if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) {
+            ?>
+            <tr>
+                <th scope="row">SNS 동시등록</th>
+                <td id="bo_vc_send_sns"></td>
+            </tr>
+            <?php
+            }
             ?>
             <tr>
                 <th scope="row">내용</th>
@@ -298,5 +305,12 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
     }
 
     comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님)
+
+    <?php if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) { ?>
+    // sns 등록
+    $(function() {
+        $("#bo_vc_send_sns").load( "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>" );
+    });
+    <?php } ?>
     </script>
     <?php } ?>
diff --git a/plugin/sns/_common.php b/plugin/sns/_common.php
new file mode 100644
index 000000000..bad54a5d7
--- /dev/null
+++ b/plugin/sns/_common.php
@@ -0,0 +1,3 @@
+<?php
+include_once('../../common.php');
+?>
\ No newline at end of file
diff --git a/plugin/sns/view.sns.skin.php b/plugin/sns/view.sns.skin.php
index 8b2910ae4..8388ab02b 100644
--- a/plugin/sns/view.sns.skin.php
+++ b/plugin/sns/view.sns.skin.php
@@ -4,23 +4,26 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 if (!$board['bo_use_sns']) return;
 
 $sns_msg = urlencode(str_replace('\"', '"', $view['subject']));
-$sns_url = googl_short_url('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
-$msg_url = $sns_msg.' : '.$sns_url;
+//$sns_url = googl_short_url('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+//$msg_url = $sns_msg.' : '.$sns_url;
 
 // 카카오톡 매뉴얼 : https://github.com/kakao/kakaolink-web
 $kakao_appid   = $_SERVER['HTTP_HOST']; // Mobile Site Domain 정확히 입력하지 않을 경우 이용이 제한될 수 있습니다.
 $kakao_appname = urlencode(str_replace('\"', '"', $g5['title']));
 
+/*
 $facebook_url  = 'http://www.facebook.com/sharer/sharer.php?s=100&p[url]='.$sns_url.'&p[title]='.$sns_msg;
 $twitter_url   = 'http://twitter.com/home?status='.$msg_url;
 $gplus_url     = 'https://plus.google.com/share?url='.$sns_url;
+*/
 
-/*
 $sns_send  = G5_BBS_URL.'/sns_send.php?longurl='.urlencode('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 //$sns_send .= '&amp;title='.urlencode(utf8_strcut(get_text($view['subject']),140));
 $sns_send .= '&amp;title='.$sns_msg;
-*/
 
+$facebook_url = $sns_send.'&amp;sns=facebook';
+$twitter_url  = $sns_send.'&amp;sns=twitter';
+$gplus_url    = $sns_send.'&amp;sns=gplus';
 ?>
 <ul id="bo_v_sns">
     <li><a href="<?php echo $facebook_url; ?>" target="_blank"><img src="<?php echo G5_SNS_URL; ?>/icon/facebook.png" alt="페이스북으로 보내기"></a></li>
diff --git a/plugin/sns/view_comment_write.sns.skin.php b/plugin/sns/view_comment_write.sns.skin.php
index 4cd2b82ba..c47fc9f32 100644
--- a/plugin/sns/view_comment_write.sns.skin.php
+++ b/plugin/sns/view_comment_write.sns.skin.php
@@ -1,112 +1,108 @@
 <?php
-if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+include_once('./_common.php');
 
-if (!$board['bo_use_sns']) return;
+if (!$board['bo_use_sns']) die('');
 ?>
-<tr>
-    <th scope="row">SNS 동시등록</th>
-    <td>
-        <ul id="bo_vc_sns">
-        <?php
-        //============================================================================
-        // 페이스북
-        //----------------------------------------------------------------------------
-        if ($config['cf_facebook_appid']) {
-            $facebook_user = get_session("ss_facebook_user");
-            if (!$facebook_user) {
-                include_once(G5_SNS_PATH."/facebook/src/facebook.php");
-                $facebook = new Facebook(array(
-                    'appId'  => $config['cf_facebook_appid'],
-                    'secret' => $config['cf_facebook_secret']
-                ));
 
-                $facebook_user = $facebook->getUser();
+<ul id="bo_vc_sns">
+<?php
+//============================================================================
+// 페이스북
+//----------------------------------------------------------------------------
+if ($config['cf_facebook_appid']) {
+    $facebook_user = get_session("ss_facebook_user");
+    if (!$facebook_user) {
+        include_once(G5_SNS_PATH."/facebook/src/facebook.php");
+        $facebook = new Facebook(array(
+            'appId'  => $config['cf_facebook_appid'],
+            'secret' => $config['cf_facebook_secret']
+        ));
 
-                if ($facebook_user) {
-                    try {
-                        $facebook_user_profile = $facebook->api('/me');
-                    } catch (FacebookApiException $e) {
-                        error_log($e);
-                        $facebook_user = null;
-                    }
-                }
+        $facebook_user = $facebook->getUser();
+
+        if ($facebook_user) {
+            try {
+                $facebook_user_profile = $facebook->api('/me');
+            } catch (FacebookApiException $e) {
+                error_log($e);
+                $facebook_user = null;
             }
-
-            echo '<li>';
-            if ($facebook_user) {
-                echo '<img src="'.G5_SNS_URL.'/icon/facebook.png" id="facebook_icon">';
-                echo '<label for="" class="sound_only">페이스북 동시 등록</label>';
-                echo '<input type="checkbox" name="facebook_checked" id="facebook_checked" '.(get_cookie('ck_facebook_checked')?'checked':'').' value="1">';
-            } else {
-                $facebook_url = $facebook->getLoginUrl(array("redirect_uri"=>G5_SNS_URL."/facebook/callback.php", "scope"=>"publish_stream,read_stream,offline_access", "display"=>"popup"));
-
-                echo '<a href="'.$facebook_url.'" id="facebook_url" onclick="return false;"><img src="'.G5_SNS_URL.'/icon/facebook'.($facebook_user?'':'_off').'.png" id="facebook_icon"></a>';
-                echo '<label for="" class="sound_only">페이스북 동시 등록</label>';
-                echo '<input type="checkbox" name="facebook_checked" id="facebook_checked" disabled value="1">';
-                echo '<script>$(function(){ $("#facebook_url").live("click", function(){ window.open(this.href, "facebook_url", "width=600,height=250"); }); });</script>';
-            }
-            echo '</li>';
         }
-        //============================================================================
+    }
+
+    echo '<li>';
+    if ($facebook_user) {
+        echo '<img src="'.G5_SNS_URL.'/icon/facebook.png" id="facebook_icon">';
+        echo '<label for="" class="sound_only">페이스북 동시 등록</label>';
+        echo '<input type="checkbox" name="facebook_checked" id="facebook_checked" '.(get_cookie('ck_facebook_checked')?'checked':'').' value="1">';
+    } else {
+        $facebook_url = $facebook->getLoginUrl(array("redirect_uri"=>G5_SNS_URL."/facebook/callback.php", "scope"=>"publish_stream,read_stream,offline_access", "display"=>"popup"));
+
+        echo '<a href="'.$facebook_url.'" id="facebook_url" onclick="return false;"><img src="'.G5_SNS_URL.'/icon/facebook'.($facebook_user?'':'_off').'.png" id="facebook_icon"></a>';
+        echo '<label for="" class="sound_only">페이스북 동시 등록</label>';
+        echo '<input type="checkbox" name="facebook_checked" id="facebook_checked" disabled value="1">';
+        echo '<script>$(function(){ $("#facebook_url").live("click", function(){ window.open(this.href, "facebook_url", "width=600,height=250"); }); });</script>';
+    }
+    echo '</li>';
+}
+//============================================================================
 
 
-        //============================================================================
-        // 트위터
-        //----------------------------------------------------------------------------
-        if ($config['cf_twitter_key']) {
-            $twitter_user = get_session("ss_twitter_user");
-            if (!$twitter_user) {
-                include_once(G5_SNS_PATH."/twitter/twitteroauth/twitteroauth.php");
-                include_once(G5_SNS_PATH."/twitter/twitterconfig.php");
+//============================================================================
+// 트위터
+//----------------------------------------------------------------------------
+if ($config['cf_twitter_key']) {
+    $twitter_user = get_session("ss_twitter_user");
+    if (!$twitter_user) {
+        include_once(G5_SNS_PATH."/twitter/twitteroauth/twitteroauth.php");
+        include_once(G5_SNS_PATH."/twitter/twitterconfig.php");
 
-                $twitter_user = false;
-                /*
-                if (empty($_SESSION['access_token']) || empty($_SESSION['access_token']['oauth_token']) || empty($_SESSION['access_token']['oauth_token_secret'])) {
+        $twitter_user = false;
+        /*
+        if (empty($_SESSION['access_token']) || empty($_SESSION['access_token']['oauth_token']) || empty($_SESSION['access_token']['oauth_token_secret'])) {
+            $twitter_url = G5_SNS_URL."/twitter/redirect.php";
+        } else {
+            $access_token = $_SESSION['access_token'];
+            $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
+            $content = $connection->get('account/verify_credentials');
+
+            switch ($connection->http_code) {
+                case 200:
+                    $twitter_user = true;
+                    $twitter_url = $connection->getAuthorizeURL($token);
+                    break;
+                default :
                     $twitter_url = G5_SNS_URL."/twitter/redirect.php";
-                } else {
-                    $access_token = $_SESSION['access_token'];
-                    $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
-                    $content = $connection->get('account/verify_credentials');
-
-                    switch ($connection->http_code) {
-                        case 200:
-                            $twitter_user = true;
-                            $twitter_url = $connection->getAuthorizeURL($token);
-                            break;
-                        default :
-                            $twitter_url = G5_SNS_URL."/twitter/redirect.php";
-                    }
-                }
-                */
-                $access_token = $_SESSION['access_token'];
-                $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
-                $content = $connection->get('account/verify_credentials');
-
-                switch ($connection->http_code) {
-                    case 200:
-                        $twitter_user = true;
-                        $twitter_url = $connection->getAuthorizeURL($token);
-                        break;
-                    default :
-                        $twitter_url = G5_SNS_URL."/twitter/redirect.php";
-                }
             }
-
-            echo '<li>';
-            if ($twitter_user) {
-                echo '<img src="'.G5_SNS_URL.'/icon/twitter.png" id="twitter_icon">';
-                echo '<label for="" class="sound_only">트위터 동시 등록</label>';
-                echo '<input type="checkbox" name="twitter_checked" id="twitter_checked" '.(get_cookie('ck_twitter_checked')?'checked':'').' value="1">';
-            } else {
-                echo '<a href="'.$twitter_url.'" id="twitter_url" onclick="return false;"><img src="'.G5_SNS_URL.'/icon/twitter'.($twitter_user?'':'_off').'.png" id="twitter_icon"></a>';
-                echo '<label for="" class="sound_only">트위터 동시 등록</label>';
-                echo '<input type="checkbox" name="twitter_checked" id="twitter_checked" disabled value="1">';
-                echo '<script>$(function(){ $("#twitter_url").live("click", function(){ window.open(this.href, "twitter_url", "width=600,height=250"); }); });</script>';
-            }
-            echo '</li>';
         }
-        //============================================================================
-        ?>
-        </ul>
-    </td>
-</tr>
+        */
+        $access_token = $_SESSION['access_token'];
+        $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $access_token['oauth_token'], $access_token['oauth_token_secret']);
+        $content = $connection->get('account/verify_credentials');
+
+        switch ($connection->http_code) {
+            case 200:
+                $twitter_user = true;
+                $twitter_url = $connection->getAuthorizeURL($token);
+                break;
+            default :
+                $twitter_url = G5_SNS_URL."/twitter/redirect.php";
+        }
+    }
+
+    echo '<li>';
+    if ($twitter_user) {
+        echo '<img src="'.G5_SNS_URL.'/icon/twitter.png" id="twitter_icon">';
+        echo '<label for="" class="sound_only">트위터 동시 등록</label>';
+        echo '<input type="checkbox" name="twitter_checked" id="twitter_checked" '.(get_cookie('ck_twitter_checked')?'checked':'').' value="1">';
+    } else {
+        echo '<a href="'.$twitter_url.'" id="twitter_url" onclick="return false;"><img src="'.G5_SNS_URL.'/icon/twitter'.($twitter_user?'':'_off').'.png" id="twitter_icon"></a>';
+        echo '<label for="" class="sound_only">트위터 동시 등록</label>';
+        echo '<input type="checkbox" name="twitter_checked" id="twitter_checked" disabled value="1">';
+        echo '<script>$(function(){ $("#twitter_url").live("click", function(){ window.open(this.href, "twitter_url", "width=600,height=250"); }); });</script>';
+    }
+    echo '</li>';
+}
+//============================================================================
+?>
+</ul>
\ No newline at end of file
diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php
index 89991ee1e..db0d2f9ff 100644
--- a/skin/board/basic/view_comment.skin.php
+++ b/skin/board/basic/view_comment.skin.php
@@ -125,7 +125,14 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         </tr>
         <?php } ?>
         <?php
-        include(G5_SNS_PATH."/view_comment_write.sns.skin.php");
+        if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) {
+        ?>
+        <tr>
+            <th scope="row">SNS 동시등록</th>
+            <td id="bo_vc_send_sns"></td>
+        </tr>
+        <?php
+        }
         ?>
         <tr>
             <th scope="row">내용</th>
@@ -306,6 +313,13 @@ function comment_delete()
 }
 
 comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님)
+
+<?php if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) { ?>
+// sns 등록
+$(function() {
+    $("#bo_vc_send_sns").load( "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>" );
+});
+<?php } ?>
 </script>
 <?php } ?>
 <!-- } 댓글 쓰기 끝 -->
\ No newline at end of file
diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php
index 894b74a13..56e62aa0e 100644
--- a/skin/board/gallery/view_comment.skin.php
+++ b/skin/board/gallery/view_comment.skin.php
@@ -125,7 +125,14 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         </tr>
         <?php } ?>
         <?php
-        include(G5_SNS_PATH."/view_comment_write.sns.skin.php");
+        if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) {
+        ?>
+        <tr>
+            <th scope="row">SNS 동시등록</th>
+            <td id="bo_vc_send_sns"></td>
+        </tr>
+        <?php
+        }
         ?>
         <tr>
             <th scope="row">내용</th>
@@ -306,6 +313,13 @@ function comment_delete()
 }
 
 comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님)
+
+<?php if($board['bo_use_sns'] && ($config['cf_facebook_appid'] || $config['cf_twitter_key'])) { ?>
+// sns 등록
+$(function() {
+    $("#bo_vc_send_sns").load( "<?php echo G5_SNS_URL; ?>/view_comment_write.sns.skin.php?bo_table=<?php echo $bo_table; ?>" );
+});
+<?php } ?>
 </script>
 <?php } ?>
 <!-- } 댓글 쓰기 끝 -->
\ No newline at end of file