aboutsummaryrefslogtreecommitdiff
path: root/mod/oauth_api/vendors
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2011-11-18 07:32:27 +0100
committerSem <sembrestels@riseup.net>2011-11-18 07:32:27 +0100
commite53d410129701ea1c9d19529afa493f11b5f5b70 (patch)
treed9963b24bf8932654b4a47e36602c75975e50dba /mod/oauth_api/vendors
parent377da25d2965c64941f83baae119fc970ec60982 (diff)
parent08a962c98e2923724f8013d6eaae89101243752a (diff)
downloadelgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz
elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2
Merge github.com:Elgg/Elgg
Conflicts: engine/lib/input.php
Diffstat (limited to 'mod/oauth_api/vendors')
-rw-r--r--mod/oauth_api/vendors/oauth/library/OAuthRequestLogger.php2
-rw-r--r--mod/oauth_api/vendors/oauth/library/OAuthRequestSigner.php2
-rw-r--r--mod/oauth_api/vendors/oauth/library/OAuthRequestVerifier.php2
-rw-r--r--mod/oauth_api/vendors/oauth/library/OAuthRequester.php4
-rw-r--r--mod/oauth_api/vendors/oauth/library/OAuthServer.php8
5 files changed, 9 insertions, 9 deletions
diff --git a/mod/oauth_api/vendors/oauth/library/OAuthRequestLogger.php b/mod/oauth_api/vendors/oauth/library/OAuthRequestLogger.php
index 5b88e9d20..934c1c53c 100644
--- a/mod/oauth_api/vendors/oauth/library/OAuthRequestLogger.php
+++ b/mod/oauth_api/vendors/oauth/library/OAuthRequestLogger.php
@@ -190,7 +190,7 @@ class OAuthRequestLogger
// Log the request
if (OAuthRequestLogger::$store_log)
{
- $store = elggconnect_get_oauth_store();//OAuthStore::instance();
+ $store = OAuthStore::instance();
$store->addLog($keys, $received, $sent, $base_string, OAuthRequestLogger::$note, OAuthRequestLogger::$user_id);
}
diff --git a/mod/oauth_api/vendors/oauth/library/OAuthRequestSigner.php b/mod/oauth_api/vendors/oauth/library/OAuthRequestSigner.php
index a33d14034..9f83f287f 100644
--- a/mod/oauth_api/vendors/oauth/library/OAuthRequestSigner.php
+++ b/mod/oauth_api/vendors/oauth/library/OAuthRequestSigner.php
@@ -56,7 +56,7 @@ class OAuthRequestSigner extends OAuthRequest
*/
function __construct ( $request, $method = 'GET', $params = null, $body = null )
{
- $this->store = elggconnect_get_oauth_store();//OAuthStore::instance();
+ $this->store = OAuthStore::instance();
if (is_string($params))
{
diff --git a/mod/oauth_api/vendors/oauth/library/OAuthRequestVerifier.php b/mod/oauth_api/vendors/oauth/library/OAuthRequestVerifier.php
index 5b346b369..4b4db9685 100644
--- a/mod/oauth_api/vendors/oauth/library/OAuthRequestVerifier.php
+++ b/mod/oauth_api/vendors/oauth/library/OAuthRequestVerifier.php
@@ -49,7 +49,7 @@ class OAuthRequestVerifier extends OAuthRequest
*/
function __construct ( $uri = null, $method = 'GET' )
{
- $this->store = elggconnect_get_oauth_store();//OAuthStore::instance();
+ $this->store = OAuthStore::instance();
parent::__construct($uri, $method);
OAuthRequestLogger::start($this);
diff --git a/mod/oauth_api/vendors/oauth/library/OAuthRequester.php b/mod/oauth_api/vendors/oauth/library/OAuthRequester.php
index c6f56178e..87f9586c0 100644
--- a/mod/oauth_api/vendors/oauth/library/OAuthRequester.php
+++ b/mod/oauth_api/vendors/oauth/library/OAuthRequester.php
@@ -150,7 +150,7 @@ class OAuthRequester extends OAuthRequestSigner
$params['xoauth_token_ttl'] = intval($options['token_ttl']);
}
- $store = elggconnect_get_oauth_store();//OAuthStore::instance();
+ $store = OAuthStore::instance();
$r = $store->getServer($consumer_key, $usr_id);
$uri = $r['request_token_uri'];
@@ -220,7 +220,7 @@ class OAuthRequester extends OAuthRequestSigner
{
OAuthRequestLogger::start();
- $store = elggconnect_get_oauth_store();//OAuthStore::instance();
+ $store = OAuthStore::instance();
$r = $store->getServerTokenSecrets($consumer_key, $token, 'request', $usr_id);
$uri = $r['access_token_uri'];
$token_name = $r['token_name'];
diff --git a/mod/oauth_api/vendors/oauth/library/OAuthServer.php b/mod/oauth_api/vendors/oauth/library/OAuthServer.php
index d86cc5f14..c7f9097b3 100644
--- a/mod/oauth_api/vendors/oauth/library/OAuthServer.php
+++ b/mod/oauth_api/vendors/oauth/library/OAuthServer.php
@@ -58,7 +58,7 @@ class OAuthServer extends OAuthRequestVerifier
}
// Create a request token
- $store = elggconnect_get_oauth_store();//OAuthStore::instance();
+ $store = OAuthStore::instance();
$token = $store->addConsumerRequestToken($this->getParam('oauth_consumer_key', true), $options);
$result = 'oauth_token='.$this->urlencode($token['token'])
.'&oauth_token_secret='.$this->urlencode($token['token_secret']);
@@ -104,7 +104,7 @@ class OAuthServer extends OAuthRequestVerifier
{
OAuthRequestLogger::start($this);
- $store = elggconnect_get_oauth_store();//OAuthStore::instance();
+ $store = OAuthStore::instance();
$token = $this->getParam('oauth_token', true);
$rs = $store->getConsumerRequestToken($token);
if (empty($rs))
@@ -142,7 +142,7 @@ class OAuthServer extends OAuthRequestVerifier
&& $_SESSION['verify_oauth_token'] == $token)
{
// Flag the token as authorized, or remove the token when not authorized
- $store = elggconnect_get_oauth_store();//OAuthStore::instance();
+ $store = OAuthStore::instance();
// Fetch the referrer host from the oauth callback parameter
$referrer_host = '';
@@ -198,7 +198,7 @@ class OAuthServer extends OAuthRequestVerifier
$options['token_ttl'] = $ttl;
}
- $store = elggconnect_get_oauth_store();//OAuthStore::instance();
+ $store = OAuthStore::instance();
$token = $store->exchangeConsumerRequestForAccessToken($this->getParam('oauth_token', true), $options);
$result = 'oauth_token='.$this->urlencode($token['token'])
.'&oauth_token_secret='.$this->urlencode($token['token_secret']);