remove the unqualified "OAuth" namespace from the project. We need to reference either OAuth1 or OAuth2.

3 files changed, 15 insertions, 15 deletions

diff --git a/include/api.php b/include/api.php
index fd6883f44..9c31f994f 100644
--- a/include/api.php
+++ b/include/api.php
@@ -2311,12 +2311,12 @@ require_once('include/api_auth.php');
 	function api_oauth_request_token(&$a, $type){
 		try{
 			$oauth = new ZotOAuth1();
-			$req = OAuthRequest::from_request();
+			$req = OAuth1Request::from_request();
 			logger('Req: ' . var_export($req,true),LOGGER_DATA);
 			$r = $oauth->fetch_request_token($req);
 		}catch(Exception $e){
 			logger('oauth_exception: ' . print_r($e->getMessage(),true));
-			echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); 
+			echo "error=". OAuth1Util::urlencode_rfc3986($e->getMessage()); 
 			killme();
 		}
 		echo $r;
@@ -2326,10 +2326,10 @@ require_once('include/api_auth.php');
 	function api_oauth_access_token(&$a, $type){
 		try{
 			$oauth = new ZotOAuth1();
-			$req = OAuthRequest::from_request();
+			$req = OAuth1Request::from_request();
 			$r = $oauth->fetch_access_token($req);
 		}catch(Exception $e){
-			echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme();
+			echo "error=". OAuth1Util::urlencode_rfc3986($e->getMessage()); killme();
 		}
 		echo $r;
 		killme();			
diff --git a/include/api_auth.php b/include/api_auth.php
index e3697adb0..26a9df8d4 100644
--- a/include/api_auth.php
+++ b/include/api_auth.php
@@ -13,7 +13,7 @@ function api_login(&$a){
 	// login with oauth
 	try {
 		$oauth = new ZotOAuth1();
-		$req = OAuthRequest::from_request();
+		$req = OAuth1Request::from_request();
 
 		list($consumer,$token) = $oauth->verify_request($req);
 
diff --git a/include/oauth.php b/include/oauth.php
index 4e5e4ecf8..f3d144158 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -13,7 +13,7 @@ require_once("library/OAuth1.php");
 
 //require_once("library/oauth2-php/lib/OAuth2.inc");
 
-class ZotOAuthDataStore extends OAuthDataStore {
+class ZotOAuth1DataStore extends OAuth1DataStore {
 
 	function gen_token(){
 		return md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid())));
@@ -28,7 +28,7 @@ class ZotOAuthDataStore extends OAuthDataStore {
 
 		if($r) {
 			get_app()->set_oauth_key($consumer_key);
-			return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
+			return new OAuth1Consumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
 		}
 		return null;
 	}
@@ -44,7 +44,7 @@ class ZotOAuthDataStore extends OAuthDataStore {
 		);
 
 		if (count($r)){
-			$ot=new OAuthToken($r[0]['id'],$r[0]['secret']);
+			$ot=new OAuth1Token($r[0]['id'],$r[0]['secret']);
 			$ot->scope=$r[0]['scope'];
 			$ot->expires = $r[0]['expires'];
 			$ot->uid = $r[0]['uid'];
@@ -62,7 +62,7 @@ class ZotOAuthDataStore extends OAuthDataStore {
 		);
 
 		if (count($r))
-			return new OAuthToken($r[0]['id'],$r[0]['secret']);
+			return new OAuth1Token($r[0]['id'],$r[0]['secret']);
 		return null;
 	}
 
@@ -88,7 +88,7 @@ class ZotOAuthDataStore extends OAuthDataStore {
 
 		if(! $r)
 			return null;
-		return new OAuthToken($key,$sec);
+		return new OAuth1Token($key,$sec);
 	}
 
 	function new_access_token($token, $consumer, $verifier = null) {
@@ -119,7 +119,7 @@ class ZotOAuthDataStore extends OAuthDataStore {
 				intval($uverifier));
 
 			if ($r)
-				$ret = new OAuthToken($key,$sec);		
+				$ret = new OAuth1Token($key,$sec);		
 		}
 		
 		
@@ -138,12 +138,12 @@ class ZotOAuthDataStore extends OAuthDataStore {
 	}
 }
 
-class ZotOAuth1 extends OAuthServer {
+class ZotOAuth1 extends OAuth1Server {
 
 	function __construct() {
-		parent::__construct(new ZotOAuthDataStore());
-		$this->add_signature_method(new OAuthSignatureMethod_PLAINTEXT());
-		$this->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1());
+		parent::__construct(new ZotOAuth1DataStore());
+		$this->add_signature_method(new OAuth1SignatureMethod_PLAINTEXT());
+		$this->add_signature_method(new OAuth1SignatureMethod_HMAC_SHA1());
 	}
 	
 	function loginUser($uid){