From 04810bb8f94209d68b4087bed484daf2283eeb4f Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Tue, 28 May 2013 16:30:20 +0900
Subject: [PATCH] =?UTF-8?q?config.php=20push=20=EC=95=88=EB=90=98=EB=8A=94?=
 =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=EB=A1=9C=20twitter/config.php=20=EB=A5=BC?=
 =?UTF-8?q?=20twitter/twitterconfig.php=20=EB=A1=9C=20=ED=8C=8C=EC=9D=BC?=
 =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/write_comment_update.sns.php           |  2 +-
 plugin/sns/twitter/callback.php            |  2 +-
 plugin/sns/twitter/connect.php             |  2 +-
 plugin/sns/twitter/index.php               |  2 +-
 plugin/sns/twitter/redirect.php            |  2 +-
 plugin/sns/twitter/twitterconfig.php       | 10 ++++++++++
 skin/board/basic/view_comment.sns.skin.php |  2 +-
 7 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 plugin/sns/twitter/twitterconfig.php

diff --git a/bbs/write_comment_update.sns.php b/bbs/write_comment_update.sns.php
index 1b20936b6..ca527ec62 100644
--- a/bbs/write_comment_update.sns.php
+++ b/bbs/write_comment_update.sns.php
@@ -49,7 +49,7 @@ if ($_POST['facebook_checked']) {
 //----------------------------------------------------------------------------
 if ($_POST['twitter_checked']) {
     include_once(G4_SNS_PATH."/twitter/twitteroauth/twitteroauth.php");
-    include_once(G4_SNS_PATH."/twitter/config.php");
+    include_once(G4_SNS_PATH."/twitter/twitterconfig.php");
     
     if ( !(empty($_SESSION['access_token']) || empty($_SESSION['access_token']['oauth_token']) || empty($_SESSION['access_token']['oauth_token_secret'])) ) {
         $post = googl_short_url($comment_url).' '.$wr_content;
diff --git a/plugin/sns/twitter/callback.php b/plugin/sns/twitter/callback.php
index 7e61b8ded..27b58b765 100644
--- a/plugin/sns/twitter/callback.php
+++ b/plugin/sns/twitter/callback.php
@@ -10,7 +10,7 @@ include_once("./_common.php");
 /* Start session and load lib */
 //session_start();
 require_once(G4_SNS_PATH.'/twitter/twitteroauth/twitteroauth.php');
-require_once(G4_SNS_PATH.'/twitter/config.php');
+require_once(G4_SNS_PATH.'/twitter/twitterconfig.php');
 
 //print_r2($_SESSION); print_r2($_REQUEST); exit;
 
diff --git a/plugin/sns/twitter/connect.php b/plugin/sns/twitter/connect.php
index df51f9022..7f9526c7f 100644
--- a/plugin/sns/twitter/connect.php
+++ b/plugin/sns/twitter/connect.php
@@ -9,7 +9,7 @@ include_once("./_common.php");
 /**
  * Exit with an error message if the CONSUMER_KEY or CONSUMER_SECRET is not defined.
  */
-require_once(G4_SNS_PATH.'/twitter/config.php');
+require_once(G4_SNS_PATH.'/twitter/twitterconfig.php');
 if (CONSUMER_KEY === '' || CONSUMER_SECRET === '' || CONSUMER_KEY === 'CONSUMER_KEY_HERE' || CONSUMER_SECRET === 'CONSUMER_SECRET_HERE') {
   echo 'You need a consumer key and secret to test the sample code. Get one from <a href="https://dev.twitter.com/apps">dev.twitter.com/apps</a>';
   exit;
diff --git a/plugin/sns/twitter/index.php b/plugin/sns/twitter/index.php
index 2e77264f5..1a655fcb4 100644
--- a/plugin/sns/twitter/index.php
+++ b/plugin/sns/twitter/index.php
@@ -9,7 +9,7 @@ include_once("./_common.php");
 /* Load required lib files. */
 //session_start();
 require_once(G4_SNS_PATH.'/twitter/twitteroauth/twitteroauth.php');
-require_once(G4_SNS_PATH.'/twitter/config.php');
+require_once(G4_SNS_PATH.'/twitter/twitterconfig.php');
 
 /* If access tokens are not available redirect to connect page. */
 if (empty($_SESSION['access_token']) || empty($_SESSION['access_token']['oauth_token']) || empty($_SESSION['access_token']['oauth_token_secret'])) {
diff --git a/plugin/sns/twitter/redirect.php b/plugin/sns/twitter/redirect.php
index 4a4bb95ca..3f13a5f88 100644
--- a/plugin/sns/twitter/redirect.php
+++ b/plugin/sns/twitter/redirect.php
@@ -4,7 +4,7 @@ include_once("./_common.php");
 /* Start session and load library. */
 //session_start();
 require_once(G4_SNS_PATH.'/twitter/twitteroauth/twitteroauth.php');
-require_once(G4_SNS_PATH.'/twitter/config.php');
+require_once(G4_SNS_PATH.'/twitter/twitterconfig.php');
 
 /* Build TwitterOAuth object with client credentials. */
 $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
diff --git a/plugin/sns/twitter/twitterconfig.php b/plugin/sns/twitter/twitterconfig.php
new file mode 100644
index 000000000..7f8b2684c
--- /dev/null
+++ b/plugin/sns/twitter/twitterconfig.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @file
+ * A single location to store configuration.
+ */
+
+define('CONSUMER_KEY', $config['cf_twitter_key']);
+define('CONSUMER_SECRET', $config['cf_twitter_secret']);
+//define('OAUTH_CALLBACK', G4_SNS_URL.'/twitter/callback.php');
+define('OAUTH_CALLBACK', '');
diff --git a/skin/board/basic/view_comment.sns.skin.php b/skin/board/basic/view_comment.sns.skin.php
index 7fa1c4492..10739d1a6 100644
--- a/skin/board/basic/view_comment.sns.skin.php
+++ b/skin/board/basic/view_comment.sns.skin.php
@@ -48,7 +48,7 @@ if (!$board['bo_use_sns']) return;
         //----------------------------------------------------------------------------
         if ($config['cf_twitter_key']) {
             include_once(G4_SNS_PATH."/twitter/twitteroauth/twitteroauth.php");
-            include_once(G4_SNS_PATH."/twitter/config.php");
+            include_once(G4_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'])) {