Refs #4028 reset the oAuth lib to version r64 of oauth-php

diff --git a/mod/oauth_api/vendors/oauth/library/OAuthRequestLogger.php b/mod/oauth_api/vendors/oauth/library/OAuthRequestLogger.php
index 5b88e9d20f543ea18308de87012dfe56d0ab50c3..934c1c53caec16f7da356adb00b146b595bda7a5 100644 (file)
--- 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 a33d14034a7701fb95d7b30886ddaadfb5ac1830..9f83f287fbe678631ab54f3ef1af31b4de81e36f 100644 (file)
--- 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 5b346b3698ecf3ca2089d77eaf7bbc1c8cf19ae0..4b4db96850549c3ff4dd3177e72a8d00338353c5 100644 (file)
--- 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 c6f56178eca6aa53590ab91e13df00576aa56874..87f9586c07447de04e683a87a3bf22339de778d5 100644 (file)
--- 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 d86cc5f14f22d228842c862ad030eed675b4cdac..c7f9097b39476187ebb509dd2f31571b7b3c70eb 100644 (file)
--- 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']);