From 35e7f6ff108bb16258dd7ecddb9219f3b6e67732 Mon Sep 17 00:00:00 2001
From: gnuboard
Date: Fri, 24 May 2013 09:22:06 +0900
Subject: [PATCH] =?UTF-8?q?SNS=20=EC=88=98=EC=A0=95=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
adm/board_delete.php | 28 -
adm/config_form.php | 18 +-
adm/config_form_update.php | 3 +
common.php | 22 +-
config.php | 17 +-
lib/common.lib.php | 7 -
plugin/sns/facebook/callback.php | 3 +-
plugin/sns/twitter/.gitignore | 1 +
plugin/sns/twitter/LICENSE | 22 +
plugin/sns/twitter/README.md | 114 +++
plugin/sns/twitter/_common.php | 3 +
plugin/sns/twitter/callback-sample.php | 40 +
plugin/sns/twitter/callback.php | 97 ++
plugin/sns/twitter/clearsessions.php | 14 +
plugin/sns/twitter/config-sample.php | 10 +
plugin/sns/twitter/connect.php | 22 +
plugin/sns/twitter/html.inc | 39 +
plugin/sns/twitter/images/darker.png | Bin 0 -> 2370 bytes
plugin/sns/twitter/images/lighter.png | Bin 0 -> 2490 bytes
plugin/sns/twitter/index.php | 35 +
plugin/sns/twitter/redirect.php | 31 +
plugin/sns/twitter/twitteroauth/OAuth.php | 872 ++++++++++++++++++
.../sns/twitter/twitteroauth/twitteroauth.php | 241 +++++
skin/board/basic/list.skin.php | 10 +-
skin/board/basic/sns_comment.skin.php | 138 +--
skin/board/basic/style.css | 58 +-
skin/board/basic/view.skin.php | 107 +--
skin/board/basic/view_comment.skin.php | 321 +++----
skin/board/basic/write.skin.php | 6 +-
skin/board/gallery/list.skin.php | 2 +-
skin/board/gallery/style.css | 50 +-
skin/board/gallery/view.skin.php | 101 +-
skin/board/gallery/view_comment.skin.php | 391 ++++----
skin/board/gallery/write.skin.php | 2 +-
skin/connect/basic/current_connect.skin.php | 6 +-
skin/latest/basic/latest.skin.php | 8 +-
skin/latest/basic/style.css | 12 +-
skin/member/basic/formmail.skin.php | 5 +-
skin/member/basic/login.skin.php | 11 +-
skin/member/basic/memo.skin.php | 4 +-
skin/member/basic/memo_form.skin.php | 6 +-
skin/member/basic/memo_view.skin.php | 12 +-
skin/member/basic/password_lost.skin.php | 2 +-
skin/member/basic/profile.skin.php | 2 +-
skin/member/basic/register_form.skin.php | 125 ++-
.../basic/register_form_update.head.skin.php | 7 +
.../basic/register_form_update.tail.skin.php | 7 +
skin/member/basic/scrap.skin.php | 2 +-
skin/member/basic/scrap_popin.skin.php | 2 +-
skin/member/basic/style.css | 33 +-
skin/member/basic/zip.skin.php | 13 +-
skin/new/basic/new.skin.php | 2 +-
skin/outlogin/basic/outlogin.skin.1.php | 6 +-
skin/outlogin/basic/outlogin.skin.2.php | 6 +-
skin/outlogin/basic/style.css | 16 +-
skin/poll/basic/poll.skin.php | 4 +-
skin/poll/basic/poll_result.skin.php | 6 +-
skin/poll/basic/style.css | 2 +-
skin/popular/basic/popular.skin.php | 15 +-
skin/popular/basic/style.css | 5 +-
skin/search/basic/search.skin.php | 97 +-
skin/search/basic/style.css | 54 +-
skin/visit/basic/style.css | 5 +-
skin/visit/basic/visit.skin.php | 4 +-
64 files changed, 2348 insertions(+), 956 deletions(-)
delete mode 100644 adm/board_delete.php
create mode 100644 plugin/sns/twitter/.gitignore
create mode 100644 plugin/sns/twitter/LICENSE
create mode 100644 plugin/sns/twitter/README.md
create mode 100644 plugin/sns/twitter/_common.php
create mode 100644 plugin/sns/twitter/callback-sample.php
create mode 100644 plugin/sns/twitter/callback.php
create mode 100644 plugin/sns/twitter/clearsessions.php
create mode 100644 plugin/sns/twitter/config-sample.php
create mode 100644 plugin/sns/twitter/connect.php
create mode 100644 plugin/sns/twitter/html.inc
create mode 100644 plugin/sns/twitter/images/darker.png
create mode 100644 plugin/sns/twitter/images/lighter.png
create mode 100644 plugin/sns/twitter/index.php
create mode 100644 plugin/sns/twitter/redirect.php
create mode 100644 plugin/sns/twitter/twitteroauth/OAuth.php
create mode 100644 plugin/sns/twitter/twitteroauth/twitteroauth.php
create mode 100644 skin/member/basic/register_form_update.head.skin.php
create mode 100644 skin/member/basic/register_form_update.tail.skin.php
diff --git a/adm/board_delete.php b/adm/board_delete.php
deleted file mode 100644
index 00a66b0b3..000000000
--- a/adm/board_delete.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
diff --git a/adm/config_form.php b/adm/config_form.php
index 42df3ea32..38ab8e737 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -729,11 +729,25 @@ $pg_anchor = '
페이스북 앱 ID
- 앱 등록페이지
+ 앱 등록하기
페이스북 앱 Secret
-
+
+
+
+
+ 트위터 사용
+ > 사용
+
+
+ 트위터 컨슈머 Key
+
+ 앱 등록하기
+
+ 트위터 컨슈머 Secret
+
+
diff --git a/adm/config_form_update.php b/adm/config_form_update.php
index 47bf8c220..f83e3994e 100644
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@@ -106,6 +106,9 @@ $sql = " update {$g4['config_table']}
cf_facebook_use = '{$_POST['cf_facebook_use']}',
cf_facebook_appid = '{$_POST['cf_facebook_appid']}',
cf_facebook_secret = '{$_POST['cf_facebook_secret']}',
+ cf_twitter_use = '{$_POST['cf_twitter_use']}',
+ cf_twitter_key = '{$_POST['cf_twitter_key']}',
+ cf_twitter_secret = '{$_POST['cf_twitter_secret']}',
cf_1_subj = '{$_POST['cf_1_subj']}',
cf_2_subj = '{$_POST['cf_2_subj']}',
cf_3_subj = '{$_POST['cf_3_subj']}',
diff --git a/common.php b/common.php
index b4cf0bac6..9d360364c 100644
--- a/common.php
+++ b/common.php
@@ -134,8 +134,8 @@ div a {display:block;margin:50px auto 10px;width:170px;text-align:center}
//==============================================================================
// SESSION 설정
//------------------------------------------------------------------------------
-ini_set("session.use_trans_sid", 0); // PHPSESSID를 자동으로 넘기지 않음
-ini_set("url_rewriter.tags",""); // 링크에 PHPSESSID가 따라다니는것을 무력화함 (해뜰녘님께서 알려주셨습니다.)
+@ini_set("session.use_trans_sid", 0); // PHPSESSID를 자동으로 넘기지 않음
+@ini_set("url_rewriter.tags",""); // 링크에 PHPSESSID가 따라다니는것을 무력화함 (해뜰녘님께서 알려주셨습니다.)
session_save_path(G4_DATA_PATH.'/session');
@@ -143,15 +143,6 @@ if (isset($SESSION_CACHE_LIMITER))
@session_cache_limiter($SESSION_CACHE_LIMITER);
else
@session_cache_limiter("no-cache, must-revalidate");
-//==============================================================================
-
-
-//==============================================================================
-// 공용 변수
-//------------------------------------------------------------------------------
-// 기본환경설정
-// 기본적으로 사용하는 필드만 얻은 후 상황에 따라 필드를 추가로 얻음
-$config = sql_fetch(" select * from {$g4['config_table']} ");
ini_set("session.cache_expire", 180); // 세션 캐쉬 보관시간 (분)
ini_set("session.gc_maxlifetime", 10800); // session data의 garbage collection 존재 기간을 지정 (초)
@@ -162,6 +153,15 @@ session_set_cookie_params(0, '/');
ini_set("session.cookie_domain", G4_COOKIE_DOMAIN);
@session_start();
+//==============================================================================
+
+
+//==============================================================================
+// 공용 변수
+//------------------------------------------------------------------------------
+// 기본환경설정
+// 기본적으로 사용하는 필드만 얻은 후 상황에 따라 필드를 추가로 얻음
+$config = sql_fetch(" select * from {$g4['config_table']} ");
define('G4_HTTP_BBS_URL', https_url(G4_BBS_DIR, false));
define('G4_HTTPS_BBS_URL', https_url(G4_BBS_DIR, true));
diff --git a/config.php b/config.php
index a065f5b25..39639a4e6 100644
--- a/config.php
+++ b/config.php
@@ -48,11 +48,9 @@ define('G4_SKIN_DIR', 'skin');
define('G4_GCAPTCHA_DIR', 'gcaptcha');
define('G4_CKEDITOR_DIR', 'ckeditor');
define('G4_MOBILE_DIR', 'mobile');
-<<<<<<< HEAD
-define('G4_KCP_DIR', 'kcp');
-=======
+
define('G4_KCPCERT_DIR', 'kcpcert');
->>>>>>> master
+
define('G4_SNS_DIR', 'sns');
define('G4_SYNDI_DIR', 'syndi');
@@ -82,11 +80,7 @@ define('G4_SKIN_URL', G4_URL.'/'.G4_SKIN_DIR);
define('G4_PLUGIN_URL', G4_URL.'/'.G4_PLUGIN_DIR);
define('G4_GCAPTCHA_URL', G4_PLUGIN_URL.'/'.G4_GCAPTCHA_DIR);
define('G4_CKEDITOR_URL', G4_PLUGIN_URL.'/'.G4_CKEDITOR_DIR); // CKEDITOR 의 라이브러리 경로
-<<<<<<< HEAD
-define('G4_KCP_URL', G4_PLUGIN_URL.'/'.G4_KCP_DIR);
-=======
define('G4_KCPCERT_URL', G4_PLUGIN_URL.'/'.G4_KCPCERT_DIR);
->>>>>>> master
define('G4_SNS_URL', G4_PLUGIN_URL.'/'.G4_SNS_DIR);
define('G4_SYNDI_URL', G4_PLUGIN_URL.'/'.G4_SYNDI_DIR);
define('G4_MOBILE_URL', G4_URL.'/'.G4_MOBILE_DIR);
@@ -101,11 +95,9 @@ define('G4_PLUGIN_PATH', G4_PATH.'/'.G4_PLUGIN_DIR);
define('G4_SKIN_PATH', G4_PATH.'/'.G4_SKIN_DIR);
define('G4_GCAPTCHA_PATH', G4_PLUGIN_PATH.'/'.G4_GCAPTCHA_DIR);
define('G4_CKEDITOR_PATH', G4_PLUGIN_PATH.'/'.G4_CKEDITOR_DIR);
-<<<<<<< HEAD
-define('G4_KCP_PATH', G4_PLUGIN_PATH.'/'.G4_KCP_DIR);
-=======
+
define('G4_KCPCERT_PATH', G4_PLUGIN_PATH.'/'.G4_KCPCERT_DIR);
->>>>>>> master
+
define('G4_SNS_PATH', G4_PLUGIN_PATH.'/'.G4_SNS_DIR);
define('G4_SYNDI_PATH', G4_PLUGIN_PATH.'/'.G4_SYNDI_DIR);
define('G4_MOBILE_PATH', G4_PATH.'/'.G4_MOBILE_DIR);
@@ -139,7 +131,6 @@ define('G4_SPECIAL', 64); // 특수문자
// 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT']
define('G4_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|skt|nokia|blackberry|android|sony');
-
/********************
기타 상수
********************/
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 0986199ee..226c4ee03 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -998,17 +998,10 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
$tmp_name = $tmp_name.' '.$name;
} else {
-<<<<<<< HEAD
$tmp_name = $tmp_name." ".$name;
}
- } else {
- $tmp_name = $tmp_name.' '.$name;
-=======
- $tmp_name = $tmp_name.' '.$name;
- }
} else {
$tmp_name = $tmp_name.' '.$name;
->>>>>>> master
}
$tmp_name .= '';
diff --git a/plugin/sns/facebook/callback.php b/plugin/sns/facebook/callback.php
index e51b3cc6c..2ec663aa9 100644
--- a/plugin/sns/facebook/callback.php
+++ b/plugin/sns/facebook/callback.php
@@ -39,11 +39,12 @@ if ($user) {
echo <<
$(function() {
+ document.write("페이스북 승인이 되었습니다. ");
+
var opener = window.opener;
opener.$("#facebook_icon").attr("src", "{$g4_sns_url}/icon/facebook_on.png");
opener.$("#facebook_checked").attr("disabled", false);
opener.$("#facebook_checked").attr("checked", true);
- //alert("페이스북 승인이 되었습니다.");
window.close();
});
diff --git a/plugin/sns/twitter/.gitignore b/plugin/sns/twitter/.gitignore
new file mode 100644
index 000000000..4f4773fb3
--- /dev/null
+++ b/plugin/sns/twitter/.gitignore
@@ -0,0 +1 @@
+config.php
diff --git a/plugin/sns/twitter/LICENSE b/plugin/sns/twitter/LICENSE
new file mode 100644
index 000000000..233854f16
--- /dev/null
+++ b/plugin/sns/twitter/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2009 Abraham Williams - http://abrah.am - abraham@poseurte.ch
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugin/sns/twitter/README.md b/plugin/sns/twitter/README.md
new file mode 100644
index 000000000..c9a17ce4b
--- /dev/null
+++ b/plugin/sns/twitter/README.md
@@ -0,0 +1,114 @@
+TwitterOAuth
+------------
+
+PHP library for working with Twitter's OAuth API.
+
+Flow Overview
+=============
+
+1. Build TwitterOAuth object using client credentials.
+2. Request temporary credentials from Twitter.
+3. Build authorize URL for Twitter.
+4. Redirect user to authorize URL.
+5. User authorizes access and returns from Twitter.
+6. Rebuild TwitterOAuth object with client credentials and temporary credentials.
+7. Get token credentials from Twitter.
+8. Rebuild TwitterOAuth object with client credentials and token credentials.
+9. Query Twitter API.
+
+Terminology
+===========
+
+The terminology has changed since 0.1.x to better match the draft-hammer-oauth IETF
+RFC. You can read that at http://tools.ietf.org/html/draft-hammer-oauth. Some of the
+terms will differ from those Twitter uses as well.
+
+client credentials - Consumer key/secret you get when registering an app with Twitter.
+temporary credentials - Previously known as the request token.
+token credentials - Previously known as the access token.
+
+Parameters
+==========
+
+There are a number of parameters you can modify after creating a TwitterOAuth object.
+
+Switch an existing TwitterOAuth install to use version 1.1 of the API.
+
+ $connection->$host = "https://api.twitter.com/1.1/";
+
+Custom useragent.
+
+ $connection->useragent = 'Custom useragent string';
+
+Verify Twitters SSL certificate.
+
+ $connection->ssl_verifypeer = TRUE;
+
+There are several more you can find in TwitterOAuth.php.
+
+Extended flow using example code
+================================
+
+To use TwitterOAuth with the Twitter API you need *TwitterOAuth.php*, *OAuth.php* and
+client credentials. You can get client credentials by registering your application at
+[dev.twitter.com/apps](https://dev.twitter.com/apps).
+
+Users start out on connect.php which displays the "Sign in with Twitter" image hyperlinked
+to redirect.php. This button should be displayed on your homepage in your login section. The
+client credentials are saved in config.php as `CONSUMER_KEY` and `CONSUMER_SECRET`. You can
+save a static callback URL in the app settings page, in the config file or use a dynamic
+callback URL later in step 2. In example use https://example.com/callback.php.
+
+1) When a user lands on redirect.php we build a new TwitterOAuth object using the client credentials.
+If you have your own configuration method feel free to use it instead of config.php.
+
+ $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET); // Use config.php client credentials
+ $connection = new TwitterOAuth('abc890', '123xyz');
+
+2) Using the built $connection object you will ask Twitter for temporary credentials. The `oauth_callback` value is required.
+
+ $temporary_credentials = $connection->getRequestToken(OAUTH_CALLBACK); // Use config.php callback URL.
+
+3) Now that we have temporary credentials the user has to go to Twitter and authorize the app
+to access and updates their data. You can also pass a second parameter of FALSE to not use [Sign
+in with Twitter](https://dev.twitter.com/docs/auth/sign-twitter).
+
+ $redirect_url = $connection->getAuthorizeURL($temporary_credentials); // Use Sign in with Twitter
+ $redirect_url = $connection->getAuthorizeURL($temporary_credentials, FALSE);
+
+4) You will now have a Twitter URL that you must send the user to.
+
+ https://api.twitter.com/oauth/authenticate?oauth_token=xyz123
+
+5) The user is now on twitter.com and may have to login. Once authenticated with Twitter they will
+will either have to click on allow/deny, or will be automatically redirected back to the callback.
+
+6) Now that the user has returned to callback.php and allowed access we need to build a new
+TwitterOAuth object using the temporary credentials.
+
+ $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $_SESSION['oauth_token'],
+ $_SESSION['oauth_token_secret']);
+
+7) Now we ask Twitter for long lasting token credentials. These are specific to the application
+and user and will act like password to make future requests. Normally the token credentials would
+get saved in your database but for this example we are just using sessions.
+
+ $token_credentials = $connection->getAccessToken($_REQUEST['oauth_verifier']);
+
+8) With the token credentials we build a new TwitterOAuth object.
+
+ $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $token_credentials['oauth_token'],
+ $token_credentials['oauth_token_secret']);
+
+9) And finally we can make requests authenticated as the user. You can GET, POST, and DELETE API
+methods. Directly copy the path from the API documentation and add an array of any parameter
+you wish to include for the API method such as curser or in_reply_to_status_id.
+
+ $account = $connection->get('account/verify_credentials');
+ $status = $connection->post('statuses/update', array('status' => 'Text of status here', 'in_reply_to_status_id' => 123456));
+ $status = $connection->delete('statuses/destroy/12345');
+
+Contributors
+============
+
+* [Abraham Williams](https://twitter.com/abraham) - Main developer, current maintainer.
diff --git a/plugin/sns/twitter/_common.php b/plugin/sns/twitter/_common.php
new file mode 100644
index 000000000..28c56e92c
--- /dev/null
+++ b/plugin/sns/twitter/_common.php
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/plugin/sns/twitter/callback-sample.php b/plugin/sns/twitter/callback-sample.php
new file mode 100644
index 000000000..fe55f88e2
--- /dev/null
+++ b/plugin/sns/twitter/callback-sample.php
@@ -0,0 +1,40 @@
+getAccessToken($_REQUEST['oauth_verifier']);
+
+/* Save the access tokens. Normally these would be saved in a database for future use. */
+$_SESSION['access_token'] = $access_token;
+
+/* Remove no longer needed request tokens */
+unset($_SESSION['oauth_token']);
+unset($_SESSION['oauth_token_secret']);
+
+/* If HTTP response is 200 continue otherwise send to connect page to retry */
+if (200 == $connection->http_code) {
+ /* The user has been verified and the access tokens can be saved for future use */
+ $_SESSION['status'] = 'verified';
+ header('Location: ./index.php');
+} else {
+ /* Save HTTP status for error dialog on connnect page.*/
+ header('Location: ./clearsessions.php');
+}
diff --git a/plugin/sns/twitter/callback.php b/plugin/sns/twitter/callback.php
new file mode 100644
index 000000000..1c7e9faaf
--- /dev/null
+++ b/plugin/sns/twitter/callback.php
@@ -0,0 +1,97 @@
+getAccessToken($_REQUEST['oauth_verifier']);
+
+/* Save the access tokens. Normally these would be saved in a database for future use. */
+$_SESSION['access_token'] = $access_token;
+
+/* Remove no longer needed request tokens */
+unset($_SESSION['oauth_token']);
+unset($_SESSION['oauth_token_secret']);
+
+/*
+if (200 == $connection->http_code) {
+ $_SESSION['status'] = 'verified';
+ header('Location: ./index.php');
+} else {
+ header('Location: ./clearsessions.php');
+}
+exit;
+*/
+
+$g4['title'] = '트위터 콜백';
+include_once(G4_PATH.'/head.sub.php');
+
+if (200 == $connection->http_code) {
+
+ /*
+ $access_token = $facebook->getAccessToken();
+
+ $appid = $config['cf_facebook_appid'];
+
+ setcookie('fbs_'.$appid, 1, G4_SERVER_TIME + 86400 * 31, '/', G4_COOKIE_DOMAIN);
+ setcookie('fbs_'.$appid.'_code', $_SESSION['fb_'.$appid.'_code'], G4_SERVER_TIME + 86400 * 31, '/', G4_COOKIE_DOMAIN);
+ setcookie('fbs_'.$appid.'_access_token', $_SESSION['fb_'.$appid.'_access_token'], G4_SERVER_TIME + 86400 * 31, '/', G4_COOKIE_DOMAIN);
+ setcookie('fbs_'.$appid.'_user_id', $_SESSION['fb_'.$appid.'_user_id'], G4_SERVER_TIME + 86400 * 31, '/', G4_COOKIE_DOMAIN);
+
+ sql_query(" update {$g4['member_table']} set mb_facebook_token = '{$access_token}' where mb_id = '{$member['mb_id']}' ", true);
+
+ */
+
+ sql_query(" update {$g4['member_table']} set mb_twitter_token = '{$access_token['oauth_token']}', mb_twitter_token_secret = '{$access_token['oauth_token_secret']}' where mb_id = '{$member['mb_id']}' ", true);
+
+ $g4_sns_url = G4_SNS_URL;
+
+ echo <<
+ $(function() {
+ document.write("트위터에 승인이 되었습니다. ");
+
+ var opener = window.opener;
+ opener.$("#twitter_icon").attr("src", "{$g4_sns_url}/icon/twitter_on.png");
+ opener.$("#twitter_checked").attr("disabled", false);
+ opener.$("#twitter_checked").attr("checked", true);
+ window.close();
+ });
+
+EOT;
+
+} else {
+
+ echo <<
+ $(function() {
+ alert("트위터에 승인이 되지 않았습니다.");
+ window.close();
+ });
+
+EOT;
+
+}
+
+include_once(G4_PATH.'/tail.sub.php');
+?>
diff --git a/plugin/sns/twitter/clearsessions.php b/plugin/sns/twitter/clearsessions.php
new file mode 100644
index 000000000..2947d6276
--- /dev/null
+++ b/plugin/sns/twitter/clearsessions.php
@@ -0,0 +1,14 @@
+dev.twitter.com/apps';
+ exit;
+}
+
+/* Build an image link to start the redirect process. */
+$content = ' ';
+
+/* Include HTML to display on the page. */
+include('html.inc');
diff --git a/plugin/sns/twitter/html.inc b/plugin/sns/twitter/html.inc
new file mode 100644
index 000000000..e093e35e7
--- /dev/null
+++ b/plugin/sns/twitter/html.inc
@@ -0,0 +1,39 @@
+
+
+
+ Twitter OAuth in PHP
+
+
+
+
+
+
+ '.$status_text.''; ?>
+
+
+
+
+
+
+
+
+
diff --git a/plugin/sns/twitter/images/darker.png b/plugin/sns/twitter/images/darker.png
new file mode 100644
index 0000000000000000000000000000000000000000..746b6b9f80c71049f2a4eb84ff72d5d1bf77c62c
GIT binary patch
literal 2370
zcmV-I3BC4-P)dbVG7wVRUJ4ZXi@?ZDjy8FEKeU
zFgbGL({lg-0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#1y$)1UwV2%AYn
zK~!jg?VD?CQ|B4Sf5(m;U*kCB;v^&~X`mqlD70k=%6eVbQL0v*Xp7YQm8n{*b!>yJ
z(!O+58|t*KV;|a1YSE?^(P~r!DwWWcmX(x3qEZMUPRQMkYn;T6?ZlUJ&OSJC634d`
z2cpeC=_r2mzR&ajpNrq~p4TS=K=t-rGFh@@kd9Zj2}1SuU2^SRo90ZU_22>KvVNBN
zN$bG_D6X`LEdRUY0LY>^=R%i5Bg_0Ea&bx0oC{qJjV$wvq$5|gLBmVSt0>W^0odPr
zkvH4z-$^Jta{d3210W?h@h{a^F(j&a*$TCKc&?(53nP9G+XiPXlt^O&F&IP&hsn`s
z5EPNA;FxsxVjtoV%
z8w_x}#msH+D
zUG^;@b5%E4eOZieLxC|GdqX0xe$&Ypj-jMNi8KOE2Y=kSfm@f>FeZxRDir+gt8;wj^zh!Z
z4|1S;fIofHmFDiG$6VD-RKNGsNereu%r#2@czVNHJ~(6LRF^Ahouk{HM6Xf-GLk4F
z2#V;a{+_juy`2LY@e>1%F6o1ag}KMDd^>Xs!v=aD&Ais3mCBO>f^
zz-{K7lr<8yYYhef7Mt|!Z9Imrv=m)I0RVfS+RTxTUf$^)Brr0G@8oEJduZEaPNXAHVpl8Ko(IhUV0|K-#%m*RAB1@**Dl
z=s1!fueR#0OW`wyYIg<
zsa}`I3qYPSa=Y>cLv*@FGU}&&*gGwL=D_FNS6R#x58XwfUdyTOetvVfk#J!#4KF;x
zvGyKn7g|72@Z#~aNzb_gBBM&YEgjb6MgFF$k*NJpmz@@un+I-K&cC)k$QrE@kIjZG
zid2|Q7;@FfqDY-y&Ch9>U1jV%1XGUb`j!;hxMg}*nFc%;pz4NalQwCD8!dNc7A`d
zHF`|$sIN)OYh;t+9>+}hiH%pAbo}Z^-{-?KR(|-_2V7lLz!R&NMvv3R6Q5aRhyn%L9QNukNeYg;z4xn|*H
zt{ll-v(SP<5ctU2!)PExv&}i)E=T(|v~{!R%mo_z8~~^lio~8|rp4*xp0K;{2Scnb
zDPVnhF~@rc(5Y2iYtnIjWhu=UJu~V%y`xBy%vdNyuiH0kud*mjt`W*)+)r%0uBr@$
zAW&q`^XT>U1Vou-<(6ojBi0_?ZRz5q-Idtyc;BQ?i?NieCr7FYj`cfv`%Fj5+(a6o
z(NV%mC2xIgPtsNA_$Y)ue
z(H6(iw6=6|1Cq$sb|O4!+Cosu(|F91lh*NY-eyjL*2
zPp14#jdRp00ET>iMwBYvxArpZ^GEwivXu7ql5#>{u7-)zygM?N#;BZZzp=cC=T_G6
zm!|Vcg%W98rOCnGZ^Jg?M>gn??_7&dk|z7hkzA|C2f+O+YB8K?YpQttt8+<(5^3C0SHn|VHsbV;k)Nx^=^x{bW^1&+TB}7CC60F4`JlLy
zO-rh%uPo)z*>>tJMTiJ9`l@m@kyxWe7UMtePxOtAQ{|p=4DqZ|L6c*Ma9HHbpqIOq
zN>01naq9sb?y~bh-6Fo&v6XxG9htRPL6sBNbEf>n#&0&CXG{GO?q0DJ8EAI6*w%0&
zp@&2W)!TQ;B}?M3Z>+K`;LmrgWw#A>_r))8n;BkT3>)?wjN9&LYoqqAO$=Gv5}L3W
zw3O(z_<~_NhCC#Cxh%)!WWeJELEyz(*Ru7dH9Y#^QLKaRWcxTTDA4AjQ{~V%J_289
zV*SL%ISK{kMjh@zkm0e^i{!C5+S-!e7MuFNW#_SGetqLAZZN?9i_kwsCr=rf(A&NK
zltX2*cDvh)-R(_j_}yn7M3yB)Nv0y-$onl9Xmif~r>HA|%j+lklIi6o)=z945=FW$
z@k^U>&ULW0i;>X)Ppn?b&T7+)cKe8*9Sx0_baAE2L;DU>TVzJB&Y^wK&A^C1byAiq
zM#`Um0FGYh=jet0OA<==KAjA|7^G?Z(LKxjXI4uQm%`=H$TGi3`pQivxf~i<<`>!5
ooU_as0%ZTSEKBC;cx9XLUtuVuKI-|I^Z)<=07*qoM6N<$g3Pn2od5s;
literal 0
HcmV?d00001
diff --git a/plugin/sns/twitter/images/lighter.png b/plugin/sns/twitter/images/lighter.png
new file mode 100644
index 0000000000000000000000000000000000000000..297bb03404f2d7462ee9355aae38f5f5f3e47fbd
GIT binary patch
literal 2490
zcmV;r2}SmaP)dbVG7wVRUJ4ZXi@?ZDjy8FEKeU
zFgbGL({lg-0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#1y$)1UwV2@^>~
zK~!jg?VEdWl+_u=f8X9WA)72QVM!vF1VSK4AZQ?nK}o}NseS3JN$f
zgRQMIo!W~OJ6`ZouvAJ_K&eH%O=zU35Dd9+OGJ}EvYTu++57IdU;kJVc9XpY6B?a;
zX3k{ZIp=-eC+|7m`<-)kR{+>vQ7sWi9D|5ebEgWz_KIq$s4!>9f*d_|j-lj_V|e1|
zv2!Q@e7>PCTvsDT9K#C=07>!<2
zJRT3v{^4m(e0B`AMuXes=AQD^+;C$tPj22q>4H*zdfz>`#KAid3>9xAeo+*W%jE#P
zv+pgwyLbU*^X6iX@D|vxdJPV{BV^y=rMIzo>FtA}CzL%H7|@3PC-uR0k{o`MEpT&+
zmiCUwd$DjaD&G5mR^R=5Ugy>A
zFL6`pd;osE=`rd~)-ZEc5shchvh}x5aZ~9nJpS;;UjCggyhMFX4IM@k^;K2OnpeX9
zJ+G59W-M>Ndx+<@J`*QB2?^MN1N-(fead7?=HEi6T!B@Box5IR=L;`>Ej{PX
zHuTf??pp_V_K#2V&%f=WuDXUP)2>6K(eP;bS}ruV@b7*5sr;ydIrB8I2tIsDgsYdEB~aA*X6k7?
zxX|2;qp^|Gwe@`Y#d&IupCC)EqUw`l7)GU&uTKu*U$o?QG#U*z%qZYj8`hDRoCLu8
zhbzgOI5DbLyT^;&?d{E@=<{Loc(HlBWQ@7?YwIarxgyB6oH@guS9eiXI-mWozJlq(
z1uEY@fC2%N(MZ*iqs%Lw&3$(-XHs%f#Ci8GF3A_N^~J`q@N(Yec4#`>p8;Rm>`^(w
z^()mX);zY6A1}KTOQ(hBpZ+tI2M_vvC6EgOasg^TuSW9u`2L~=xMTvlF=IdirA&q(
z01}jz+(`M#6-+Id=Jypvl2wZSngV!x>{xvBuA7QRt)c4kYU--0D3~!Fhr>aA^+`_G
z)iHDWG@POs#IMsQgCL+*sYp&si#>KieJ
zAZPaXZl!3>9M-SjNX7dfvh?=bdf)$&1YWO*1jqy#ZFVPakM~lt{ns24pi(Mnce*e+
zoV|U5)IWA0uWtapa=C)>xf3{EU4zZ(WX19y(%RC@hySVMd_x1@*}REPr@KGD1PCBr
zszd|P3jULJU(P|*6JUEpf1ZUYMN@b5y{gO~R0`R^
zzo2^1b1iYS>vBugsL9qPM&yVTyCwWp(Uo=ev@y*W7rS{ZmOePbh#j}_&X%YtxeZa(=9L5<&(e8Bi
z<5wsYm^&^0MKr*8(egMLdIIf9`S}2Jn9Y=xl~T570XoAdF4!DlHH6a}anEJ-cv*VQ
z<;7KRgYq-}Q)5qi@;qcECS38JtLDV#Y+3g(n;(3LUp}&dB%O}ct5)I-xFV2%>k11g
zTUf@C&yKTa*KVdw^(R50loR*{_b2SKCHeZt4jkLpj^;ZlKOe6sQZ!>aT9uM(b0*;N
zdYL_=0IS=B(gj7|CTgIo3w=s5DLNgUE;lDl
z=6*ck(9~r1FRqNt5);TzP2p%4ylH~wfExv!+`pk8s}?!j(i+mgrP)GJVGd2L
zrifxR3OQ=I9MLCX4Ray;#3LJ#2{HtkfT^vG#S0hk#JUIhwAC2&WDQrS)2nfk*V=iQ!Y2K(sVlqHpM%x^1{ck;y4Kin5jc`W;@8<8AFx4+YWs
z?QSo2A}4+Q<6F?#y0F{rget('account/verify_credentials');
+
+/* Some example calls */
+//$connection->get('users/show', array('screen_name' => 'abraham'));
+//$connection->post('statuses/update', array('status' => date(DATE_RFC822)));
+//$connection->post('statuses/destroy', array('id' => 5437877770));
+//$connection->post('friendships/create', array('id' => 9436992));
+//$connection->post('friendships/destroy', array('id' => 9436992));
+
+/* Include HTML to display on the page */
+include('html.inc');
diff --git a/plugin/sns/twitter/redirect.php b/plugin/sns/twitter/redirect.php
new file mode 100644
index 000000000..4a4bb95ca
--- /dev/null
+++ b/plugin/sns/twitter/redirect.php
@@ -0,0 +1,31 @@
+getRequestToken(OAUTH_CALLBACK);
+
+/* Save temporary credentials to session. */
+$_SESSION['oauth_token'] = $token = $request_token['oauth_token'];
+$_SESSION['oauth_token_secret'] = $request_token['oauth_token_secret'];
+
+//print_r2($_SESSION); exit;
+
+/* If last connection failed don't display authorization link. */
+switch ($connection->http_code) {
+ case 200:
+ /* Build authorize URL and redirect user to Twitter. */
+ $url = $connection->getAuthorizeURL($token);
+ header('Location: ' . $url);
+ break;
+ default:
+ /* Show notification if something went wrong. */
+ echo 'Could not connect to Twitter. Refresh the page or try again later.';
+}
diff --git a/plugin/sns/twitter/twitteroauth/OAuth.php b/plugin/sns/twitter/twitteroauth/OAuth.php
new file mode 100644
index 000000000..e76304146
--- /dev/null
+++ b/plugin/sns/twitter/twitteroauth/OAuth.php
@@ -0,0 +1,872 @@
+key = $key;
+ $this->secret = $secret;
+ $this->callback_url = $callback_url;
+ }
+
+ function __toString() {
+ return "OAuthConsumer[key=$this->key,secret=$this->secret]";
+ }
+}
+
+class OAuthToken {
+ // access tokens and request tokens
+ public $key;
+ public $secret;
+
+ /**
+ * key = the token
+ * secret = the token secret
+ */
+ function __construct($key, $secret) {
+ $this->key = $key;
+ $this->secret = $secret;
+ }
+
+ /**
+ * generates the basic string serialization of a token that a server
+ * would respond to request_token and access_token calls with
+ */
+ function to_string() {
+ return "oauth_token=" .
+ OAuthUtil::urlencode_rfc3986($this->key) .
+ "&oauth_token_secret=" .
+ OAuthUtil::urlencode_rfc3986($this->secret);
+ }
+
+ function __toString() {
+ return $this->to_string();
+ }
+}
+
+/**
+ * A class for implementing a Signature Method
+ * See section 9 ("Signing Requests") in the spec
+ */
+abstract class OAuthSignatureMethod {
+ /**
+ * Needs to return the name of the Signature Method (ie HMAC-SHA1)
+ * @return string
+ */
+ abstract public function get_name();
+
+ /**
+ * Build up the signature
+ * NOTE: The output of this function MUST NOT be urlencoded.
+ * the encoding is handled in OAuthRequest when the final
+ * request is serialized
+ * @param OAuthRequest $request
+ * @param OAuthConsumer $consumer
+ * @param OAuthToken $token
+ * @return string
+ */
+ abstract public function build_signature($request, $consumer, $token);
+
+ /**
+ * Verifies that a given signature is correct
+ * @param OAuthRequest $request
+ * @param OAuthConsumer $consumer
+ * @param OAuthToken $token
+ * @param string $signature
+ * @return bool
+ */
+ public function check_signature($request, $consumer, $token, $signature) {
+ $built = $this->build_signature($request, $consumer, $token);
+ return $built == $signature;
+ }
+}
+
+/**
+ * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104]
+ * where the Signature Base String is the text and the key is the concatenated values (each first
+ * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&'
+ * character (ASCII code 38) even if empty.
+ * - Chapter 9.2 ("HMAC-SHA1")
+ */
+class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
+ function get_name() {
+ return "HMAC-SHA1";
+ }
+
+ public function build_signature($request, $consumer, $token) {
+ $base_string = $request->get_signature_base_string();
+ $request->base_string = $base_string;
+
+ $key_parts = array(
+ $consumer->secret,
+ ($token) ? $token->secret : ""
+ );
+
+ $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+ $key = implode('&', $key_parts);
+
+ return base64_encode(hash_hmac('sha1', $base_string, $key, true));
+ }
+}
+
+/**
+ * The PLAINTEXT method does not provide any security protection and SHOULD only be used
+ * over a secure channel such as HTTPS. It does not use the Signature Base String.
+ * - Chapter 9.4 ("PLAINTEXT")
+ */
+class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
+ public function get_name() {
+ return "PLAINTEXT";
+ }
+
+ /**
+ * oauth_signature is set to the concatenated encoded values of the Consumer Secret and
+ * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is
+ * empty. The result MUST be encoded again.
+ * - Chapter 9.4.1 ("Generating Signatures")
+ *
+ * Please note that the second encoding MUST NOT happen in the SignatureMethod, as
+ * OAuthRequest handles this!
+ */
+ public function build_signature($request, $consumer, $token) {
+ $key_parts = array(
+ $consumer->secret,
+ ($token) ? $token->secret : ""
+ );
+
+ $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+ $key = implode('&', $key_parts);
+ $request->base_string = $key;
+
+ return $key;
+ }
+}
+
+/**
+ * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in
+ * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for
+ * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a
+ * verified way to the Service Provider, in a manner which is beyond the scope of this
+ * specification.
+ * - Chapter 9.3 ("RSA-SHA1")
+ */
+abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
+ public function get_name() {
+ return "RSA-SHA1";
+ }
+
+ // Up to the SP to implement this lookup of keys. Possible ideas are:
+ // (1) do a lookup in a table of trusted certs keyed off of consumer
+ // (2) fetch via http using a url provided by the requester
+ // (3) some sort of specific discovery code based on request
+ //
+ // Either way should return a string representation of the certificate
+ protected abstract function fetch_public_cert(&$request);
+
+ // Up to the SP to implement this lookup of keys. Possible ideas are:
+ // (1) do a lookup in a table of trusted certs keyed off of consumer
+ //
+ // Either way should return a string representation of the certificate
+ protected abstract function fetch_private_cert(&$request);
+
+ public function build_signature($request, $consumer, $token) {
+ $base_string = $request->get_signature_base_string();
+ $request->base_string = $base_string;
+
+ // Fetch the private key cert based on the request
+ $cert = $this->fetch_private_cert($request);
+
+ // Pull the private key ID from the certificate
+ $privatekeyid = openssl_get_privatekey($cert);
+
+ // Sign using the key
+ $ok = openssl_sign($base_string, $signature, $privatekeyid);
+
+ // Release the key resource
+ openssl_free_key($privatekeyid);
+
+ return base64_encode($signature);
+ }
+
+ public function check_signature($request, $consumer, $token, $signature) {
+ $decoded_sig = base64_decode($signature);
+
+ $base_string = $request->get_signature_base_string();
+
+ // Fetch the public key cert based on the request
+ $cert = $this->fetch_public_cert($request);
+
+ // Pull the public key ID from the certificate
+ $publickeyid = openssl_get_publickey($cert);
+
+ // Check the computed signature against the one passed in the query
+ $ok = openssl_verify($base_string, $decoded_sig, $publickeyid);
+
+ // Release the key resource
+ openssl_free_key($publickeyid);
+
+ return $ok == 1;
+ }
+}
+
+class OAuthRequest {
+ private $parameters;
+ private $http_method;
+ private $http_url;
+ // for debug purposes
+ public $base_string;
+ public static $version = '1.0';
+ public static $POST_INPUT = 'php://input';
+
+ function __construct($http_method, $http_url, $parameters=NULL) {
+ @$parameters or $parameters = array();
+ $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
+ $this->parameters = $parameters;
+ $this->http_method = $http_method;
+ $this->http_url = $http_url;
+ }
+
+
+ /**
+ * attempt to build up a request from what was passed to the server
+ */
+ public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {
+ $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
+ ? 'http'
+ : 'https';
+ @$http_url or $http_url = $scheme .
+ '://' . $_SERVER['HTTP_HOST'] .
+ ':' .
+ $_SERVER['SERVER_PORT'] .
+ $_SERVER['REQUEST_URI'];
+ @$http_method or $http_method = $_SERVER['REQUEST_METHOD'];
+
+ // We weren't handed any parameters, so let's find the ones relevant to
+ // this request.
+ // If you run XML-RPC or similar you should use this to provide your own
+ // parsed parameter-list
+ if (!$parameters) {
+ // Find request headers
+ $request_headers = OAuthUtil::get_headers();
+
+ // Parse the query-string to find GET parameters
+ $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
+
+ // It's a POST request of the proper content-type, so parse POST
+ // parameters and add those overriding any duplicates from GET
+ if ($http_method == "POST"
+ && @strstr($request_headers["Content-Type"],
+ "application/x-www-form-urlencoded")
+ ) {
+ $post_data = OAuthUtil::parse_parameters(
+ file_get_contents(self::$POST_INPUT)
+ );
+ $parameters = array_merge($parameters, $post_data);
+ }
+
+ // We have a Authorization-header with OAuth data. Parse the header
+ // and add those overriding any duplicates from GET or POST
+ if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") {
+ $header_parameters = OAuthUtil::split_header(
+ $request_headers['Authorization']
+ );
+ $parameters = array_merge($parameters, $header_parameters);
+ }
+
+ }
+
+ return new OAuthRequest($http_method, $http_url, $parameters);
+ }
+
+ /**
+ * pretty much a helper function to set up the request
+ */
+ public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
+ @$parameters or $parameters = array();
+ $defaults = array("oauth_version" => OAuthRequest::$version,
+ "oauth_nonce" => OAuthRequest::generate_nonce(),
+ "oauth_timestamp" => OAuthRequest::generate_timestamp(),
+ "oauth_consumer_key" => $consumer->key);
+ if ($token)
+ $defaults['oauth_token'] = $token->key;
+
+ $parameters = array_merge($defaults, $parameters);
+
+ return new OAuthRequest($http_method, $http_url, $parameters);
+ }
+
+ public function set_parameter($name, $value, $allow_duplicates = true) {
+ if ($allow_duplicates && isset($this->parameters[$name])) {
+ // We have already added parameter(s) with this name, so add to the list
+ if (is_scalar($this->parameters[$name])) {
+ // This is the first duplicate, so transform scalar (string)
+ // into an array so we can add the duplicates
+ $this->parameters[$name] = array($this->parameters[$name]);
+ }
+
+ $this->parameters[$name][] = $value;
+ } else {
+ $this->parameters[$name] = $value;
+ }
+ }
+
+ public function get_parameter($name) {
+ return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
+ }
+
+ public function get_parameters() {
+ return $this->parameters;
+ }
+
+ public function unset_parameter($name) {
+ unset($this->parameters[$name]);
+ }
+
+ /**
+ * The request parameters, sorted and concatenated into a normalized string.
+ * @return string
+ */
+ public function get_signable_parameters() {
+ // Grab all parameters
+ $params = $this->parameters;
+
+ // Remove oauth_signature if present
+ // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
+ if (isset($params['oauth_signature'])) {
+ unset($params['oauth_signature']);
+ }
+
+ return OAuthUtil::build_http_query($params);
+ }
+
+ /**
+ * Returns the base string of this request
+ *
+ * The base string defined as the method, the url
+ * and the parameters (normalized), each urlencoded
+ * and the concated with &.
+ */
+ public function get_signature_base_string() {
+ $parts = array(
+ $this->get_normalized_http_method(),
+ $this->get_normalized_http_url(),
+ $this->get_signable_parameters()
+ );
+
+ $parts = OAuthUtil::urlencode_rfc3986($parts);
+
+ return implode('&', $parts);
+ }
+
+ /**
+ * just uppercases the http method
+ */
+ public function get_normalized_http_method() {
+ return strtoupper($this->http_method);
+ }
+
+ /**
+ * parses the url and rebuilds it to be
+ * scheme://host/path
+ */
+ public function get_normalized_http_url() {
+ $parts = parse_url($this->http_url);
+
+ $port = @$parts['port'];
+ $scheme = $parts['scheme'];
+ $host = $parts['host'];
+ $path = @$parts['path'];
+
+ $port or $port = ($scheme == 'https') ? '443' : '80';
+
+ if (($scheme == 'https' && $port != '443')
+ || ($scheme == 'http' && $port != '80')) {
+ $host = "$host:$port";
+ }
+ return "$scheme://$host$path";
+ }
+
+ /**
+ * builds a url usable for a GET request
+ */
+ public function to_url() {
+ $post_data = $this->to_postdata();
+ $out = $this->get_normalized_http_url();
+ if ($post_data) {
+ $out .= '?'.$post_data;
+ }
+ return $out;
+ }
+
+ /**
+ * builds the data one would send in a POST request
+ */
+ public function to_postdata() {
+ return OAuthUtil::build_http_query($this->parameters);
+ }
+
+ /**
+ * builds the Authorization: header
+ */
+ public function to_header($realm=null) {
+ $first = true;
+ if($realm) {
+ $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
+ $first = false;
+ } else
+ $out = 'Authorization: OAuth';
+
+ $total = array();
+ foreach ($this->parameters as $k => $v) {
+ if (substr($k, 0, 5) != "oauth") continue;
+ if (is_array($v)) {
+ throw new OAuthException('Arrays not supported in headers');
+ }
+ $out .= ($first) ? ' ' : ',';
+ $out .= OAuthUtil::urlencode_rfc3986($k) .
+ '="' .
+ OAuthUtil::urlencode_rfc3986($v) .
+ '"';
+ $first = false;
+ }
+ return $out;
+ }
+
+ public function __toString() {
+ return $this->to_url();
+ }
+
+
+ public function sign_request($signature_method, $consumer, $token) {
+ $this->set_parameter(
+ "oauth_signature_method",
+ $signature_method->get_name(),
+ false
+ );
+ $signature = $this->build_signature($signature_method, $consumer, $token);
+ $this->set_parameter("oauth_signature", $signature, false);
+ }
+
+ public function build_signature($signature_method, $consumer, $token) {
+ $signature = $signature_method->build_signature($this, $consumer, $token);
+ return $signature;
+ }
+
+ /**
+ * util function: current timestamp
+ */
+ private static function generate_timestamp() {
+ return time();
+ }
+
+ /**
+ * util function: current nonce
+ */
+ private static function generate_nonce() {
+ $mt = microtime();
+ $rand = mt_rand();
+
+ return md5($mt . $rand); // md5s look nicer than numbers
+ }
+}
+
+class OAuthServer {
+ protected $timestamp_threshold = 300; // in seconds, five minutes
+ protected $version = '1.0'; // hi blaine
+ protected $signature_methods = array();
+
+ protected $data_store;
+
+ function __construct($data_store) {
+ $this->data_store = $data_store;
+ }
+
+ public function add_signature_method($signature_method) {
+ $this->signature_methods[$signature_method->get_name()] =
+ $signature_method;
+ }
+
+ // high level functions
+
+ /**
+ * process a request_token request
+ * returns the request token on success
+ */
+ public function fetch_request_token(&$request) {
+ $this->get_version($request);
+
+ $consumer = $this->get_consumer($request);
+
+ // no token required for the initial token request
+ $token = NULL;
+
+ $this->check_signature($request, $consumer, $token);
+
+ // Rev A change
+ $callback = $request->get_parameter('oauth_callback');
+ $new_token = $this->data_store->new_request_token($consumer, $callback);
+
+ return $new_token;
+ }
+
+ /**
+ * process an access_token request
+ * returns the access token on success
+ */
+ public function fetch_access_token(&$request) {
+ $this->get_version($request);
+
+ $consumer = $this->get_consumer($request);
+
+ // requires authorized request token
+ $token = $this->get_token($request, $consumer, "request");
+
+ $this->check_signature($request, $consumer, $token);
+
+ // Rev A change
+ $verifier = $request->get_parameter('oauth_verifier');
+ $new_token = $this->data_store->new_access_token($token, $consumer, $verifier);
+
+ return $new_token;
+ }
+
+ /**
+ * verify an api call, checks all the parameters
+ */
+ public function verify_request(&$request) {
+ $this->get_version($request);
+ $consumer = $this->get_consumer($request);
+ $token = $this->get_token($request, $consumer, "access");
+ $this->check_signature($request, $consumer, $token);
+ return array($consumer, $token);
+ }
+
+ // Internals from here
+ /**
+ * version 1
+ */
+ private function get_version(&$request) {
+ $version = $request->get_parameter("oauth_version");
+ if (!$version) {
+ // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present.
+ // Chapter 7.0 ("Accessing Protected Ressources")
+ $version = '1.0';
+ }
+ if ($version !== $this->version) {
+ throw new OAuthException("OAuth version '$version' not supported");
+ }
+ return $version;
+ }
+
+ /**
+ * figure out the signature with some defaults
+ */
+ private function get_signature_method(&$request) {
+ $signature_method =
+ @$request->get_parameter("oauth_signature_method");
+
+ if (!$signature_method) {
+ // According to chapter 7 ("Accessing Protected Ressources") the signature-method
+ // parameter is required, and we can't just fallback to PLAINTEXT
+ throw new OAuthException('No signature method parameter. This parameter is required');
+ }
+
+ if (!in_array($signature_method,
+ array_keys($this->signature_methods))) {
+ throw new OAuthException(
+ "Signature method '$signature_method' not supported " .
+ "try one of the following: " .
+ implode(", ", array_keys($this->signature_methods))
+ );
+ }
+ return $this->signature_methods[$signature_method];
+ }
+
+ /**
+ * try to find the consumer for the provided request's consumer key
+ */
+ private function get_consumer(&$request) {
+ $consumer_key = @$request->get_parameter("oauth_consumer_key");
+ if (!$consumer_key) {
+ throw new OAuthException("Invalid consumer key");
+ }
+
+ $consumer = $this->data_store->lookup_consumer($consumer_key);
+ if (!$consumer) {
+ throw new OAuthException("Invalid consumer");
+ }
+
+ return $consumer;
+ }
+
+ /**
+ * try to find the token for the provided request's token key
+ */
+ private function get_token(&$request, $consumer, $token_type="access") {
+ $token_field = @$request->get_parameter('oauth_token');
+ $token = $this->data_store->lookup_token(
+ $consumer, $token_type, $token_field
+ );
+ if (!$token) {
+ throw new OAuthException("Invalid $token_type token: $token_field");
+ }
+ return $token;
+ }
+
+ /**
+ * all-in-one function to check the signature on a request
+ * should guess the signature method appropriately
+ */
+ private function check_signature(&$request, $consumer, $token) {
+ // this should probably be in a different method
+ $timestamp = @$request->get_parameter('oauth_timestamp');
+ $nonce = @$request->get_parameter('oauth_nonce');
+
+ $this->check_timestamp($timestamp);
+ $this->check_nonce($consumer, $token, $nonce, $timestamp);
+
+ $signature_method = $this->get_signature_method($request);
+
+ $signature = $request->get_parameter('oauth_signature');
+ $valid_sig = $signature_method->check_signature(
+ $request,
+ $consumer,
+ $token,
+ $signature
+ );
+
+ if (!$valid_sig) {
+ throw new OAuthException("Invalid signature");
+ }
+ }
+
+ /**
+ * check that the timestamp is new enough
+ */
+ private function check_timestamp($timestamp) {
+ if( ! $timestamp )
+ throw new OAuthException(
+ 'Missing timestamp parameter. The parameter is required'
+ );
+
+ // verify that timestamp is recentish
+ $now = time();
+ if (abs($now - $timestamp) > $this->timestamp_threshold) {
+ throw new OAuthException(
+ "Expired timestamp, yours $timestamp, ours $now"
+ );
+ }
+ }
+
+ /**
+ * check that the nonce is not repeated
+ */
+ private function check_nonce($consumer, $token, $nonce, $timestamp) {
+ if( ! $nonce )
+ throw new OAuthException(
+ 'Missing nonce parameter. The parameter is required'
+ );
+
+ // verify that the nonce is uniqueish
+ $found = $this->data_store->lookup_nonce(
+ $consumer,
+ $token,
+ $nonce,
+ $timestamp
+ );
+ if ($found) {
+ throw new OAuthException("Nonce already used: $nonce");
+ }
+ }
+
+}
+
+class OAuthDataStore {
+ function lookup_consumer($consumer_key) {
+ // implement me
+ }
+
+ function lookup_token($consumer, $token_type, $token) {
+ // implement me
+ }
+
+ function lookup_nonce($consumer, $token, $nonce, $timestamp) {
+ // implement me
+ }
+
+ function new_request_token($consumer, $callback = null) {
+ // return a new token attached to this consumer
+ }
+
+ function new_access_token($token, $consumer, $verifier = null) {
+ // return a new access token attached to this consumer
+ // for the user associated with this token if the request token
+ // is authorized
+ // should also invalidate the request token
+ }
+
+}
+
+class OAuthUtil {
+ public static function urlencode_rfc3986($input) {
+ if (is_array($input)) {
+ return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input);
+ } else if (is_scalar($input)) {
+ return str_replace(
+ '+',
+ ' ',
+ str_replace('%7E', '~', rawurlencode($input))
+ );
+ } else {
+ return '';
+ }
+}
+
+
+ // This decode function isn't taking into consideration the above
+ // modifications to the encoding process. However, this method doesn't
+ // seem to be used anywhere so leaving it as is.
+ public static function urldecode_rfc3986($string) {
+ return urldecode($string);
+ }
+
+ // Utility function for turning the Authorization: header into
+ // parameters, has to do some unescaping
+ // Can filter out any non-oauth parameters if needed (default behaviour)
+ public static function split_header($header, $only_allow_oauth_parameters = true) {
+ $pattern = '/(([-_a-z]*)=("([^"]*)"|([^,]*)),?)/';
+ $offset = 0;
+ $params = array();
+ while (preg_match($pattern, $header, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
+ $match = $matches[0];
+ $header_name = $matches[2][0];
+ $header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0];
+ if (preg_match('/^oauth_/', $header_name) || !$only_allow_oauth_parameters) {
+ $params[$header_name] = OAuthUtil::urldecode_rfc3986($header_content);
+ }
+ $offset = $match[1] + strlen($match[0]);
+ }
+
+ if (isset($params['realm'])) {
+ unset($params['realm']);
+ }
+
+ return $params;
+ }
+
+ // helper to try to sort out headers for people who aren't running apache
+ public static function get_headers() {
+ if (function_exists('apache_request_headers')) {
+ // we need this to get the actual Authorization: header
+ // because apache tends to tell us it doesn't exist
+ $headers = apache_request_headers();
+
+ // sanitize the output of apache_request_headers because
+ // we always want the keys to be Cased-Like-This and arh()
+ // returns the headers in the same case as they are in the
+ // request
+ $out = array();
+ foreach( $headers AS $key => $value ) {
+ $key = str_replace(
+ " ",
+ "-",
+ ucwords(strtolower(str_replace("-", " ", $key)))
+ );
+ $out[$key] = $value;
+ }
+ } else {
+ // otherwise we don't have apache and are just going to have to hope
+ // that $_SERVER actually contains what we need
+ $out = array();
+ if( isset($_SERVER['CONTENT_TYPE']) )
+ $out['Content-Type'] = $_SERVER['CONTENT_TYPE'];
+ if( isset($_ENV['CONTENT_TYPE']) )
+ $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
+
+ foreach ($_SERVER as $key => $value) {
+ if (substr($key, 0, 5) == "HTTP_") {
+ // this is chaos, basically it is just there to capitalize the first
+ // letter of every word that is not an initial HTTP and strip HTTP
+ // code from przemek
+ $key = str_replace(
+ " ",
+ "-",
+ ucwords(strtolower(str_replace("_", " ", substr($key, 5))))
+ );
+ $out[$key] = $value;
+ }
+ }
+ }
+ return $out;
+ }
+
+ // This function takes a input like a=b&a=c&d=e and returns the parsed
+ // parameters like this
+ // array('a' => array('b','c'), 'd' => 'e')
+ public static function parse_parameters( $input ) {
+ if (!isset($input) || !$input) return array();
+
+ $pairs = explode('&', $input);
+
+ $parsed_parameters = array();
+ foreach ($pairs as $pair) {
+ $split = explode('=', $pair, 2);
+ $parameter = OAuthUtil::urldecode_rfc3986($split[0]);
+ $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
+
+ if (isset($parsed_parameters[$parameter])) {
+ // We have already recieved parameter(s) with this name, so add to the list
+ // of parameters with this name
+
+ if (is_scalar($parsed_parameters[$parameter])) {
+ // This is the first duplicate, so transform scalar (string) into an array
+ // so we can add the duplicates
+ $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]);
+ }
+
+ $parsed_parameters[$parameter][] = $value;
+ } else {
+ $parsed_parameters[$parameter] = $value;
+ }
+ }
+ return $parsed_parameters;
+ }
+
+ public static function build_http_query($params) {
+ if (!$params) return '';
+
+ // Urlencode both keys and values
+ $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));
+ $values = OAuthUtil::urlencode_rfc3986(array_values($params));
+ $params = array_combine($keys, $values);
+
+ // Parameters are sorted by name, using lexicographical byte value ordering.
+ // Ref: Spec: 9.1.1 (1)
+ uksort($params, 'strcmp');
+
+ $pairs = array();
+ foreach ($params as $parameter => $value) {
+ if (is_array($value)) {
+ // If two or more parameters share the same name, they are sorted by their value
+ // Ref: Spec: 9.1.1 (1)
+ natsort($value);
+ foreach ($value as $duplicate_value) {
+ $pairs[] = $parameter . '=' . $duplicate_value;
+ }
+ } else {
+ $pairs[] = $parameter . '=' . $value;
+ }
+ }
+ // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61)
+ // Each name-value pair is separated by an '&' character (ASCII code 38)
+ return implode('&', $pairs);
+ }
+}
diff --git a/plugin/sns/twitter/twitteroauth/twitteroauth.php b/plugin/sns/twitter/twitteroauth/twitteroauth.php
new file mode 100644
index 000000000..4c2447c46
--- /dev/null
+++ b/plugin/sns/twitter/twitteroauth/twitteroauth.php
@@ -0,0 +1,241 @@
+http_status; }
+ function lastAPICall() { return $this->last_api_call; }
+
+ /**
+ * construct TwitterOAuth object
+ */
+ function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
+ $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
+ $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+ if (!empty($oauth_token) && !empty($oauth_token_secret)) {
+ $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
+ } else {
+ $this->token = NULL;
+ }
+ }
+
+
+ /**
+ * Get a request_token from Twitter
+ *
+ * @returns a key/value array containing oauth_token and oauth_token_secret
+ */
+ function getRequestToken($oauth_callback) {
+ $parameters = array();
+ $parameters['oauth_callback'] = $oauth_callback;
+ $request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
+ $token = OAuthUtil::parse_parameters($request);
+ $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+ return $token;
+ }
+
+ /**
+ * Get the authorize URL
+ *
+ * @returns a string
+ */
+ function getAuthorizeURL($token, $sign_in_with_twitter = TRUE) {
+ if (is_array($token)) {
+ $token = $token['oauth_token'];
+ }
+ if (empty($sign_in_with_twitter)) {
+ return $this->authorizeURL() . "?oauth_token={$token}";
+ } else {
+ return $this->authenticateURL() . "?oauth_token={$token}";
+ }
+ }
+
+ /**
+ * Exchange request token and secret for an access token and
+ * secret, to sign API calls.
+ *
+ * @returns array("oauth_token" => "the-access-token",
+ * "oauth_token_secret" => "the-access-secret",
+ * "user_id" => "9436992",
+ * "screen_name" => "abraham")
+ */
+ function getAccessToken($oauth_verifier) {
+ $parameters = array();
+ $parameters['oauth_verifier'] = $oauth_verifier;
+ $request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
+ $token = OAuthUtil::parse_parameters($request);
+ $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+ return $token;
+ }
+
+ /**
+ * One time exchange of username and password for access token and secret.
+ *
+ * @returns array("oauth_token" => "the-access-token",
+ * "oauth_token_secret" => "the-access-secret",
+ * "user_id" => "9436992",
+ * "screen_name" => "abraham",
+ * "x_auth_expires" => "0")
+ */
+ function getXAuthToken($username, $password) {
+ $parameters = array();
+ $parameters['x_auth_username'] = $username;
+ $parameters['x_auth_password'] = $password;
+ $parameters['x_auth_mode'] = 'client_auth';
+ $request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
+ $token = OAuthUtil::parse_parameters($request);
+ $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+ return $token;
+ }
+
+ /**
+ * GET wrapper for oAuthRequest.
+ */
+ function get($url, $parameters = array()) {
+ $response = $this->oAuthRequest($url, 'GET', $parameters);
+ if ($this->format === 'json' && $this->decode_json) {
+ return json_decode($response);
+ }
+ return $response;
+ }
+
+ /**
+ * POST wrapper for oAuthRequest.
+ */
+ function post($url, $parameters = array()) {
+ $response = $this->oAuthRequest($url, 'POST', $parameters);
+ if ($this->format === 'json' && $this->decode_json) {
+ return json_decode($response);
+ }
+ return $response;
+ }
+
+ /**
+ * DELETE wrapper for oAuthReqeust.
+ */
+ function delete($url, $parameters = array()) {
+ $response = $this->oAuthRequest($url, 'DELETE', $parameters);
+ if ($this->format === 'json' && $this->decode_json) {
+ return json_decode($response);
+ }
+ return $response;
+ }
+
+ /**
+ * Format and sign an OAuth / API request
+ */
+ function oAuthRequest($url, $method, $parameters) {
+ if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
+ $url = "{$this->host}{$url}.{$this->format}";
+ }
+ $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
+ $request->sign_request($this->sha1_method, $this->consumer, $this->token);
+ switch ($method) {
+ case 'GET':
+ return $this->http($request->to_url(), 'GET');
+ default:
+ return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata());
+ }
+ }
+
+ /**
+ * Make an HTTP request
+ *
+ * @return API results
+ */
+ function http($url, $method, $postfields = NULL) {
+ $this->http_info = array();
+ $ci = curl_init();
+ /* Curl settings */
+ curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
+ curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
+ curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
+ curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
+ curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:'));
+ curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
+ curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader'));
+ curl_setopt($ci, CURLOPT_HEADER, FALSE);
+
+ switch ($method) {
+ case 'POST':
+ curl_setopt($ci, CURLOPT_POST, TRUE);
+ if (!empty($postfields)) {
+ curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
+ }
+ break;
+ case 'DELETE':
+ curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
+ if (!empty($postfields)) {
+ $url = "{$url}?{$postfields}";
+ }
+ }
+
+ curl_setopt($ci, CURLOPT_URL, $url);
+ $response = curl_exec($ci);
+ $this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
+ $this->http_info = array_merge($this->http_info, curl_getinfo($ci));
+ $this->url = $url;
+ curl_close ($ci);
+ return $response;
+ }
+
+ /**
+ * Get the header info to store.
+ */
+ function getHeader($ch, $header) {
+ $i = strpos($header, ':');
+ if (!empty($i)) {
+ $key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
+ $value = trim(substr($header, $i + 2));
+ $this->http_header[$key] = $value;
+ }
+ return strlen($header);
+ }
+}
diff --git a/skin/board/basic/list.skin.php b/skin/board/basic/list.skin.php
index a19bd3a15..5bd5500d8 100644
--- a/skin/board/basic/list.skin.php
+++ b/skin/board/basic/list.skin.php
@@ -35,9 +35,9 @@ if ($is_nogood) $colspan++;
@@ -115,7 +115,7 @@ if ($is_nogood) $colspan++;
?>
-
+
@@ -140,7 +140,7 @@ if ($is_nogood) $colspan++;
@@ -174,7 +174,7 @@ if ($is_nogood) $colspan++;
>글쓴이(코)
검색어 필수
-
+
diff --git a/skin/board/basic/sns_comment.skin.php b/skin/board/basic/sns_comment.skin.php
index ea09105b0..d7ce2ae74 100644
--- a/skin/board/basic/sns_comment.skin.php
+++ b/skin/board/basic/sns_comment.skin.php
@@ -2,81 +2,83 @@
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if (!$is_member) return;
-if (!$config['cf_facebook_use']) return;
-
-include_once(G4_SNS_PATH."/facebook/src/facebook.php");
-$facebook = new Facebook(array(
- 'appId' => $config['cf_facebook_appid'],
- 'secret' => $config['cf_facebook_secret']
-));
-
-$user = $facebook->getUser();
-
-if ($user) {
- try {
- $user_profile = $facebook->api('/me');
- } catch (FacebookApiException $e) {
- error_log($e);
- $user = null;
- }
-} else {
- $appid = $config['cf_facebook_appid'];
- $secret = $config['cf_facebook_secret'];
- $access_token = $_COOKIE['fbs_'.$appid.'_access_token'];
-
- $graph_url = "https://graph.facebook.com/oauth/access_token?client_id=$appid&client_secret=$secret&grant_type=client_credentials";
- $access_token = file_get_contents($graph_url);
-
- if($access_token){
-
- $graph_url = "https://graph.facebook.com/oauth/access_token_info?client_id=$appid&" . $access_token;
- $access_token_info = json_decode(file_get_contents($graph_url));
-
- function nonceHasBeenUsed($auth_nonce) {
- // Here you would check your database to see if the nonce
- // has been used before. For the sake of this example, we'll
- // just assume the answer is "no".
- return false;
- }
-
- if (nonceHasBeenUsed($access_token_info->auth_nonce) != true) {
- if ($result = @file_get_contents("https://graph.facebook.com/me/?".$access_token)) {
- $result = json_decode($result, true);
- print_r2($result);
- $user = $result['id'];
- }
- }
- /*
- if ($result = @file_get_contents("https://graph.facebook.com/me/?access_token=".$access_token)) {
- $result = json_decode($result, true);
-
- print_r2($result);
- //echo $_SESSION['uid'] = $result['id'];
- //if ($result = @file_get_contents("https://graph.facebook.com/{$result['id']}/accounts/test-users?installed=true&name={$result['name']}&locale={$result['locale']}&permissions=read_stream&method=post&access_token=".$access_token)) {
- if ($result = @file_get_contents("https://graph.facebook.com/{$result['id']}/accounts/test-users?access_token=".$access_token)) {
- $result = json_decode($result, true);
- print_r2($result);
- $user = $result['id'];
- }
- }
- */
- }
-}
+if (!$config['cf_facebook_use'] && !$config['cf_twitter_use']) return;
?>
SNS 등록
';
- echo '
';
- } else {
- $facebook_url = $facebook->getLoginUrl(array("redirect_uri"=>G4_SNS_URL."/facebook/callback.php", "scope"=>"publish_stream,read_stream,offline_access", "display"=>"popup"));
+ if ($config['cf_facebook_use']) {
+ include_once(G4_SNS_PATH."/facebook/src/facebook.php");
+ $facebook = new Facebook(array(
+ 'appId' => $config['cf_facebook_appid'],
+ 'secret' => $config['cf_facebook_secret']
+ ));
- echo '
';
- echo '
';
- echo '';
+ $user = $facebook->getUser();
+
+ if ($user) {
+ try {
+ $user_profile = $facebook->api('/me');
+ } catch (FacebookApiException $e) {
+ error_log($e);
+ $user = null;
+ }
+ }
+
+ if ($user) {
+ echo ' ';
+ echo ' ';
+ } else {
+ $facebook_url = $facebook->getLoginUrl(array("redirect_uri"=>G4_SNS_URL."/facebook/callback.php", "scope"=>"publish_stream,read_stream,offline_access", "display"=>"popup"));
+
+ echo ' ';
+ echo ' ';
+ echo '';
+ }
+ }
+
+ if ($config['cf_twitter_use']) {
+ include_once(G4_SNS_PATH."/twitter/twitteroauth/twitteroauth.php");
+ include_once(G4_SNS_PATH."/twitter/config.php");
+
+ $user = false;
+ if (empty($_SESSION['access_token']) || empty($_SESSION['access_token']['oauth_token']) || empty($_SESSION['access_token']['oauth_token_secret'])) {
+ $twitter_url = G4_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');
+ //print_r2($content);
+
+ switch ($connection->http_code) {
+ case 200:
+ $user = true;
+ $twitter_url = $connection->getAuthorizeURL($token);
+ break;
+ default :
+ $twitter_url = G4_SNS_URL."/twitter/redirect.php";
+ // 안먹히는 코드 ㅠㅠ
+ if ($member['mb_twitter_token'] && $member['mb_twitter_token_secret']) {
+ $connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $member['mb_twitter_token'], $member['mb_twitter_token_secret']);
+ $content = $connection->get('account/verify_credentials');
+ if (200 == $connection->http_code) {
+ $user = true;
+ $twitter_url = $connection->getAuthorizeURL($token);
+ }
+ }
+ }
+ }
+
+ if ($user) {
+ echo '';
+ echo '';
+ } else {
+ echo '';
+ echo '
diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css
index f2f48e0d3..e9b257b52 100644
--- a/skin/board/basic/style.css
+++ b/skin/board/basic/style.css
@@ -3,12 +3,14 @@
/* 게시판 목록 */
#bo_list_title {margin-bottom:20px;font-size:1.2em;letter-spacing:-0.1em}
-#bo_cate h2 {position:absolute;;font-size:0;line-height:0;overflow:hidden}
+#bo_cate h2 {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1}
#bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""}
#bo_cate li {float:left;margin-bottom:-1px}
#bo_cate a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:90px;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}
-#bo_cate a:focus, #bo_cate a:hover, #bo_cate a:active {text-decoration:none}
+#bo_cate a:focus,
+#bo_cate a:hover,
+#bo_cate a:active {text-decoration:none}
#bo_cate #bo_cate_on {z-index:2;border:1px solid #565e60;background:#fff;color:#565e60;font-weight:bold}
.td_subject img {margin-left:3px}
@@ -23,7 +25,7 @@
.btn_bo_adm {float:left}
.btn_bo_adm li {float:left;margin-right:5px}
.btn_bo_adm input {padding:0 10px;height:25px;border:1px solid #e8180c !important;background:#e8180c;color:#fff;text-decoration:none;vertical-align:middle;cursor:pointer}
-.bo_notice td {background:#f5f6fa}
+.bo_notice td {background:#f7f7f2}
.bo_notice td a {font-weight:bold}
.td_num strong {color:#000}
.bo_cate_link {display:inline-block;margin:0 3px 0 0;padding:0 6px 0 0;border-right:1px solid #e7f1ed;color:#999 !important;font-weight:bold;text-decoration:none} /* 글제목줄 분류스타일 */
@@ -31,14 +33,14 @@
.cnt_cmt {font-weight:bold}
#bo_sch {margin-bottom:10px;padding-top:5px;text-align:center}
-#bo_sch legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_sch legend {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}
-#bo_v_table {position:absolute;top:0;right:15px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em}
+#bo_v_cate {position:absolute;top:0;right:15px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em}
-#bo_v_title {padding:10px 0;font-size:1.2em}
+#bo_v_h1 {padding:10px 0;font-size:1.2em}
#bo_v_info {padding:0 0 10px;border-bottom:1px solid #ddd}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
@@ -51,24 +53,27 @@
#bo_v_file {}
#bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_file ul {margin:0;padding:0;list-style:none}
-#bo_v_file li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa}
-#bo_v_file a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word}
-#bo_v_file a:focus, #bo_v_file a:hover, #bo_v_file a:active {text-decoration:none}
-#bo_v_file img {float:left;margin:0 10px 0 0}
-.bo_v_file_cnt {display:inline-block;margin:0 0 3px 22px}
+#bo_v_file li {padding:0 10px;border-bottom:1px solid #eee;background:#f7f7f2}
+#bo_v_file a {display:inline-block;padding:8px 0 7px;color:#000}
+#bo_v_file a:focus,
+#bo_v_file a:hover,
+#bo_v_file a:active {text-decoration:none}
+.bo_v_file_cnt {display:inline-block;margin:0 10px}
#bo_v_link {}
#bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_link ul {margin:0;padding:0;list-style:none}
-#bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa}
-#bo_v_link a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word}
-#bo_v_link a:focus, #bo_v_link a:hover, #bo_v_link a:active {text-decoration:none}
-.bo_v_link_cnt {display:inline-block;margin:0 0 3px 22px}
+#bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f7f7f2}
+#bo_v_link a {display:inline-block;padding:8px 0 7px;color:#000}
+#bo_v_link a:focus,
+#bo_v_link a:hover,
+#bo_v_link a:active {text-decoration:none}
+.bo_v_link_cnt {display:inline-block;margin:0 10px}
#bo_v_top {margin:0 0 10px;padding:10px 0;zoom:1}
#bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden}
-#bo_v_top ul {margin:0;padding:0;list-style:none}
+#bo_v_top ul {list-style:none}
#bo_v_bot {zoom:1}
#bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""}
@@ -81,7 +86,7 @@
.bo_v_com li {float:left;margin-left:5px}
#bo_v_atc {min-height:200px;height:auto !important;height:200px}
-#bo_v_atc_title {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_v_atc header h1 {margin:0;padding:0;width:1px;height:1px;overflow:hidden}
#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
#bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
@@ -96,24 +101,27 @@
#bo_v_act span {display:inline-block;margin-right:5px;padding:0 10px;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:top}
#bo_v_act strong {color:#ff3061}
#bo_v_act_good,
-#bo_v_act_nogood {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_v_act_nogood {position:absolute;top:0;left:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_v form {padding-top:20px}
/* 게시판 댓글 */
-#bo_vc {padding:20px 20px 10px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f5f6fa}
+#bo_vc {margin:0 0 10px;padding:20px 20px 10px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f7f7f2}
#bo_vc h2 {margin-bottom:10px}
#bo_vc article {padding:0 0 10px;border-top:1px dotted #ccc}
#bo_vc header {position:relative;padding:15px 0 5px}
#bo_vc header .icon_reply {position:absolute;top:15px;left:-20px}
#bo_vc .sv_wrap {margin-right:15px}
-#bo_vc .member, #bo_vc .guest, #bo_vc .sv_member, #bo_vc .sv_guest {font-weight:bold}
+#bo_vc .member,
+#bo_vc .guest,
+#bo_vc .sv_member,
+#bo_vc .sv_guest {font-weight:bold}
.bo_vc_hdinfo {display:inline-block;margin:0 15px 0 5px}
-#bo_vc h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_vc h1 {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_vc a {color:#000;text-decoration:none}
#bo_vc p {padding:0 0 5px;line-height:1.8em}
#bo_vc p a {text-decoration:underline}
-#bo_vc_empty {margin:0;padding:20px !important;text-align:center}
+#bo_vc_empty {margin:0;padding:20px !important;border-bottom:1px dotted #ccc;text-align:center}
#bo_vc fieldset {margin:0 0 10px;padding:0}
#bo_vc #bo_vc_winfo {float:left}
#bo_vc footer {zoom:1}
@@ -123,8 +131,8 @@
.bo_vc_act:after {display:block;visibility:hidden;clear:both;content:""}
.bo_vc_act li {float:left;margin-left:5px}
-#bo_vc_w {position:relative;margin:0 0 10px;padding:0 0 20px;border-bottom:1px solid #cfded8}
-#bo_vc_w h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#bo_vc_w #char_cnt {display:block;margin:0 0 5px}
+#bo_vc_w {position:relative;margin-bottom:10px;padding:0 20px 20px;border-bottom:1px solid #cfded8}
+#bo_vc_w h2 {padding:15px 0 5px}
+#bo_vc_w #char_cnt {display:block;margin-bottom:5px}
#bo_vc form {padding:0}
\ No newline at end of file
diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php
index 1df245abd..3a8859118 100644
--- a/skin/board/basic/view.skin.php
+++ b/skin/board/basic/view.skin.php
@@ -5,20 +5,17 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
-
+
-
-
+
+
+
+
+
+
- 페이지 정보
+ 게시물 정보
작성자
작성일
조회회
@@ -90,7 +87,8 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
-
+
+ 게시물 상단 버튼
@@ -115,10 +113,12 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
$link_buttons = ob_get_contents();
ob_end_flush();
?>
-
+
-
- 본문
+
+
스크랩
+
추천
@@ -153,10 +154,11 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
비추천
+
+ ?>
추천
비추천
@@ -164,20 +166,24 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
-
+ ?>
+
-
+
+ 게시물 하단 버튼
+
-
+
+
+
+
-
-
-
-
-
-
+ function fviewcomment_submit(f)
+ {
+ var pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자
-
-
-
-
-
-
-
-
-
+ comment_box('', 'c'); // 댓글 입력폼이 보이도록 처리하기위해서 추가 (root님)
+
+
diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php
index 4e8527cd5..52cca5147 100644
--- a/skin/board/basic/write.skin.php
+++ b/skin/board/basic/write.skin.php
@@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
+
@@ -218,8 +218,6 @@ function fwrite_submit(f)
- document.getElementById("btn_submit").disabled = "disabled";
-
return true;
}
diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php
index 1e14ce3bc..eea67e427 100644
--- a/skin/board/gallery/list.skin.php
+++ b/skin/board/gallery/list.skin.php
@@ -171,7 +171,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
>글쓴이(코)
검색어 필수
-
+
diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css
index 2a1dfc769..61c53f9fc 100644
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@@ -48,7 +48,7 @@
.btn_bo_adm {float:left}
.btn_bo_adm li {float:left;margin-right:5px}
.btn_bo_adm input {padding:0 10px;height:25px;border:1px solid #e8180c !important;background:#e8180c;color:#fff;text-decoration:none;vertical-align:middle;cursor:pointer}
-.bo_notice td {background:#f5f6fa}
+.bo_notice td {background:#f7f7f2}
.bo_notice td a {font-weight:bold}
.td_num strong {color:#000}
.bo_cate_link {display:inline-block;margin:0 3px 0 0;padding:0 6px 0 0;border-right:1px solid #e7f1ed;color:#999 !important;font-weight:bold;text-decoration:none} /* 글제목줄 분류스타일 */
@@ -60,9 +60,9 @@
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}
-#bo_v_table {position:absolute;top:0;right:15px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em}
+#bo_v_cate {position:absolute;top:0;right:15px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em}
-#bo_v_title {padding:10px 0;font-size:1.2em}
+#bo_v_h1 {padding:10px 0;font-size:1.2em}
#bo_v_info {padding:0 0 10px;border-bottom:1px solid #ddd}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
@@ -75,24 +75,27 @@
#bo_v_file {}
#bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_file ul {margin:0;padding:0;list-style:none}
-#bo_v_file li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa}
-#bo_v_file a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word}
-#bo_v_file a:focus, #bo_v_file a:hover, #bo_v_file a:active {text-decoration:none}
-#bo_v_file img {float:left;margin:0 10px 0 0}
-.bo_v_file_cnt {display:inline-block;margin:0 0 3px 22px}
+#bo_v_file li {padding:0 10px;border-bottom:1px solid #eee;background:#f7f7f2}
+#bo_v_file a {display:inline-block;padding:8px 0 7px;color:#000}
+#bo_v_file a:focus,
+#bo_v_file a:hover,
+#bo_v_file a:active {text-decoration:none}
+.bo_v_file_cnt {display:inline-block;margin:0 10px}
#bo_v_link {}
#bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_link ul {margin:0;padding:0;list-style:none}
-#bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f5f6fa}
-#bo_v_link a {display:inline-block;padding:8px 0 7px;width:100%;color:#000;word-wrap:break-word}
-#bo_v_link a:focus, #bo_v_link a:hover, #bo_v_link a:active {text-decoration:none}
-.bo_v_link_cnt {display:inline-block;margin:0 0 3px 22px}
+#bo_v_link li {padding:0 10px;border-bottom:1px solid #eee;background:#f7f7f2}
+#bo_v_link a {display:inline-block;padding:8px 0 7px;color:#000}
+#bo_v_link a:focus,
+#bo_v_link a:hover,
+#bo_v_link a:active {text-decoration:none}
+.bo_v_link_cnt {display:inline-block;margin:0 10px}
#bo_v_top {margin:0 0 10px;padding:10px 0;zoom:1}
#bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden}
-#bo_v_top ul {margin:0;padding:0;list-style:none}
+#bo_v_top ul {list-style:none}
#bo_v_bot {zoom:1}
#bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""}
@@ -105,7 +108,7 @@
.bo_v_com li {float:left;margin-left:5px}
#bo_v_atc {min-height:200px;height:auto !important;height:200px}
-#bo_v_atc_title {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_v_atc header h1 {margin:0;padding:0;width:1px;height:1px;overflow:hidden}
#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
#bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
@@ -120,24 +123,27 @@
#bo_v_act span {display:inline-block;margin-right:5px;padding:0 10px;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:top}
#bo_v_act strong {color:#ff3061}
#bo_v_act_good,
-#bo_v_act_nogood {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_v_act_nogood {position:absolute;top:0;left:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_v form {padding-top:20px}
/* 게시판 댓글 */
-#bo_vc {padding:20px 20px 10px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f5f6fa}
+#bo_vc {margin:0 0 10px;padding:20px 20px 10px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f7f7f2}
#bo_vc h2 {margin-bottom:10px}
#bo_vc article {padding:0 0 10px;border-top:1px dotted #ccc}
#bo_vc header {position:relative;padding:15px 0 5px}
#bo_vc header .icon_reply {position:absolute;top:15px;left:-20px}
#bo_vc .sv_wrap {margin-right:15px}
-#bo_vc .member, #bo_vc .guest, #bo_vc .sv_member, #bo_vc .sv_guest {font-weight:bold}
+#bo_vc .member,
+#bo_vc .guest,
+#bo_vc .sv_member,
+#bo_vc .sv_guest {font-weight:bold}
.bo_vc_hdinfo {display:inline-block;margin:0 15px 0 5px}
-#bo_vc h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_vc h1 {width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_vc a {color:#000;text-decoration:none}
#bo_vc p {padding:0 0 5px;line-height:1.8em}
#bo_vc p a {text-decoration:underline}
-#bo_vc_empty {margin:0;padding:20px !important;text-align:center}
+#bo_vc_empty {margin:0;padding:20px !important;border-bottom:1px dotted #ccc;text-align:center}
#bo_vc fieldset {margin:0 0 10px;padding:0}
#bo_vc #bo_vc_winfo {float:left}
#bo_vc footer {zoom:1}
@@ -147,8 +153,8 @@
.bo_vc_act:after {display:block;visibility:hidden;clear:both;content:""}
.bo_vc_act li {float:left;margin-left:5px}
-#bo_vc_w {position:relative;margin:0 0 10px;padding:0 0 20px;border-bottom:1px solid #cfded8}
-#bo_vc_w h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#bo_vc_w #char_cnt {display:block;margin:0 0 5px}
+#bo_vc_w {position:relative;margin-bottom:10px;padding:0 20px 20px;border-bottom:1px solid #cfded8}
+#bo_vc_w h2 {padding:15px 0 5px}
+#bo_vc_w #char_cnt {display:block;margin-bottom:5px}
#bo_vc form {padding:0}
\ No newline at end of file
diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php
index c955bc90a..a889e4a88 100644
--- a/skin/board/gallery/view.skin.php
+++ b/skin/board/gallery/view.skin.php
@@ -5,20 +5,17 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
-
+
-
-
+
+
+
+
+
+
- 페이지 정보
+ 게시물 정보
작성자
작성일
조회회
@@ -90,7 +87,8 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
-
+
+ 게시물 상단 버튼
@@ -115,10 +113,12 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
$link_buttons = ob_get_contents();
ob_end_flush();
?>
-
+
-
+
-
+
+ 게시물 하단 버튼
+
-
+
+
+
+
-
", $str);
- ?>
-