Merge branch 'main' into issue-3911issue-3911

49 files changed, 0 insertions, 9003 deletions

diff --git a/vendor/oauth-php/library/store/OAuthStore2Leg.php b/vendor/oauth-php/library/store/OAuthStore2Leg.php
deleted file mode 100644
index d86505b..0000000
--- a/vendor/oauth-php/library/store/OAuthStore2Leg.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * OAuthStore implementation for 2 legged OAuth. This 'store' just saves the 
- * consumer_token and consumer_secret.
- * 
- * @version $Id$
- * @author Ben Hesketh <ben.hesketh@compassengine.com>
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * 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.
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';
-
-class OAuthStore2Leg extends OAuthStoreAbstract
-{
-	protected $consumer_key;
-	protected $consumer_secret;
-	protected $signature_method = array('HMAC-SHA1');
-	protected $token_type = false;
-	
-	/*
-	 * Takes two options: consumer_key and consumer_secret
-	 */
-	public function __construct( $options = array() )
-	{
-		if(isset($options['consumer_key']) && isset($options['consumer_secret']))
-		{
-			$this->consumer_key = $options['consumer_key'];
-			$this->consumer_secret = $options['consumer_secret'];
-			if (isset($options['token_secret'])) 
-			{			
-				$this->token_secret = $options['token_secret'];
-			}
-		}
-		else
-		{
-			throw new OAuthException2("OAuthStore2Leg needs consumer_token and consumer_secret");
-		}
-	}
-
-	public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getSecretsForSignature ( $uri, $user_id ) 
-	{
-		return array(
-			'consumer_key' => $this->consumer_key,
-			'consumer_secret' => $this->consumer_secret,
-			'signature_methods' => $this->signature_method,
-			'token' => $this->token_type,
-			'token_secret' => $this->token_secret
-		);	
-	}
-	public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' ) 	{ throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-
-	public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getServer( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getServerForUri ( $uri, $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function listServerTokens ( $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function countServerTokens ( $consumer_key ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getServerToken ( $consumer_key, $token, $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )
-	{
-		//This method just needs to exist. It doesn't have to do anything!
-	}
-	
-	public function listServers ( $q = '', $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function updateServer ( $server, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-
-	public function updateConsumer ( $consumer, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getConsumerStatic () { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-
-	public function addConsumerRequestToken ( $consumer_key, $options = array() ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getConsumerRequestToken ( $token ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function deleteConsumerRequestToken ( $token ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function countConsumerAccessTokens ( $consumer_key ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function exchangeConsumerRequestForAccessToken ( $token, $options = array() ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function getConsumerAccessToken ( $token, $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function setConsumerAccessTokenTtl ( $token, $ttl ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	
-	public function listConsumers ( $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function listConsumerApplications( $begin = 0, $total = 25 )  { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function listConsumerTokens ( $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-
-	public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	
-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	public function listLog ( $options, $user_id ) { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }
-	
-	public function install () { throw new OAuthException2("OAuthStore2Leg doesn't support " . __METHOD__); }		
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreAbstract.class.php b/vendor/oauth-php/library/store/OAuthStoreAbstract.class.php
deleted file mode 100644
index 0b240ee..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreAbstract.class.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * Abstract base class for OAuthStore implementations
- * 
- * @version $Id$
- * @author Marc Worrell <marcw@pobox.com>
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * 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.
- */
-
-abstract class OAuthStoreAbstract
-{
-	abstract public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' );
-	abstract public function getSecretsForSignature ( $uri, $user_id );
-	abstract public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' );
-	abstract public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() );
-
-	abstract public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getServer( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getServerForUri ( $uri, $user_id );
-	abstract public function listServerTokens ( $user_id );
-	abstract public function countServerTokens ( $consumer_key );
-	abstract public function getServerToken ( $consumer_key, $token, $user_id );
-	abstract public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL );	
-	abstract public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false );
-	abstract public function listServers ( $q = '', $user_id );
-	abstract public function updateServer ( $server, $user_id, $user_is_admin = false );
-
-	abstract public function updateConsumer ( $consumer, $user_id, $user_is_admin = false );
-	abstract public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false );
-	abstract public function getConsumerStatic ();
-
-	abstract public function addConsumerRequestToken ( $consumer_key, $options = array() );
-	abstract public function getConsumerRequestToken ( $token );
-	abstract public function deleteConsumerRequestToken ( $token );
-	abstract public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' );
-	abstract public function countConsumerAccessTokens ( $consumer_key );
-	abstract public function exchangeConsumerRequestForAccessToken ( $token, $options = array() );
-	abstract public function getConsumerAccessToken ( $token, $user_id );
-	abstract public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false );
-	abstract public function setConsumerAccessTokenTtl ( $token, $ttl );
-	
-	abstract public function listConsumers ( $user_id );
-	abstract public function listConsumerApplications( $begin = 0, $total = 25 ); 
-	abstract public function listConsumerTokens ( $user_id );
-
-	abstract public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce );
-	
-	abstract public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null );
-	abstract public function listLog ( $options, $user_id );
-	
-	abstract public function install ();	
-	
-	/**
-	 * Fetch the current static consumer key for this site, create it when it was not found.
-	 * The consumer secret for the consumer key is always empty.
-	 * 
-	 * @return string	consumer key 
-	 */
-	
-	
-	/* ** Some handy utility functions ** */
-	
-	/**
-	 * Generate a unique key
-	 * 
-	 * @param boolean unique	force the key to be unique
-	 * @return string
-	 */
-	public function generateKey ( $unique = false )
-	{
-		$key = md5(uniqid(rand(), true));
-		if ($unique)
-		{
-			list($usec,$sec) = explode(' ',microtime());
-			$key .= dechex($usec).dechex($sec);
-		}
-		return $key;
-	}
-
-	/**
-	 * Check to see if a string is valid utf8
-	 * 
-	 * @param string $s
-	 * @return boolean
-	 */
-	protected function isUTF8 ( $s )
-	{
-		return preg_match('%(?:
-	       [\xC2-\xDF][\x80-\xBF]              # non-overlong 2-byte
-	       |\xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
-	       |[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-	       |\xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
-	       |\xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
-	       |[\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
-	       |\xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
-	       )+%xs', $s);
-	}
-	
-	
-	/**
-	 * Make a string utf8, replacing all non-utf8 chars with a '.'
-	 * 
-	 * @param string
-	 * @return string
-	 */
-	protected function makeUTF8 ( $s )
-	{
-		if (function_exists('iconv'))
-		{
-			do
-			{
-				$ok   = true;
-				$text = @iconv('UTF-8', 'UTF-8//TRANSLIT', $s);
-				if (strlen($text) != strlen($s))
-				{
-					// Remove the offending character...
-					$s  = $text . '.' . substr($s, strlen($text) + 1);
-					$ok = false;
-				}
-			}
-			while (!$ok);
-		}
-		return $s;
-	}
-	
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreAnyMeta.php b/vendor/oauth-php/library/store/OAuthStoreAnyMeta.php
deleted file mode 100644
index b619ec0..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreAnyMeta.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * This file can only be used in conjunction with anyMeta.
- * 
- * @version $Id: OAuthStoreAnyMeta.php 68 2010-01-12 18:59:23Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 4:03:30 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * 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.
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreMySQL.php';
-
-
-class OAuthStoreAnymeta extends OAuthStoreMySQL
-{
-	/**
-	 * Construct the OAuthStoreAnymeta
-	 * 
-	 * @param array options
-	 */
-	function __construct ( $options = array() )
-	{
-		parent::__construct(array('conn' => any_db_conn()));
-	}
-
-
-	/**
-	 * Add an entry to the log table
-	 * 
-	 * @param array keys (osr_consumer_key, ost_token, ocr_consumer_key, oct_token)
-	 * @param string received
-	 * @param string sent
-	 * @param string base_string
-	 * @param string notes
-	 * @param int (optional) user_id
-	 */
-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null )
-	{
-		if (is_null($user_id) && isset($GLOBALS['any_auth']))
-		{
-			$user_id = $GLOBALS['any_auth']->getUserId();
-		}
-		parent::addLog($keys, $received, $sent, $base_string, $notes, $user_id);
-	}
-	
-	
-	/**
-	 * Get a page of entries from the log.  Returns the last 100 records
-	 * matching the options given.
-	 * 
-	 * @param array options
-	 * @param int user_id	current user
-	 * @return array log records
-	 */
-	public function listLog ( $options, $user_id )
-	{
-		$where = array();
-		$args  = array();
-		if (empty($options))
-		{
-			$where[] = 'olg_usa_id_ref = %d';
-			$args[]  = $user_id;
-		}
-		else
-		{
-			foreach ($options as $option => $value)
-			{
-				if (strlen($value) > 0)
-				{
-					switch ($option)
-					{
-					case 'osr_consumer_key':
-					case 'ocr_consumer_key':
-					case 'ost_token':
-					case 'oct_token':
-						$where[] = 'olg_'.$option.' = \'%s\'';
-						$args[]  = $value;	
-						break;				
-					}
-				}
-			}
-			
-			$where[] = '(olg_usa_id_ref IS NULL OR olg_usa_id_ref = %d)';
-			$args[]  = $user_id;
-		}
-
-		$rs = any_db_query_all_assoc('
-					SELECT olg_id,
-							olg_osr_consumer_key 	AS osr_consumer_key,
-							olg_ost_token			AS ost_token,
-							olg_ocr_consumer_key	AS ocr_consumer_key,
-							olg_oct_token			AS oct_token,
-							olg_usa_id_ref			AS user_id,
-							olg_received			AS received,
-							olg_sent				AS sent,
-							olg_base_string			AS base_string,
-							olg_notes				AS notes,
-							olg_timestamp			AS timestamp,
-							INET_NTOA(olg_remote_ip) AS remote_ip
-					FROM oauth_log
-					WHERE '.implode(' AND ', $where).'
-					ORDER BY olg_id DESC
-					LIMIT 0,100', $args);
-
-		return $rs;
-	}
-
-
-
-	/**
-	 * Initialise the database
-	 */
-	public function install ()
-	{
-		parent::install();
-
-		any_db_query("ALTER TABLE oauth_consumer_registry MODIFY ocr_usa_id_ref int(11) unsigned");
-		any_db_query("ALTER TABLE oauth_consumer_token    MODIFY oct_usa_id_ref int(11) unsigned not null");
-		any_db_query("ALTER TABLE oauth_server_registry   MODIFY osr_usa_id_ref int(11) unsigned");
-		any_db_query("ALTER TABLE oauth_server_token      MODIFY ost_usa_id_ref int(11) unsigned not null");
-		any_db_query("ALTER TABLE oauth_log               MODIFY olg_usa_id_ref int(11) unsigned");
-
-		any_db_alter_add_fk('oauth_consumer_registry', 'ocr_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete set null');
-		any_db_alter_add_fk('oauth_consumer_token',    'oct_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete cascade');
-		any_db_alter_add_fk('oauth_server_registry',   'osr_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete set null');
-		any_db_alter_add_fk('oauth_server_token',      'ost_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete cascade');
-		any_db_alter_add_fk('oauth_log',               'olg_usa_id_ref', 'any_user_auth(usa_id_ref)', 'on update cascade on delete cascade');
-	}
-
-	
-	
-	/** Some simple helper functions for querying the mysql db **/
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	protected function query ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		any_db_query($sql, $args);
-	}
-	
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_all_assoc ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		return any_db_query_all_assoc($sql, $args);
-	}
-	
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row_assoc ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		return any_db_query_row_assoc($sql, $args);
-	}
-
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		return any_db_query_row($sql, $args);
-	}
-	
-		
-	/**
-	 * Perform a query, return the first column of the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	protected function query_one ( $sql )
-	{
-		list($sql, $args) = $this->sql_args(func_get_args());
-		return any_db_query_one($sql, $args);
-	}
-	
-	
-	/**
-	 * Return the number of rows affected in the last query
-	 * 
-	 * @return int
-	 */
-	protected function query_affected_rows ()
-	{
-		return any_db_affected_rows();
-	}
-
-
-	/**
-	 * Return the id of the last inserted row
-	 * 
-	 * @return int
-	 */
-	protected function query_insert_id ()
-	{
-		return any_db_insert_id();
-	}
-	
-	
-	private function sql_args ( $args )
-	{
-		$sql = array_shift($args);
-		if (count($args) == 1 && is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-		return array($sql, $args);
-	}
-
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreMySQL.php b/vendor/oauth-php/library/store/OAuthStoreMySQL.php
deleted file mode 100644
index c568359..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreMySQL.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on MySQL
- * 
- * @version $Id: OAuthStoreMySQL.php 85 2010-02-19 14:56:40Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 4:03:30 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * 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.
- */
-
-
-require_once dirname(__FILE__) . '/OAuthStoreSQL.php';
-
-
-class OAuthStoreMySQL extends OAuthStoreSQL
-{
-	/**
-	 * The MySQL connection 
-	 */
-	protected $conn;
-
-	/**
-	 * Initialise the database
-	 */
-	public function install ()
-	{
-		require_once dirname(__FILE__) . '/mysql/install.php';
-	}
-	
-	
-	/* ** Some simple helper functions for querying the mysql db ** */
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	protected function query ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if (is_resource($res))
-		{
-			mysql_free_result($res);
-		}
-	}
-	
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_all_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		$rs = array();
-		while ($row  = mysql_fetch_assoc($res))
-		{
-			$rs[] = $row;
-		}
-		mysql_free_result($res);
-		return $rs;
-	}
-	
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysql_fetch_assoc($res))
-		{
-			$rs = $row;
-		}
-		else
-		{
-			$rs = false;
-		}
-		mysql_free_result($res);
-		return $rs;
-	}
-
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysql_fetch_array($res))
-		{
-			$rs = $row;
-		}
-		else
-		{
-			$rs = false;
-		}
-		mysql_free_result($res);
-		return $rs;
-	}
-	
-		
-	/**
-	 * Perform a query, return the first column of the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	protected function query_one ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysql_query($sql, $this->conn)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		$val = @mysql_result($res, 0, 0);
-		mysql_free_result($res);
-		return $val;
-	}
-	
-	
-	/**
-	 * Return the number of rows affected in the last query
-	 */
-	protected function query_affected_rows ()
-	{
-		return mysql_affected_rows($this->conn);
-	}
-
-
-	/**
-	 * Return the id of the last inserted row
-	 * 
-	 * @return int
-	 */
-	protected function query_insert_id ()
-	{
-		return mysql_insert_id($this->conn);
-	}
-	
-	
-	protected function sql_printf ( $args )
-	{
-		$sql  = array_shift($args);
-		if (count($args) == 1 && is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-		$args = array_map(array($this, 'sql_escape_string'), $args);
-		return vsprintf($sql, $args);
-	}
-	
-	
-	protected function sql_escape_string ( $s )
-	{
-		if (is_string($s))
-		{
-			return mysql_real_escape_string($s, $this->conn);
-		}
-		else if (is_null($s))
-		{
-			return NULL;
-		}
-		else if (is_bool($s))
-		{
-			return intval($s);
-		}
-		else if (is_int($s) || is_float($s))
-		{
-			return $s;
-		}
-		else
-		{
-			return mysql_real_escape_string(strval($s), $this->conn);
-		}
-	}
-	
-	
-	protected function sql_errcheck ( $sql )
-	{
-		if (mysql_errno($this->conn))
-		{
-			$msg =  "SQL Error in OAuthStoreMySQL: ".mysql_error($this->conn)."\n\n" . $sql;
-			throw new OAuthException2($msg);
-		}
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreMySQLi.php b/vendor/oauth-php/library/store/OAuthStoreMySQLi.php
deleted file mode 100644
index 09d71bf..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreMySQLi.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on MySQL
- * 
- * @version $Id: OAuthStoreMySQLi.php 64 2009-08-16 19:37:00Z marcw@pobox.com $
- * @author Bruno Barberi Gnecco <brunobg@users.sf.net> Based on code by Marc Worrell <marcw@pobox.com>
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * 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.
- */
-
-/*
- * Modified from OAuthStoreMySQL to support MySQLi
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreMySQL.php';
-
-
-class OAuthStoreMySQLi extends OAuthStoreMySQL
-{
-	
-	public function install() {
-		$sql = file_get_contents(dirname(__FILE__) . '/mysql/mysql.sql');
-		$ps  = explode('#--SPLIT--', $sql);
-		
-		foreach ($ps as $p)
-		{
-			$p = preg_replace('/^\s*#.*$/m', '', $p);
-			
-			$this->query($p);
-			$this->sql_errcheck($p);
-		}		
-	}
-
-	/**
-	 * Construct the OAuthStoreMySQLi.
-	 * In the options you have to supply either:
-	 * - server, username, password and database (for a mysqli_connect)
-	 * - conn (for the connection to be used)
-	 * 
-	 * @param array options
-	 */
-	function __construct ( $options = array() )
-	{
-		if (isset($options['conn']))
-		{
-			$this->conn = $options['conn'];
-		}
-		else
-		{
-			if (isset($options['server']))
-			{
-				$server   = $options['server'];
-				$username = $options['username'];
-				
-				if (isset($options['password']))
-				{
-					$this->conn = ($GLOBALS["___mysqli_ston"] = mysqli_connect($server,  $username,  $options['password']));
-				}
-				else
-				{
-					$this->conn = ($GLOBALS["___mysqli_ston"] = mysqli_connect($server,  $username));
-				}
-			}
-			else
-			{
-				// Try the default mysql connect
-				$this->conn = ($GLOBALS["___mysqli_ston"] = mysqli_connect());
-			}
-
-			if ($this->conn === false)
-			{
-				throw new OAuthException2('Could not connect to MySQL database: ' . ((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false)));
-			}
-
-			if (isset($options['database']))
-			{
-				/* TODO: security. mysqli_ doesn't seem to have an escape identifier function.
-				$escapeddb = mysqli_real_escape_string($options['database']);
-				if (!((bool)mysqli_query( $this->conn, "USE `$escapeddb`" )))
-				{
-					$this->sql_errcheck();
-				}*/
-			}
-			$this->query('set character set utf8');
-		}
-	}
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	protected function query ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if (!is_bool($res))
-		{
-			((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		}
-	}
-	
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_all_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		$rs = array();
-		while ($row  = mysqli_fetch_assoc($res))
-		{
-			$rs[] = $row;
-		}
-		((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		return $rs;
-	}
-	
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysqli_fetch_assoc($res))
-		{
-			$rs = $row;
-		}
-		else
-		{
-			$rs = false;
-		}
-		((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		return $rs;
-	}
-
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysqli_fetch_array($res))
-		{
-			$rs = $row;
-		}
-		else
-		{
-			$rs = false;
-		}
-		((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		return $rs;
-	}
-	
-		
-	/**
-	 * Perform a query, return the first column of the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	protected function query_one ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		if (!($res = mysqli_query( $this->conn, $sql)))
-		{
-			$this->sql_errcheck($sql);
-		}
-		if ($row = mysqli_fetch_assoc($res))
-		{
-			$val = array_pop($row);
-		}
-		else
-		{
-			$val = false;
-		}
-		((mysqli_free_result($res) || (is_object($res) && (get_class($res) == "mysqli_result"))) ? true : false);
-		return $val;
-	}
-	
-	
-	/**
-	 * Return the number of rows affected in the last query
-	 */
-	protected function query_affected_rows ()
-	{
-		return mysqli_affected_rows($this->conn);
-	}
-
-
-	/**
-	 * Return the id of the last inserted row
-	 * 
-	 * @return int
-	 */
-	protected function query_insert_id ()
-	{
-		return ((is_null($___mysqli_res = mysqli_insert_id($this->conn))) ? false : $___mysqli_res);
-	}
-	
-	
-	protected function sql_printf ( $args )
-	{
-		$sql  = array_shift($args);
-		if (count($args) == 1 && is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-		$args = array_map(array($this, 'sql_escape_string'), $args);
-		return vsprintf($sql, $args);
-	}
-	
-	
-	protected function sql_escape_string ( $s )
-	{
-		if (is_string($s))
-		{
-			return mysqli_real_escape_string( $this->conn, $s);
-		}
-		else if (is_null($s))
-		{
-			return NULL;
-		}
-		else if (is_bool($s))
-		{
-			return intval($s);
-		}
-		else if (is_int($s) || is_float($s))
-		{
-			return $s;
-		}
-		else
-		{
-			return mysqli_real_escape_string( $this->conn, strval($s));
-		}
-	}
-	
-	
-	protected function sql_errcheck ( $sql )
-	{
-		if (((is_object($this->conn)) ? mysqli_errno($this->conn) : (($___mysqli_res = mysqli_connect_errno()) ? $___mysqli_res : false)))
-		{
-			$msg =  "SQL Error in OAuthStoreMySQL: ".((is_object($this->conn)) ? mysqli_error($this->conn) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false))."\n\n" . $sql;
-			throw new OAuthException2($msg);
-		}
-	}
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreOracle.php b/vendor/oauth-php/library/store/OAuthStoreOracle.php
deleted file mode 100644
index ea905a2..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreOracle.php
+++ /dev/null
@@ -1,1541 +0,0 @@
-<?php

-

-/**

- * Added by Vinay Kant Sahu.

- * Replaced all the MySQL queries with Oracle SPs. (ref: OAuthStoreSQL.php)

- * vinaykant.sahu@gmail.com

- *

- * Storage container for the oauth credentials, both server and consumer side.

- * Based on Oracle

- *

- * @author Vinay Kant Sahu <vinaykant.sahu@gmail.com>

- * @date  Aug 6, 2010

- * 

- * The MIT License

- * 

- * 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.

- */

-

-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';

-

-abstract class OAuthStoreOracle extends OAuthStoreAbstract {

-    /**

-     * Maximum delta a timestamp may be off from a previous timestamp.

-     * Allows multiple consumers with some clock skew to work with the same token.

-     * Unit is seconds, default max skew is 10 minutes.

-     */

-    protected $max_timestamp_skew = MAX_TIMESTAMP_SKEW;

-

-    /**

-     * Default ttl for request tokens

-     */

-    protected $max_request_token_ttl = MAX_REQUEST_TOKEN_TIME;

-

-

-    /**

-     * Construct the OAuthStoreMySQL.

-     * In the options you have to supply either:

-     * - server, username, password and database (for a mysql_connect)

-     * - conn (for the connection to be used)

-     *

-     * @param array options

-     */

-    function __construct ( $options = array() ) {

-        if (isset($options['conn'])) {

-            $this->conn = $options['conn'];

-        }

-        else {

-            $this->conn=oci_connect(DBUSER,DBPASSWORD,DBHOST);

-

-            if ($this->conn === false) {

-                throw new OAuthException2('Could not connect to database');

-            }

-

-            // $this->query('set character set utf8');

-        }

-    }

-

-	/**

-	 * Find stored credentials for the consumer key and token. Used by an OAuth server

-	 * when verifying an OAuth request.

-	 * 

-	 * @param string consumer_key

-	 * @param string token

-	 * @param string token_type		false, 'request' or 'access'

-	 * @exception OAuthException2 when no secrets where found

-	 * @return array	assoc (consumer_secret, token_secret, osr_id, ost_id, user_id)

-	 */

-	public function getSecretsForVerify ($consumer_key, $token, $token_type = 'access' ) {

-            $sql = "BEGIN SP_GET_SECRETS_FOR_VERIFY(:P_CONSUMER_KEY, :P_TOKEN, :P_TOKEN_TYPE, :P_ROWS, :P_RESULT); END;";

-

-            // parse sql

-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-            

-            // Bind In and Out Variables

-            oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-            oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-            oci_bind_by_name($stmt, ':P_TOKEN_TYPE', $token_type, 255);

-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-            //Bind the ref cursor

-            $p_row = oci_new_cursor($this->conn);

-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-            //Execute the statement

-            oci_execute($stmt);

-

-            // treat the ref cursor as a statement resource

-            oci_execute($p_row, OCI_DEFAULT);

-            oci_fetch_all($p_row, $getSecretsForVerifyList, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-

-            $rs =$getSecretsForVerifyList;

-            if (empty($rs)) {

-                throw new OAuthException2('The consumer_key "'.$consumer_key.'" token "'.$token.'" combination does not exist or is not enabled.');

-            }

- 

-            return $rs[0];

-        }

-

-

-	/**

-	 * Find the server details for signing a request, always looks for an access token.

-	 * The returned credentials depend on which local user is making the request.

-	 * 

-	 * The consumer_key must belong to the user or be public (user id is null)

-	 * 

-	 * For signing we need all of the following:

-	 * 

-	 * consumer_key			consumer key associated with the server

-	 * consumer_secret		consumer secret associated with this server

-	 * token				access token associated with this server

-	 * token_secret			secret for the access token

-	 * signature_methods	signing methods supported by the server (array)

-	 * 

-	 * @todo filter on token type (we should know how and with what to sign this request, and there might be old access tokens)

-	 * @param string uri	uri of the server

-	 * @param int user_id	id of the logged on user

-	 * @param string name	(optional) name of the token (case sensitive)

-	 * @exception OAuthException2 when no credentials found

-	 * @return array

-	 */

-	public function getSecretsForSignature ( $uri, $user_id, $name = '' ) {

-            // Find a consumer key and token for the given uri

-            $ps     = parse_url($uri);

-            $host   = isset($ps['host']) ? $ps['host'] : 'localhost';

-            $path   = isset($ps['path']) ? $ps['path'] : '';

-

-            if (empty($path) || substr($path, -1) != '/') {

-                $path .= '/';

-            }

-            //

-            $sql = "BEGIN SP_GET_SECRETS_FOR_SIGNATURE(:P_HOST, :P_PATH, :P_USER_ID, :P_NAME, :P_ROWS, :P_RESULT); END;";

-

-            // parse sql

-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-            // Bind In and Out Variables

-            oci_bind_by_name($stmt, ':P_HOST', $host, 255);

-            oci_bind_by_name($stmt, ':P_PATH', $path, 255);

-            oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 20);

-            oci_bind_by_name($stmt, ':P_NAME', $name, 255);

-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-            //Bind the ref cursor

-            $p_row = oci_new_cursor($this->conn);

-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-            //Execute the statement

-            oci_execute($stmt);

-

-            // treat the ref cursor as a statement resource

-            oci_execute($p_row, OCI_DEFAULT);

-            oci_fetch_all($p_row, $getSecretsForSignatureList, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-            $secrets  = $getSecretsForSignatureList[0];

-            //

-            // The owner of the consumer_key is either the user or nobody (public consumer key)

-            /*$secrets = $this->query_row_assoc('

-					SELECT	ocr_consumer_key		as consumer_key,

-							ocr_consumer_secret		as consumer_secret,

-							oct_token				as token,

-							oct_token_secret		as token_secret,

-							ocr_signature_methods	as signature_methods

-					FROM oauth_consumer_registry

-						JOIN oauth_consumer_token ON oct_ocr_id_ref = ocr_id

-					WHERE ocr_server_uri_host = \'%s\'

-					  AND ocr_server_uri_path = LEFT(\'%s\', LENGTH(ocr_server_uri_path))

-					  AND (ocr_usa_id_ref = %s OR ocr_usa_id_ref IS NULL)

-					  AND oct_usa_id_ref	  = %d

-					  AND oct_token_type      = \'access\'

-					  AND oct_name			  = \'%s\'

-					  AND oct_token_ttl       >= NOW()

-					ORDER BY ocr_usa_id_ref DESC, ocr_consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC

-					LIMIT 0,1

-					', $host, $path, $user_id, $user_id, $name

-					);

-            */

-            if (empty($secrets)) {

-                throw new OAuthException2('No server tokens available for '.$uri);

-            }

-            $secrets['signature_methods'] = explode(',', $secrets['signature_methods']);

-            return $secrets;

-        }

-

-

-	/**

-	 * Get the token and token secret we obtained from a server.

-	 * 

-	 * @param string	consumer_key

-	 * @param string 	token

-	 * @param string	token_type

-	 * @param int		user_id			the user owning the token

-	 * @param string	name			optional name for a named token

-	 * @exception OAuthException2 when no credentials found

-	 * @return array

-	 */

-	public function getServerTokenSecrets ($consumer_key,$token,$token_type,$user_id,$name = '')

-	{

-		if ($token_type != 'request' && $token_type != 'access')

-		{

-			throw new OAuthException2('Unkown token type "'.$token_type.'", must be either "request" or "access"');

-		}

-                //

-                $sql = "BEGIN SP_GET_SERVER_TOKEN_SECRETS(:P_CONSUMER_KEY, :P_TOKEN, :P_TOKEN_TYPE, :P_USER_ID, :P_ROWS, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-                

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-                oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-                oci_bind_by_name($stmt, ':P_TOKEN_TYPE', $token_type, 20);

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-                //Bind the ref cursor

-                $p_row = oci_new_cursor($this->conn);

-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-                //Execute the statement

-                oci_execute($stmt);

-

-                // treat the ref cursor as a statement resource

-                oci_execute($p_row, OCI_DEFAULT);

-                oci_fetch_all($p_row, $getServerTokenSecretsList, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-                $r=$getServerTokenSecretsList[0];

-                //

-		// Take the most recent token of the given type

-		/*$r = $this->query_row_assoc('

-					SELECT	ocr_consumer_key		as consumer_key,

-							ocr_consumer_secret		as consumer_secret,

-							oct_token				as token,

-							oct_token_secret		as token_secret,

-							oct_name				as token_name,

-							ocr_signature_methods	as signature_methods,

-							ocr_server_uri			as server_uri,

-							ocr_request_token_uri	as request_token_uri,

-							ocr_authorize_uri		as authorize_uri,

-							ocr_access_token_uri	as access_token_uri,

-							IF(oct_token_ttl >= \'9999-12-31\', NULL, UNIX_TIMESTAMP(oct_token_ttl) - UNIX_TIMESTAMP(NOW())) as token_ttl

-					FROM oauth_consumer_registry

-							JOIN oauth_consumer_token

-							ON oct_ocr_id_ref = ocr_id

-					WHERE ocr_consumer_key = \'%s\'

-					  AND oct_token_type   = \'%s\'

-					  AND oct_token        = \'%s\'

-					  AND oct_usa_id_ref   = %d

-					  AND oct_token_ttl    >= NOW()

-					', $consumer_key, $token_type, $token, $user_id

-					);*/

-					

-		if (empty($r))

-		{

-			throw new OAuthException2('Could not find a "'.$token_type.'" token for consumer "'.$consumer_key.'" and user '.$user_id);

-		}

-		if (isset($r['signature_methods']) && !empty($r['signature_methods']))

-		{

-			$r['signature_methods'] = explode(',',$r['signature_methods']);

-		}

-		else

-		{

-			$r['signature_methods'] = array();

-		}

-		return $r;		

-	}

-

-

-	/**

-	 * Add a request token we obtained from a server.

-	 * 

-	 * @todo remove old tokens for this user and this ocr_id

-	 * @param string consumer_key	key of the server in the consumer registry

-	 * @param string token_type		one of 'request' or 'access'

-	 * @param string token

-	 * @param string token_secret

-	 * @param int 	 user_id			the user owning the token

-	 * @param array  options			extra options, name and token_ttl

-	 * @exception OAuthException2 when server is not known

-	 * @exception OAuthException2 when we received a duplicate token

-	 */

-	public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() )

-	{

-		if ($token_type != 'request' && $token_type != 'access')

-		{

-			throw new OAuthException2('Unknown token type "'.$token_type.'", must be either "request" or "access"');

-		}

-

-		// Maximum time to live for this token

-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))

-		{

-			$ttl = intval($options['token_ttl']);

-		}

-		else if ($token_type == 'request')

-		{

-			$ttl =intval($this->max_request_token_ttl);

-		}

-		else

-		{

-			$ttl = NULL;

-		}

-		

-		

-		

-		// Named tokens, unique per user/consumer key

-		if (isset($options['name']) && $options['name'] != '')

-		{

-			$name = $options['name'];

-		}

-		else

-		{

-			$name = '';

-		}

-                //

-                $sql = "BEGIN SP_ADD_SERVER_TOKEN(:P_CONSUMER_KEY, :P_USER_ID, :P_NAME, :P_TOKEN_TYPE, :P_TOKEN, :P_TOKEN_SECRET, :P_TOKEN_INTERVAL_IN_SEC, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-                oci_bind_by_name($stmt, ':P_NAME', $name, 255);

-                oci_bind_by_name($stmt, ':P_TOKEN_TYPE', $token_type, 20);

-                oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-                oci_bind_by_name($stmt, ':P_TOKEN_SECRET', $token_secret, 255);

-                oci_bind_by_name($stmt, ':P_TOKEN_INTERVAL_IN_SEC', $ttl, 40);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-                //Execute the statement

-                oci_execute($stmt);

-                //

-

-              

-		

-		if (!$result)

-		{

-			throw new OAuthException2('Received duplicate token "'.$token.'" for the same consumer_key "'.$consumer_key.'"');

-		}

-	}

-

-

-	/**

-	 * Delete a server key.  This removes access to that site.

-	 * 

-	 * @param string consumer_key

-	 * @param int user_id	user registering this server

-	 * @param boolean user_is_admin

-	 */

-	public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false )

-	{

-		

-            $sql = "BEGIN SP_DELETE_SERVER(:P_CONSUMER_KEY, :P_USER_ID, :P_USER_IS_ADMIN, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-                oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 255);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-                //Execute the statement

-                oci_execute($stmt);

-	}

-	

-	

-	/**

-	 * Get a server from the consumer registry using the consumer key

-	 * 

-	 * @param string consumer_key

-	 * @param int user_id

-	 * @param boolean user_is_admin (optional)

-	 * @exception OAuthException2 when server is not found

-	 * @return array

-	 */	

-	public function getServer ( $consumer_key, $user_id, $user_is_admin = false )

-	{

-		

-                //

-                $sql = "BEGIN SP_GET_SERVER(:P_CONSUMER_KEY, :P_USER_ID, :P_ROWS, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);                

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-                //Bind the ref cursor

-                $p_row = oci_new_cursor($this->conn);

-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-                //Execute the statement

-                oci_execute($stmt);

-

-                // treat the ref cursor as a statement resource

-                oci_execute($p_row, OCI_DEFAULT);

-                oci_fetch_all($p_row, $getServerList, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-                $r = $getServerList;

-                //

-		if (empty($r))

-		{

-			throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" has been registered (for this user)');

-		}

-			

-		if (isset($r['signature_methods']) && !empty($r['signature_methods']))

-		{

-			$r['signature_methods'] = explode(',',$r['signature_methods']);

-		}

-		else

-		{

-			$r['signature_methods'] = array();

-		}

-		return $r;

-	}

-

-

-

-	/**

-	 * Find the server details that might be used for a request

-	 * 

-	 * The consumer_key must belong to the user or be public (user id is null)

-	 * 

-	 * @param string uri	uri of the server

-	 * @param int user_id	id of the logged on user

-	 * @exception OAuthException2 when no credentials found

-	 * @return array

-	 */

-	public function getServerForUri ( $uri, $user_id )

-	{

-		// Find a consumer key and token for the given uri

-		$ps	= parse_url($uri);

-		$host	= isset($ps['host']) ? $ps['host'] : 'localhost';

-		$path	= isset($ps['path']) ? $ps['path'] : '';

-		

-		if (empty($path) || substr($path, -1) != '/')

-		{

-			$path .= '/';

-		}

-

-		

-                //

-                $sql = "BEGIN SP_GET_SERVER_FOR_URI(:P_HOST, :P_PATH,:P_USER_ID, :P_ROWS, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_HOST', $host, 255);

-                oci_bind_by_name($stmt, ':P_PATH', $path, 255);

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-                //Bind the ref cursor

-                $p_row = oci_new_cursor($this->conn);

-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-                //Execute the statement

-                oci_execute($stmt);

-

-                // treat the ref cursor as a statement resource

-                oci_execute($p_row, OCI_DEFAULT);

-                oci_fetch_all($p_row, $getServerForUriList, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-                $server = $getServerForUriList;

-                //		

-		if (empty($server))

-		{

-			throw new OAuthException2('No server available for '.$uri);

-		}

-		$server['signature_methods'] = explode(',', $server['signature_methods']);

-		return $server;

-	}

-

-

-	/**

-	 * Get a list of all server token this user has access to.

-	 * 

-	 * @param int usr_id

-	 * @return array

-	 */

-	public function listServerTokens ( $user_id )

-	{

-		

-                $sql = "BEGIN SP_LIST_SERVER_TOKENS(:P_USER_ID, :P_ROWS, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables                

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-                //Bind the ref cursor

-                $p_row = oci_new_cursor($this->conn);

-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-                //Execute the statement

-                oci_execute($stmt);

-

-                // treat the ref cursor as a statement resource

-                oci_execute($p_row, OCI_DEFAULT);

-                oci_fetch_all($p_row, $listServerTokensList, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-                $ts = $listServerTokensList;

-		return $ts;

-	}

-

-

-	/**

-	 * Count how many tokens we have for the given server

-	 * 

-	 * @param string consumer_key

-	 * @return int

-	 */

-	public function countServerTokens ( $consumer_key )

-	{

-		

-                //

-                $count =0;

-                $sql = "BEGIN SP_COUNT_SERVICE_TOKENS(:P_CONSUMER_KEY, :P_COUNT, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-                oci_bind_by_name($stmt, ':P_COUNT', $count, 40);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-                

-                //Execute the statement

-                oci_execute($stmt);                

-                //

-		return $count;

-	}

-

-

-	/**

-	 * Get a specific server token for the given user

-	 * 

-	 * @param string consumer_key

-	 * @param string token

-	 * @param int user_id

-	 * @exception OAuthException2 when no such token found

-	 * @return array

-	 */

-	public function getServerToken ( $consumer_key, $token, $user_id )

-	{

-		

-                $sql = "BEGIN SP_GET_SERVER_TOKEN(:P_CONSUMER_KEY, :P_USER_ID,:P_TOKEN, :P_ROWS, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-                oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-                //Bind the ref cursor

-                $p_row = oci_new_cursor($this->conn);

-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-                //Execute the statement

-                oci_execute($stmt);

-

-                // treat the ref cursor as a statement resource

-                oci_execute($p_row, OCI_DEFAULT);

-                oci_fetch_all($p_row, $getServerTokenList, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-                $ts = $getServerTokenList;

-                //

-		

-		if (empty($ts))

-		{

-			throw new OAuthException2('No such consumer key ('.$consumer_key.') and token ('.$token.') combination for user "'.$user_id.'"');

-		}

-		return $ts;

-	}

-

-

-	/**

-	 * Delete a token we obtained from a server.

-	 * 

-	 * @param string consumer_key

-	 * @param string token

-	 * @param int user_id

-	 * @param boolean user_is_admin

-	 */

-	public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false )

-	{

-		

-                //

-                $sql = "BEGIN SP_DELETE_SERVER_TOKEN(:P_CONSUMER_KEY, :P_USER_ID,:P_TOKEN, :P_USER_IS_ADMIN, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-                oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-                oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 40);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);                

-

-                //Execute the statement

-                oci_execute($stmt);

-                //

-

-        }

-

-

-	/**

-	 * Set the ttl of a server access token.  This is done when the

-	 * server receives a valid request with a xoauth_token_ttl parameter in it.

-	 * 

-	 * @param string consumer_key

-	 * @param string token

-	 * @param int token_ttl

-	 */

-	public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )

-	{

-		if ($token_ttl <= 0)

-		{

-			// Immediate delete when the token is past its ttl

-			$this->deleteServerToken($consumer_key, $token, 0, true);

-		}

-		else if ( $server_uri ) 

-		{

-			// TODO

-			throw new OAuthException2('server_uri not implemented in Oracle yet, sorry');	

-		}

-		else

-		{

-			// Set maximum time to live for this token

-

-			//

-			$sql = "BEGIN SP_SET_SERVER_TOKEN_TTL(:P_TOKEN_TTL, :P_CONSUMER_KEY, :P_TOKEN, :P_RESULT); END;";

-			

-			// parse sql

-			$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-			

-			// Bind In and Out Variables

-			oci_bind_by_name($stmt, ':P_TOKEN_TTL', $token_ttl, 40);

-			oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-			oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-			oci_bind_by_name($stmt, ':P_RESULT', $result, 20);                         

-			

-			//Execute the statement

-			oci_execute($stmt);

-//                    

-		}

-	}

-

-

-	/**

-	 * Get a list of all consumers from the consumer registry.

-	 * The consumer keys belong to the user or are public (user id is null)

-	 * 

-	 * @param string q	query term

-	 * @param int user_id

-	 * @return array

-	 */	

-	public function listServers ( $q = '', $user_id )

-	{

-		$q    = trim(str_replace('%', '', $q));

-		$args = array();

-

-		

-                //

-                $sql = "BEGIN SP_LIST_SERVERS(:P_Q, :P_USER_ID, :P_ROWS, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_Q', $q, 255);

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-                //Bind the ref cursor

-                $p_row = oci_new_cursor($this->conn);

-                oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-                //Execute the statement

-                oci_execute($stmt);

-

-                // treat the ref cursor as a statement resource

-                oci_execute($p_row, OCI_DEFAULT);

-                oci_fetch_all($p_row, $listServersList, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-                $servers = $listServersList;

-                //

-

-		return $servers;

-	}

-

-

-	/**

-	 * Register or update a server for our site (we will be the consumer)

-	 * 

-	 * (This is the registry at the consumers, registering servers ;-) )

-	 * 

-	 * @param array server

-	 * @param int user_id	user registering this server

-	 * @param boolean user_is_admin

-	 * @exception OAuthException2 when fields are missing or on duplicate consumer_key

-	 * @return consumer_key

-	 */

-        public function updateServer ( $server, $user_id, $user_is_admin = false ) {

-            foreach (array('consumer_key', 'server_uri') as $f) {

-                if (empty($server[$f])) {

-                    throw new OAuthException2('The field "'.$f.'" must be set and non empty');

-                }

-            }

-            $parts = parse_url($server['server_uri']);

-            $host  = (isset($parts['host']) ? $parts['host'] : 'localhost');

-            $path  = (isset($parts['path']) ? $parts['path'] : '/');

-

-            if (isset($server['signature_methods'])) {

-                if (is_array($server['signature_methods'])) {

-                    $server['signature_methods'] = strtoupper(implode(',', $server['signature_methods']));

-                }

-            }

-            else {

-                $server['signature_methods'] = '';

-            }

-            // When the user is an admin, then the user can update the user_id of this record

-            if ($user_is_admin && array_key_exists('user_id', $server)) {

-                $flag=1;

-            }

-            if($flag) {

-                if (is_null($server['user_id'])) {

-                    $ocr_usa_id_ref= NULL;

-                }

-                else {

-                    $ocr_usa_id_ref = $server['user_id'];

-                }

-            }

-            else {

-                $flag=0;

-                $ocr_usa_id_ref=$user_id;

-            }

-            //sp

-            $sql = "BEGIN SP_UPDATE_SERVER(:P_CONSUMER_KEY, :P_USER_ID, :P_OCR_ID, :P_USER_IS_ADMIN,

-                 :P_OCR_CONSUMER_SECRET, :P_OCR_SERVER_URI, :P_OCR_SERVER_URI_HOST, :P_OCR_SERVER_URI_PATH,

-                 :P_OCR_REQUEST_TOKEN_URI, :P_OCR_AUTHORIZE_URI, :P_OCR_ACCESS_TOKEN_URI, :P_OCR_SIGNATURE_METHODS,

-                 :P_OCR_USA_ID_REF, :P_UPDATE_P_OCR_USA_ID_REF_FLAG, :P_RESULT); END;";

-

-            // parse sql

-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-            $server['request_token_uri'] = isset($server['request_token_uri']) ? $server['request_token_uri'] : '';

-            $server['authorize_uri'] = isset($server['authorize_uri'])     ? $server['authorize_uri']     : '';

-            $server['access_token_uri'] = isset($server['access_token_uri'])  ? $server['access_token_uri']  : '';

-            // Bind In and Out Variables

-            oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $server['consumer_key'], 255);

-            oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-            oci_bind_by_name($stmt, ':P_OCR_ID', $server['id'], 40);

-            oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 40);

-            oci_bind_by_name($stmt, ':P_OCR_CONSUMER_SECRET', $server['consumer_secret'], 255);

-            oci_bind_by_name($stmt, ':P_OCR_SERVER_URI', $server['server_uri'], 255);

-            oci_bind_by_name($stmt, ':P_OCR_SERVER_URI_HOST', strtolower($host), 255);

-            oci_bind_by_name($stmt, ':P_OCR_SERVER_URI_PATH', $path, 255);

-            oci_bind_by_name($stmt, ':P_OCR_REQUEST_TOKEN_URI', $server['request_token_uri'], 255);

-            oci_bind_by_name($stmt, ':P_OCR_AUTHORIZE_URI', $server['authorize_uri'], 255);

-            oci_bind_by_name($stmt, ':P_OCR_ACCESS_TOKEN_URI', $server['access_token_uri'], 255);

-            oci_bind_by_name($stmt, ':P_OCR_SIGNATURE_METHODS', $server['signature_methods'], 255);

-            oci_bind_by_name($stmt, ':P_OCR_USA_ID_REF', $ocr_usa_id_ref, 40);

-            oci_bind_by_name($stmt, ':P_UPDATE_P_OCR_USA_ID_REF_FLAG', $flag, 40);

-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-            

-            //Execute the statement

-            oci_execute($stmt);

-

-            return $server['consumer_key'];

-        }

-

-	/**

-	 * Insert/update a new consumer with this server (we will be the server)

-	 * When this is a new consumer, then also generate the consumer key and secret.

-	 * Never updates the consumer key and secret.

-	 * When the id is set, then the key and secret must correspond to the entry

-	 * being updated.

-	 * 

-	 * (This is the registry at the server, registering consumers ;-) )

-	 * 

-	 * @param array consumer

-	 * @param int user_id	user registering this consumer

-	 * @param boolean user_is_admin

-	 * @return string consumer key

-	 */

-	public function updateConsumer ( $consumer, $user_id, $user_is_admin = false ) {

-            $consumer_key = $this->generateKey(true);

-            $consumer_secret = $this->generateKey();

-			

- $consumer['callback_uri'] = isset($consumer['callback_uri'])? $consumer['callback_uri']: '';

-            $consumer['application_uri'] = isset($consumer['application_uri'])? $consumer['application_uri']: '';

-            $consumer['application_title'] = isset($consumer['application_title'])? $consumer['application_title']: '';

-            $consumer['application_descr'] = isset($consumer['application_descr'])? $consumer['application_descr']: '';

-            $consumer['application_notes'] = isset($consumer['application_notes'])? $consumer['application_notes']: '';

-            $consumer['application_type'] = isset($consumer['application_type'])? $consumer['application_type']: '';

-            $consumer['application_commercial'] = isset($consumer['application_commercial'])?$consumer['application_commercial']:0;

-			

-            //sp

-            $sql = "BEGIN SP_UPDATE_CONSUMER(:P_OSR_USA_ID_REF, :P_OSR_CONSUMER_KEY, :P_OSR_CONSUMER_SECRET, :P_OSR_REQUESTER_NAME, :P_OSR_REQUESTER_EMAIL, :P_OSR_CALLBACK_URI, :P_OSR_APPLICATION_URI, :P_OSR_APPLICATION_TITLE  , :P_OSR_APPLICATION_DESCR, :P_OSR_APPLICATION_NOTES, :P_OSR_APPLICATION_TYPE, :P_OSR_APPLICATION_COMMERCIAL, :P_RESULT); END;";

-

-            // parse sql

-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-			

-           

-            // Bind In and Out Variables

-            oci_bind_by_name($stmt, ':P_OSR_USA_ID_REF', $user_id, 40);

-            oci_bind_by_name($stmt, ':P_OSR_CONSUMER_KEY', $consumer_key, 255);

-            oci_bind_by_name($stmt, ':P_OSR_CONSUMER_SECRET', $consumer_secret, 255);

-            oci_bind_by_name($stmt, ':P_OSR_REQUESTER_NAME', $consumer['requester_name'], 255);

-            oci_bind_by_name($stmt, ':P_OSR_REQUESTER_EMAIL', $consumer['requester_email'], 255);

-            oci_bind_by_name($stmt, ':P_OSR_CALLBACK_URI', $consumer['callback_uri'], 255);

-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_URI', $consumer['application_uri'], 255);

-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_TITLE', $consumer['application_title'], 255);

-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_DESCR', $consumer['application_descr'], 255);

-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_NOTES', $consumer['application_notes'], 255);

-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_TYPE', $consumer['application_type'], 255);

-            oci_bind_by_name($stmt, ':P_OSR_APPLICATION_COMMERCIAL', $consumer['application_commercial'], 40);

-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-            //Execute the statement

-            oci_execute($stmt);

-			echo $result;

-            return $consumer_key;

-        }

-

-

-

-	/**

-	 * Delete a consumer key.  This removes access to our site for all applications using this key.

-	 * 

-	 * @param string consumer_key

-	 * @param int user_id	user registering this server

-	 * @param boolean user_is_admin

-	 */

-	public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false )

-	{

-		

-                //

-                $sql = "BEGIN SP_DELETE_CONSUMER(:P_CONSUMER_KEY, :P_USER_ID, :P_USER_IS_ADMIN, :P_RESULT); END;";

-

-                // parse sql

-                $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-                // Bind In and Out Variables

-                oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-                oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 40);

-                oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 40);

-                oci_bind_by_name($stmt, ':P_RESULT', $result, 20);               

-

-                //Execute the statement

-                oci_execute($stmt);

-                //

-        }

-	

-	

-	

-	/**

-	 * Fetch a consumer of this server, by consumer_key.

-	 * 

-	 * @param string consumer_key

-	 * @param int user_id

-	 * @param boolean user_is_admin (optional)

-	 * @exception OAuthException2 when consumer not found

-	 * @return array

-	 */

-	public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false ) {

-           

-            $sql = "BEGIN SP_GET_CONSUMER(:P_CONSUMER_KEY, :P_ROWS, :P_RESULT); END;";

-

-            // parse sql

-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-            // Bind In and Out Variables

-            oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-            //Bind the ref cursor

-            $p_row = oci_new_cursor($this->conn);

-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-            //Execute the statement

-            oci_execute($stmt);

-

-            // treat the ref cursor as a statement resource

-            oci_execute($p_row, OCI_DEFAULT);

-            oci_fetch_all($p_row, $getConsumerList, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-

-            $consumer = $getConsumerList;

-           

-		    if (!is_array($consumer)) {

-                throw new OAuthException2('No consumer with consumer_key "'.$consumer_key.'"');

-            }

-

-            $c = array();

-            foreach ($consumer as $key => $value) {

-                $c[substr($key, 4)] = $value;

-            }

-            $c['user_id'] = $c['usa_id_ref'];

-

-            if (!$user_is_admin && !empty($c['user_id']) && $c['user_id'] != $user_id) {

-                throw new OAuthException2('No access to the consumer information for consumer_key "'.$consumer_key.'"');

-            }

-            return $c;

-        }

-

-

-	/**

-	 * Fetch the static consumer key for this provider.  The user for the static consumer 

-	 * key is NULL (no user, shared key).  If the key did not exist then the key is created.

-	 * 

-	 * @return string

-	 */

-	public function getConsumerStatic ()

-	{

-		

-		 //

-		$sql = "BEGIN SP_GET_CONSUMER_STATIC_SELECT(:P_OSR_CONSUMER_KEY, :P_RESULT); END;";

-

-		// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_OSR_CONSUMER_KEY', $consumer, 255);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);               

-

-		//Execute the statement

-		oci_execute($stmt);

-

-		if (empty($consumer))

-		{

-			$consumer_key = 'sc-'.$this->generateKey(true);

-			

-			$sql = "BEGIN SP_CONSUMER_STATIC_SAVE(:P_OSR_CONSUMER_KEY, :P_RESULT); END;";

-

-			// parse sql

-			$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-			// Bind In and Out Variables

-			oci_bind_by_name($stmt, ':P_OSR_CONSUMER_KEY', $consumer_key, 255);

-			oci_bind_by_name($stmt, ':P_RESULT', $result, 20);               

-

-			//Execute the statement

-			oci_execute($stmt);

-			

-			

-			// Just make sure that if the consumer key is truncated that we get the truncated string

-			$consumer = $consumer_key;

-		}

-		return $consumer;

-	}

-

-

-	/**

-	 * Add an unautorized request token to our server.

-	 * 

-	 * @param string consumer_key

-	 * @param array options		(eg. token_ttl)

-	 * @return array (token, token_secret)

-	 */

-	public function addConsumerRequestToken ( $consumer_key, $options = array() )

-	{

-		$token  = $this->generateKey(true);

-		$secret = !isset($options['secret']) ? $this->generateKey() : $options['secret'];

-		 

-

-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))

-		{

-			$ttl = intval($options['token_ttl']);

-		}

-		else

-		{

-			$ttl = $this->max_request_token_ttl;

-		}

-

-		if (!isset($options['oauth_callback'])) {

-	 		// 1.0a Compatibility : store callback url associated with request token

-			$options['oauth_callback']='oob';

- 		}

-		$options_oauth_callback =$options['oauth_callback'];

-		$sql = "BEGIN SP_ADD_CONSUMER_REQUEST_TOKEN(:P_TOKEN_TTL, :P_CONSUMER_KEY, :P_TOKEN, :P_TOKEN_SECRET, :P_CALLBACK_URL, :P_RESULT); END;";

-

-			// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

- 

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_TOKEN_TTL', $ttl, 20);

-		oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-		oci_bind_by_name($stmt, ':P_TOKEN_SECRET', $secret, 255);

-		oci_bind_by_name($stmt, ':P_CALLBACK_URL', $options_oauth_callback, 255);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-		//Execute the statement

-		oci_execute($stmt);

-		

-

-		$returnArray= array('token'=>$token, 'token_secret'=>$secret, 'token_ttl'=>$ttl);

-		return $returnArray;

-	}

-	

-	

-	/**

-	 * Fetch the consumer request token, by request token.

-	 * 

-	 * @param string token

-	 * @return array  token and consumer details

-	 */

-	public function getConsumerRequestToken ( $token )

-	{

-		 

-		$sql = "BEGIN SP_GET_CONSUMER_REQUEST_TOKEN(:P_TOKEN, :P_ROWS, :P_RESULT); END;";

-

-            // parse sql

-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-            // Bind In and Out Variables

-            oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-            //Bind the ref cursor

-            $p_row = oci_new_cursor($this->conn);

-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-            //Execute the statement

-            oci_execute($stmt);

-

-            // treat the ref cursor as a statement resource

-            oci_execute($p_row, OCI_DEFAULT);

-			  

-            oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);

- 

-		return $rs[0];

-	}

-	

-

-	/**

-	 * Delete a consumer token.  The token must be a request or authorized token.

-	 * 

-	 * @param string token

-	 */

-	public function deleteConsumerRequestToken ( $token )

-	{

-		 

-		$sql = "BEGIN SP_DEL_CONSUMER_REQUEST_TOKEN(:P_TOKEN, :P_RESULT); END;";

-

-			// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-		//Execute the statement

-		oci_execute($stmt);

-	}

-	

-

-	/**

-	 * Upgrade a request token to be an authorized request token.

-	 * 

-	 * @param string token

-	 * @param int	 user_id  user authorizing the token

-	 * @param string referrer_host used to set the referrer host for this token, for user feedback

-	 */

-	public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' )

-	{

- 		// 1.0a Compatibility : create a token verifier

- 		$verifier = substr(md5(rand()),0,10);

-		

-		$sql = "BEGIN SP_AUTH_CONSUMER_REQ_TOKEN(:P_USER_ID, :P_REFERRER_HOST, :P_VERIFIER, :P_TOKEN, :P_RESULT); END;";

-

-			// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);

-		oci_bind_by_name($stmt, ':P_REFERRER_HOST', $referrer_host, 255);

-		oci_bind_by_name($stmt, ':P_VERIFIER', $verifier, 255);

-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-

-		//Execute the statement

-		oci_execute($stmt);

-

-		return $verifier;

-	}

-

-

-	/**

-	 * Count the consumer access tokens for the given consumer.

-	 * 

-	 * @param string consumer_key

-	 * @return int

-	 */

-	public function countConsumerAccessTokens ( $consumer_key )

-	{

-		/*$count = $this->query_one('

-					SELECT COUNT(ost_id)

-					FROM oauth_server_token

-							JOIN oauth_server_registry

-							ON ost_osr_id_ref = osr_id

-					WHERE ost_token_type   = \'access\'

-					  AND osr_consumer_key = \'%s\'

-					  AND ost_token_ttl    >= NOW()

-					', $consumer_key);

-		*/

-		$sql = "BEGIN SP_COUNT_CONSUMER_ACCESS_TOKEN(:P_CONSUMER_KEY, :P_COUNT, :P_RESULT); END;";

-

-			// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-		oci_bind_by_name($stmt, ':P_COUNT', $count, 20);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-

-		//Execute the statement

-		oci_execute($stmt);

-

-		return $count;

-	}

-

-

-	/**

-	 * Exchange an authorized request token for new access token.

-	 * 

-	 * @param string token

-	 * @param array options		options for the token, token_ttl

-	 * @exception OAuthException2 when token could not be exchanged

-	 * @return array (token, token_secret)

-	 */

-	public function exchangeConsumerRequestForAccessToken ( $token, $options = array() )

-	{

-		$new_token  = $this->generateKey(true);

-		$new_secret = $this->generateKey();

-		

-		$sql = "BEGIN SP_EXCH_CONS_REQ_FOR_ACC_TOKEN(:P_TOKEN_TTL, :P_NEW_TOKEN, :P_TOKEN, :P_TOKEN_SECRET, :P_VERIFIER, :P_OUT_TOKEN_TTL, :P_RESULT); END;";

-

-			// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_TOKEN_TTL', $options['token_ttl'], 255);

-		oci_bind_by_name($stmt, ':P_NEW_TOKEN', $new_token, 255);

-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-		oci_bind_by_name($stmt, ':P_TOKEN_SECRET', $new_secret, 255);

-		oci_bind_by_name($stmt, ':P_VERIFIER', $options['verifier'], 255);

-		oci_bind_by_name($stmt, ':P_OUT_TOKEN_TTL', $ttl, 255);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-

-		//Execute the statement

-		oci_execute($stmt);

-

-		$ret = array('token' => $new_token, 'token_secret' => $new_secret);

-		if (is_numeric($ttl))

-		{

-			$ret['token_ttl'] = intval($ttl);

-		}

-		return $ret;

-	}

-

-

-	/**

-	 * Fetch the consumer access token, by access token.

-	 * 

-	 * @param string token

-	 * @param int user_id

-	 * @exception OAuthException2 when token is not found

-	 * @return array  token and consumer details

-	 */

-	public function getConsumerAccessToken ( $token, $user_id )

-	{

-		 

-		$sql = "BEGIN SP_GET_CONSUMER_ACCESS_TOKEN(:P_USER_ID, :P_TOKEN, :P_ROWS :P_RESULT); END;";

-

-            // parse sql

-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-            // Bind In and Out Variables

-            oci_bind_by_name($stmt, ':P_USER_ID',$user_id, 255);

-            oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-			oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-            //Bind the ref cursor

-            $p_row = oci_new_cursor($this->conn);

-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-            //Execute the statement

-            oci_execute($stmt);

-

-            // treat the ref cursor as a statement resource

-            oci_execute($p_row, OCI_DEFAULT);

-            oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-		if (empty($rs))

-		{

-			throw new OAuthException2('No server_token "'.$token.'" for user "'.$user_id.'"');

-		}

-		return $rs;

-	}

-

-

-	/**

-	 * Delete a consumer access token.

-	 * 

-	 * @param string token

-	 * @param int user_id

-	 * @param boolean user_is_admin

-	 */

-	public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false )

-	{

-		/*if ($user_is_admin)

-		{

-			$this->query('

-						DELETE FROM oauth_server_token

-						WHERE ost_token 	 = \'%s\'

-						  AND ost_token_type = \'access\'

-						', $token);

-		}

-		else

-		{

-			$this->query('

-						DELETE FROM oauth_server_token

-						WHERE ost_token 	 = \'%s\'

-						  AND ost_token_type = \'access\'

-						  AND ost_usa_id_ref = %d

-						', $token, $user_id);

-		}*/

-		$sql = "BEGIN SP_DEL_CONSUMER_ACCESS_TOKEN(:P_USER_ID, :P_TOKEN, :P_USER_IS_ADMIN, :P_RESULT); END;";

-

-			// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);

-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-		oci_bind_by_name($stmt, ':P_USER_IS_ADMIN', $user_is_admin, 20);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-

-		//Execute the statement

-		oci_execute($stmt);

-	}

-

-

-	/**

-	 * Set the ttl of a consumer access token.  This is done when the

-	 * server receives a valid request with a xoauth_token_ttl parameter in it.

-	 * 

-	 * @param string token

-	 * @param int ttl

-	 */

-	public function setConsumerAccessTokenTtl ( $token, $token_ttl )

-	{

-		if ($token_ttl <= 0)

-		{

-			// Immediate delete when the token is past its ttl

-			$this->deleteConsumerAccessToken($token, 0, true);

-		}

-		else

-		{

-			// Set maximum time to live for this token

-			 

-			

-			$sql = "BEGIN SP_SET_CONSUMER_ACC_TOKEN_TTL(:P_TOKEN, :P_TOKEN_TTL, :P_RESULT); END;";

-

-			// parse sql

-			$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-			// Bind In and Out Variables

-			oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-			oci_bind_by_name($stmt, ':P_TOKEN_TTL', $token_ttl, 20);

-			oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-

-			//Execute the statement

-			oci_execute($stmt);

-		}

-	}

-

-

-	/**

-	 * Fetch a list of all consumer keys, secrets etc.

-	 * Returns the public (user_id is null) and the keys owned by the user

-	 * 

-	 * @param int user_id

-	 * @return array

-	 */

-	public function listConsumers ( $user_id )

-	{

-

-		$sql = "BEGIN SP_LIST_CONSUMERS(:P_USER_ID, :P_ROWS, :P_RESULT); END;";

-

-		// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-		//Bind the ref cursor

-		$p_row = oci_new_cursor($this->conn);

-		oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-		//Execute the statement

-		oci_execute($stmt);

-

-		// treat the ref cursor as a statement resource

-		oci_execute($p_row, OCI_DEFAULT);

-		oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-

-		return $rs;

-	}

-

-	/**

-	 * List of all registered applications. Data returned has not sensitive 

-	 * information and therefore is suitable for public displaying.

-	 * 

-	 * @param int $begin

-	 * @param int $total

-	 * @return array

-	 */

-	public function listConsumerApplications($begin = 0, $total = 25) 

-	{

-		// TODO

-		return array();

-	}

-

-	/**

-	 * Fetch a list of all consumer tokens accessing the account of the given user.

-	 * 

-	 * @param int user_id

-	 * @return array

-	 */

-	public function listConsumerTokens ( $user_id )

-	{

-	 

-		$sql = "BEGIN SP_LIST_CONSUMER_TOKENS(:P_USER_ID, :P_ROWS, :P_RESULT); END;";

-

-		// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_USER_ID', $user_id, 255);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-		//Bind the ref cursor

-		$p_row = oci_new_cursor($this->conn);

-		oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-		//Execute the statement

-		oci_execute($stmt);

-

-		// treat the ref cursor as a statement resource

-		oci_execute($p_row, OCI_DEFAULT);

-		oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-

-		return $rs;

-	}

-

-

-	/**

-	 * Check an nonce/timestamp combination.  Clears any nonce combinations

-	 * that are older than the one received.

-	 * 

-	 * @param string	consumer_key

-	 * @param string 	token

-	 * @param int		timestamp

-	 * @param string 	nonce

-	 * @exception OAuthException2	thrown when the timestamp is not in sequence or nonce is not unique

-	 */

-	public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce )

-	{

-		

-		 $sql = "BEGIN SP_CHECK_SERVER_NONCE(:P_CONSUMER_KEY, :P_TOKEN, :P_TIMESTAMP, :P_MAX_TIMESTAMP_SKEW, :P_NONCE, :P_RESULT); END;";

-

-			// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_CONSUMER_KEY', $consumer_key, 255);

-		oci_bind_by_name($stmt, ':P_TOKEN', $token, 255);

-		oci_bind_by_name($stmt, ':P_TIMESTAMP', $timestamp, 255);

-		oci_bind_by_name($stmt, ':P_MAX_TIMESTAMP_SKEW', $this->max_timestamp_skew, 20);

-		oci_bind_by_name($stmt, ':P_NONCE', $nonce, 255);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-

-		//Execute the statement

-		oci_execute($stmt);

-		

-	}

-

-

-	/**

-	 * Add an entry to the log table

-	 * 

-	 * @param array keys (osr_consumer_key, ost_token, ocr_consumer_key, oct_token)

-	 * @param string received

-	 * @param string sent

-	 * @param string base_string

-	 * @param string notes

-	 * @param int (optional) user_id

-	 */

-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null )

-	{

-		$args = array();

-		$ps   = array();

-		foreach ($keys as $key => $value)

-		{

-			$args[] = $value;

-			$ps[]   = "olg_$key = '%s'";

-		}

-

-		if (!empty($_SERVER['REMOTE_ADDR']))

-		{

-			$remote_ip = $_SERVER['REMOTE_ADDR'];

-		}	

-		else if (!empty($_SERVER['REMOTE_IP']))

-		{

-			$remote_ip = $_SERVER['REMOTE_IP'];

-		}

-		else

-		{

-			$remote_ip = '0.0.0.0';

-		}

-

-		// Build the SQL

-		$olg_received = $this->makeUTF8($received);

-		$olg_sent = $this->makeUTF8($sent);

-		$olg_base_string = $base_string;

-		$olg_notes = $this->makeUTF8($notes);

-		$olg_usa_id_ref = $user_id;

-		$olg_remote_ip = $remote_ip;

-

-		 

-

-		$sql = "BEGIN SP_ADD_LOG(:P_RECEIVED, :P_SENT, :P_BASE_STRING, :P_NOTES, :P_USA_ID_REF, :P_REMOTE_IP, :P_RESULT); END;";

-

-			// parse sql

-		$stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-		// Bind In and Out Variables

-		oci_bind_by_name($stmt, ':P_RECEIVED', $olg_received, 255);

-		oci_bind_by_name($stmt, ':P_SENT', $olg_sent, 255);

-		oci_bind_by_name($stmt, ':P_BASE_STRING', $olg_base_string, 255);

-		oci_bind_by_name($stmt, ':P_NOTES', $olg_notes, 255);

-		oci_bind_by_name($stmt, ':P_USA_ID_REF', $olg_usa_id_ref, 255);

-		oci_bind_by_name($stmt, ':P_REMOTE_IP', $olg_remote_ip, 255);

-		oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-

-		//Execute the statement

-		oci_execute($stmt);

-	}

-	

-	

-	/**

-	 * Get a page of entries from the log.  Returns the last 100 records

-	 * matching the options given.

-	 * 

-	 * @param array options

-	 * @param int user_id	current user

-	 * @return array log records

-	 */

-	public function listLog ( $options, $user_id )

-	{

-		

-		 if (empty($options))

-		{

-			$optionsFlag=NULL;

-			

-		}

-		else

-		{

-			$optionsFlag=1;

-			

-		}

-	

-		$sql = "BEGIN SP_LIST_LOG(:P_OPTION_FLAG, :P_USA_ID, :P_OSR_CONSUMER_KEY, :P_OCR_CONSUMER_KEY, :P_OST_TOKEN, :P_OCT_TOKEN, :P_ROWS, :P_RESULT); END;";

-

-            // parse sql

-            $stmt = oci_parse($this->conn, $sql) or die ('Can not parse query');

-

-            // Bind In and Out Variables

-            oci_bind_by_name($stmt, ':P_OPTION_FLAG', $optionsFlag, 255);

-            oci_bind_by_name($stmt, ':P_USA_ID', $user_id, 40);

-			oci_bind_by_name($stmt, ':P_OSR_CONSUMER_KEY', $options['osr_consumer_key'], 255);

-            oci_bind_by_name($stmt, ':P_OCR_CONSUMER_KEY', $options['ocr_consumer_key'], 255);

-			oci_bind_by_name($stmt, ':P_OST_TOKEN', $options['ost_token'], 255);

-            oci_bind_by_name($stmt, ':P_OCT_TOKEN', $options['oct_token'], 255);

-            oci_bind_by_name($stmt, ':P_RESULT', $result, 20);

-

-            //Bind the ref cursor

-            $p_row = oci_new_cursor($this->conn);

-            oci_bind_by_name($stmt, ':P_ROWS', $p_row, -1, OCI_B_CURSOR);

-

-            //Execute the statement

-            oci_execute($stmt);

-

-            // treat the ref cursor as a statement resource

-            oci_execute($p_row, OCI_DEFAULT);

-            oci_fetch_all($p_row, $rs, null, null, OCI_FETCHSTATEMENT_BY_ROW);

-

-		return $rs;

-	}

-

-	/**

-	 * Initialise the database

-	 */

-	public function install ()

-	{

-		require_once dirname(__FILE__) . '/oracle/install.php';

-	}

-}

-

-

-/* vi:set ts=4 sts=4 sw=4 binary noeol: */

-

-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStorePDO.php b/vendor/oauth-php/library/store/OAuthStorePDO.php
deleted file mode 100644
index aa3a1b9..0000000
--- a/vendor/oauth-php/library/store/OAuthStorePDO.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on MySQL
- *
- * @version $Id: OAuthStorePDO.php 64 2009-08-16 19:37:00Z marcw@pobox.com $
- * @author Bruno Barberi Gnecco <brunobg@users.sf.net> Based on code by Marc Worrell <marcw@pobox.com>
- *
- *
- * The MIT License
- *
- * Copyright (c) 2007-2008 Mediamatic Lab
- *
- * 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.
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreSQL.php';
-
-
-class OAuthStorePDO extends OAuthStoreSQL
-{
-	private $conn; // PDO connection
-	private $lastaffectedrows;
-
-	/**
-	 * Construct the OAuthStorePDO.
-	 * In the options you have to supply either:
-	 * - dsn, username, password and database (for a new PDO connection)
-	 * - conn (for the connection to be used)
-	 *
-	 * @param array options
-	 */
-	function __construct ( $options = array() )
-	{
-		if (isset($options['conn']))
-		{
-			$this->conn = $options['conn'];
-		}
-		else if (isset($options['dsn']))
-		{
-			try
-			{
-				$this->conn = new PDO($options['dsn'], $options['username'], @$options['password']);
-			}
-			catch (PDOException $e)
-			{
-				throw new OAuthException2('Could not connect to PDO database: ' . $e->getMessage());
-			}
-
-			$this->query('set character set utf8');
-		}
-	}
-
-	/**
-	 * Perform a query, ignore the results
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	protected function query ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		try
-		{
-			$this->lastaffectedrows = $this->conn->exec($sql);
-			if ($this->lastaffectedrows === FALSE) {
-				$this->sql_errcheck($sql);
-			}
-		}
-		catch (PDOException $e)
-		{
-			$this->sql_errcheck($sql);
-		}
-	}
-
-
-	/**
-	 * Perform a query, ignore the results
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_all_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		$result = array();
-
-		try
-		{
-			$stmt = $this->conn->query($sql);
-
-			$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
-		}
-		catch (PDOException $e)
-		{
-			$this->sql_errcheck($sql);
-		}
-		return $result;
-	}
-
-
-	/**
-	 * Perform a query, return the first row
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row_assoc ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		$result = $this->query_all_assoc($sql);
-		$val = array_pop($result);
-		return $val;
-	}
-
-
-	/**
-	 * Perform a query, return the first row
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	protected function query_row ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		try
-		{
-			$all = $this->conn->query($sql, PDO::FETCH_NUM);
-			$row = array();
-			foreach ($all as $r) {
-				$row = $r;
-				break;
-			}
-		}
-		catch (PDOException $e)
-		{
-			$this->sql_errcheck($sql);
-		}
-		return $row;
-	}
-
-
-	/**
-	 * Perform a query, return the first column of the first row
-	 *
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	protected function query_one ( $sql )
-	{
-		$sql = $this->sql_printf(func_get_args());
-		$row = $this->query_row($sql);
-		$val = array_pop($row);
-		return $val;
-	}
-
-
-	/**
-	 * Return the number of rows affected in the last query
-	 */
-	protected function query_affected_rows ()
-	{
-		return $this->lastaffectedrows;
-	}
-
-
-	/**
-	 * Return the id of the last inserted row
-	 *
-	 * @return int
-	 */
-	protected function query_insert_id ()
-	{
-		return $this->conn->lastInsertId();
-	}
-
-
-	protected function sql_printf ( $args )
-	{
-		$sql  = array_shift($args);
-		if (count($args) == 1 && is_array($args[0]))
-		{
-			$args = $args[0];
-		}
-		$args = array_map(array($this, 'sql_escape_string'), $args);
-		return vsprintf($sql, $args);
-	}
-
-
-	protected function sql_escape_string ( $s )
-	{
-		if (is_string($s))
-		{
-			$s = $this->conn->quote($s);
-			// kludge. Quote already adds quotes, and this conflicts with OAuthStoreSQL.
-			// so remove the quotes
-			$len = strlen($s);
-			if ($len == 0)
-				return $s;
-
-			$startcut = 0;
-			while (isset($s[$startcut]) && $s[$startcut] == '\'')
-				$startcut++;
-
-			$endcut = $len-1;
-			while (isset($s[$endcut]) && $s[$endcut] == '\'')
-				$endcut--;
-
-			$s = substr($s, $startcut, $endcut-$startcut+1);
-			return $s;
-		}
-		else if (is_null($s))
-		{
-			return NULL;
-		}
-		else if (is_bool($s))
-		{
-			return intval($s);
-		}
-		else if (is_int($s) || is_float($s))
-		{
-			return $s;
-		}
-		else
-		{
-			return $this->conn->quote(strval($s));
-		}
-	}
-
-
-	protected function sql_errcheck ( $sql )
-	{
-		$msg =  "SQL Error in OAuthStoreMySQL: ". print_r($this->conn->errorInfo(), true) ."\n\n" . $sql;
-		$backtrace = debug_backtrace();
-		$msg .=  "\n\nAt file " . $backtrace[1]['file'] . ", line "  . $backtrace[1]['line'];
-		throw new OAuthException2($msg);
-	}
-
-	/**
-	* Initialise the database
-	*/
-	public function install ()
-	{
-		// TODO: this depends on mysql extension
-		require_once dirname(__FILE__) . '/mysql/install.php';
-	}
-
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
diff --git a/vendor/oauth-php/library/store/OAuthStorePostgreSQL.php b/vendor/oauth-php/library/store/OAuthStorePostgreSQL.php
deleted file mode 100644
index db55804..0000000
--- a/vendor/oauth-php/library/store/OAuthStorePostgreSQL.php
+++ /dev/null
@@ -1,1981 +0,0 @@
-<?php
-/**
- * OAuthStorePostgreSQL.php
- *
- * PHP Version 5.2
- *
- * @author Elma R&D Team  <rdteam@elma.fr>
- * @link http://elma.fr
- * 
- * @Id 2010-10-22 10:07:18 ndelanoe $
- * @version $Id: OAuthStorePostgreSQL.php 190 2011-03-22 09:16:01Z scherpenisse $
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * 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.
- **/
-
-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';
-
-
-class OAuthStorePostgreSQL extends OAuthStoreAbstract
-{
-    /**
-     * Maximum delta a timestamp may be off from a previous timestamp.
-     * Allows multiple consumers with some clock skew to work with the same token.
-     * Unit is seconds, default max skew is 10 minutes.
-     */
-    protected $max_timestamp_skew = 600;
-
-    /**
-     * Default ttl for request tokens
-     */
-    protected $max_request_token_ttl = 3600;
-
-    /**
-     * Number of affected rowsby the last queries
-     */
-    private $_lastAffectedRows = 0;
-
-    public function install()
-    {
-        throw new OAuthException2('Not yet implemented, see postgresql/pgsql.sql');
-    }
-
-    /**
-     * Construct the OAuthStorePostgrSQL.
-     * In the options you have to supply either:
-     * - server, username, password and database (for a pg_connect)
-     * - connectionString (for a pg_connect)
-     * - conn (for the connection to be used)
-     *
-     * @param array options
-     */
-    function __construct ( $options = array() )
-    {
-        if (isset($options['conn']))
-        {
-            $this->conn = $options['conn'];
-        }
-        else
-        {
-            if (isset($options['server']))
-            {
-                $host   = $options['server'];
-                $user = $options['username'];
-                $dbname = $options['database'];
-
-                $connectionString = sprintf('host=%s dbname=%s user=%s', $host, $dbname, $user);
-
-                if (isset($options['password']))
-                {
-                    $connectionString .= ' password=' . $options['password'];
-                }
-
-                $this->conn = pg_connect($connectionString);
-            }
-            elseif (isset($options['connectionString']))
-            {
-                $this->conn = pg_connect($options['connectionString']);
-            }
-            else {
-
-                // Try the default  pg connect
-                $this->conn = pg_connect();
-            }
-
-            if ($this->conn === false)
-            {
-                throw new OAuthException2('Could not connect to PostgresSQL database');
-            }
-        }
-    }
-
-    /**
-     * Find stored credentials for the consumer key and token. Used by an OAuth server
-     * when verifying an OAuth request.
-     *
-     * @param string consumer_key
-     * @param string token
-     * @param string token_type        false, 'request' or 'access'
-     * @exception OAuthException2 when no secrets where found
-     * @return array    assoc (consumer_secret, token_secret, osr_id, ost_id, user_id)
-     */
-    public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' )
-    {
-        if ($token_type === false)
-        {
-            $rs = $this->query_row_assoc('
-                        SELECT    osr_id,
-                                osr_consumer_key        as consumer_key,
-                                osr_consumer_secret        as consumer_secret
-                        FROM oauth_server_registry
-                        WHERE osr_consumer_key    = \'%s\'
-                          AND osr_enabled        = \'1\'
-                        ',
-                        $consumer_key);
-
-            if ($rs)
-            {
-                $rs['token']         = false;
-                $rs['token_secret']    = false;
-                $rs['user_id']        = false;
-                $rs['ost_id']        = false;
-            }
-        }
-        else
-        {
-            $rs = $this->query_row_assoc('
-                        SELECT    osr_id,
-                                ost_id,
-                                ost_usa_id_ref            as user_id,
-                                osr_consumer_key        as consumer_key,
-                                osr_consumer_secret        as consumer_secret,
-                                ost_token                as token,
-                                ost_token_secret        as token_secret
-                        FROM oauth_server_registry
-                                JOIN oauth_server_token
-                                ON ost_osr_id_ref = osr_id
-                        WHERE ost_token_type    = \'%s\'
-                          AND osr_consumer_key    = \'%s\'
-                          AND ost_token            = \'%s\'
-                           AND osr_enabled        = \'1\'
-                          AND ost_token_ttl     >= NOW()
-                        ',
-                        $token_type, $consumer_key, $token);
-        }
-
-        if (empty($rs))
-        {
-            throw new OAuthException2('The consumer_key "'.$consumer_key.'" token "'.$token.'" combination does not exist or is not enabled.');
-        }
-        return $rs;
-    }
-
-    /**
-     * Find the server details for signing a request, always looks for an access token.
-     * The returned credentials depend on which local user is making the request.
-     *
-     * The consumer_key must belong to the user or be public (user id is null)
-     *
-     * For signing we need all of the following:
-     *
-     * consumer_key            consumer key associated with the server
-     * consumer_secret        consumer secret associated with this server
-     * token                access token associated with this server
-     * token_secret            secret for the access token
-     * signature_methods    signing methods supported by the server (array)
-     *
-     * @todo filter on token type (we should know how and with what to sign this request, and there might be old access tokens)
-     * @param string uri    uri of the server
-     * @param int user_id    id of the logged on user
-     * @param string name    (optional) name of the token (case sensitive)
-     * @exception OAuthException2 when no credentials found
-     * @return array
-     */
-    public function getSecretsForSignature ( $uri, $user_id, $name = '' )
-    {
-        // Find a consumer key and token for the given uri
-        $ps        = parse_url($uri);
-        $host    = isset($ps['host']) ? $ps['host'] : 'localhost';
-        $path    = isset($ps['path']) ? $ps['path'] : '';
-
-        if (empty($path) || substr($path, -1) != '/')
-        {
-            $path .= '/';
-        }
-
-        // The owner of the consumer_key is either the user or nobody (public consumer key)
-        $secrets = $this->query_row_assoc('
-                    SELECT    ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            oct_token                as token,
-                            oct_token_secret        as token_secret,
-                            ocr_signature_methods    as signature_methods
-                    FROM oauth_consumer_registry
-                        JOIN oauth_consumer_token ON oct_ocr_id_ref = ocr_id
-                    WHERE ocr_server_uri_host = \'%s\'
-                      AND ocr_server_uri_path = SUBSTR(\'%s\', 1, LENGTH(ocr_server_uri_path))
-                      AND (ocr_usa_id_ref = \'%s\' OR ocr_usa_id_ref IS NULL)
-                      AND oct_usa_id_ref      = \'%d\'
-                      AND oct_token_type      = \'access\'
-                      AND oct_name              = \'%s\'
-                      AND oct_token_ttl       >= NOW()
-                    ORDER BY ocr_usa_id_ref DESC, ocr_consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC
-                    LIMIT 1
-                    ', $host, $path, $user_id, $user_id, $name
-                    );
-
-        if (empty($secrets))
-        {
-            throw new OAuthException2('No server tokens available for '.$uri);
-        }
-        $secrets['signature_methods'] = explode(',', $secrets['signature_methods']);
-        return $secrets;
-    }
-
-    /**
-     * Get the token and token secret we obtained from a server.
-     *
-     * @param string    consumer_key
-     * @param string     token
-     * @param string    token_type
-     * @param int        user_id            the user owning the token
-     * @param string    name            optional name for a named token
-     * @exception OAuthException2 when no credentials found
-     * @return array
-     */
-    public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' )
-    {
-        if ($token_type != 'request' && $token_type != 'access')
-        {
-            throw new OAuthException2('Unkown token type "'.$token_type.'", must be either "request" or "access"');
-        }
-
-        // Take the most recent token of the given type
-        $r = $this->query_row_assoc('
-                    SELECT    ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            oct_token                as token,
-                            oct_token_secret        as token_secret,
-                            oct_name                as token_name,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri,
-                            CASE WHEN oct_token_ttl >= \'9999-12-31\' THEN NULL ELSE oct_token_ttl - NOW() END as token_ttl
-                    FROM oauth_consumer_registry
-                            JOIN oauth_consumer_token
-                            ON oct_ocr_id_ref = ocr_id
-                    WHERE ocr_consumer_key = \'%s\'
-                      AND oct_token_type   = \'%s\'
-                      AND oct_token        = \'%s\'
-                      AND oct_usa_id_ref   = \'%d\'
-                      AND oct_token_ttl    >= NOW()
-                    ', $consumer_key, $token_type, $token, $user_id
-                    );
-
-        if (empty($r))
-        {
-            throw new OAuthException2('Could not find a "'.$token_type.'" token for consumer "'.$consumer_key.'" and user '.$user_id);
-        }
-        if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-        {
-            $r['signature_methods'] = explode(',',$r['signature_methods']);
-        }
-        else
-        {
-            $r['signature_methods'] = array();
-        }
-        return $r;
-    }
-
-
-    /**
-     * Add a request token we obtained from a server.
-     *
-     * @todo remove old tokens for this user and this ocr_id
-     * @param string consumer_key    key of the server in the consumer registry
-     * @param string token_type        one of 'request' or 'access'
-     * @param string token
-     * @param string token_secret
-     * @param int      user_id            the user owning the token
-     * @param array  options            extra options, name and token_ttl
-     * @exception OAuthException2 when server is not known
-     * @exception OAuthException2 when we received a duplicate token
-     */
-    public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() )
-    {
-        if ($token_type != 'request' && $token_type != 'access')
-        {
-            throw new OAuthException2('Unknown token type "'.$token_type.'", must be either "request" or "access"');
-        }
-
-        // Maximum time to live for this token
-        if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-        {
-            $ttl = 'NOW() + INTERVAL \''.intval($options['token_ttl']).' SECOND\'';
-        }
-        else if ($token_type == 'request')
-        {
-            $ttl = 'NOW() + INTERVAL \''.$this->max_request_token_ttl.' SECOND\'';
-        }
-        else
-        {
-            $ttl = "'9999-12-31'";
-        }
-
-        if (isset($options['server_uri']))
-        {
-            $ocr_id = $this->query_one('
-                        SELECT ocr_id
-                        FROM oauth_consumer_registry
-                        WHERE ocr_consumer_key = \'%s\'
-                        AND ocr_usa_id_ref = \'%d\'
-                        AND ocr_server_uri = \'%s\'
-                        ', $consumer_key, $user_id, $options['server_uri']);
-        }
-        else
-        {
-            $ocr_id = $this->query_one('
-                        SELECT ocr_id
-                        FROM oauth_consumer_registry
-                        WHERE ocr_consumer_key = \'%s\'
-                        AND ocr_usa_id_ref = \'%d\'
-                        ', $consumer_key, $user_id);
-        }
-
-        if (empty($ocr_id))
-        {
-            throw new OAuthException2('No server associated with consumer_key "'.$consumer_key.'"');
-        }
-
-        // Named tokens, unique per user/consumer key
-        if (isset($options['name']) && $options['name'] != '')
-        {
-            $name = $options['name'];
-        }
-        else
-        {
-            $name = '';
-        }
-
-        // Delete any old tokens with the same type and name for this user/server combination
-        $this->query('
-                    DELETE FROM oauth_consumer_token
-                    WHERE oct_ocr_id_ref = %d
-                      AND oct_usa_id_ref = \'%d\'
-                      AND oct_token_type::text = LOWER(\'%s\')::text
-                      AND oct_name       = \'%s\'
-                    ',
-                    $ocr_id,
-                    $user_id,
-                    $token_type,
-                    $name);
-
-        // Insert the new token
-        $this->query('
-            INSERT INTO
-               oauth_consumer_token(
-                   oct_ocr_id_ref,
-                   oct_usa_id_ref,
-                   oct_name,
-                   oct_token,
-                   oct_token_secret,
-                   oct_token_type,
-                   oct_timestamp,
-                   oct_token_ttl
-               )
-               VALUES (%d,%d,\'%s\',\'%s\',\'%s\',\'%s\',NOW(),'.$ttl.')',
-                    $ocr_id,
-                    $user_id,
-                    $name,
-                    $token,
-                    $token_secret,
-                    $token_type);
-
-        if (!$this->query_affected_rows())
-        {
-            throw new OAuthException2('Received duplicate token "'.$token.'" for the same consumer_key "'.$consumer_key.'"');
-        }
-    }
-
-    /**
-     * Delete a server key.  This removes access to that site.
-     *
-     * @param string consumer_key
-     * @param int user_id    user registering this server
-     * @param boolean user_is_admin
-     */
-    public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false )
-    {
-        if ($user_is_admin)
-        {
-            $this->query('
-                    DELETE FROM oauth_consumer_registry
-                    WHERE ocr_consumer_key = \'%s\'
-                      AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                    ', $consumer_key, $user_id);
-        }
-        else
-        {
-            $this->query('
-                    DELETE FROM oauth_consumer_registry
-                    WHERE ocr_consumer_key = \'%s\'
-                      AND ocr_usa_id_ref   = \'%d\'
-                    ', $consumer_key, $user_id);
-        }
-    }
-
-
-    /**
-     * Get a server from the consumer registry using the consumer key
-     *
-     * @param string consumer_key
-     * @param int user_id
-     * @param boolean user_is_admin (optional)
-     * @exception OAuthException2 when server is not found
-     * @return array
-     */
-    public function getServer ( $consumer_key, $user_id, $user_is_admin = false )
-    {
-        $r = $this->query_row_assoc('
-                SELECT    ocr_id                    as id,
-                        ocr_usa_id_ref            as user_id,
-                        ocr_consumer_key         as consumer_key,
-                        ocr_consumer_secret     as consumer_secret,
-                        ocr_signature_methods    as signature_methods,
-                        ocr_server_uri            as server_uri,
-                        ocr_request_token_uri    as request_token_uri,
-                        ocr_authorize_uri        as authorize_uri,
-                        ocr_access_token_uri    as access_token_uri
-                FROM oauth_consumer_registry
-                WHERE ocr_consumer_key = \'%s\'
-                  AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                ',    $consumer_key, $user_id);
-
-        if (empty($r))
-        {
-            throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" has been registered (for this user)');
-        }
-
-        if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-        {
-            $r['signature_methods'] = explode(',',$r['signature_methods']);
-        }
-        else
-        {
-            $r['signature_methods'] = array();
-        }
-        return $r;
-    }
-
-
-    /**
-     * Find the server details that might be used for a request
-     *
-     * The consumer_key must belong to the user or be public (user id is null)
-     *
-     * @param string uri    uri of the server
-     * @param int user_id    id of the logged on user
-     * @exception OAuthException2 when no credentials found
-     * @return array
-     */
-    public function getServerForUri ( $uri, $user_id )
-    {
-        // Find a consumer key and token for the given uri
-        $ps        = parse_url($uri);
-        $host    = isset($ps['host']) ? $ps['host'] : 'localhost';
-        $path    = isset($ps['path']) ? $ps['path'] : '';
-
-        if (empty($path) || substr($path, -1) != '/')
-        {
-            $path .= '/';
-        }
-
-        // The owner of the consumer_key is either the user or nobody (public consumer key)
-        $server = $this->query_row_assoc('
-                    SELECT    ocr_id                    as id,
-                            ocr_usa_id_ref            as user_id,
-                            ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri
-                    FROM oauth_consumer_registry
-                    WHERE ocr_server_uri_host = \'%s\'
-                      AND ocr_server_uri_path = SUBSTR(\'%s\', 1, LENGTH(ocr_server_uri_path))
-                      AND (ocr_usa_id_ref = \'%s\' OR ocr_usa_id_ref IS NULL)
-                    ORDER BY ocr_usa_id_ref DESC, consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC
-                    LIMIT 1
-                    ', $host, $path, $user_id
-                    );
-
-        if (empty($server))
-        {
-            throw new OAuthException2('No server available for '.$uri);
-        }
-        $server['signature_methods'] = explode(',', $server['signature_methods']);
-        return $server;
-    }
-
-    /**
-     * Get a list of all server token this user has access to.
-     *
-     * @param int usr_id
-     * @return array
-     */
-    public function listServerTokens ( $user_id )
-    {
-        $ts = $this->query_all_assoc('
-                    SELECT    ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            oct_id                    as token_id,
-                            oct_token                as token,
-                            oct_token_secret        as token_secret,
-                            oct_usa_id_ref            as user_id,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_server_uri_host        as server_uri_host,
-                            ocr_server_uri_path        as server_uri_path,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri,
-                            oct_timestamp            as timestamp
-                    FROM oauth_consumer_registry
-                            JOIN oauth_consumer_token
-                            ON oct_ocr_id_ref = ocr_id
-                    WHERE oct_usa_id_ref = \'%d\'
-                      AND oct_token_type = \'access\'
-                      AND oct_token_ttl  >= NOW()
-                    ORDER BY ocr_server_uri_host, ocr_server_uri_path
-                    ', $user_id);
-        return $ts;
-    }
-
-     /**
-     * Count how many tokens we have for the given server
-     *
-     * @param string consumer_key
-     * @return int
-     */
-    public function countServerTokens ( $consumer_key )
-    {
-        $count = $this->query_one('
-                    SELECT COUNT(oct_id)
-                    FROM oauth_consumer_token
-                            JOIN oauth_consumer_registry
-                            ON oct_ocr_id_ref = ocr_id
-                    WHERE oct_token_type   = \'access\'
-                      AND ocr_consumer_key = \'%s\'
-                      AND oct_token_ttl    >= NOW()
-                    ', $consumer_key);
-
-        return $count;
-    }
-
-    /**
-     * Get a specific server token for the given user
-     *
-     * @param string consumer_key
-     * @param string token
-     * @param int user_id
-     * @exception OAuthException2 when no such token found
-     * @return array
-     */
-    public function getServerToken ( $consumer_key, $token, $user_id )
-    {
-        $ts = $this->query_row_assoc('
-                    SELECT    ocr_consumer_key        as consumer_key,
-                            ocr_consumer_secret        as consumer_secret,
-                            oct_token                as token,
-                            oct_token_secret        as token_secret,
-                            oct_usa_id_ref            as usr_id,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_server_uri_host        as server_uri_host,
-                            ocr_server_uri_path        as server_uri_path,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri,
-                            oct_timestamp            as timestamp
-                    FROM oauth_consumer_registry
-                            JOIN oauth_consumer_token
-                            ON oct_ocr_id_ref = ocr_id
-                    WHERE ocr_consumer_key = \'%s\'
-                      AND oct_usa_id_ref   = \'%d\'
-                      AND oct_token_type   = \'access\'
-                      AND oct_token        = \'%s\'
-                      AND oct_token_ttl    >= NOW()
-                    ', $consumer_key, $user_id, $token);
-
-        if (empty($ts))
-        {
-            throw new OAuthException2('No such consumer key ('.$consumer_key.') and token ('.$token.') combination for user "'.$user_id.'"');
-        }
-        return $ts;
-    }
-
-
-    /**
-     * Delete a token we obtained from a server.
-     *
-     * @param string consumer_key
-     * @param string token
-     * @param int user_id
-     * @param boolean user_is_admin
-     */
-    public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false )
-    {
-        if ($user_is_admin)
-        {
-            $this->query('
-                DELETE FROM oauth_consumer_token
-                    USING oauth_consumer_registry
-                WHERE
-                    oct_ocr_id_ref = ocr_id
-                    AND ocr_consumer_key    = \'%s\'
-                    AND oct_token            = \'%s\'
-                ', $consumer_key, $token);
-        }
-        else
-        {
-            $this->query('
-                DELETE FROM oauth_consumer_token
-                    USING oauth_consumer_registry
-                WHERE
-                    oct_ocr_id_ref = ocr_id
-                    AND ocr_consumer_key    = \'%s\'
-                    AND oct_token            = \'%s\'
-                    AND oct_usa_id_ref    = \'%d\'
-                ', $consumer_key, $token, $user_id);
-        }
-    }
-
-    /**
-     * Set the ttl of a server access token.  This is done when the
-     * server receives a valid request with a xoauth_token_ttl parameter in it.
-     *
-     * @param string consumer_key
-     * @param string token
-     * @param int token_ttl
-     */
-    public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )
-    {
-        if ($token_ttl <= 0)
-        {
-            // Immediate delete when the token is past its ttl
-            $this->deleteServerToken($consumer_key, $token, 0, true);
-        }
-		else if ( $server_uri ) 
-		{
-			// Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_consumer_token
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ocr_consumer_key    = \'%s\'
-						  AND ocr_server_uri = \'%s\'
-                          AND oct_ocr_id_ref    = ocr_id
-                          AND oct_token         = \'%s\'
-                          ', $token_ttl, $server_uri, $consumer_key, $token);
-
-            // Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_consumer_registry
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ocr_consumer_key    = \'%s\'
-						  AND ocr_server_uri = \'%s\'
-                          AND oct_ocr_id_ref    = ocr_id
-                          AND oct_token         = \'%s\'
-                        ', $token_ttl, $server_uri, $consumer_key, $token);
-		}
-        else
-        {
-            // Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_consumer_token
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ocr_consumer_key    = \'%s\'
-                          AND oct_ocr_id_ref    = ocr_id
-                          AND oct_token         = \'%s\'
-                          ', $token_ttl, $consumer_key, $token);
-
-            // Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_consumer_registry
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ocr_consumer_key    = \'%s\'
-                          AND oct_ocr_id_ref    = ocr_id
-                          AND oct_token         = \'%s\'
-                        ', $token_ttl, $consumer_key, $token);
-        }
-    }
-
-    /**
-     * Get a list of all consumers from the consumer registry.
-     * The consumer keys belong to the user or are public (user id is null)
-     *
-     * @param string q    query term
-     * @param int user_id
-     * @return array
-     */
-    public function listServers ( $q = '', $user_id )
-    {
-        $q    = trim(str_replace('%', '', $q));
-        $args = array();
-
-        if (!empty($q))
-        {
-            $where = ' WHERE (    ocr_consumer_key like \'%%%s%%\'
-                               OR ocr_server_uri like \'%%%s%%\'
-                               OR ocr_server_uri_host like \'%%%s%%\'
-                               OR ocr_server_uri_path like \'%%%s%%\')
-                         AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                    ';
-
-            $args[] = $q;
-            $args[] = $q;
-            $args[] = $q;
-            $args[] = $q;
-            $args[] = $user_id;
-        }
-        else
-        {
-            $where  = ' WHERE ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL';
-            $args[] = $user_id;
-        }
-
-        $servers = $this->query_all_assoc('
-                    SELECT    ocr_id                    as id,
-                            ocr_usa_id_ref            as user_id,
-                            ocr_consumer_key         as consumer_key,
-                            ocr_consumer_secret     as consumer_secret,
-                            ocr_signature_methods    as signature_methods,
-                            ocr_server_uri            as server_uri,
-                            ocr_server_uri_host        as server_uri_host,
-                            ocr_server_uri_path        as server_uri_path,
-                            ocr_request_token_uri    as request_token_uri,
-                            ocr_authorize_uri        as authorize_uri,
-                            ocr_access_token_uri    as access_token_uri
-                    FROM oauth_consumer_registry
-                    '.$where.'
-                    ORDER BY ocr_server_uri_host, ocr_server_uri_path
-                    ', $args);
-        return $servers;
-    }
-
-    /**
-     * Register or update a server for our site (we will be the consumer)
-     *
-     * (This is the registry at the consumers, registering servers ;-) )
-     *
-     * @param array server
-     * @param int user_id    user registering this server
-     * @param boolean user_is_admin
-     * @exception OAuthException2 when fields are missing or on duplicate consumer_key
-     * @return consumer_key
-     */
-    public function updateServer ( $server, $user_id, $user_is_admin = false )
-    {
-        foreach (array('consumer_key', 'server_uri') as $f)
-        {
-            if (empty($server[$f]))
-            {
-                throw new OAuthException2('The field "'.$f.'" must be set and non empty');
-            }
-        }
-
-        if (!empty($server['id']))
-        {
-            $exists = $this->query_one('
-                        SELECT ocr_id
-                        FROM oauth_consumer_registry
-                        WHERE ocr_consumer_key = \'%s\'
-                          AND ocr_id <> %d
-                          AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                        ', $server['consumer_key'], $server['id'], $user_id);
-        }
-        else
-        {
-            $exists = $this->query_one('
-                        SELECT ocr_id
-                        FROM oauth_consumer_registry
-                        WHERE ocr_consumer_key = \'%s\'
-                          AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-                        ', $server['consumer_key'], $user_id);
-        }
-
-        if ($exists)
-        {
-            throw new OAuthException2('The server with key "'.$server['consumer_key'].'" has already been registered');
-        }
-
-        $parts = parse_url($server['server_uri']);
-        $host  = (isset($parts['host']) ? $parts['host'] : 'localhost');
-        $path  = (isset($parts['path']) ? $parts['path'] : '/');
-
-        if (isset($server['signature_methods']))
-        {
-            if (is_array($server['signature_methods']))
-            {
-                $server['signature_methods'] = strtoupper(implode(',', $server['signature_methods']));
-            }
-        }
-        else
-        {
-            $server['signature_methods'] = '';
-        }
-
-        // When the user is an admin, then the user can update the user_id of this record
-        if ($user_is_admin && array_key_exists('user_id', $server))
-        {
-            if (is_null($server['user_id']))
-            {
-                $update_user =  ', ocr_usa_id_ref = NULL';
-            }
-            else
-            {
-                $update_user =  ', ocr_usa_id_ref = \''. intval($server['user_id']) . '\'';
-            }
-        }
-        else
-        {
-            $update_user = '';
-        }
-
-        if (!empty($server['id']))
-        {
-            // Check if the current user can update this server definition
-            if (!$user_is_admin)
-            {
-                $ocr_usa_id_ref = $this->query_one('
-                                    SELECT ocr_usa_id_ref
-                                    FROM oauth_consumer_registry
-                                    WHERE ocr_id = %d
-                                    ', $server['id']);
-
-                if ($ocr_usa_id_ref != $user_id)
-                {
-                    throw new OAuthException2('The user "'.$user_id.'" is not allowed to update this server');
-                }
-            }
-
-            // Update the consumer registration
-            $this->query('
-                    UPDATE oauth_consumer_registry
-                    SET ocr_consumer_key        = \'%s\',
-                        ocr_consumer_secret     = \'%s\',
-                        ocr_server_uri            = \'%s\',
-                        ocr_server_uri_host     = \'%s\',
-                        ocr_server_uri_path     = \'%s\',
-                        ocr_timestamp           = NOW(),
-                        ocr_request_token_uri    = \'%s\',
-                        ocr_authorize_uri        = \'%s\',
-                        ocr_access_token_uri    = \'%s\',
-                        ocr_signature_methods    = \'%s\'
-                        '.$update_user.'
-                    WHERE ocr_id = %d
-                    ',
-                    $server['consumer_key'],
-                    $server['consumer_secret'],
-                    $server['server_uri'],
-                    strtolower($host),
-                    $path,
-                    isset($server['request_token_uri']) ? $server['request_token_uri'] : '',
-                    isset($server['authorize_uri'])     ? $server['authorize_uri']     : '',
-                    isset($server['access_token_uri'])  ? $server['access_token_uri']  : '',
-                    $server['signature_methods'],
-                    $server['id']
-                    );
-        }
-        else
-        {
-            $update_user_field = '';
-            $update_user_value = '';
-            if (empty($update_user))
-            {
-                // Per default the user owning the key is the user registering the key
-                $update_user_field =  ', ocr_usa_id_ref';
-                $update_user_value = ', ' . intval($user_id);
-            }
-
-            $this->query('
-                INSERT INTO oauth_consumer_registry (
-                    ocr_consumer_key     ,
-                    ocr_consumer_secret  ,
-                    ocr_server_uri         ,
-                    ocr_server_uri_host  ,
-                    ocr_server_uri_path  ,
-                    ocr_timestamp        ,
-                    ocr_request_token_uri,
-                    ocr_authorize_uri     ,
-                    ocr_access_token_uri ,
-                    ocr_signature_methods' . $update_user_field . '
-                )
-                VALUES (\'%s\', \'%s\', \'%s\', \'%s\', \'%s\', NOW(), \'%s\', \'%s\', \'%s\', \'%s\''. $update_user_value . ')',
-                    $server['consumer_key'],
-                    $server['consumer_secret'],
-                    $server['server_uri'],
-                    strtolower($host),
-                    $path,
-                    isset($server['request_token_uri']) ? $server['request_token_uri'] : '',
-                    isset($server['authorize_uri'])     ? $server['authorize_uri']     : '',
-                    isset($server['access_token_uri'])  ? $server['access_token_uri']  : '',
-                    $server['signature_methods']
-                    );
-
-            $ocr_id = $this->query_insert_id('oauth_consumer_registry', 'ocr_id');
-        }
-        return $server['consumer_key'];
-    }
-
-
-    /**
-     * Insert/update a new consumer with this server (we will be the server)
-     * When this is a new consumer, then also generate the consumer key and secret.
-     * Never updates the consumer key and secret.
-     * When the id is set, then the key and secret must correspond to the entry
-     * being updated.
-     *
-     * (This is the registry at the server, registering consumers ;-) )
-     *
-     * @param array consumer
-     * @param int user_id    user registering this consumer
-     * @param boolean user_is_admin
-     * @return string consumer key
-     */
-    public function updateConsumer ( $consumer, $user_id, $user_is_admin = false )
-    {
-        if (!$user_is_admin)
-        {
-            foreach (array('requester_name', 'requester_email') as $f)
-            {
-                if (empty($consumer[$f]))
-                {
-                    throw new OAuthException2('The field "'.$f.'" must be set and non empty');
-                }
-            }
-        }
-
-        if (!empty($consumer['id']))
-        {
-            if (empty($consumer['consumer_key']))
-            {
-                throw new OAuthException2('The field "consumer_key" must be set and non empty');
-            }
-            if (!$user_is_admin && empty($consumer['consumer_secret']))
-            {
-                throw new OAuthException2('The field "consumer_secret" must be set and non empty');
-            }
-
-            // Check if the current user can update this server definition
-            if (!$user_is_admin)
-            {
-                $osr_usa_id_ref = $this->query_one('
-                                    SELECT osr_usa_id_ref
-                                    FROM oauth_server_registry
-                                    WHERE osr_id = %d
-                                    ', $consumer['id']);
-
-                if ($osr_usa_id_ref != $user_id)
-                {
-                    throw new OAuthException2('The user "'.$user_id.'" is not allowed to update this consumer');
-                }
-            }
-            else
-            {
-                // User is an admin, allow a key owner to be changed or key to be shared
-                if (array_key_exists('user_id',$consumer))
-                {
-                    if (is_null($consumer['user_id']))
-                    {
-                        $this->query('
-                            UPDATE oauth_server_registry
-                            SET osr_usa_id_ref = NULL
-                            WHERE osr_id = %d
-                            ', $consumer['id']);
-                    }
-                    else
-                    {
-                        $this->query('
-                            UPDATE oauth_server_registry
-                            SET osr_usa_id_ref = \'%d\'
-                            WHERE osr_id = %d
-                            ', $consumer['user_id'], $consumer['id']);
-                    }
-                }
-            }
-
-            $this->query('
-                UPDATE oauth_server_registry
-                SET osr_requester_name        = \'%s\',
-                    osr_requester_email        = \'%s\',
-                    osr_callback_uri        = \'%s\',
-                    osr_application_uri        = \'%s\',
-                    osr_application_title    = \'%s\',
-                    osr_application_descr    = \'%s\',
-                    osr_application_notes    = \'%s\',
-                    osr_application_type    = \'%s\',
-                    osr_application_commercial = IF(%d,\'1\',\'0\'),
-                    osr_timestamp            = NOW()
-                WHERE osr_id              = %d
-                  AND osr_consumer_key    = \'%s\'
-                  AND osr_consumer_secret = \'%s\'
-                ',
-                $consumer['requester_name'],
-                $consumer['requester_email'],
-                isset($consumer['callback_uri'])         ? $consumer['callback_uri']              : '',
-                isset($consumer['application_uri'])     ? $consumer['application_uri']              : '',
-                isset($consumer['application_title'])    ? $consumer['application_title']          : '',
-                isset($consumer['application_descr'])    ? $consumer['application_descr']          : '',
-                isset($consumer['application_notes'])    ? $consumer['application_notes']          : '',
-                isset($consumer['application_type'])     ? $consumer['application_type']          : '',
-                isset($consumer['application_commercial']) ? $consumer['application_commercial'] : 0,
-                $consumer['id'],
-                $consumer['consumer_key'],
-                $consumer['consumer_secret']
-                );
-
-
-            $consumer_key = $consumer['consumer_key'];
-        }
-        else
-        {
-            $consumer_key    = $this->generateKey(true);
-            $consumer_secret= $this->generateKey();
-
-            // When the user is an admin, then the user can be forced to something else that the user
-            if ($user_is_admin && array_key_exists('user_id',$consumer))
-            {
-                if (is_null($consumer['user_id']))
-                {
-                    $owner_id = 'NULL';
-                }
-                else
-                {
-                    $owner_id = intval($consumer['user_id']);
-                }
-            }
-            else
-            {
-                // No admin, take the user id as the owner id.
-                $owner_id = intval($user_id);
-            }
-
-            $this->query('
-                INSERT INTO oauth_server_registry (
-                    osr_enabled,
-                    osr_status,
-                    osr_usa_id_ref,
-                    osr_consumer_key,
-                    osr_consumer_secret,
-                    osr_requester_name,
-                    osr_requester_email,
-                    osr_callback_uri,
-                    osr_application_uri,
-                    osr_application_title,
-                    osr_application_descr,
-                    osr_application_notes,
-                    osr_application_type,
-                    osr_application_commercial,
-                    osr_timestamp,
-                    osr_issue_date
-                )
-                VALUES (\'1\', \'active\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%s\', \'%d\', NOW(), NOW())
-                ',
-                $owner_id,
-                $consumer_key,
-                $consumer_secret,
-                $consumer['requester_name'],
-                $consumer['requester_email'],
-                isset($consumer['callback_uri'])         ? $consumer['callback_uri']              : '',
-                isset($consumer['application_uri'])     ? $consumer['application_uri']              : '',
-                isset($consumer['application_title'])    ? $consumer['application_title']          : '',
-                isset($consumer['application_descr'])    ? $consumer['application_descr']          : '',
-                isset($consumer['application_notes'])    ? $consumer['application_notes']          : '',
-                isset($consumer['application_type'])     ? $consumer['application_type']          : '',
-                isset($consumer['application_commercial']) ? $consumer['application_commercial'] : 0
-                );
-        }
-        return $consumer_key;
-
-    }
-
-    /**
-     * Delete a consumer key.  This removes access to our site for all applications using this key.
-     *
-     * @param string consumer_key
-     * @param int user_id    user registering this server
-     * @param boolean user_is_admin
-     */
-    public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false )
-    {
-        if ($user_is_admin)
-        {
-            $this->query('
-                    DELETE FROM oauth_server_registry
-                    WHERE osr_consumer_key = \'%s\'
-                      AND (osr_usa_id_ref = \'%d\' OR osr_usa_id_ref IS NULL)
-                    ', $consumer_key, $user_id);
-        }
-        else
-        {
-            $this->query('
-                    DELETE FROM oauth_server_registry
-                    WHERE osr_consumer_key = \'%s\'
-                      AND osr_usa_id_ref   = \'%d\'
-                    ', $consumer_key, $user_id);
-        }
-    }
-
-    /**
-     * Fetch a consumer of this server, by consumer_key.
-     *
-     * @param string consumer_key
-     * @param int user_id
-     * @param boolean user_is_admin (optional)
-     * @exception OAuthException2 when consumer not found
-     * @return array
-     */
-    public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false )
-    {
-        $consumer = $this->query_row_assoc('
-                        SELECT    *
-                        FROM oauth_server_registry
-                        WHERE osr_consumer_key = \'%s\'
-                        ', $consumer_key);
-
-        if (!is_array($consumer))
-        {
-            throw new OAuthException2('No consumer with consumer_key "'.$consumer_key.'"');
-        }
-
-        $c = array();
-        foreach ($consumer as $key => $value)
-        {
-            $c[substr($key, 4)] = $value;
-        }
-        $c['user_id'] = $c['usa_id_ref'];
-
-        if (!$user_is_admin && !empty($c['user_id']) && $c['user_id'] != $user_id)
-        {
-            throw new OAuthException2('No access to the consumer information for consumer_key "'.$consumer_key.'"');
-        }
-        return $c;
-    }
-
-
-    /**
-     * Fetch the static consumer key for this provider.  The user for the static consumer
-     * key is NULL (no user, shared key).  If the key did not exist then the key is created.
-     *
-     * @return string
-     */
-    public function getConsumerStatic ()
-    {
-        $consumer = $this->query_one('
-                        SELECT osr_consumer_key
-                        FROM oauth_server_registry
-                        WHERE osr_consumer_key LIKE \'sc-%%\'
-                          AND osr_usa_id_ref IS NULL
-                        ');
-
-        if (empty($consumer))
-        {
-            $consumer_key = 'sc-'.$this->generateKey(true);
-            $this->query('
-                INSERT INTO oauth_server_registry (
-                    osr_enabled,
-                    osr_status,
-                    osr_usa_id_ref,
-                    osr_consumer_key,
-                    osr_consumer_secret,
-                    osr_requester_name,
-                    osr_requester_email,
-                    osr_callback_uri,
-                    osr_application_uri,
-                    osr_application_title,
-                    osr_application_descr,
-                    osr_application_notes,
-                    osr_application_type,
-                    osr_application_commercial,
-                    osr_timestamp,
-                    osr_issue_date
-                )
-                VALUES (\'1\',\'active\', NULL, \'%s\', \'\', \'\', \'\', \'\', \'\', \'Static shared consumer key\', \'\', \'Static shared consumer key\', \'\', 0, NOW(), NOW())
-                ',
-                $consumer_key
-                );
-
-            // Just make sure that if the consumer key is truncated that we get the truncated string
-            $consumer = $this->getConsumerStatic();
-        }
-        return $consumer;
-    }
-
-    /**
-     * Add an unautorized request token to our server.
-     *
-     * @param string consumer_key
-     * @param array options        (eg. token_ttl)
-     * @return array (token, token_secret)
-     */
-    public function addConsumerRequestToken ( $consumer_key, $options = array() )
-    {
-        $token  = $this->generateKey(true);
-        $secret = !isset($options['secret']) ? $this->generateKey() : $options['secret'];
-        $osr_id    = $this->query_one('
-                        SELECT osr_id
-                        FROM oauth_server_registry
-                        WHERE osr_consumer_key = \'%s\'
-                          AND osr_enabled      = \'1\'
-                        ', $consumer_key);
-
-        if (!$osr_id)
-        {
-            throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" or consumer_key is disabled');
-        }
-
-        if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-        {
-            $ttl = intval($options['token_ttl']);
-        }
-        else
-        {
-            $ttl = $this->max_request_token_ttl;
-        }
-
-        if (!isset($options['oauth_callback'])) {
-             // 1.0a Compatibility : store callback url associated with request token
-            $options['oauth_callback']='oob';
-         }
-
-        $this->query('
-            INSERT INTO oauth_server_token (
-                ost_osr_id_ref,
-                ost_usa_id_ref,
-                ost_token,
-                ost_token_secret,
-                ost_token_type,
-                ost_token_ttl,
-                ost_callback_url
-            )
-            VALUES (%d, \'1\', \'%s\', \'%s\', \'request\', NOW() + INTERVAL \'%d SECOND\', \'%s\')',
-                $osr_id, $token, $secret, $ttl, $options['oauth_callback']);
-
-        return array('token'=>$token, 'token_secret'=>$secret, 'token_ttl'=>$ttl);
-    }
-
-    /**
-     * Fetch the consumer request token, by request token.
-     *
-     * @param string token
-     * @return array  token and consumer details
-     */
-    public function getConsumerRequestToken ( $token )
-    {
-        $rs = $this->query_row_assoc('
-                SELECT    ost_token            as token,
-                        ost_token_secret    as token_secret,
-                        osr_consumer_key    as consumer_key,
-                        osr_consumer_secret    as consumer_secret,
-                        ost_token_type        as token_type,
-                         ost_callback_url    as callback_url,
-                         osr_application_title as application_title,
-                         osr_application_descr as application_descr,
-                         osr_application_uri   as application_uri
-                FROM oauth_server_token
-                        JOIN oauth_server_registry
-                        ON ost_osr_id_ref = osr_id
-                WHERE ost_token_type = \'request\'
-                  AND ost_token      = \'%s\'
-                  AND ost_token_ttl  >= NOW()
-                ', $token);
-
-        return $rs;
-    }
-
-    /**
-     * Delete a consumer token.  The token must be a request or authorized token.
-     *
-     * @param string token
-     */
-    public function deleteConsumerRequestToken ( $token )
-    {
-        $this->query('
-                    DELETE FROM oauth_server_token
-                    WHERE ost_token      = \'%s\'
-                      AND ost_token_type = \'request\'
-                    ', $token);
-    }
-
-    /**
-     * Upgrade a request token to be an authorized request token.
-     *
-     * @param string token
-     * @param int     user_id  user authorizing the token
-     * @param string referrer_host used to set the referrer host for this token, for user feedback
-     */
-    public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' )
-    {
-         // 1.0a Compatibility : create a token verifier
-         $verifier = substr(md5(rand()),0,10);
-
-        $this->query('
-                    UPDATE oauth_server_token
-                    SET ost_authorized    = \'1\',
-                        ost_usa_id_ref    = \'%d\',
-                        ost_timestamp     = NOW(),
-                        ost_referrer_host = \'%s\',
-                        ost_verifier      = \'%s\'
-                    WHERE ost_token      = \'%s\'
-                      AND ost_token_type = \'request\'
-                    ', $user_id, $referrer_host, $verifier, $token);
-        return $verifier;
-    }
-
-    /**
-     * Count the consumer access tokens for the given consumer.
-     *
-     * @param string consumer_key
-     * @return int
-     */
-    public function countConsumerAccessTokens ( $consumer_key )
-    {
-        $count = $this->query_one('
-                    SELECT COUNT(ost_id)
-                    FROM oauth_server_token
-                            JOIN oauth_server_registry
-                            ON ost_osr_id_ref = osr_id
-                    WHERE ost_token_type   = \'access\'
-                      AND osr_consumer_key = \'%s\'
-                      AND ost_token_ttl    >= NOW()
-                    ', $consumer_key);
-
-        return $count;
-    }
-
-    /**
-     * Exchange an authorized request token for new access token.
-     *
-     * @param string token
-     * @param array options        options for the token, token_ttl
-     * @exception OAuthException2 when token could not be exchanged
-     * @return array (token, token_secret)
-     */
-    public function exchangeConsumerRequestForAccessToken ( $token, $options = array() )
-    {
-        $new_token  = $this->generateKey(true);
-        $new_secret = $this->generateKey();
-
-        // Maximum time to live for this token
-        if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-        {
-            $ttl_sql = '(NOW() + INTERVAL \''.intval($options['token_ttl']).' SECOND\')';
-        }
-        else
-        {
-            $ttl_sql = "'9999-12-31'";
-        }
-
-         if (isset($options['verifier'])) {
-             $verifier = $options['verifier'];
-
-             // 1.0a Compatibility : check token against oauth_verifier
-             $this->query('
-                         UPDATE oauth_server_token
-                         SET ost_token            = \'%s\',
-                             ost_token_secret    = \'%s\',
-                             ost_token_type        = \'access\',
-                             ost_timestamp        = NOW(),
-                             ost_token_ttl       = '.$ttl_sql.'
-                         WHERE ost_token      = \'%s\'
-                           AND ost_token_type = \'request\'
-                           AND ost_authorized = \'1\'
-                           AND ost_token_ttl  >= NOW()
-                           AND ost_verifier = \'%s\'
-                         ', $new_token, $new_secret, $token, $verifier);
-         } else {
-
-             // 1.0
-             $this->query('
-                         UPDATE oauth_server_token
-                         SET ost_token            = \'%s\',
-                             ost_token_secret    = \'%s\',
-                             ost_token_type        = \'access\',
-                             ost_timestamp        = NOW(),
-                             ost_token_ttl       = '.$ttl_sql.'
-                         WHERE ost_token      = \'%s\'
-                           AND ost_token_type = \'request\'
-                           AND ost_authorized = \'1\'
-                           AND ost_token_ttl  >= NOW()
-                         ', $new_token, $new_secret, $token);
-        }
-
-        if ($this->query_affected_rows() != 1)
-        {
-            throw new OAuthException2('Can\'t exchange request token "'.$token.'" for access token. No such token or not authorized');
-        }
-
-        $ret = array('token' => $new_token, 'token_secret' => $new_secret);
-        $ttl = $this->query_one('
-                    SELECT    (CASE WHEN ost_token_ttl >= \'9999-12-31\' THEN NULL ELSE ost_token_ttl - NOW() END) as token_ttl
-                    FROM oauth_server_token
-                    WHERE ost_token = \'%s\'', $new_token);
-
-        if (is_numeric($ttl))
-        {
-            $ret['token_ttl'] = intval($ttl);
-        }
-        return $ret;
-    }
-
-    /**
-     * Fetch the consumer access token, by access token.
-     *
-     * @param string token
-     * @param int user_id
-     * @exception OAuthException2 when token is not found
-     * @return array  token and consumer details
-     */
-    public function getConsumerAccessToken ( $token, $user_id )
-    {
-        $rs = $this->query_row_assoc('
-                SELECT    ost_token                as token,
-                        ost_token_secret        as token_secret,
-                        ost_referrer_host        as token_referrer_host,
-                        osr_consumer_key        as consumer_key,
-                        osr_consumer_secret        as consumer_secret,
-                        osr_application_uri        as application_uri,
-                        osr_application_title    as application_title,
-                        osr_application_descr    as application_descr,
-                        osr_callback_uri        as callback_uri
-                FROM oauth_server_token
-                        JOIN oauth_server_registry
-                        ON ost_osr_id_ref = osr_id
-                WHERE ost_token_type = \'access\'
-                  AND ost_token      = \'%s\'
-                  AND ost_usa_id_ref = \'%d\'
-                  AND ost_token_ttl  >= NOW()
-                ', $token, $user_id);
-
-        if (empty($rs))
-        {
-            throw new OAuthException2('No server_token "'.$token.'" for user "'.$user_id.'"');
-        }
-        return $rs;
-    }
-
-    /**
-     * Delete a consumer access token.
-     *
-     * @param string token
-     * @param int user_id
-     * @param boolean user_is_admin
-     */
-    public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false )
-    {
-        if ($user_is_admin)
-        {
-            $this->query('
-                        DELETE FROM oauth_server_token
-                        WHERE ost_token      = \'%s\'
-                          AND ost_token_type = \'access\'
-                        ', $token);
-        }
-        else
-        {
-            $this->query('
-                        DELETE FROM oauth_server_token
-                        WHERE ost_token      = \'%s\'
-                          AND ost_token_type = \'access\'
-                          AND ost_usa_id_ref = \'%d\'
-                        ', $token, $user_id);
-        }
-    }
-
-    /**
-     * Set the ttl of a consumer access token.  This is done when the
-     * server receives a valid request with a xoauth_token_ttl parameter in it.
-     *
-     * @param string token
-     * @param int ttl
-     */
-    public function setConsumerAccessTokenTtl ( $token, $token_ttl )
-    {
-        if ($token_ttl <= 0)
-        {
-            // Immediate delete when the token is past its ttl
-            $this->deleteConsumerAccessToken($token, 0, true);
-        }
-        else
-        {
-            // Set maximum time to live for this token
-            $this->query('
-                        UPDATE oauth_server_token
-                        SET ost_token_ttl = (NOW() + INTERVAL \'%d SECOND\')
-                        WHERE ost_token      = \'%s\'
-                          AND ost_token_type = \'access\'
-                        ', $token_ttl, $token);
-        }
-    }
-
-    /**
-     * Fetch a list of all consumer keys, secrets etc.
-     * Returns the public (user_id is null) and the keys owned by the user
-     *
-     * @param int user_id
-     * @return array
-     */
-    public function listConsumers ( $user_id )
-    {
-        $rs = $this->query_all_assoc('
-                SELECT    osr_id                    as id,
-                        osr_usa_id_ref            as user_id,
-                        osr_consumer_key         as consumer_key,
-                        osr_consumer_secret        as consumer_secret,
-                        osr_enabled                as enabled,
-                        osr_status                 as status,
-                        osr_issue_date            as issue_date,
-                        osr_application_uri        as application_uri,
-                        osr_application_title    as application_title,
-                        osr_application_descr    as application_descr,
-                        osr_requester_name        as requester_name,
-                        osr_requester_email        as requester_email,
-                        osr_callback_uri        as callback_uri
-                FROM oauth_server_registry
-                WHERE (osr_usa_id_ref = \'%d\' OR osr_usa_id_ref IS NULL)
-                ORDER BY osr_application_title
-                ', $user_id);
-        return $rs;
-    }
-
-    /**
-     * List of all registered applications. Data returned has not sensitive
-     * information and therefore is suitable for public displaying.
-     *
-     * @param int $begin
-     * @param int $total
-     * @return array
-     */
-    public function listConsumerApplications($begin = 0, $total = 25)
-    {
-        $rs = $this->query_all_assoc('
-                SELECT    osr_id                    as id,
-                        osr_enabled                as enabled,
-                        osr_status                 as status,
-                        osr_issue_date            as issue_date,
-                        osr_application_uri        as application_uri,
-                        osr_application_title    as application_title,
-                        osr_application_descr    as application_descr
-                FROM oauth_server_registry
-                ORDER BY osr_application_title
-                ');
-        // TODO: pagination
-        return $rs;
-    }
-
-
-    /**
-     * Fetch a list of all consumer tokens accessing the account of the given user.
-     *
-     * @param int user_id
-     * @return array
-     */
-    public function listConsumerTokens ( $user_id )
-    {
-        $rs = $this->query_all_assoc('
-                SELECT    osr_consumer_key         as consumer_key,
-                        osr_consumer_secret        as consumer_secret,
-                        osr_enabled                as enabled,
-                        osr_status                 as status,
-                        osr_application_uri        as application_uri,
-                        osr_application_title    as application_title,
-                        osr_application_descr    as application_descr,
-                        ost_timestamp            as timestamp,
-                        ost_token                as token,
-                        ost_token_secret        as token_secret,
-                        ost_referrer_host        as token_referrer_host,
-                        osr_callback_uri        as callback_uri
-                FROM oauth_server_registry
-                    JOIN oauth_server_token
-                    ON ost_osr_id_ref = osr_id
-                WHERE ost_usa_id_ref = \'%d\'
-                  AND ost_token_type = \'access\'
-                  AND ost_token_ttl  >= NOW()
-                ORDER BY osr_application_title
-                ', $user_id);
-        return $rs;
-    }
-
-
-    /**
-     * Check an nonce/timestamp combination.  Clears any nonce combinations
-     * that are older than the one received.
-     *
-     * @param string    consumer_key
-     * @param string     token
-     * @param int        timestamp
-     * @param string     nonce
-     * @exception OAuthException2    thrown when the timestamp is not in sequence or nonce is not unique
-     */
-    public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce )
-    {
-    	/* removed in Appendix A of RFC 5849
-        $r = $this->query_row('
-                            SELECT MAX(osn_timestamp)
-                            FROM oauth_server_nonce
-                            WHERE osn_consumer_key = \'%s\'
-                              AND osn_token        = \'%s\'
-                            ', $timestamp, $this->max_timestamp_skew, $consumer_key, $token);
-
-        if (!empty($r) && $r[1] === 't')
-        {
-            throw new OAuthException2('Timestamp is out of sequence. Request rejected. Got '.$timestamp.' last max is '.$r[0].' allowed skew is '.$this->max_timestamp_skew);
-        }
-        */
-
-        // Insert the new combination
-        $this->query('
-            INSERT INTO oauth_server_nonce (
-                osn_consumer_key,
-                osn_token,
-                osn_timestamp,
-                osn_nonce
-            )
-            VALUES (\'%s\', \'%s\', %d, \'%s\')',
-            $consumer_key, $token, $timestamp, $nonce);
-
-        if ($this->query_affected_rows() == 0)
-        {
-            throw new OAuthException2('Duplicate timestamp/nonce combination, possible replay attack.  Request rejected.');
-        }
-
-        // Clean up all timestamps older than the one we just received
-        $this->query('
-                DELETE FROM oauth_server_nonce
-                WHERE osn_consumer_key    = \'%s\'
-                  AND osn_token            = \'%s\'
-                  AND osn_timestamp     < %d - %d
-                ', $consumer_key, $token, $timestamp, $this->max_timestamp_skew);
-    }
-
-    /**
-     * Add an entry to the log table
-     *
-     * @param array keys (osr_consumer_key, ost_token, ocr_consumer_key, oct_token)
-     * @param string received
-     * @param string sent
-     * @param string base_string
-     * @param string notes
-     * @param int (optional) user_id
-     */
-    public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null )
-    {
-        $args = array();
-        $ps   = array();
-        foreach ($keys as $key => $value)
-        {
-            $args[] = $value;
-            $ps["olg_$key"] = "'%s'";
-        }
-
-        if (!empty($_SERVER['REMOTE_ADDR']))
-        {
-            $remote_ip = $_SERVER['REMOTE_ADDR'];
-        }
-        else if (!empty($_SERVER['REMOTE_IP']))
-        {
-            $remote_ip = $_SERVER['REMOTE_IP'];
-        }
-        else
-        {
-            $remote_ip = '0.0.0.0';
-        }
-
-        // Build the SQL
-        $ps['olg_received']    = "'%s'";                        $args[] = $this->makeUTF8($received);
-        $ps['olg_sent']        = "'%s'";                        $args[] = $this->makeUTF8($sent);
-        $ps['olg_base_string'] = "'%s'";                        $args[] = $base_string;
-        $ps['olg_notes']       = "'%s'";                        $args[] = $this->makeUTF8($notes);
-        $ps['olg_usa_id_ref'] = "NULLIF('%d', '0')";            $args[] = $user_id;
-        $ps['olg_remote_ip']  = "NULLIF('%s','0.0.0.0')::inet";        $args[] = $remote_ip;
-        
-        $this->query('
-            INSERT INTO oauth_log ('.implode(',', array_keys($ps)) . ')
-            VALUES(' . implode(',', $ps) . ')',
-            $args
-        );
-    }
-
-     /**
-     * Get a page of entries from the log.  Returns the last 100 records
-     * matching the options given.
-     *
-     * @param array options
-     * @param int user_id    current user
-     * @return array log records
-     */
-    public function listLog ( $options, $user_id )
-    {
-        $where = array();
-        $args  = array();
-        if (empty($options))
-        {
-            $where[] = 'olg_usa_id_ref = \'%d\'';
-            $args[]  = $user_id;
-        }
-        else
-        {
-            foreach ($options as $option => $value)
-            {
-                if (strlen($value) > 0)
-                {
-                    switch ($option)
-                    {
-                    case 'osr_consumer_key':
-                    case 'ocr_consumer_key':
-                    case 'ost_token':
-                    case 'oct_token':
-                        $where[] = 'olg_'.$option.' = \'%s\'';
-                        $args[]  = $value;
-                        break;
-                    }
-                }
-            }
-
-            $where[] = '(olg_usa_id_ref IS NULL OR olg_usa_id_ref = \'%d\')';
-            $args[]  = $user_id;
-        }
-
-        $rs = $this->query_all_assoc('
-                    SELECT olg_id,
-                            olg_osr_consumer_key     AS osr_consumer_key,
-                            olg_ost_token            AS ost_token,
-                            olg_ocr_consumer_key    AS ocr_consumer_key,
-                            olg_oct_token            AS oct_token,
-                            olg_usa_id_ref            AS user_id,
-                            olg_received            AS received,
-                            olg_sent                AS sent,
-                            olg_base_string            AS base_string,
-                            olg_notes                AS notes,
-                            olg_timestamp            AS timestamp,
-                            olg_remote_ip           AS remote_ip
-                    FROM oauth_log
-                    WHERE '.implode(' AND ', $where).'
-                    ORDER BY olg_id DESC
-                    LIMIT 0,100', $args);
-
-        return $rs;
-    }
-
-
-    /* ** Some simple helper functions for querying the pgsql db ** */
-
-    /**
-     * Perform a query, ignore the results
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     */
-    protected function query ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        $this->_lastAffectedRows = pg_affected_rows($res);
-        if (is_resource($res))
-        {
-            pg_free_result($res);
-        }
-    }
-
-
-    /**
-     * Perform a query, return all rows
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     * @return array
-     */
-    protected function query_all_assoc ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        $rs = array();
-        while ($row  = pg_fetch_assoc($res))
-        {
-            $rs[] = $row;
-        }
-        pg_free_result($res);
-        return $rs;
-    }
-
-
-    /**
-     * Perform a query, return the first row
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     * @return array
-     */
-    protected function query_row_assoc ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        if ($row = pg_fetch_assoc($res))
-        {
-            $rs = $row;
-        }
-        else
-        {
-            $rs = false;
-        }
-        pg_free_result($res);
-        return $rs;
-    }
-
-    /**
-     * Perform a query, return the first row
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     * @return array
-     */
-    protected function query_row ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        if ($row = pg_fetch_array($res))
-        {
-            $rs = $row;
-        }
-        else
-        {
-            $rs = false;
-        }
-        pg_free_result($res);
-        return $rs;
-    }
-
-
-    /**
-     * Perform a query, return the first column of the first row
-     *
-     * @param string sql
-     * @param vararg arguments (for sprintf)
-     * @return mixed
-     */
-    protected function query_one ( $sql )
-    {
-        $sql = $this->sql_printf(func_get_args());
-        if (!($res = pg_query($this->conn, $sql)))
-        {
-            $this->sql_errcheck($sql);
-        }
-        $val = pg_fetch_row($res);
-        if ($val && isset($val[0])) {
-            $val = $val[0];
-        }
-        pg_free_result($res);
-        return $val;
-    }
-
-
-    /**
-     * Return the number of rows affected in the last query
-     */
-    protected function query_affected_rows ()
-    {
-        return $this->_lastAffectedRows;
-    }
-
-
-    /**
-     * Return the id of the last inserted row
-     *
-     * @return int
-     */
-    protected function query_insert_id ( $tableName, $primaryKey = null )
-    {
-        $sequenceName = $tableName;
-        if ($primaryKey) {
-            $sequenceName .= "_$primaryKey";
-        }
-        $sequenceName .= '_seq';
-
-        $sql = "
-            SELECT
-                CURRVAL('%s')
-                ";
-        $args = array($sql, $sequenceName);
-        $sql = $this->sql_printf($args);
-        if (!($res = pg_query($this->conn, $sql))) {
-            return 0;
-        }
-        $val = pg_fetch_row($res, 0);
-        if ($val && isset($val[0])) {
-            $val = $val[0];
-        }
-
-        pg_free_result($res);
-        return $val;
-    }
-
-
-    protected function sql_printf ( $args )
-    {
-        $sql  = array_shift($args);
-        if (count($args) == 1 && is_array($args[0]))
-        {
-            $args = $args[0];
-        }
-        $args = array_map(array($this, 'sql_escape_string'), $args);
-        return vsprintf($sql, $args);
-    }
-
-
-    protected function sql_escape_string ( $s )
-    {
-        if (is_string($s))
-        {
-            return pg_escape_string($this->conn, $s);
-        }
-        else if (is_null($s))
-        {
-            return NULL;
-        }
-        else if (is_bool($s))
-        {
-            return intval($s);
-        }
-        else if (is_int($s) || is_float($s))
-        {
-            return $s;
-        }
-        else
-        {
-            return pg_escape_string($this->conn, strval($s));
-        }
-    }
-
-
-    protected function sql_errcheck ( $sql )
-    {
-            $msg =  "SQL Error in OAuthStorePostgreSQL: ".pg_last_error($this->conn)."\n\n" . $sql;
-            throw new OAuthException2($msg);
-    }
-}
diff --git a/vendor/oauth-php/library/store/OAuthStoreSQL.php b/vendor/oauth-php/library/store/OAuthStoreSQL.php
deleted file mode 100644
index 45a4887..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreSQL.php
+++ /dev/null
@@ -1,1843 +0,0 @@
-<?php
-
-/**
- * Storage container for the oauth credentials, both server and consumer side.
- * Based on MySQL
- * 
- * @version $Id: OAuthStoreMySQL.php 76 2010-01-27 19:51:17Z brunobg@corollarium.com $
- * @author Marc Worrell <marcw@pobox.com>
- * @date  Nov 16, 2007 4:03:30 PM
- * 
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * 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.
- */
-
-
-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';
-
-
-abstract class OAuthStoreSQL extends OAuthStoreAbstract
-{
-	/**
-	 * Maximum delta a timestamp may be off from a previous timestamp.
-	 * Allows multiple consumers with some clock skew to work with the same token.
-	 * Unit is seconds, default max skew is 10 minutes.
-	 */
-	protected $max_timestamp_skew = 600;
-
-	/**
-	 * Default ttl for request tokens
-	 */
-	protected $max_request_token_ttl = 3600;
-	
-
-	/**
-	 * Construct the OAuthStoreMySQL.
-	 * In the options you have to supply either:
-	 * - server, username, password and database (for a mysql_connect)
-	 * - conn (for the connection to be used)
-	 * 
-	 * @param array options
-	 */
-	function __construct ( $options = array() )
-	{
-		if (isset($options['conn']))
-		{
-			$this->conn = $options['conn'];
-		}
-		else
-		{
-			if (isset($options['server']))
-			{
-				$server   = $options['server'];
-				$username = $options['username'];
-				
-				if (isset($options['password']))
-				{
-					$this->conn = mysql_connect($server, $username, $options['password']);
-				}
-				else
-				{
-					$this->conn = mysql_connect($server, $username);
-				}
-			}
-			else
-			{
-				// Try the default mysql connect
-				$this->conn = mysql_connect();
-			}
-
-			if ($this->conn === false)
-			{
-				throw new OAuthException2('Could not connect to MySQL database: ' . mysql_error());
-			}
-
-			if (isset($options['database']))
-			{
-				if (!mysql_select_db($options['database'], $this->conn))
-				{
-					$this->sql_errcheck();
-				}
-			}
-			$this->query('set character set utf8');
-		}
-	}
-
-
-	/**
-	 * Find stored credentials for the consumer key and token. Used by an OAuth server
-	 * when verifying an OAuth request.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param string token_type		false, 'request' or 'access'
-	 * @exception OAuthException2 when no secrets where found
-	 * @return array	assoc (consumer_secret, token_secret, osr_id, ost_id, user_id)
-	 */
-	public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' )
-	{
-		if ($token_type === false)
-		{
-			$rs = $this->query_row_assoc('
-						SELECT	osr_id, 
-								osr_consumer_key		as consumer_key,
-								osr_consumer_secret		as consumer_secret
-						FROM oauth_server_registry
-						WHERE osr_consumer_key	= \'%s\'
-						  AND osr_enabled		= 1
-						', 
-						$consumer_key);
-
-			if ($rs)
-			{
-				$rs['token'] 		= false;
-				$rs['token_secret']	= false;
-				$rs['user_id']		= false;
-				$rs['ost_id']		= false;
-			}
-		}
-		else
-		{
-			$rs = $this->query_row_assoc('
-						SELECT	osr_id, 
-								ost_id,
-								ost_usa_id_ref			as user_id,
-								osr_consumer_key		as consumer_key,
-								osr_consumer_secret		as consumer_secret,
-								ost_token				as token,
-								ost_token_secret		as token_secret
-						FROM oauth_server_registry
-								JOIN oauth_server_token
-								ON ost_osr_id_ref = osr_id
-						WHERE ost_token_type	= \'%s\'
-						  AND osr_consumer_key	= \'%s\'
-						  AND ost_token			= \'%s\'
-					 	  AND osr_enabled		= 1
-						  AND ost_token_ttl     >= NOW()
-						',
-						$token_type, $consumer_key, $token);
-		}
-		
-		if (empty($rs))
-		{
-			throw new OAuthException2('The consumer_key "'.$consumer_key.'" token "'.$token.'" combination does not exist or is not enabled.');
-		}
-		return $rs;
-	}
-
-
-	/**
-	 * Find the server details for signing a request, always looks for an access token.
-	 * The returned credentials depend on which local user is making the request.
-	 * 
-	 * The consumer_key must belong to the user or be public (user id is null)
-	 * 
-	 * For signing we need all of the following:
-	 * 
-	 * consumer_key			consumer key associated with the server
-	 * consumer_secret		consumer secret associated with this server
-	 * token				access token associated with this server
-	 * token_secret			secret for the access token
-	 * signature_methods	signing methods supported by the server (array)
-	 * 
-	 * @todo filter on token type (we should know how and with what to sign this request, and there might be old access tokens)
-	 * @param string uri	uri of the server
-	 * @param int user_id	id of the logged on user
-	 * @param string name	(optional) name of the token (case sensitive)
-	 * @exception OAuthException2 when no credentials found
-	 * @return array
-	 */
-	public function getSecretsForSignature ( $uri, $user_id, $name = '' )
-	{
-		// Find a consumer key and token for the given uri
-		$ps		= parse_url($uri);
-		$host	= isset($ps['host']) ? $ps['host'] : 'localhost';
-		$path	= isset($ps['path']) ? $ps['path'] : '';
-		
-		if (empty($path) || substr($path, -1) != '/')
-		{
-			$path .= '/';
-		}
-
-		// The owner of the consumer_key is either the user or nobody (public consumer key)
-		$secrets = $this->query_row_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							ocr_signature_methods	as signature_methods
-					FROM oauth_consumer_registry
-						JOIN oauth_consumer_token ON oct_ocr_id_ref = ocr_id
-					WHERE ocr_server_uri_host = \'%s\'
-					  AND ocr_server_uri_path = LEFT(\'%s\', LENGTH(ocr_server_uri_path))
-					  AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-					  AND oct_usa_id_ref = \'%d\'
-					  AND oct_token_type      = \'access\'
-					  AND oct_name			  = \'%s\'
-					  AND oct_token_ttl       >= NOW()
-					ORDER BY ocr_usa_id_ref DESC, ocr_consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC
-					LIMIT 0,1
-					', $host, $path, $user_id, $user_id, $name
-					);
-		
-		if (empty($secrets))
-		{
-			throw new OAuthException2('No server tokens available for '.$uri);
-		}
-		$secrets['signature_methods'] = explode(',', $secrets['signature_methods']);
-		return $secrets;
-	}
-
-
-	/**
-	 * Get the token and token secret we obtained from a server.
-	 * 
-	 * @param string	consumer_key
-	 * @param string 	token
-	 * @param string	token_type
-	 * @param int		user_id			the user owning the token
-	 * @param string	name			optional name for a named token
-	 * @exception OAuthException2 when no credentials found
-	 * @return array
-	 */
-	public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '' )
-	{
-		if ($token_type != 'request' && $token_type != 'access')
-		{
-			throw new OAuthException2('Unkown token type "'.$token_type.'", must be either "request" or "access"');
-		}
-
-		// Take the most recent token of the given type
-		$r = $this->query_row_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							oct_name				as token_name,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri,
-							IF(oct_token_ttl >= \'9999-12-31\', NULL, UNIX_TIMESTAMP(oct_token_ttl) - UNIX_TIMESTAMP(NOW())) as token_ttl
-					FROM oauth_consumer_registry
-							JOIN oauth_consumer_token
-							ON oct_ocr_id_ref = ocr_id
-					WHERE ocr_consumer_key = \'%s\'
-					  AND oct_token_type   = \'%s\'
-					  AND oct_token        = \'%s\'
-					  AND oct_usa_id_ref   = %d
-					  AND oct_token_ttl    >= NOW()
-					', $consumer_key, $token_type, $token, $user_id
-					);
-					
-		if (empty($r))
-		{
-			throw new OAuthException2('Could not find a "'.$token_type.'" token for consumer "'.$consumer_key.'" and user '.$user_id);
-		}
-		if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-		{
-			$r['signature_methods'] = explode(',',$r['signature_methods']);
-		}
-		else
-		{
-			$r['signature_methods'] = array();
-		}
-		return $r;		
-	}
-
-
-	/**
-	 * Add a request token we obtained from a server.
-	 * 
-	 * @todo remove old tokens for this user and this ocr_id
-	 * @param string consumer_key	key of the server in the consumer registry
-	 * @param string token_type		one of 'request' or 'access'
-	 * @param string token
-	 * @param string token_secret
-	 * @param int 	 user_id			the user owning the token
-	 * @param array  options			extra options, server_uri, name and token_ttl
-	 * @exception OAuthException2 when server is not known
-	 * @exception OAuthException2 when we received a duplicate token
-	 */
-	public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() )
-	{
-		if ($token_type != 'request' && $token_type != 'access')
-		{
-			throw new OAuthException2('Unknown token type "'.$token_type.'", must be either "request" or "access"');
-		}
-
-		// Maximum time to live for this token
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$ttl = 'DATE_ADD(NOW(), INTERVAL '.intval($options['token_ttl']).' SECOND)';
-		}
-		else if ($token_type == 'request')
-		{
-			$ttl = 'DATE_ADD(NOW(), INTERVAL '.$this->max_request_token_ttl.' SECOND)';
-		}
-		else
-		{
-			$ttl = "'9999-12-31'";
-		}
-		
-		if (isset($options['server_uri'])) 
-		{
-			$ocr_id = $this->query_one('
-						SELECT ocr_id
-						FROM oauth_consumer_registry
-						WHERE ocr_consumer_key = \'%s\'
-						AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-						AND ocr_server_uri = \'%s\'
-						', $consumer_key, $user_id, $options['server_uri']);
-		}
-		else 
-		{
-			$ocr_id = $this->query_one('
-						SELECT ocr_id
-						FROM oauth_consumer_registry
-						WHERE ocr_consumer_key = \'%s\'
-						AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-						', $consumer_key, $user_id);
-		}
-					
-		if (empty($ocr_id))
-		{
-			throw new OAuthException2('No server associated with consumer_key "'.$consumer_key.'"');
-		}
-		
-		// Named tokens, unique per user/consumer key
-		if (isset($options['name']) && $options['name'] != '')
-		{
-			$name = $options['name'];
-		}
-		else
-		{
-			$name = '';
-		}
-
-		// Delete any old tokens with the same type and name for this user/server combination
-		$this->query('
-					DELETE FROM oauth_consumer_token
-					WHERE oct_ocr_id_ref = %d
-					  AND oct_usa_id_ref = %d
-					  AND oct_token_type = LOWER(\'%s\')
-					  AND oct_name       = \'%s\'
-					',
-					$ocr_id,
-					$user_id,
-					$token_type,
-					$name);
-
-		// Insert the new token
-		$this->query('
-					INSERT IGNORE INTO oauth_consumer_token
-					SET oct_ocr_id_ref	= %d,
-						oct_usa_id_ref  = %d,
-						oct_name		= \'%s\',
-						oct_token		= \'%s\',
-						oct_token_secret= \'%s\',
-						oct_token_type	= LOWER(\'%s\'),
-						oct_timestamp	= NOW(),
-						oct_token_ttl	= '.$ttl.'
-					',
-					$ocr_id,
-					$user_id,
-					$name,
-					$token,
-					$token_secret,
-					$token_type);
-		
-		if (!$this->query_affected_rows())
-		{
-			throw new OAuthException2('Received duplicate token "'.$token.'" for the same consumer_key "'.$consumer_key.'"');
-		}
-	}
-
-
-	/**
-	 * Delete a server key.  This removes access to that site.
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id	user registering this server
-	 * @param boolean user_is_admin
-	 */
-	public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		if ($user_is_admin)
-		{
-			$this->query('
-					DELETE FROM oauth_consumer_registry
-					WHERE ocr_consumer_key = \'%s\'
-					  AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-					', $consumer_key, $user_id);
-		}
-		else
-		{
-			$this->query('
-					DELETE FROM oauth_consumer_registry
-					WHERE ocr_consumer_key = \'%s\'
-					  AND ocr_usa_id_ref   = %d
-					', $consumer_key, $user_id);
-		}
-	}
-	
-	
-	/**
-	 * Get a server from the consumer registry using the consumer key
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id
-	 * @param boolean user_is_admin (optional)
-	 * @exception OAuthException2 when server is not found
-	 * @return array
-	 */	
-	public function getServer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		$r = $this->query_row_assoc('
-				SELECT	ocr_id					as id,
-						ocr_usa_id_ref			as user_id,
-						ocr_consumer_key 		as consumer_key,
-						ocr_consumer_secret 	as consumer_secret,
-						ocr_signature_methods	as signature_methods,
-						ocr_server_uri			as server_uri,
-						ocr_request_token_uri	as request_token_uri,
-						ocr_authorize_uri		as authorize_uri,
-						ocr_access_token_uri	as access_token_uri
-				FROM oauth_consumer_registry
-				WHERE ocr_consumer_key = \'%s\'
-				  AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-				',	$consumer_key, $user_id);
-		
-		if (empty($r))
-		{
-			throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" has been registered (for this user)');
-		}
-			
-		if (isset($r['signature_methods']) && !empty($r['signature_methods']))
-		{
-			$r['signature_methods'] = explode(',',$r['signature_methods']);
-		}
-		else
-		{
-			$r['signature_methods'] = array();
-		}
-		return $r;
-	}
-
-
-
-	/**
-	 * Find the server details that might be used for a request
-	 * 
-	 * The consumer_key must belong to the user or be public (user id is null)
-	 * 
-	 * @param string uri	uri of the server
-	 * @param int user_id	id of the logged on user
-	 * @exception OAuthException2 when no credentials found
-	 * @return array
-	 */
-	public function getServerForUri ( $uri, $user_id )
-	{
-		// Find a consumer key and token for the given uri
-		$ps		= parse_url($uri);
-		$host	= isset($ps['host']) ? $ps['host'] : 'localhost';
-		$path	= isset($ps['path']) ? $ps['path'] : '';
-		
-		if (empty($path) || substr($path, -1) != '/')
-		{
-			$path .= '/';
-		}
-
-		// The owner of the consumer_key is either the user or nobody (public consumer key)
-		$server = $this->query_row_assoc('
-					SELECT	ocr_id					as id,
-							ocr_usa_id_ref			as user_id,
-							ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri
-					FROM oauth_consumer_registry
-					WHERE ocr_server_uri_host = \'%s\'
-					  AND ocr_server_uri_path = LEFT(\'%s\', LENGTH(ocr_server_uri_path))
-					  AND (ocr_usa_id_ref = \'%d\' OR ocr_usa_id_ref IS NULL)
-					ORDER BY ocr_usa_id_ref DESC, consumer_secret DESC, LENGTH(ocr_server_uri_path) DESC
-					LIMIT 0,1
-					', $host, $path, $user_id
-					);
-		
-		if (empty($server))
-		{
-			throw new OAuthException2('No server available for '.$uri);
-		}
-		$server['signature_methods'] = explode(',', $server['signature_methods']);
-		return $server;
-	}
-
-
-	/**
-	 * Get a list of all server token this user has access to.
-	 * 
-	 * @param int usr_id
-	 * @return array
-	 */
-	public function listServerTokens ( $user_id )
-	{
-		$ts = $this->query_all_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_id					as token_id,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							oct_usa_id_ref			as user_id,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_server_uri_host		as server_uri_host,
-							ocr_server_uri_path		as server_uri_path,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri,
-							oct_timestamp			as timestamp
-					FROM oauth_consumer_registry
-							JOIN oauth_consumer_token
-							ON oct_ocr_id_ref = ocr_id
-					WHERE oct_usa_id_ref = %d
-					  AND oct_token_type = \'access\'
-					  AND oct_token_ttl  >= NOW()
-					ORDER BY ocr_server_uri_host, ocr_server_uri_path
-					', $user_id);
-		return $ts;
-	}
-
-
-	/**
-	 * Count how many tokens we have for the given server
-	 * 
-	 * @param string consumer_key
-	 * @return int
-	 */
-	public function countServerTokens ( $consumer_key )
-	{
-		$count = $this->query_one('
-					SELECT COUNT(oct_id)
-					FROM oauth_consumer_token
-							JOIN oauth_consumer_registry
-							ON oct_ocr_id_ref = ocr_id
-					WHERE oct_token_type   = \'access\'
-					  AND ocr_consumer_key = \'%s\'
-					  AND oct_token_ttl    >= NOW()
-					', $consumer_key);
-		
-		return $count;
-	}
-
-
-	/**
-	 * Get a specific server token for the given user
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int user_id
-	 * @exception OAuthException2 when no such token found
-	 * @return array
-	 */
-	public function getServerToken ( $consumer_key, $token, $user_id )
-	{
-		$ts = $this->query_row_assoc('
-					SELECT	ocr_consumer_key		as consumer_key,
-							ocr_consumer_secret		as consumer_secret,
-							oct_token				as token,
-							oct_token_secret		as token_secret,
-							oct_usa_id_ref			as usr_id,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_server_uri_host		as server_uri_host,
-							ocr_server_uri_path		as server_uri_path,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri,
-							oct_timestamp			as timestamp
-					FROM oauth_consumer_registry
-							JOIN oauth_consumer_token
-							ON oct_ocr_id_ref = ocr_id
-					WHERE ocr_consumer_key = \'%s\'
-					  AND oct_usa_id_ref   = %d
-					  AND oct_token_type   = \'access\'
-					  AND oct_token        = \'%s\'
-					  AND oct_token_ttl    >= NOW()
-					', $consumer_key, $user_id, $token);
-		
-		if (empty($ts))
-		{
-			throw new OAuthException2('No such consumer key ('.$consumer_key.') and token ('.$token.') combination for user "'.$user_id.'"');
-		}
-		return $ts;
-	}
-
-
-	/**
-	 * Delete a token we obtained from a server.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int user_id
-	 * @param boolean user_is_admin
-	 */
-	public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false )
-	{
-		if ($user_is_admin)
-		{
-			$this->query('
-				DELETE oauth_consumer_token 
-				FROM oauth_consumer_token
-						JOIN oauth_consumer_registry
-						ON oct_ocr_id_ref = ocr_id
-				WHERE ocr_consumer_key	= \'%s\'
-				  AND oct_token			= \'%s\'
-				', $consumer_key, $token);
-		}
-		else
-		{
-			$this->query('
-				DELETE oauth_consumer_token 
-				FROM oauth_consumer_token
-						JOIN oauth_consumer_registry
-						ON oct_ocr_id_ref = ocr_id
-				WHERE ocr_consumer_key	= \'%s\'
-				  AND oct_token			= \'%s\'
-				  AND oct_usa_id_ref	= %d
-				', $consumer_key, $token, $user_id);
-		}
-	}
-
-
-	/**
-	 * Set the ttl of a server access token.  This is done when the
-	 * server receives a valid request with a xoauth_token_ttl parameter in it.
-	 * 
-	 * @param string consumer_key
-	 * @param string token
-	 * @param int token_ttl
-	 */
-	public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )
-	{
-		if ($token_ttl <= 0)
-		{
-			// Immediate delete when the token is past its ttl
-			$this->deleteServerToken($consumer_key, $token, 0, true);
-		}
-		else if ( $server_uri ) 
-		{
-			// Set maximum time to live for this token
-			$this->query('
-						UPDATE oauth_consumer_token, oauth_consumer_registry
-						SET ost_token_ttl = DATE_ADD(NOW(), INTERVAL %d SECOND)
-						WHERE ocr_consumer_key	= \'%s\'
-						  AND ocr_server_uri = \'%s\'
-						  AND oct_ocr_id_ref    = ocr_id
-						  AND oct_token 	    = \'%s\'
-						', $token_ttl, $server_uri, $consumer_key, $token);
-		}
-		else
-		{
-			// Set maximum time to live for this token
-			$this->query('
-						UPDATE oauth_consumer_token, oauth_consumer_registry
-						SET ost_token_ttl = DATE_ADD(NOW(), INTERVAL %d SECOND)
-						WHERE ocr_consumer_key	= \'%s\'
-						  AND oct_ocr_id_ref    = ocr_id
-						  AND oct_token 	    = \'%s\'
-						', $token_ttl, $consumer_key, $token);
-		}
-	}
-
-
-	/**
-	 * Get a list of all consumers from the consumer registry.
-	 * The consumer keys belong to the user or are public (user id is null)
-	 * 
-	 * @param string q	query term
-	 * @param int user_id
-	 * @return array
-	 */	
-	public function listServers ( $q = '', $user_id )
-	{
-		$q    = trim(str_replace('%', '', $q));
-		$args = array();
-
-		if (!empty($q))
-		{
-			$where = ' WHERE (	ocr_consumer_key like \'%%%s%%\'
-						  	 OR ocr_server_uri like \'%%%s%%\'
-						  	 OR ocr_server_uri_host like \'%%%s%%\'
-						  	 OR ocr_server_uri_path like \'%%%s%%\')
-						 AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-					';
-			
-			$args[] = $q;
-			$args[] = $q;
-			$args[] = $q;
-			$args[] = $q;
-			$args[] = $user_id;
-		}
-		else
-		{
-			$where  = ' WHERE ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL';
-			$args[] = $user_id;
-		}
-
-		$servers = $this->query_all_assoc('
-					SELECT	ocr_id					as id,
-							ocr_usa_id_ref			as user_id,
-							ocr_consumer_key 		as consumer_key,
-							ocr_consumer_secret 	as consumer_secret,
-							ocr_signature_methods	as signature_methods,
-							ocr_server_uri			as server_uri,
-							ocr_server_uri_host		as server_uri_host,
-							ocr_server_uri_path		as server_uri_path,
-							ocr_request_token_uri	as request_token_uri,
-							ocr_authorize_uri		as authorize_uri,
-							ocr_access_token_uri	as access_token_uri
-					FROM oauth_consumer_registry
-					'.$where.'
-					ORDER BY ocr_server_uri_host, ocr_server_uri_path
-					', $args);
-		return $servers;
-	}
-
-
-	/**
-	 * Register or update a server for our site (we will be the consumer)
-	 * 
-	 * (This is the registry at the consumers, registering servers ;-) )
-	 * 
-	 * @param array server
-	 * @param int user_id	user registering this server
-	 * @param boolean user_is_admin
-	 * @exception OAuthException2 when fields are missing or on duplicate consumer_key
-	 * @return consumer_key
-	 */
-	public function updateServer ( $server, $user_id, $user_is_admin = false )
-	{
-		foreach (array('consumer_key', 'server_uri') as $f)
-		{
-			if (empty($server[$f]))
-			{
-				throw new OAuthException2('The field "'.$f.'" must be set and non empty');
-			}
-		}
-		
-		if (!empty($server['id']))
-		{
-			$exists = $this->query_one('
-						SELECT ocr_id
-						FROM oauth_consumer_registry
-						WHERE ocr_consumer_key = \'%s\'
-						  AND ocr_id <> %d
-						  AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-						', $server['consumer_key'], $server['id'], $user_id);
-		}
-		else
-		{
-			$exists = $this->query_one('
-						SELECT ocr_id
-						FROM oauth_consumer_registry
-						WHERE ocr_consumer_key = \'%s\'
-						  AND (ocr_usa_id_ref = %d OR ocr_usa_id_ref IS NULL)
-						', $server['consumer_key'], $user_id);
-		}
-
-		if ($exists)
-		{
-			throw new OAuthException2('The server with key "'.$server['consumer_key'].'" has already been registered');
-		}
-
-		$parts = parse_url($server['server_uri']);
-		$host  = (isset($parts['host']) ? $parts['host'] : 'localhost');
-		$path  = (isset($parts['path']) ? $parts['path'] : '/');
-
-		if (isset($server['signature_methods']))
-		{
-			if (is_array($server['signature_methods']))
-			{
-				$server['signature_methods'] = strtoupper(implode(',', $server['signature_methods']));
-			}
-		}	
-		else
-		{
-			$server['signature_methods'] = '';
-		}
-
-		// When the user is an admin, then the user can update the user_id of this record
-		if ($user_is_admin && array_key_exists('user_id', $server))
-		{
-			if (is_null($server['user_id']))
-			{
-				$update_user =  ', ocr_usa_id_ref = NULL';
-			}
-			else
-			{
-				$update_user =  ', ocr_usa_id_ref = '.intval($server['user_id']);
-			}
-		}
-		else
-		{
-			$update_user = '';
-		}
-		
-		if (!empty($server['id']))
-		{
-			// Check if the current user can update this server definition
-			if (!$user_is_admin)
-			{
-				$ocr_usa_id_ref = $this->query_one('
-									SELECT ocr_usa_id_ref
-									FROM oauth_consumer_registry
-									WHERE ocr_id = %d
-									', $server['id']);
-				
-				if ($ocr_usa_id_ref != $user_id)
-				{
-					throw new OAuthException2('The user "'.$user_id.'" is not allowed to update this server');
-				}
-			}
-			
-			// Update the consumer registration	
-			$this->query('
-					UPDATE oauth_consumer_registry
-					SET ocr_consumer_key    	= \'%s\',
-						ocr_consumer_secret 	= \'%s\',
-						ocr_server_uri	    	= \'%s\',
-						ocr_server_uri_host 	= \'%s\',
-						ocr_server_uri_path 	= \'%s\',
-						ocr_timestamp       	= NOW(),
-						ocr_request_token_uri	= \'%s\',
-						ocr_authorize_uri		= \'%s\',
-						ocr_access_token_uri	= \'%s\',
-						ocr_signature_methods	= \'%s\'
-						'.$update_user.'
-					WHERE ocr_id = %d
-					', 
-					$server['consumer_key'],
-					$server['consumer_secret'],
-					$server['server_uri'],
-					strtolower($host),
-					$path,
-					isset($server['request_token_uri']) ? $server['request_token_uri'] : '',
-					isset($server['authorize_uri'])     ? $server['authorize_uri']     : '',
-					isset($server['access_token_uri'])  ? $server['access_token_uri']  : '',
-					$server['signature_methods'],
-					$server['id']
-					);
-		}
-		else
-		{
-			if (empty($update_user))
-			{
-				// Per default the user owning the key is the user registering the key
-				$update_user =  ', ocr_usa_id_ref = '.intval($user_id);
-			}
-
-			$this->query('
-					INSERT INTO oauth_consumer_registry
-					SET ocr_consumer_key    	= \'%s\',
-						ocr_consumer_secret 	= \'%s\',
-						ocr_server_uri	    	= \'%s\',
-						ocr_server_uri_host 	= \'%s\',
-						ocr_server_uri_path 	= \'%s\',
-						ocr_timestamp       	= NOW(),
-						ocr_request_token_uri	= \'%s\',
-						ocr_authorize_uri		= \'%s\',
-						ocr_access_token_uri	= \'%s\',
-						ocr_signature_methods	= \'%s\'
-						'.$update_user, 
-					$server['consumer_key'],
-					$server['consumer_secret'],
-					$server['server_uri'],
-					strtolower($host),
-					$path,
-					isset($server['request_token_uri']) ? $server['request_token_uri'] : '',
-					isset($server['authorize_uri'])     ? $server['authorize_uri']     : '',
-					isset($server['access_token_uri'])  ? $server['access_token_uri']  : '',
-					$server['signature_methods']
-					);
-		
-			$ocr_id = $this->query_insert_id();
-		}
-		return $server['consumer_key'];
-	}
-
-
-	/**
-	 * Insert/update a new consumer with this server (we will be the server)
-	 * When this is a new consumer, then also generate the consumer key and secret.
-	 * Never updates the consumer key and secret.
-	 * When the id is set, then the key and secret must correspond to the entry
-	 * being updated.
-	 * 
-	 * (This is the registry at the server, registering consumers ;-) )
-	 * 
-	 * @param array consumer
-	 * @param int user_id	user registering this consumer
-	 * @param boolean user_is_admin
-	 * @return string consumer key
-	 */
-	public function updateConsumer ( $consumer, $user_id, $user_is_admin = false )
-	{
-		if (!$user_is_admin)
-		{
-			foreach (array('requester_name', 'requester_email') as $f)
-			{
-				if (empty($consumer[$f]))
-				{
-					throw new OAuthException2('The field "'.$f.'" must be set and non empty');
-				}
-			}
-		}
-		
-		if (!empty($consumer['id']))
-		{
-			if (empty($consumer['consumer_key']))
-			{
-				throw new OAuthException2('The field "consumer_key" must be set and non empty');
-			}
-			if (!$user_is_admin && empty($consumer['consumer_secret']))
-			{
-				throw new OAuthException2('The field "consumer_secret" must be set and non empty');
-			}
-
-			// Check if the current user can update this server definition
-			if (!$user_is_admin)
-			{
-				$osr_usa_id_ref = $this->query_one('
-									SELECT osr_usa_id_ref
-									FROM oauth_server_registry
-									WHERE osr_id = %d
-									', $consumer['id']);
-				
-				if ($osr_usa_id_ref != $user_id)
-				{
-					throw new OAuthException2('The user "'.$user_id.'" is not allowed to update this consumer');
-				}
-			}
-			else
-			{
-				// User is an admin, allow a key owner to be changed or key to be shared
-				if (array_key_exists('user_id',$consumer))
-				{
-					if (is_null($consumer['user_id']))
-					{
-						$this->query('
-							UPDATE oauth_server_registry
-							SET osr_usa_id_ref = NULL
-							WHERE osr_id = %d
-							', $consumer['id']);
-					}
-					else
-					{
-						$this->query('
-							UPDATE oauth_server_registry
-							SET osr_usa_id_ref = %d
-							WHERE osr_id = %d
-							', $consumer['user_id'], $consumer['id']);	
-					}
-				}
-			}
-			
-			$this->query('
-				UPDATE oauth_server_registry
-				SET osr_requester_name		= \'%s\',
-					osr_requester_email		= \'%s\',
-					osr_callback_uri		= \'%s\',
-					osr_application_uri		= \'%s\',
-					osr_application_title	= \'%s\',
-					osr_application_descr	= \'%s\',
-					osr_application_notes	= \'%s\',
-					osr_application_type	= \'%s\',
-					osr_application_commercial = IF(%d,1,0),
-					osr_timestamp			= NOW()
-				WHERE osr_id              = %d
-				  AND osr_consumer_key    = \'%s\'
-				  AND osr_consumer_secret = \'%s\'
-				',
-				$consumer['requester_name'],
-				$consumer['requester_email'],
-				isset($consumer['callback_uri']) 		? $consumer['callback_uri'] 			 : '',
-				isset($consumer['application_uri']) 	? $consumer['application_uri'] 			 : '',
-				isset($consumer['application_title'])	? $consumer['application_title'] 		 : '',
-				isset($consumer['application_descr'])	? $consumer['application_descr'] 		 : '',
-				isset($consumer['application_notes'])	? $consumer['application_notes'] 		 : '',
-				isset($consumer['application_type']) 	? $consumer['application_type'] 		 : '',
-				isset($consumer['application_commercial']) ? $consumer['application_commercial'] : 0,
-				$consumer['id'],
-				$consumer['consumer_key'],
-				$consumer['consumer_secret']
-				);
-				
-
-			$consumer_key = $consumer['consumer_key'];
-		}
-		else
-		{
-			$consumer_key	= $this->generateKey(true);
-			$consumer_secret= $this->generateKey();
-
-			// When the user is an admin, then the user can be forced to something else that the user
-			if ($user_is_admin && array_key_exists('user_id',$consumer))
-			{
-				if (is_null($consumer['user_id']))
-				{
-					$owner_id = 'NULL';
-				}
-				else
-				{
-					$owner_id = intval($consumer['user_id']);
-				}
-			}
-			else
-			{
-				// No admin, take the user id as the owner id.
-				$owner_id = intval($user_id);
-			}
-
-			$this->query('
-				INSERT INTO oauth_server_registry
-				SET osr_enabled				= 1,
-					osr_status				= \'active\',
-					osr_usa_id_ref			= \'%s\',
-					osr_consumer_key		= \'%s\',
-					osr_consumer_secret		= \'%s\',
-					osr_requester_name		= \'%s\',
-					osr_requester_email		= \'%s\',
-					osr_callback_uri		= \'%s\',
-					osr_application_uri		= \'%s\',
-					osr_application_title	= \'%s\',
-					osr_application_descr	= \'%s\',
-					osr_application_notes	= \'%s\',
-					osr_application_type	= \'%s\',
-					osr_application_commercial = IF(%d,1,0),
-					osr_timestamp			= NOW(),
-					osr_issue_date			= NOW()
-				',
-				$owner_id,
-				$consumer_key,
-				$consumer_secret,
-				$consumer['requester_name'],
-				$consumer['requester_email'],
-				isset($consumer['callback_uri']) 		? $consumer['callback_uri'] 			 : '',
-				isset($consumer['application_uri']) 	? $consumer['application_uri'] 			 : '',
-				isset($consumer['application_title'])	? $consumer['application_title'] 		 : '',
-				isset($consumer['application_descr'])	? $consumer['application_descr'] 		 : '',
-				isset($consumer['application_notes'])	? $consumer['application_notes'] 		 : '',
-				isset($consumer['application_type']) 	? $consumer['application_type'] 		 : '',
-				isset($consumer['application_commercial']) ? $consumer['application_commercial'] : 0
-				);
-		}
-		return $consumer_key;
-
-	}
-
-
-
-	/**
-	 * Delete a consumer key.  This removes access to our site for all applications using this key.
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id	user registering this server
-	 * @param boolean user_is_admin
-	 */
-	public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		if ($user_is_admin)
-		{
-			$this->query('
-					DELETE FROM oauth_server_registry
-					WHERE osr_consumer_key = \'%s\'
-					  AND (osr_usa_id_ref = %d OR osr_usa_id_ref IS NULL)
-					', $consumer_key, $user_id);
-		}
-		else
-		{
-			$this->query('
-					DELETE FROM oauth_server_registry
-					WHERE osr_consumer_key = \'%s\'
-					  AND osr_usa_id_ref   = %d
-					', $consumer_key, $user_id);
-		}
-	}	
-	
-	
-	
-	/**
-	 * Fetch a consumer of this server, by consumer_key.
-	 * 
-	 * @param string consumer_key
-	 * @param int user_id
-	 * @param boolean user_is_admin (optional)
-	 * @exception OAuthException2 when consumer not found
-	 * @return array
-	 */
-	public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false )
-	{
-		$consumer = $this->query_row_assoc('
-						SELECT	*
-						FROM oauth_server_registry
-						WHERE osr_consumer_key = \'%s\'
-						', $consumer_key);
-		
-		if (!is_array($consumer))
-		{
-			throw new OAuthException2('No consumer with consumer_key "'.$consumer_key.'"');
-		}
-
-		$c = array();
-		foreach ($consumer as $key => $value)
-		{
-			$c[substr($key, 4)] = $value;
-		}
-		$c['user_id'] = $c['usa_id_ref'];
-
-		if (!$user_is_admin && !empty($c['user_id']) && $c['user_id'] != $user_id)
-		{
-			throw new OAuthException2('No access to the consumer information for consumer_key "'.$consumer_key.'"');
-		}
-		return $c;
-	}
-
-
-	/**
-	 * Fetch the static consumer key for this provider.  The user for the static consumer 
-	 * key is NULL (no user, shared key).  If the key did not exist then the key is created.
-	 * 
-	 * @return string
-	 */
-	public function getConsumerStatic ()
-	{
-		$consumer = $this->query_one('
-						SELECT osr_consumer_key
-						FROM oauth_server_registry
-						WHERE osr_consumer_key LIKE \'sc-%%\'
-						  AND osr_usa_id_ref IS NULL
-						');
-
-		if (empty($consumer))
-		{
-			$consumer_key = 'sc-'.$this->generateKey(true);
-			$this->query('
-				INSERT INTO oauth_server_registry
-				SET osr_enabled				= 1,
-					osr_status				= \'active\',
-					osr_usa_id_ref			= NULL,
-					osr_consumer_key		= \'%s\',
-					osr_consumer_secret		= \'\',
-					osr_requester_name		= \'\',
-					osr_requester_email		= \'\',
-					osr_callback_uri		= \'\',
-					osr_application_uri		= \'\',
-					osr_application_title	= \'Static shared consumer key\',
-					osr_application_descr	= \'\',
-					osr_application_notes	= \'Static shared consumer key\',
-					osr_application_type	= \'\',
-					osr_application_commercial = 0,
-					osr_timestamp			= NOW(),
-					osr_issue_date			= NOW()
-				',
-				$consumer_key
-				);
-			
-			// Just make sure that if the consumer key is truncated that we get the truncated string
-			$consumer = $this->getConsumerStatic();
-		}
-		return $consumer;
-	}
-
-
-	/**
-	 * Add an unautorized request token to our server.
-	 * 
-	 * @param string consumer_key
-	 * @param array options		(eg. token_ttl)
-	 * @return array (token, token_secret)
-	 */
-	public function addConsumerRequestToken ( $consumer_key, $options = array() )
-	{
-		$token  = $this->generateKey(true);
-		$secret = !isset($options['secret']) ? $this->generateKey() : $options['secret'];
-		$osr_id	= $this->query_one('
-						SELECT osr_id
-						FROM oauth_server_registry
-						WHERE osr_consumer_key = \'%s\'
-						  AND osr_enabled      = 1
-						', $consumer_key);
-
-		if (!$osr_id)
-		{
-			throw new OAuthException2('No server with consumer_key "'.$consumer_key.'" or consumer_key is disabled');
-		}
-
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$ttl = intval($options['token_ttl']);
-		}
-		else
-		{
-			$ttl = $this->max_request_token_ttl;
-		}
-
-		if (!isset($options['oauth_callback'])) {
-	 		// 1.0a Compatibility : store callback url associated with request token
-			$options['oauth_callback']='oob';
- 		}
-		
-		$this->query('
-				INSERT INTO oauth_server_token
-				SET ost_osr_id_ref		= %d,
-					ost_usa_id_ref		= 1,
-					ost_token			= \'%s\',
-					ost_token_secret	= \'%s\',
-					ost_token_type		= \'request\',
-					ost_token_ttl       = DATE_ADD(NOW(), INTERVAL %d SECOND),
-					ost_callback_url    = \'%s\'
-				ON DUPLICATE KEY UPDATE
-					ost_osr_id_ref		= VALUES(ost_osr_id_ref),
-					ost_usa_id_ref		= VALUES(ost_usa_id_ref),
-					ost_token			= VALUES(ost_token),
-					ost_token_secret	= VALUES(ost_token_secret),
-					ost_token_type		= VALUES(ost_token_type),
-					ost_token_ttl       = VALUES(ost_token_ttl),
-					ost_callback_url    = VALUES(ost_callback_url),
-					ost_timestamp		= NOW()
-				', $osr_id, $token, $secret, $ttl, $options['oauth_callback']);
-		
-		return array('token'=>$token, 'token_secret'=>$secret, 'token_ttl'=>$ttl);
-	}
-	
-	
-	/**
-	 * Fetch the consumer request token, by request token.
-	 * 
-	 * @param string token
-	 * @return array  token and consumer details
-	 */
-	public function getConsumerRequestToken ( $token )
-	{
-		$rs = $this->query_row_assoc('
-				SELECT	ost_token			as token,
-						ost_token_secret	as token_secret,
-						osr_consumer_key	as consumer_key,
-						osr_consumer_secret	as consumer_secret,
-						ost_token_type		as token_type,
- 						ost_callback_url    as callback_url,
- 						osr_application_title as application_title,
- 						osr_application_descr as application_descr,
- 						osr_application_uri   as application_uri					
-				FROM oauth_server_token
-						JOIN oauth_server_registry
-						ON ost_osr_id_ref = osr_id
-				WHERE ost_token_type = \'request\'
-				  AND ost_token      = \'%s\'
-				  AND ost_token_ttl  >= NOW()
-				', $token);
-		
-		return $rs;
-	}
-	
-
-	/**
-	 * Delete a consumer token.  The token must be a request or authorized token.
-	 * 
-	 * @param string token
-	 */
-	public function deleteConsumerRequestToken ( $token )
-	{
-		$this->query('
-					DELETE FROM oauth_server_token
-					WHERE ost_token 	 = \'%s\'
-					  AND ost_token_type = \'request\'
-					', $token);
-	}
-	
-
-	/**
-	 * Upgrade a request token to be an authorized request token.
-	 * 
-	 * @param string token
-	 * @param int	 user_id  user authorizing the token
-	 * @param string referrer_host used to set the referrer host for this token, for user feedback
-	 */
-	public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' )
-	{
- 		// 1.0a Compatibility : create a token verifier
- 		$verifier = substr(md5(rand()),0,10);
-		
-		$this->query('
-					UPDATE oauth_server_token
-					SET ost_authorized    = 1,
-						ost_usa_id_ref    = %d,
-						ost_timestamp     = NOW(),
-						ost_referrer_host = \'%s\',
-						ost_verifier      = \'%s\'
-					WHERE ost_token      = \'%s\'
-					  AND ost_token_type = \'request\'
-					', $user_id, $referrer_host, $verifier, $token);
-		return $verifier;
-	}
-
-
-	/**
-	 * Count the consumer access tokens for the given consumer.
-	 * 
-	 * @param string consumer_key
-	 * @return int
-	 */
-	public function countConsumerAccessTokens ( $consumer_key )
-	{
-		$count = $this->query_one('
-					SELECT COUNT(ost_id)
-					FROM oauth_server_token
-							JOIN oauth_server_registry
-							ON ost_osr_id_ref = osr_id
-					WHERE ost_token_type   = \'access\'
-					  AND osr_consumer_key = \'%s\'
-					  AND ost_token_ttl    >= NOW()
-					', $consumer_key);
-		
-		return $count;
-	}
-
-
-	/**
-	 * Exchange an authorized request token for new access token.
-	 * 
-	 * @param string token
-	 * @param array options		options for the token, token_ttl
-	 * @exception OAuthException2 when token could not be exchanged
-	 * @return array (token, token_secret)
-	 */
-	public function exchangeConsumerRequestForAccessToken ( $token, $options = array() )
-	{
-		$new_token  = $this->generateKey(true);
-		$new_secret = $this->generateKey();
-
-		// Maximum time to live for this token
-		if (isset($options['token_ttl']) && is_numeric($options['token_ttl']))
-		{
-			$ttl_sql = 'DATE_ADD(NOW(), INTERVAL '.intval($options['token_ttl']).' SECOND)';
-		}
-		else
-		{
-			$ttl_sql = "'9999-12-31'";
-		}
-		
- 		if (isset($options['verifier'])) {
-		 	$verifier = $options['verifier'];
-
-		 	// 1.0a Compatibility : check token against oauth_verifier
-		 	$this->query('
-		 				UPDATE oauth_server_token
-		 				SET ost_token			= \'%s\',
-		 					ost_token_secret	= \'%s\',
-		 					ost_token_type		= \'access\',
-		 					ost_timestamp		= NOW(),
-		 					ost_token_ttl       = '.$ttl_sql.'
-		 				WHERE ost_token      = \'%s\'
-		 				  AND ost_token_type = \'request\'
-		 				  AND ost_authorized = 1
-		 				  AND ost_token_ttl  >= NOW()
-		 				  AND ost_verifier = \'%s\'
-		 				', $new_token, $new_secret, $token, $verifier);
- 		} else {
-
-		 	// 1.0
-		 	$this->query('
-		 				UPDATE oauth_server_token
-		 				SET ost_token			= \'%s\',
-		 					ost_token_secret	= \'%s\',
-		 					ost_token_type		= \'access\',
-		 					ost_timestamp		= NOW(),
-		 					ost_token_ttl       = '.$ttl_sql.'
-		 				WHERE ost_token      = \'%s\'
-		 				  AND ost_token_type = \'request\'
-		 				  AND ost_authorized = 1
-		 				  AND ost_token_ttl  >= NOW()
-		 				', $new_token, $new_secret, $token);
-		}
-		
-		if ($this->query_affected_rows() != 1)
-		{
-			throw new OAuthException2('Can\'t exchange request token "'.$token.'" for access token. No such token or not authorized');
-		}
-
-		$ret = array('token' => $new_token, 'token_secret' => $new_secret);
-		$ttl = $this->query_one('
-					SELECT	IF(ost_token_ttl >= \'9999-12-31\', NULL, UNIX_TIMESTAMP(ost_token_ttl) - UNIX_TIMESTAMP(NOW())) as token_ttl
-					FROM oauth_server_token
-					WHERE ost_token = \'%s\'', $new_token);
-
-		if (is_numeric($ttl))
-		{
-			$ret['token_ttl'] = intval($ttl);
-		}
-		return $ret;
-	}
-
-
-	/**
-	 * Fetch the consumer access token, by access token.
-	 * 
-	 * @param string token
-	 * @param int user_id
-	 * @exception OAuthException2 when token is not found
-	 * @return array  token and consumer details
-	 */
-	public function getConsumerAccessToken ( $token, $user_id )
-	{
-		$rs = $this->query_row_assoc('
-				SELECT	ost_token				as token,
-						ost_token_secret		as token_secret,
-						ost_referrer_host		as token_referrer_host,
-						osr_consumer_key		as consumer_key,
-						osr_consumer_secret		as consumer_secret,
-						osr_application_uri		as application_uri,
-						osr_application_title	as application_title,
-						osr_application_descr	as application_descr,
-						osr_callback_uri		as callback_uri
-				FROM oauth_server_token
-						JOIN oauth_server_registry
-						ON ost_osr_id_ref = osr_id
-				WHERE ost_token_type = \'access\'
-				  AND ost_token      = \'%s\'
-				  AND ost_usa_id_ref = %d
-				  AND ost_token_ttl  >= NOW()
-				', $token, $user_id);
-		
-		if (empty($rs))
-		{
-			throw new OAuthException2('No server_token "'.$token.'" for user "'.$user_id.'"');
-		}
-		return $rs;
-	}
-
-
-	/**
-	 * Delete a consumer access token.
-	 * 
-	 * @param string token
-	 * @param int user_id
-	 * @param boolean user_is_admin
-	 */
-	public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false )
-	{
-		if ($user_is_admin)
-		{
-			$this->query('
-						DELETE FROM oauth_server_token
-						WHERE ost_token 	 = \'%s\'
-						  AND ost_token_type = \'access\'
-						', $token);
-		}
-		else
-		{
-			$this->query('
-						DELETE FROM oauth_server_token
-						WHERE ost_token 	 = \'%s\'
-						  AND ost_token_type = \'access\'
-						  AND ost_usa_id_ref = %d
-						', $token, $user_id);
-		}
-	}
-
-
-	/**
-	 * Set the ttl of a consumer access token.  This is done when the
-	 * server receives a valid request with a xoauth_token_ttl parameter in it.
-	 * 
-	 * @param string token
-	 * @param int ttl
-	 */
-	public function setConsumerAccessTokenTtl ( $token, $token_ttl )
-	{
-		if ($token_ttl <= 0)
-		{
-			// Immediate delete when the token is past its ttl
-			$this->deleteConsumerAccessToken($token, 0, true);
-		}
-		else
-		{
-			// Set maximum time to live for this token
-			$this->query('
-						UPDATE oauth_server_token
-						SET ost_token_ttl = DATE_ADD(NOW(), INTERVAL %d SECOND)
-						WHERE ost_token 	 = \'%s\'
-						  AND ost_token_type = \'access\'
-						', $token_ttl, $token);
-		}
-	}
-
-
-	/**
-	 * Fetch a list of all consumer keys, secrets etc.
-	 * Returns the public (user_id is null) and the keys owned by the user
-	 * 
-	 * @param int user_id
-	 * @return array
-	 */
-	public function listConsumers ( $user_id )
-	{
-		$rs = $this->query_all_assoc('
-				SELECT	osr_id					as id,
-						osr_usa_id_ref			as user_id,
-						osr_consumer_key 		as consumer_key,
-						osr_consumer_secret		as consumer_secret,
-						osr_enabled				as enabled,
-						osr_status 				as status,
-						osr_issue_date			as issue_date,
-						osr_application_uri		as application_uri,
-						osr_application_title	as application_title,
-						osr_application_descr	as application_descr,
-						osr_application_type	as application_type,
-						osr_application_commercial	as application_commercial,
-						osr_requester_name		as requester_name,
-						osr_requester_email		as requester_email,
-						osr_callback_uri		as callback_uri
-				FROM oauth_server_registry
-				WHERE (osr_usa_id_ref = %d OR osr_usa_id_ref IS NULL)
-				ORDER BY osr_application_title
-				', $user_id);
-		return $rs;
-	}
-
-	/**
-	 * List of all registered applications. Data returned has not sensitive 
-	 * information and therefore is suitable for public displaying.
-	 * 
-	 * @param int $begin
-	 * @param int $total
-	 * @return array
-	 */
-	public function listConsumerApplications($begin = 0, $total = 25) 
-	{
-		$rs = $this->query_all_assoc('
-				SELECT	osr_id					as id,
-						osr_enabled				as enabled,
-						osr_status 				as status,
-						osr_issue_date			as issue_date,
-						osr_application_uri		as application_uri,
-						osr_application_title	as application_title,
-						osr_application_descr	as application_descr
-				FROM oauth_server_registry
-				ORDER BY osr_application_title
-				');
-		// TODO: pagination
-		return $rs;
-	}
-
-	/**
-	 * Fetch a list of all consumer tokens accessing the account of the given user.
-	 * 
-	 * @param int user_id
-	 * @return array
-	 */
-	public function listConsumerTokens ( $user_id )
-	{
-		$rs = $this->query_all_assoc('
-				SELECT	osr_consumer_key 		as consumer_key,
-						osr_consumer_secret		as consumer_secret,
-						osr_enabled				as enabled,
-						osr_status 				as status,
-						osr_application_uri		as application_uri,
-						osr_application_title	as application_title,
-						osr_application_descr	as application_descr,
-						ost_timestamp			as timestamp,	
-						ost_token				as token,
-						ost_token_secret		as token_secret,
-						ost_referrer_host		as token_referrer_host,
-						osr_callback_uri		as callback_uri
-				FROM oauth_server_registry
-					JOIN oauth_server_token
-					ON ost_osr_id_ref = osr_id
-				WHERE ost_usa_id_ref = %d
-				  AND ost_token_type = \'access\'
-				  AND ost_token_ttl  >= NOW()
-				ORDER BY osr_application_title
-				', $user_id);
-		return $rs;
-	}
-
-
-	/**
-	 * Check an nonce/timestamp combination.  Clears any nonce combinations
-	 * that are older than the one received.
-	 * 
-	 * @param string	consumer_key
-	 * @param string 	token
-	 * @param int		timestamp
-	 * @param string 	nonce
-	 * @exception OAuthException2	thrown when the timestamp is not in sequence or nonce is not unique
-	 */
-	public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce )
-	{
-		/* removed in Appendix A of RFC 5849
-		$r = $this->query_row('
-							SELECT MAX(osn_timestamp), MAX(osn_timestamp) > %d + %d
-							FROM oauth_server_nonce
-							WHERE osn_consumer_key = \'%s\'
-							  AND osn_token        = \'%s\'
-							', $timestamp, $this->max_timestamp_skew, $consumer_key, $token);
-
-		if (!empty($r) && $r[1])
-		{
-			throw new OAuthException2('Timestamp is out of sequence. Request rejected. Got '.$timestamp.' last max is '.$r[0].' allowed skew is '.$this->max_timestamp_skew);
-		}*/
-		
-		// Insert the new combination
-		$this->query('
-				INSERT IGNORE INTO oauth_server_nonce
-				SET osn_consumer_key	= \'%s\',
-					osn_token			= \'%s\',
-					osn_timestamp		= %d,
-					osn_nonce			= \'%s\'
-				', $consumer_key, $token, $timestamp, $nonce);
-		
-		if ($this->query_affected_rows() == 0)
-		{
-			throw new OAuthException2('Duplicate timestamp/nonce combination, possible replay attack.  Request rejected.');
-		}
-
-		// Clean up all timestamps older than the one we just received
-		$this->query('
-				DELETE FROM oauth_server_nonce
-				WHERE osn_consumer_key	= \'%s\'
-				  AND osn_token			= \'%s\'
-				  AND osn_timestamp     < %d - %d
-				', $consumer_key, $token, $timestamp, $this->max_timestamp_skew);
-	}
-
-
-	/**
-	 * Add an entry to the log table
-	 * 
-	 * @param array keys (osr_consumer_key, ost_token, ocr_consumer_key, oct_token)
-	 * @param string received
-	 * @param string sent
-	 * @param string base_string
-	 * @param string notes
-	 * @param int (optional) user_id
-	 */
-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null )
-	{
-		$args = array();
-		$ps   = array();
-		foreach ($keys as $key => $value)
-		{
-			$args[] = $value;
-			$ps[]   = "olg_$key = '%s'";
-		}
-
-		if (!empty($_SERVER['REMOTE_ADDR']))
-		{
-			$remote_ip = $_SERVER['REMOTE_ADDR'];
-		}	
-		else if (!empty($_SERVER['REMOTE_IP']))
-		{
-			$remote_ip = $_SERVER['REMOTE_IP'];
-		}
-		else
-		{
-			$remote_ip = '0.0.0.0';
-		}
-
-		// Build the SQL
-		$ps[] = "olg_received  	= '%s'";						$args[] = $this->makeUTF8($received);
-		$ps[] = "olg_sent   	= '%s'";						$args[] = $this->makeUTF8($sent);
-		$ps[] = "olg_base_string= '%s'";						$args[] = $base_string;
-		$ps[] = "olg_notes   	= '%s'";						$args[] = $this->makeUTF8($notes);
-		$ps[] = "olg_usa_id_ref = NULLIF(%d,0)";				$args[] = $user_id;
-		$ps[] = "olg_remote_ip  = IFNULL(INET_ATON('%s'),0)";	$args[] = $remote_ip;
-
-		$this->query('INSERT INTO oauth_log SET '.implode(',', $ps), $args);
-	}
-	
-	
-	/**
-	 * Get a page of entries from the log.  Returns the last 100 records
-	 * matching the options given.
-	 * 
-	 * @param array options
-	 * @param int user_id	current user
-	 * @return array log records
-	 */
-	public function listLog ( $options, $user_id )
-	{
-		$where = array();
-		$args  = array();
-		if (empty($options))
-		{
-			$where[] = 'olg_usa_id_ref = %d';
-			$args[]  = $user_id;
-		}
-		else
-		{
-			foreach ($options as $option => $value)
-			{
-				if (strlen($value) > 0)
-				{
-					switch ($option)
-					{
-					case 'osr_consumer_key':
-					case 'ocr_consumer_key':
-					case 'ost_token':
-					case 'oct_token':
-						$where[] = 'olg_'.$option.' = \'%s\'';
-						$args[]  = $value;	
-						break;				
-					}
-				}
-			}
-			
-			$where[] = '(olg_usa_id_ref IS NULL OR olg_usa_id_ref = %d)';
-			$args[]  = $user_id;
-		}
-
-		$rs = $this->query_all_assoc('
-					SELECT olg_id,
-							olg_osr_consumer_key 	AS osr_consumer_key,
-							olg_ost_token			AS ost_token,
-							olg_ocr_consumer_key	AS ocr_consumer_key,
-							olg_oct_token			AS oct_token,
-							olg_usa_id_ref			AS user_id,
-							olg_received			AS received,
-							olg_sent				AS sent,
-							olg_base_string			AS base_string,
-							olg_notes				AS notes,
-							olg_timestamp			AS timestamp,
-							INET_NTOA(olg_remote_ip) AS remote_ip
-					FROM oauth_log
-					WHERE '.implode(' AND ', $where).'
-					ORDER BY olg_id DESC
-					LIMIT 0,100', $args);
-
-		return $rs;
-	}
-
-	
-	/* ** Some simple helper functions for querying the mysql db ** */
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 */
-	abstract protected function query ( $sql );
-	
-
-	/**
-	 * Perform a query, ignore the results
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	abstract protected function query_all_assoc ( $sql );
-	
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	abstract protected function query_row_assoc ( $sql );
-	
-	/**
-	 * Perform a query, return the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return array
-	 */
-	abstract protected function query_row ( $sql );
-	
-		
-	/**
-	 * Perform a query, return the first column of the first row
-	 * 
-	 * @param string sql
-	 * @param vararg arguments (for sprintf)
-	 * @return mixed
-	 */
-	abstract protected function query_one ( $sql );
-	
-	
-	/**
-	 * Return the number of rows affected in the last query
-	 */
-	abstract protected function query_affected_rows ();
-
-
-	/**
-	 * Return the id of the last inserted row
-	 * 
-	 * @return int
-	 */
-	abstract protected function query_insert_id ();
-	
-	
-	abstract protected function sql_printf ( $args );
-	
-	
-	abstract protected function sql_escape_string ( $s );
-	
-	
-	abstract protected function sql_errcheck ( $sql );
-}
-
-
-/* vi:set ts=4 sts=4 sw=4 binary noeol: */
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/OAuthStoreSession.php b/vendor/oauth-php/library/store/OAuthStoreSession.php
deleted file mode 100644
index ecb30c8..0000000
--- a/vendor/oauth-php/library/store/OAuthStoreSession.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * OAuthSession is a really *dirty* storage. It's useful for testing and may 
- * be enough for some very simple applications, but it's not recommended for
- * production use.
- * 
- * @version $Id: OAuthStoreSession.php 183 2011-01-14 11:43:27Z brunobg@corollarium.com $
- * @author BBG
- * 
- * The MIT License
- * 
- * Copyright (c) 2007-2008 Mediamatic Lab
- * 
- * 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.
- */
-
-require_once dirname(__FILE__) . '/OAuthStoreAbstract.class.php';
-
-class OAuthStoreSession extends OAuthStoreAbstract
-{
-	private $session; 
-
-	/*
-	 * Takes two options: consumer_key and consumer_secret
-	 */
-	public function __construct( $options = array() )
-	{
-		if (!session_id()) {
-			session_start();
-		}
-		if(isset($options['consumer_key']) && isset($options['consumer_secret']))
-		{
-			$this->session = &$_SESSION['oauth_' . $options['consumer_key']];
-			$this->session['consumer_key'] = $options['consumer_key'];
-			$this->session['consumer_secret'] = $options['consumer_secret'];
-			$this->session['signature_methods'] = array('HMAC-SHA1');
-			$this->session['server_uri'] = $options['server_uri']; 
-			$this->session['request_token_uri'] = $options['request_token_uri'];
-			$this->session['authorize_uri'] = $options['authorize_uri'];
-			$this->session['access_token_uri'] = $options['access_token_uri']; 
-			
-		}
-		else
-		{
-			throw new OAuthException2("OAuthStoreSession needs consumer_key and consumer_secret");
-		}
-	}
-
-	public function getSecretsForVerify ( $consumer_key, $token, $token_type = 'access' ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getSecretsForSignature ( $uri, $user_id ) 
-	{
-		return $this->session;
-	}
-
-	public function getServerTokenSecrets ( $consumer_key, $token, $token_type, $user_id, $name = '') 	
-	{ 
-		if ($consumer_key != $this->session['consumer_key']) {
-			return array();
-		} 
-		return array(
-			'consumer_key' => $consumer_key,
-			'consumer_secret' => $this->session['consumer_secret'],
-			'token' => $token,
-			'token_secret' => $this->session['token_secret'],
-			'token_name' => $name,
-			'signature_methods' => $this->session['signature_methods'],
-			'server_uri' => $this->session['server_uri'],
-			'request_token_uri' => $this->session['request_token_uri'],
-			'authorize_uri' => $this->session['authorize_uri'],
-			'access_token_uri' => $this->session['access_token_uri'],
-			'token_ttl' => 3600,
-		);
-	}
-	
-	public function addServerToken ( $consumer_key, $token_type, $token, $token_secret, $user_id, $options = array() ) 
-	{
-		$this->session['token_type'] = $token_type;
-		$this->session['token'] = $token;
-		$this->session['token_secret'] = $token_secret;
-	}
-
-	public function deleteServer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getServer( $consumer_key, $user_id, $user_is_admin = false ) { 
-		return array( 
-			'id' => 0,
-			'user_id' => $user_id,
-			'consumer_key' => $this->session['consumer_key'],
-			'consumer_secret' => $this->session['consumer_secret'],
-			'signature_methods' => $this->session['signature_methods'],
-			'server_uri' => $this->session['server_uri'],
-			'request_token_uri' => $this->session['request_token_uri'],
-			'authorize_uri' => $this->session['authorize_uri'],
-			'access_token_uri' => $this->session['access_token_uri'],
-		);
-	}
-	
-	public function getServerForUri ( $uri, $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function listServerTokens ( $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function countServerTokens ( $consumer_key ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getServerToken ( $consumer_key, $token, $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function deleteServerToken ( $consumer_key, $token, $user_id, $user_is_admin = false ) {
-		// TODO 
-	}
-
-	public function setServerTokenTtl ( $consumer_key, $token, $token_ttl, $server_uri = NULL )
-	{
-		//This method just needs to exist. It doesn't have to do anything!
-	}
-	
-	public function listServers ( $q = '', $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function updateServer ( $server, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-
-	public function updateConsumer ( $consumer, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function deleteConsumer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getConsumer ( $consumer_key, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getConsumerStatic () { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-
-	public function addConsumerRequestToken ( $consumer_key, $options = array() ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getConsumerRequestToken ( $token ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function deleteConsumerRequestToken ( $token ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function authorizeConsumerRequestToken ( $token, $user_id, $referrer_host = '' ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function countConsumerAccessTokens ( $consumer_key ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function exchangeConsumerRequestForAccessToken ( $token, $options = array() ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function getConsumerAccessToken ( $token, $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function deleteConsumerAccessToken ( $token, $user_id, $user_is_admin = false ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function setConsumerAccessTokenTtl ( $token, $ttl ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	
-	public function listConsumers ( $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function listConsumerApplications( $begin = 0, $total = 25 )  { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function listConsumerTokens ( $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-
-	public function checkServerNonce ( $consumer_key, $token, $timestamp, $nonce ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	
-	public function addLog ( $keys, $received, $sent, $base_string, $notes, $user_id = null ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	public function listLog ( $options, $user_id ) { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }
-	
-	public function install () { throw new OAuthException2("OAuthStoreSession doesn't support " . __METHOD__); }		
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/mysql/install.php b/vendor/oauth-php/library/store/mysql/install.php
deleted file mode 100644
index 0015da5..0000000
--- a/vendor/oauth-php/library/store/mysql/install.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Installs all tables in the mysql.sql file, using the default mysql connection
- */
-
-/* Change and uncomment this when you need to: */
-
-/*
-mysql_connect('localhost', 'root');
-if (mysql_errno())
-{
-	die(' Error '.mysql_errno().': '.mysql_error());
-}
-mysql_select_db('test');
-*/
-
-$sql = file_get_contents(dirname(__FILE__) . '/mysql.sql');
-$ps  = explode('#--SPLIT--', $sql);
-
-foreach ($ps as $p)
-{
-	$p = preg_replace('/^\s*#.*$/m', '', $p);
-	
-	mysql_query($p);
-	if (mysql_errno())
-	{
-		die(' Error '.mysql_errno().': '.mysql_error());
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/mysql/mysql.sql b/vendor/oauth-php/library/store/mysql/mysql.sql
deleted file mode 100644
index ca8eb08..0000000
--- a/vendor/oauth-php/library/store/mysql/mysql.sql
+++ /dev/null
@@ -1,240 +0,0 @@
-# Datamodel for OAuthStoreMySQL
-#
-# You need to add the foreign key constraints for the user ids your are using.
-# I have commented the constraints out, just look for 'usa_id_ref' to enable them.
-#
-# The --SPLIT-- markers are used by the install.php script
-#   
-# @version $Id: mysql.sql 188 2011-02-25 14:40:26Z scherpenisse $
-# @author Marc Worrell
-#
-
-# Changes:
-#
-# 2011-02-25
-#           ALTER TABLE oauth_consumer_token MODIFY oct_token varchar(255) binary not null;
-#           ALTER TABLE oauth_consumer_token MODIFY oct_token_secret varchar(255) binary not null;
-#
-# 2010-09-15 
-#			ALTER TABLE oauth_server_token MODIFY ost_referrer_host varchar(128) not null default '';
-#
-# 2010-07-22 
-#			ALTER TABLE oauth_consumer_registry DROP INDEX ocr_consumer_key;
-#			ALTER TABLE oauth_consumer_registry ADD UNIQUE ocr_consumer_key(ocr_consumer_key,ocr_usa_id_ref,ocr_server_uri)
-#
-# 2010-04-20 (on 103 and 110)
-#           ALTER TABLE oauth_consumer_registry MODIFY ocr_consumer_key varchar(128) binary not null;
-#           ALTER TABLE oauth_consumer_registry MODIFY ocr_consumer_secret varchar(128) binary not null;
-#
-# 2010-04-20 (on 103 and 110)
-# 			ALTER TABLE oauth_server_token ADD ost_verifier char(10);
-# 			ALTER TABLE oauth_server_token ADD ost_callback_url varchar(512);
-#
-# 2008-10-15 (on r48) Added ttl to consumer and server tokens, added named server tokens
-#
-#			ALTER TABLE oauth_server_token 
-#			ADD ost_token_ttl datetime not null default '9999-12-31',
-#			ADD KEY (ost_token_ttl);
-#
-#			ALTER TABLE oauth_consumer_token 
-#			ADD oct_name varchar(64) binary not null default '',
-#			ADD oct_token_ttl datetime not null default '9999-12-31',
-#			DROP KEY oct_usa_id_ref,
-#			ADD UNIQUE KEY (oct_usa_id_ref, oct_ocr_id_ref, oct_token_type, oct_name),
-#			ADD KEY (oct_token_ttl);
-#
-# 2008-09-09 (on r5) Added referrer host to server access token
-#
-#			ALTER TABLE oauth_server_token ADD ost_referrer_host VARCHAR(128) NOT NULL;
-#
-
-
-#
-# Log table to hold all OAuth request when you enabled logging
-#
-
-CREATE TABLE IF NOT EXISTS oauth_log (
-    olg_id                  int(11) not null auto_increment,
-    olg_osr_consumer_key    varchar(64) binary,
-    olg_ost_token           varchar(64) binary,
-    olg_ocr_consumer_key    varchar(64) binary,
-    olg_oct_token           varchar(64) binary,
-    olg_usa_id_ref          int(11),
-    olg_received            text not null,
-    olg_sent                text not null,
-    olg_base_string         text not null,
-    olg_notes               text not null,
-    olg_timestamp           timestamp not null default current_timestamp,
-    olg_remote_ip           bigint not null,
-
-    primary key (olg_id),
-    key (olg_osr_consumer_key, olg_id),
-    key (olg_ost_token, olg_id),
-    key (olg_ocr_consumer_key, olg_id),
-    key (olg_oct_token, olg_id),
-    key (olg_usa_id_ref, olg_id)
-    
-#   , foreign key (olg_usa_id_ref) references any_user_auth (usa_id_ref)
-#       on update cascade
-#       on delete cascade
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-#
-# /////////////////// CONSUMER SIDE ///////////////////
-#
-
-# This is a registry of all consumer codes we got from other servers
-# The consumer_key/secret is obtained from the server
-# We also register the server uri, so that we can find the consumer key and secret
-# for a certain server.  From that server we can check if we have a token for a
-# particular user.
-
-CREATE TABLE IF NOT EXISTS oauth_consumer_registry (
-    ocr_id                  int(11) not null auto_increment,
-    ocr_usa_id_ref          int(11),
-    ocr_consumer_key        varchar(128) binary not null,
-    ocr_consumer_secret     varchar(128) binary not null,
-    ocr_signature_methods   varchar(255) not null default 'HMAC-SHA1,PLAINTEXT',
-    ocr_server_uri          varchar(255) not null,
-    ocr_server_uri_host     varchar(128) not null,
-    ocr_server_uri_path     varchar(128) binary not null,
-
-    ocr_request_token_uri   varchar(255) not null,
-    ocr_authorize_uri       varchar(255) not null,
-    ocr_access_token_uri    varchar(255) not null,
-    ocr_timestamp           timestamp not null default current_timestamp,
-
-    primary key (ocr_id),
-    unique key (ocr_consumer_key, ocr_usa_id_ref, ocr_server_uri),
-    key (ocr_server_uri),
-    key (ocr_server_uri_host, ocr_server_uri_path),
-    key (ocr_usa_id_ref)
-
-#   , foreign key (ocr_usa_id_ref) references any_user_auth(usa_id_ref)
-#       on update cascade
-#       on delete set null
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-# Table used to sign requests for sending to a server by the consumer
-# The key is defined for a particular user.  Only one single named
-# key is allowed per user/server combination
-
-CREATE TABLE IF NOT EXISTS oauth_consumer_token (
-    oct_id                  int(11) not null auto_increment,
-    oct_ocr_id_ref          int(11) not null,
-    oct_usa_id_ref          int(11) not null,
-    oct_name                varchar(64) binary not null default '',
-    oct_token               varchar(255) binary not null,
-    oct_token_secret        varchar(255) binary not null,
-    oct_token_type          enum('request','authorized','access'),
-    oct_token_ttl           datetime not null default '9999-12-31',
-    oct_timestamp           timestamp not null default current_timestamp,
-
-    primary key (oct_id),
-    unique key (oct_ocr_id_ref, oct_token),
-    unique key (oct_usa_id_ref, oct_ocr_id_ref, oct_token_type, oct_name),
-	key (oct_token_ttl),
-
-    foreign key (oct_ocr_id_ref) references oauth_consumer_registry (ocr_id)
-        on update cascade
-        on delete cascade
-
-#   , foreign key (oct_usa_id_ref) references any_user_auth (usa_id_ref)
-#       on update cascade
-#       on delete cascade           
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-
-#
-# ////////////////// SERVER SIDE /////////////////
-#
-
-# Table holding consumer key/secret combos an user issued to consumers. 
-# Used for verification of incoming requests.
-
-CREATE TABLE IF NOT EXISTS oauth_server_registry (
-    osr_id                      int(11) not null auto_increment,
-    osr_usa_id_ref              int(11),
-    osr_consumer_key            varchar(64) binary not null,
-    osr_consumer_secret         varchar(64) binary not null,
-    osr_enabled                 tinyint(1) not null default '1',
-    osr_status                  varchar(16) not null,
-    osr_requester_name          varchar(64) not null,
-    osr_requester_email         varchar(64) not null,
-    osr_callback_uri            varchar(255) not null,
-    osr_application_uri         varchar(255) not null,
-    osr_application_title       varchar(80) not null,
-    osr_application_descr       text not null,
-    osr_application_notes       text not null,
-    osr_application_type        varchar(20) not null,
-    osr_application_commercial  tinyint(1) not null default '0',
-    osr_issue_date              datetime not null,
-    osr_timestamp               timestamp not null default current_timestamp,
-
-    primary key (osr_id),
-    unique key (osr_consumer_key),
-    key (osr_usa_id_ref)
-
-#   , foreign key (osr_usa_id_ref) references any_user_auth(usa_id_ref)
-#       on update cascade
-#       on delete set null
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-# Nonce used by a certain consumer, every used nonce should be unique, this prevents
-# replaying attacks.  We need to store all timestamp/nonce combinations for the
-# maximum timestamp received.
-
-CREATE TABLE IF NOT EXISTS oauth_server_nonce (
-    osn_id                  int(11) not null auto_increment,
-    osn_consumer_key        varchar(64) binary not null,
-    osn_token               varchar(64) binary not null,
-    osn_timestamp           bigint not null,
-    osn_nonce               varchar(80) binary not null,
-
-    primary key (osn_id),
-    unique key (osn_consumer_key, osn_token, osn_timestamp, osn_nonce)
-) engine=InnoDB default charset=utf8;
-
-#--SPLIT--
-
-# Table used to verify signed requests sent to a server by the consumer
-# When the verification is succesful then the associated user id is returned.
-
-CREATE TABLE IF NOT EXISTS oauth_server_token (
-    ost_id                  int(11) not null auto_increment,
-    ost_osr_id_ref          int(11) not null,
-    ost_usa_id_ref          int(11) not null,
-    ost_token               varchar(64) binary not null,
-    ost_token_secret        varchar(64) binary not null,
-    ost_token_type          enum('request','access'),
-    ost_authorized          tinyint(1) not null default '0',
-	ost_referrer_host       varchar(128) not null default '',
-	ost_token_ttl           datetime not null default '9999-12-31',
-    ost_timestamp           timestamp not null default current_timestamp,
-    ost_verifier            char(10),
-    ost_callback_url        varchar(512),
-
-	primary key (ost_id),
-    unique key (ost_token),
-    key (ost_osr_id_ref),
-	key (ost_token_ttl),
-
-	foreign key (ost_osr_id_ref) references oauth_server_registry (osr_id)
-        on update cascade
-        on delete cascade
-
-#   , foreign key (ost_usa_id_ref) references any_user_auth (usa_id_ref)
-#       on update cascade
-#       on delete cascade           
-) engine=InnoDB default charset=utf8;
-
-
-
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/1_Tables/TABLES.sql b/vendor/oauth-php/library/store/oracle/OracleDB/1_Tables/TABLES.sql
deleted file mode 100644
index 3d4fa22..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/1_Tables/TABLES.sql
+++ /dev/null
@@ -1,114 +0,0 @@
-CREATE TABLE oauth_log 

-(

-    olg_id                  number,

-    olg_osr_consumer_key    varchar2(64),

-    olg_ost_token           varchar2(64),

-    olg_ocr_consumer_key    varchar2(64),

-    olg_oct_token           varchar2(64),

-    olg_usa_id_ref          number,

-    olg_received            varchar2(500),

-    olg_sent                varchar2(500),

-    olg_base_string         varchar2(500),

-    olg_notes               varchar2(500),

-    olg_timestamp           date default sysdate,

-    olg_remote_ip           varchar2(50)

-);

-

-alter table oauth_log

-  add constraint oauth_log_pk primary key (olg_id);

-  

-

-CREATE TABLE oauth_consumer_registry 

-(

-    ocr_id                  number,

-    ocr_usa_id_ref          number,

-    ocr_consumer_key        varchar2(64),

-    ocr_consumer_secret     varchar2(64),

-    ocr_signature_methods   varchar2(255)default 'HMAC-SHA1,PLAINTEXT',

-    ocr_server_uri          varchar2(255),

-    ocr_server_uri_host     varchar2(128),

-    ocr_server_uri_path     varchar2(128),

-    ocr_request_token_uri   varchar2(255),

-    ocr_authorize_uri       varchar2(255),

-    ocr_access_token_uri    varchar2(255),

-    ocr_timestamp           date default sysdate

-)

-

-alter table oauth_consumer_registry

-  add constraint oauth_consumer_registry_pk primary key (ocr_id);

-  

-

-CREATE TABLE oauth_consumer_token 

-(

-  oct_id                  number,

-  oct_ocr_id_ref          number,

-  oct_usa_id_ref          number,

-  oct_name                varchar2(64) default '',

-  oct_token               varchar2(64),

-  oct_token_secret        varchar2(64),

-  oct_token_type          varchar2(20), -- enum('request','authorized','access'),

-  oct_token_ttl           date default  TO_DATE('9999.12.31', 'yyyy.mm.dd'),

-  oct_timestamp           date default sysdate

-);

-

-alter table oauth_consumer_token

-  add constraint oauth_consumer_token_pk primary key (oct_id);

-  

-  

-CREATE TABLE oauth_server_registry 

-(

-    osr_id                      number,

-    osr_usa_id_ref              number,

-    osr_consumer_key            varchar2(64),

-    osr_consumer_secret         varchar2(64),

-    osr_enabled                 integer default '1',

-    osr_status                  varchar2(16),

-    osr_requester_name          varchar2(64),

-    osr_requester_email         varchar2(64),

-    osr_callback_uri            varchar2(255),

-    osr_application_uri         varchar2(255),

-    osr_application_title       varchar2(80),

-    osr_application_descr       varchar2(500),

-    osr_application_notes       varchar2(500),

-    osr_application_type        varchar2(20),

-    osr_application_commercial  integer default '0',

-    osr_issue_date              date,

-    osr_timestamp               date default sysdate

-);

-

-

-alter table oauth_server_registry

-  add constraint oauth_server_registry_pk primary key (osr_id);

-  

-

-CREATE TABLE oauth_server_nonce 

-(

-  osn_id                  number,

-  osn_consumer_key        varchar2(64),

-  osn_token               varchar2(64),

-  osn_timestamp           number,

-  osn_nonce               varchar2(80)

-);

-

-alter table oauth_server_nonce

-  add constraint oauth_server_nonce_pk primary key (osn_id);

-  

-  

-CREATE TABLE oauth_server_token 

-(

-    ost_id                  number,

-    ost_osr_id_ref          number,

-    ost_usa_id_ref          number,

-    ost_token               varchar2(64),

-    ost_token_secret        varchar2(64),

-    ost_token_type          varchar2(20), -- enum('request','access'),

-    ost_authorized          integer default '0',

-	  ost_referrer_host       varchar2(128),

-	  ost_token_ttl           date default TO_DATE('9999.12.31', 'yyyy.mm.dd'),

-    ost_timestamp           date default sysdate,

-    ost_verifier            varchar2(10),

-    ost_callback_url        varchar2(512)

-);

-

-alter table oauth_server_token

-  add constraint oauth_server_token_pk primary key (ost_id);
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/2_Sequences/SEQUENCES.sql b/vendor/oauth-php/library/store/oracle/OracleDB/2_Sequences/SEQUENCES.sql
deleted file mode 100644
index 53e4227..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/2_Sequences/SEQUENCES.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE SEQUENCE SEQ_OCT_ID NOCACHE;

-

-CREATE SEQUENCE SEQ_OCR_ID NOCACHE;

-

-CREATE SEQUENCE SEQ_OSR_ID NOCACHE;

-

-CREATE SEQUENCE SEQ_OSN_ID NOCACHE;

-

-CREATE SEQUENCE SEQ_OLG_ID NOCACHE;

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_CONSUMER_REQUEST_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_CONSUMER_REQUEST_TOKEN.prc
deleted file mode 100644
index efb9536..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_CONSUMER_REQUEST_TOKEN.prc
+++ /dev/null
@@ -1,71 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_ADD_CONSUMER_REQUEST_TOKEN

-(

-P_TOKEN_TTL                    IN        NUMBER, -- IN SECOND

-P_CONSUMER_KEY                 IN        VARCHAR2,

-P_TOKEN                        IN        VARCHAR2,

-P_TOKEN_SECRET                 IN        VARCHAR2,

-P_CALLBACK_URL                 IN        VARCHAR2,

-P_RESULT                       OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Add an unautorized request token to our server.

- 

-V_OSR_ID                                    NUMBER;

-V_OSR_ID_REF                                NUMBER;

-

-V_EXC_NO_SERVER_EXIST                       EXCEPTION;

-BEGIN

-

-  P_RESULT := 0;

- 

- BEGIN 

- SELECT OSR_ID INTO V_OSR_ID

-  FROM OAUTH_SERVER_REGISTRY

-  WHERE OSR_CONSUMER_KEY = P_CONSUMER_KEY

-  AND OSR_ENABLED      = 1;

- EXCEPTION

- WHEN NO_DATA_FOUND THEN

-      RAISE V_EXC_NO_SERVER_EXIST;

- END;

- 

-

-BEGIN 

-  SELECT OST_OSR_ID_REF INTO V_OSR_ID_REF

-  FROM OAUTH_SERVER_TOKEN

-  WHERE OST_OSR_ID_REF = V_OSR_ID;

-  

-  UPDATE OAUTH_SERVER_TOKEN

-  	SET OST_OSR_ID_REF		= V_OSR_ID,

-					OST_USA_ID_REF		= 1,

-					OST_TOKEN			= P_TOKEN,

-					OST_TOKEN_SECRET	= P_TOKEN_SECRET,

-					OST_TOKEN_TYPE		= 'REQUEST',

-					OST_TOKEN_TTL       = SYSDATE + (P_TOKEN_TTL/(24*60*60)),

-					OST_CALLBACK_URL    = P_CALLBACK_URL,

-          OST_TIMESTAMP		= SYSDATE

-     WHERE OST_OSR_ID_REF = V_OSR_ID_REF;

-  

-

- EXCEPTION

- WHEN NO_DATA_FOUND THEN

-      

-    INSERT INTO OAUTH_SERVER_TOKEN

-    (OST_ID, OST_OSR_ID_REF, OST_USA_ID_REF, OST_TOKEN, OST_TOKEN_SECRET, OST_TOKEN_TYPE, 

-    OST_TOKEN_TTL, OST_CALLBACK_URL)

-    VALUES

-    (SEQ_OCT_ID.NEXTVAL, V_OSR_ID, 1, P_TOKEN, P_TOKEN_SECRET, 'REQUEST', SYSDATE + (P_TOKEN_TTL/(24*60*60)),

-    P_CALLBACK_URL);

-    

- END;

- 

-

-EXCEPTION

-WHEN V_EXC_NO_SERVER_EXIST THEN

-P_RESULT := 2; -- NO_SERVER_EXIST

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_LOG.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_LOG.prc
deleted file mode 100644
index 329499d..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_LOG.prc
+++ /dev/null
@@ -1,31 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_ADD_LOG

-(

-P_RECEIVED                  IN        VARCHAR2,

-P_SENT                      IN        VARCHAR2,

-P_BASE_STRING               IN        VARCHAR2,

-P_NOTES                     IN        VARCHAR2,

-P_USA_ID_REF                IN        NUMBER,

-P_REMOTE_IP                 IN        VARCHAR2,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Add an entry to the log table

- 

-BEGIN

-

-  P_RESULT := 0;

-  

-  INSERT INTO oauth_log

-  (OLG_ID, olg_received, olg_sent, olg_base_string, olg_notes, olg_usa_id_ref, olg_remote_ip)

-  VALUES

-  (SEQ_OLG_ID.NEXTVAL, P_RECEIVED, P_SENT, P_BASE_STRING, P_NOTES, NVL(P_USA_ID_REF, 0), P_REMOTE_IP);

-            

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_SERVER_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_SERVER_TOKEN.prc
deleted file mode 100644
index 371134c..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_ADD_SERVER_TOKEN.prc
+++ /dev/null
@@ -1,55 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_ADD_SERVER_TOKEN

-(

-P_CONSUMER_KEY      IN        VARCHAR2,

-P_USER_ID           IN        NUMBER,

-P_NAME              IN        VARCHAR2,

-P_TOKEN_TYPE        IN        VARCHAR2,

-P_TOKEN             IN        VARCHAR2,

-P_TOKEN_SECRET      IN        VARCHAR2,

-P_TOKEN_INTERVAL_IN_SEC         IN        NUMBER,

-P_RESULT            OUT       NUMBER

-)

-AS

- 

- -- Add a request token we obtained from a server.

-V_OCR_ID                                NUMBER;

-V_TOKEN_TTL                             DATE;

-

-V_EXC_INVALID_CONSUMER_KEY              EXCEPTION;

-BEGIN

-P_RESULT := 0;

-

-      BEGIN

-        SELECT OCR_ID INTO V_OCR_ID FROM OAUTH_CONSUMER_REGISTRY

-        WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY AND OCR_USA_ID_REF = P_USER_ID;

-      EXCEPTION

-      WHEN NO_DATA_FOUND THEN

-          RAISE V_EXC_INVALID_CONSUMER_KEY;

-      END;

-     

-      DELETE FROM OAUTH_CONSUMER_TOKEN

-      WHERE OCT_OCR_ID_REF = V_OCR_ID

-      AND OCT_USA_ID_REF = P_USER_ID

-      AND UPPER(OCT_TOKEN_TYPE) = UPPER(P_TOKEN_TYPE)

-      AND OCT_NAME       = P_NAME;

-      

-      IF P_TOKEN_INTERVAL_IN_SEC IS NOT NULL THEN

-         V_TOKEN_TTL := SYSDATE + (P_TOKEN_INTERVAL_IN_SEC/(24*60*60));

-      ELSE

-         V_TOKEN_TTL := TO_DATE('9999.12.31', 'yyyy.mm.dd');

-      END IF;

-      

-      INSERT INTO OAUTH_CONSUMER_TOKEN

-      (OCT_ID, OCT_OCR_ID_REF,OCT_USA_ID_REF, OCT_NAME, OCT_TOKEN, OCT_TOKEN_SECRET, OCT_TOKEN_TYPE, OCT_TIMESTAMP, OCT_TOKEN_TTL)

-      VALUES

-      (SEQ_OCT_ID.NEXTVAL, V_OCR_ID, P_USER_ID, P_NAME, P_TOKEN, P_TOKEN_SECRET, UPPER(P_TOKEN_TYPE), SYSDATE, V_TOKEN_TTL);

-       

-EXCEPTION

-WHEN V_EXC_INVALID_CONSUMER_KEY THEN

-P_RESULT := 2; -- INVALID_CONSUMER_KEY

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_AUTH_CONSUMER_REQ_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_AUTH_CONSUMER_REQ_TOKEN.prc
deleted file mode 100644
index c369349..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_AUTH_CONSUMER_REQ_TOKEN.prc
+++ /dev/null
@@ -1,32 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_AUTH_CONSUMER_REQ_TOKEN

-(

-P_USER_ID                   IN        NUMBER,    

-P_REFERRER_HOST             IN        VARCHAR2,                     

-P_VERIFIER                  IN        VARCHAR2,

-P_TOKEN                     IN        VARCHAR2,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Fetch the consumer request token, by request token.

-BEGIN

-P_RESULT := 0;

-

-

-UPDATE OAUTH_SERVER_TOKEN

-  SET OST_AUTHORIZED    = 1,

-  OST_USA_ID_REF    =  P_USER_ID,

-  OST_TIMESTAMP     = SYSDATE,

-  OST_REFERRER_HOST = P_REFERRER_HOST,

-  OST_VERIFIER      = P_VERIFIER

-  WHERE OST_TOKEN      = P_TOKEN

-  AND OST_TOKEN_TYPE = 'REQUEST';

-    

-              

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CHECK_SERVER_NONCE.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CHECK_SERVER_NONCE.prc
deleted file mode 100644
index 765dd3b..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CHECK_SERVER_NONCE.prc
+++ /dev/null
@@ -1,82 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_CHECK_SERVER_NONCE

-(

-P_CONSUMER_KEY                 IN        VARCHAR2,

-P_TOKEN                        IN        VARCHAR2,

-P_TIMESTAMP                    IN        NUMBER,

-P_MAX_TIMESTAMP_SKEW           IN        NUMBER,

-P_NONCE                        IN        VARCHAR2,

-P_RESULT                       OUT       NUMBER

-)

-AS

- 

- -- PROCEDURE TO Check an nonce/timestamp combination.  Clears any nonce combinations

- -- that are older than the one received.

-V_IS_MAX                           NUMBER;

-V_MAX_TIMESTAMP                    NUMBER;

-V_IS_DUPLICATE_TIMESTAMP           NUMBER;

-

-V_EXC_INVALID_TIMESTAMP            EXCEPTION;

-V_EXC_DUPLICATE_TIMESTAMP          EXCEPTION;

-BEGIN

-

-  P_RESULT := 0;

-

-  -- removed in Appendix A of RFC 5849

-  -- BEGIN 

-  --   SELECT MAX(OSN_TIMESTAMP), 

-  --   CASE 

-  --        WHEN MAX(OSN_TIMESTAMP) > (P_TIMESTAMP + P_MAX_TIMESTAMP_SKEW) THEN 1 ELSE 0 

-  --   END "IS_MAX" INTO V_MAX_TIMESTAMP, V_IS_MAX

-  --   FROM OAUTH_SERVER_NONCE

-  --   WHERE OSN_CONSUMER_KEY = P_CONSUMER_KEY

-  --   AND OSN_TOKEN        = P_TOKEN;

-  --   

-  --   IF V_IS_MAX = 1 THEN

-  --      RAISE V_EXC_INVALID_TIMESTAMP;

-  --   END IF;

-  --     

-  -- EXCEPTION

-  -- WHEN NO_DATA_FOUND THEN

-  --      NULL;

-  -- END;        

-  

-  BEGIN

-  SELECT 1 INTO V_IS_DUPLICATE_TIMESTAMP FROM DUAL WHERE EXISTS

-  (SELECT OSN_ID FROM OAUTH_SERVER_NONCE 

-    WHERE OSN_CONSUMER_KEY = P_CONSUMER_KEY

-    AND OSN_TOKEN = P_TOKEN

-    AND OSN_TIMESTAMP = P_TIMESTAMP

-    AND OSN_NONCE = P_NONCE);

-    

-    IF V_IS_DUPLICATE_TIMESTAMP = 1 THEN

-       RAISE V_EXC_DUPLICATE_TIMESTAMP;

-    END IF;

-  EXCEPTION

-  WHEN NO_DATA_FOUND THEN

-    NULL;

-  END;          

-  

-  -- Insert the new combination

-  INSERT INTO OAUTH_SERVER_NONCE

-  (OSN_ID, OSN_CONSUMER_KEY, OSN_TOKEN, OSN_TIMESTAMP, OSN_NONCE)

-  VALUES

-  (SEQ_OSN_ID.NEXTVAL, P_CONSUMER_KEY, P_TOKEN, P_TIMESTAMP, P_NONCE);

-

-  -- Clean up all timestamps older than the one we just received

-  DELETE FROM OAUTH_SERVER_NONCE

-  WHERE OSN_CONSUMER_KEY	= P_CONSUMER_KEY

-  AND OSN_TOKEN			= P_TOKEN

-  AND OSN_TIMESTAMP     < (P_TIMESTAMP - P_MAX_TIMESTAMP_SKEW);

-                        

-

-EXCEPTION

-WHEN V_EXC_INVALID_TIMESTAMP THEN

-P_RESULT := 2; -- INVALID_TIMESTAMP

-WHEN V_EXC_DUPLICATE_TIMESTAMP THEN

-P_RESULT := 3; -- DUPLICATE_TIMESTAMP

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CONSUMER_STATIC_SAVE.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CONSUMER_STATIC_SAVE.prc
deleted file mode 100644
index 047c77b..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_CONSUMER_STATIC_SAVE.prc
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_CONSUMER_STATIC_SAVE

-(

-P_OSR_CONSUMER_KEY          IN        VARCHAR2,

-P_RESULT                    OUT       NUMBER

-)

-AS

- 

--- PROCEDURE TO Fetch the static consumer key for this provider.

-BEGIN

-P_RESULT := 0;

-

-

- INSERT INTO OAUTH_SERVER_REGISTRY

- (OSR_ID, OSR_ENABLED, OSR_STATUS, OSR_USA_ID_REF, OSR_CONSUMER_KEY, OSR_CONSUMER_SECRET, OSR_REQUESTER_NAME, OSR_REQUESTER_EMAIL, OSR_CALLBACK_URI, 

-					OSR_APPLICATION_URI, OSR_APPLICATION_TITLE, OSR_APPLICATION_DESCR, OSR_APPLICATION_NOTES,

-					OSR_APPLICATION_TYPE, OSR_APPLICATION_COMMERCIAL, OSR_TIMESTAMP,OSR_ISSUE_DATE)

-  VALUES

-  (SEQ_OSR_ID.NEXTVAL, 1, 'ACTIVE', NULL, P_OSR_CONSUMER_KEY, '\', '\', '\', '\', '\', 

-   'STATIC SHARED CONSUMER KEY', '\', 'STATIC SHARED CONSUMER KEY', '\', 0, SYSDATE, SYSDATE);

-              

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_CONSUMER_ACCESS_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_CONSUMER_ACCESS_TOKEN.prc
deleted file mode 100644
index f7099b9..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_CONSUMER_ACCESS_TOKEN.prc
+++ /dev/null
@@ -1,27 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_COUNT_CONSUMER_ACCESS_TOKEN

-(

-P_CONSUMER_KEY    IN        VARCHAR2,

-P_COUNT           OUT        NUMBER,

-P_RESULT          OUT       NUMBER

-)

-AS

--- PROCEDURE TO Count the consumer access tokens for the given consumer.

-BEGIN

-P_RESULT := 0;

-

-SELECT COUNT(OST_ID) INTO P_COUNT

-  FROM OAUTH_SERVER_TOKEN

-  JOIN OAUTH_SERVER_REGISTRY

-  ON OST_OSR_ID_REF = OSR_ID

-  WHERE OST_TOKEN_TYPE   = 'ACCESS'

-  AND OSR_CONSUMER_KEY = P_CONSUMER_KEY

-  AND OST_TOKEN_TTL    >= SYSDATE;

-              

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_SERVICE_TOKENS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_SERVICE_TOKENS.prc
deleted file mode 100644
index c73b366..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_COUNT_SERVICE_TOKENS.prc
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_COUNT_SERVICE_TOKENS

-(

-P_CONSUMER_KEY              IN        VARCHAR2,

-P_COUNT                     OUT       NUMBER,

-P_RESULT                    OUT       NUMBER

-)

-AS

- 

- -- PROCEDURE TO Count how many tokens we have for the given server

-BEGIN

-P_RESULT := 0;

-

-  SELECT COUNT(OCT_ID) INTO P_COUNT

-  FROM OAUTH_CONSUMER_TOKEN

-  JOIN OAUTH_CONSUMER_REGISTRY

-  ON OCT_OCR_ID_REF = OCR_ID

-  WHERE OCT_TOKEN_TYPE   = 'ACCESS'

-  AND OCR_CONSUMER_KEY = P_CONSUMER_KEY

-  AND OCT_TOKEN_TTL    >= SYSDATE;

-              

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_CONSUMER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_CONSUMER.prc
deleted file mode 100644
index 3f18562..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_CONSUMER.prc
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DELETE_CONSUMER

-(

-P_CONSUMER_KEY      IN        VARCHAR2,

-P_USER_ID           IN        NUMBER,

-P_USER_IS_ADMIN     IN        NUMBER, --0:NO; 1:YES

-P_RESULT            OUT       NUMBER

-)

-AS

- 

- --  Delete a consumer key.  This removes access to our site for all applications using this key.

-

-BEGIN

-P_RESULT := 0;

-

-IF P_USER_IS_ADMIN = 1 THEN

- 

-  DELETE FROM OAUTH_SERVER_REGISTRY

-	WHERE OSR_CONSUMER_KEY = P_CONSUMER_KEY

-	AND (OSR_USA_ID_REF = P_USER_ID OR OSR_USA_ID_REF IS NULL);

- 

-ELSIF P_USER_IS_ADMIN = 0 THEN

- 

-  DELETE FROM OAUTH_SERVER_REGISTRY

-	WHERE OSR_CONSUMER_KEY = P_CONSUMER_KEY

-	AND OSR_USA_ID_REF   = P_USER_ID;

-  

-END IF;

-     

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER.prc
deleted file mode 100644
index ba259de..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER.prc
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DELETE_SERVER

-(

-P_CONSUMER_KEY      IN        VARCHAR2,

-P_USER_ID           IN        NUMBER,

-P_USER_IS_ADMIN     IN        NUMBER, --0:NO; 1:YES

-P_RESULT            OUT       NUMBER

-)

-AS

- 

- --  Delete a server key.  This removes access to that site.

-

-BEGIN

-P_RESULT := 0;

-

-IF P_USER_IS_ADMIN = 1 THEN

-

-  DELETE FROM OAUTH_CONSUMER_REGISTRY

-  WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY

-  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL);

-  

-ELSIF P_USER_IS_ADMIN = 0 THEN

-

-  DELETE FROM OAUTH_CONSUMER_REGISTRY

-  WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY

-  AND OCR_USA_ID_REF   = P_USER_ID;

-  

-END IF;

-     

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER_TOKEN.prc
deleted file mode 100644
index de9d450..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DELETE_SERVER_TOKEN.prc
+++ /dev/null
@@ -1,37 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DELETE_SERVER_TOKEN

-(

-P_CONSUMER_KEY      IN        VARCHAR2,

-P_USER_ID           IN        NUMBER,

-P_TOKEN             IN        VARCHAR2,

-P_USER_IS_ADMIN     IN        NUMBER, --0:NO; 1:YES

-P_RESULT            OUT       NUMBER

-)

-AS

- 

- --  Delete a token we obtained from a server.

-

-BEGIN

-P_RESULT := 0;

-

-IF P_USER_IS_ADMIN = 1 THEN

- 

-  DELETE FROM OAUTH_CONSUMER_TOKEN

-  WHERE OCT_TOKEN	= P_TOKEN

-  AND OCT_OCR_ID_REF IN (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY); 

-  

-ELSIF P_USER_IS_ADMIN = 0 THEN

- 

-  DELETE FROM OAUTH_CONSUMER_TOKEN

-  WHERE OCT_TOKEN	= P_TOKEN

-  AND OCT_USA_ID_REF	= P_USER_ID

-  AND OCT_OCR_ID_REF IN (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY); 

-  

-END IF;

-     

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_ACCESS_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_ACCESS_TOKEN.prc
deleted file mode 100644
index 4281bdb..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_ACCESS_TOKEN.prc
+++ /dev/null
@@ -1,33 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DEL_CONSUMER_ACCESS_TOKEN

-(

-P_USER_ID                      IN        NUMBER,

-P_TOKEN                        IN        VARCHAR2,

-P_USER_IS_ADMIN                IN        NUMBER, -- 1:YES; 0:NO

-P_RESULT                       OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Delete a consumer access token.

- 

-BEGIN

-

-  P_RESULT := 0;

-  

-  IF P_USER_IS_ADMIN = 1 THEN

-    DELETE FROM OAUTH_SERVER_TOKEN

-    WHERE OST_TOKEN 	 = P_TOKEN

-    AND OST_TOKEN_TYPE = 'ACCESS';

-  ELSE

-    DELETE FROM OAUTH_SERVER_TOKEN

-    WHERE OST_TOKEN 	 = P_TOKEN

-    AND OST_TOKEN_TYPE = 'ACCESS'

-    AND OST_USA_ID_REF = P_USER_ID;

-  END IF;

-  

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_REQUEST_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_REQUEST_TOKEN.prc
deleted file mode 100644
index 01678d6..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_DEL_CONSUMER_REQUEST_TOKEN.prc
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_DEL_CONSUMER_REQUEST_TOKEN

-(

-P_TOKEN                     IN        VARCHAR2,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Delete a consumer token.  The token must be a request or authorized token.

-

-BEGIN

-

-  P_RESULT := 0;

-  

-  DELETE FROM OAUTH_SERVER_TOKEN

-  WHERE OST_TOKEN 	 = P_TOKEN

-  AND OST_TOKEN_TYPE = 'REQUEST';

-              

-  

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_EXCH_CONS_REQ_FOR_ACC_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_EXCH_CONS_REQ_FOR_ACC_TOKEN.prc
deleted file mode 100644
index 66a53ed..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_EXCH_CONS_REQ_FOR_ACC_TOKEN.prc
+++ /dev/null
@@ -1,96 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_EXCH_CONS_REQ_FOR_ACC_TOKEN

-(

-P_TOKEN_TTL                    IN        NUMBER, -- IN SECOND

-P_NEW_TOKEN                    IN        VARCHAR2,

-P_TOKEN                        IN        VARCHAR2,

-P_TOKEN_SECRET                 IN        VARCHAR2,

-P_VERIFIER                     IN        VARCHAR2,

-P_OUT_TOKEN_TTL                OUT       NUMBER,

-P_RESULT                       OUT       NUMBER

-)

-AS

- 

- -- PROCEDURE TO Add an unautorized request token to our server.

- 

-V_TOKEN_EXIST                               NUMBER;

-

-

-V_EXC_NO_TOKEN_EXIST                       EXCEPTION;

-BEGIN

-

-  P_RESULT := 0;

-  

-  IF P_VERIFIER IS NOT NULL THEN

-     

-      BEGIN 

-      SELECT 1 INTO V_TOKEN_EXIST FROM DUAL WHERE EXISTS

-       (SELECT OST_TOKEN FROM OAUTH_SERVER_TOKEN 

-               WHERE OST_TOKEN      = P_TOKEN

-            AND OST_TOKEN_TYPE = 'REQUEST'

-            AND OST_AUTHORIZED = 1

-            AND OST_TOKEN_TTL  >= SYSDATE

-            AND OST_VERIFIER = P_VERIFIER);

-       EXCEPTION

-       WHEN NO_DATA_FOUND THEN

-            RAISE V_EXC_NO_TOKEN_EXIST;

-       END;

-         

-        UPDATE OAUTH_SERVER_TOKEN

-          SET OST_TOKEN			= P_NEW_TOKEN,

-          OST_TOKEN_SECRET	= P_TOKEN_SECRET,

-          OST_TOKEN_TYPE		= 'ACCESS',

-          OST_TIMESTAMP		= SYSDATE,

-          OST_TOKEN_TTL       = NVL(SYSDATE + (P_TOKEN_TTL/(24*60*60)), TO_DATE('9999.12.31', 'yyyy.mm.dd'))

-          WHERE OST_TOKEN      = P_TOKEN

-          AND OST_TOKEN_TYPE = 'REQUEST'

-          AND OST_AUTHORIZED = 1

-          AND OST_TOKEN_TTL  >= SYSDATE

-          AND OST_VERIFIER = P_VERIFIER;

-  

-  ELSE

-      BEGIN 

-        SELECT 1 INTO V_TOKEN_EXIST FROM DUAL WHERE EXISTS

-        (SELECT OST_TOKEN FROM OAUTH_SERVER_TOKEN 

-             WHERE OST_TOKEN      = P_TOKEN

-          AND OST_TOKEN_TYPE = 'REQUEST'

-          AND OST_AUTHORIZED = 1

-          AND OST_TOKEN_TTL  >= SYSDATE);

-      EXCEPTION

-      WHEN NO_DATA_FOUND THEN

-         RAISE V_EXC_NO_TOKEN_EXIST;

-      END;

-        

-      UPDATE OAUTH_SERVER_TOKEN

-      SET OST_TOKEN			= P_NEW_TOKEN,

-      OST_TOKEN_SECRET	= P_TOKEN_SECRET,

-      OST_TOKEN_TYPE		= 'ACCESS',

-      OST_TIMESTAMP		= SYSDATE,

-      OST_TOKEN_TTL       = NVL(SYSDATE + (P_TOKEN_TTL/(24*60*60)), TO_DATE('9999.12.31', 'yyyy.mm.dd'))

-      WHERE OST_TOKEN      = P_TOKEN

-      AND OST_TOKEN_TYPE = 'REQUEST'

-      AND OST_AUTHORIZED = 1

-      AND OST_TOKEN_TTL  >= SYSDATE;

-              

-  

-  END IF;

-  

-    SELECT	CASE

-            WHEN OST_TOKEN_TTL >= TO_DATE('9999.12.31', 'yyyy.mm.dd') THEN NULL ELSE (OST_TOKEN_TTL - SYSDATE)*24*60*60 

-    END "TOKEN_TTL" INTO P_OUT_TOKEN_TTL

-    FROM OAUTH_SERVER_TOKEN

-    WHERE OST_TOKEN = P_NEW_TOKEN;

-              

-  

-  

-  

-  

-

-EXCEPTION

-WHEN V_EXC_NO_TOKEN_EXIST THEN

-P_RESULT := 2; -- NO_TOKEN_EXIST

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER.prc
deleted file mode 100644
index 4225ff2..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER.prc
+++ /dev/null
@@ -1,41 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_CONSUMER

-(

-P_CONSUMER_KEY              IN        STRING,

-P_ROWS                      OUT       TYPES.REF_CURSOR,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Fetch a consumer of this server, by consumer_key.

-BEGIN

-P_RESULT := 0;

-

-OPEN P_ROWS FOR

-  SELECT	OSR_ID "osr_id", 

-	OSR_USA_ID_REF "osr_usa_id_ref", 

-	OSR_CONSUMER_KEY "osr_consumer_key", 

-	OSR_CONSUMER_SECRET "osr_consumer_secret", 

-	OSR_ENABLED "osr_enabled", 

-	OSR_STATUS "osr_status", 

-	OSR_REQUESTER_NAME "osr_requester_name", 

-	OSR_REQUESTER_EMAIL "osr_requester_email",

-	OSR_CALLBACK_URI "osr_callback_uri",

-	OSR_APPLICATION_URI "osr_application_uri",

-	OSR_APPLICATION_TITLE "osr_application_title",

-	OSR_APPLICATION_DESCR "osr_application_descr",

-	OSR_APPLICATION_NOTES "osr_application_notes",

-	OSR_APPLICATION_TYPE "osr_application_type",

-	OSR_APPLICATION_COMMERCIAL "osr_application_commercial",

-	OSR_ISSUE_DATE "osr_issue_date",

-	OSR_TIMESTAMP "osr_timestamp"

-	FROM OAUTH_SERVER_REGISTRY

-	WHERE OSR_CONSUMER_KEY = P_CONSUMER_KEY;

-              

-              

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_ACCESS_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_ACCESS_TOKEN.prc
deleted file mode 100644
index 0db2ea9..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_ACCESS_TOKEN.prc
+++ /dev/null
@@ -1,43 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_CONSUMER_ACCESS_TOKEN

-(

-P_USER_ID                      IN        NUMBER,

-P_TOKEN                        IN        VARCHAR2,

-P_ROWS                         OUT       TYPES.REF_CURSOR,

-P_RESULT                       OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Fetch the consumer access token, by access token.

- 

-BEGIN

-

-  P_RESULT := 0;

-  

-  

-  OPEN P_ROWS FOR

-    SELECT	OST_TOKEN				"token",

-    OST_TOKEN_SECRET		"token_secret",

-    OST_REFERRER_HOST		"token_referrer_host",

-    OSR_CONSUMER_KEY		"consumer_key",

-    OSR_CONSUMER_SECRET		"consumer_secret",

-    OSR_APPLICATION_URI		"application_uri",

-    OSR_APPLICATION_TITLE	"application_title",

-    OSR_APPLICATION_DESCR	"application_descr",

-    OSR_CALLBACK_URI		"callback_uri"

-    FROM OAUTH_SERVER_TOKEN

-    JOIN OAUTH_SERVER_REGISTRY

-    ON OST_OSR_ID_REF = OSR_ID

-    WHERE OST_TOKEN_TYPE = 'ACCESS'

-    AND OST_TOKEN      = P_TOKEN

-    AND OST_USA_ID_REF = P_USER_ID

-    AND OST_TOKEN_TTL  >= SYSDATE;

-              

-   

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_REQUEST_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_REQUEST_TOKEN.prc
deleted file mode 100644
index 6d3b590..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_REQUEST_TOKEN.prc
+++ /dev/null
@@ -1,41 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_CONSUMER_REQUEST_TOKEN

-(

-P_TOKEN                     IN        VARCHAR2,

-P_ROWS                      OUT       TYPES.REF_CURSOR,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Fetch the consumer request token, by request token.

-BEGIN

-P_RESULT := 0;

-

-OPEN P_ROWS FOR

- 

-SELECT	OST_TOKEN			"token",

-    OST_TOKEN_SECRET	"token_secret",

-    OSR_CONSUMER_KEY	"consumer_key",

-    OSR_CONSUMER_SECRET	"consumer_secret",

-    OST_TOKEN_TYPE		"token_type",

-    OST_CALLBACK_URL    "callback_url",

-    OSR_APPLICATION_TITLE "application_title",

-    OSR_APPLICATION_DESCR "application_descr",

-    OSR_APPLICATION_URI   "application_uri"

-    FROM OAUTH_SERVER_TOKEN

-    JOIN OAUTH_SERVER_REGISTRY

-    ON OST_OSR_ID_REF = OSR_ID

-    WHERE OST_TOKEN_TYPE = 'REQUEST'

-    AND OST_TOKEN      = P_TOKEN

-    AND OST_TOKEN_TTL  >= SYSDATE;

-              

-              

-              

-        

-              

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_STATIC_SELECT.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_STATIC_SELECT.prc
deleted file mode 100644
index 1126ef6..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_CONSUMER_STATIC_SELECT.prc
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_CONSUMER_STATIC_SELECT

-(

-P_OSR_CONSUMER_KEY          OUT        VARCHAR2,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

--- PROCEDURE TO Fetch the static consumer key for this provider.

-BEGIN

-P_RESULT := 0;

-

-

- SELECT OSR_CONSUMER_KEY INTO P_OSR_CONSUMER_KEY

-  FROM OAUTH_SERVER_REGISTRY

-  WHERE OSR_CONSUMER_KEY LIKE 'sc-%%'

-  AND OSR_USA_ID_REF IS NULL;

-              

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_SIGNATURE.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_SIGNATURE.prc
deleted file mode 100644
index 2af7847..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_SIGNATURE.prc
+++ /dev/null
@@ -1,43 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SECRETS_FOR_SIGNATURE

-(

-P_HOST                IN        VARCHAR2,

-P_PATH                IN        VARCHAR2,

-P_USER_ID             IN        NUMBER,

-P_NAME                IN        VARCHAR2,

-P_ROWS                OUT       TYPES.REF_CURSOR,

-P_RESULT              OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Find the server details for signing a request, always looks for an access token.

- -- The returned credentials depend on which local user is making the request.

-BEGIN

-P_RESULT := 0;

-

-   OPEN P_ROWS FOR

-   SELECT * FROM (

-   SELECT	OCR_CONSUMER_KEY		"consumer_key",

-      OCR_CONSUMER_SECRET		"consumer_secret",

-      OCT_TOKEN				"token",

-      OCT_TOKEN_SECRET		"token_secret",

-      OCR_SIGNATURE_METHODS	"signature_methods"

-      FROM OAUTH_CONSUMER_REGISTRY

-      JOIN OAUTH_CONSUMER_TOKEN ON OCT_OCR_ID_REF = OCR_ID

-      WHERE OCR_SERVER_URI_HOST = P_HOST

-      AND OCR_SERVER_URI_PATH = SUBSTR(P_PATH, 1, LENGTH(OCR_SERVER_URI_PATH))

-      AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL)

-      AND OCT_USA_ID_REF	= P_USER_ID

-      AND OCT_TOKEN_TYPE  = 'ACCESS'

-      AND OCT_NAME			  = P_NAME

-      AND OCT_TOKEN_TTL   >= SYSDATE

-      ORDER BY OCR_USA_ID_REF DESC, OCR_CONSUMER_SECRET DESC, LENGTH(OCR_SERVER_URI_PATH) DESC

-      ) WHERE ROWNUM<=1;

-

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_VERIFY.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_VERIFY.prc
deleted file mode 100644
index 4fbb435..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SECRETS_FOR_VERIFY.prc
+++ /dev/null
@@ -1,52 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SECRETS_FOR_VERIFY

-(

-P_CONSUMER_KEY      IN        VARCHAR2,

-P_TOKEN             IN        VARCHAR2,

-P_TOKEN_TYPE        IN        VARCHAR2,

-P_ROWS          OUT       TYPES.REF_CURSOR,

-P_RESULT          OUT       NUMBER

-)

-AS

-

- -- PROCEDURE to Find stored credentials for the consumer key and token. Used by an OAuth server

- -- when verifying an OAuth request.

- 

-BEGIN

-P_RESULT := 0;

-

-IF P_TOKEN_TYPE IS NULL THEN

-   OPEN P_ROWS FOR

-   SELECT	OSR.OSR_ID "osr_id",

-          OSR.OSR_CONSUMER_KEY		"consumer_key",

-          OSR.OSR_CONSUMER_SECRET		"consumer_secret"

-          FROM OAUTH_SERVER_REGISTRY OSR

-          WHERE OSR.OSR_CONSUMER_KEY	= P_CONSUMER_KEY

-          AND OSR.OSR_ENABLED		= 1;

-ELSE

-    OPEN P_ROWS FOR

-    SELECT OSR.OSR_ID "osr_id",

-           OST.OST_ID "ost_id",

-           OST.OST_USA_ID_REF			"user_id",

-           OSR.OSR_CONSUMER_KEY		"consumer_key",

-           OSR.OSR_CONSUMER_SECRET		"consumer_secret",

-           OST.OST_TOKEN				"token",

-           OST.OST_TOKEN_SECRET		"token_secret"

-           FROM OAUTH_SERVER_REGISTRY OSR, OAUTH_SERVER_TOKEN OST

-           WHERE OST.OST_OSR_ID_REF = OSR.OSR_ID

-           AND upper(OST.OST_TOKEN_TYPE)	= upper(P_TOKEN_TYPE)

-           AND OSR.OSR_CONSUMER_KEY	= P_CONSUMER_KEY

-           AND OST.OST_TOKEN			= P_TOKEN

-           AND OSR.OSR_ENABLED		= 1

-           AND OST.OST_TOKEN_TTL  >= SYSDATE;

-    

-END IF;

-

-

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER.prc
deleted file mode 100644
index af7d275..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER.prc
+++ /dev/null
@@ -1,35 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SERVER

-(

-P_CONSUMER_KEY              IN        VARCHAR2,

-P_USER_ID                   IN        NUMBER,

-P_ROWS                      OUT       TYPES.REF_CURSOR,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Get a server from the consumer registry using the consumer key

-BEGIN

-P_RESULT := 0;

-

-OPEN P_ROWS FOR

-  SELECT	OCR_ID	"id",

-  OCR_USA_ID_REF			"user_id",

-  OCR_CONSUMER_KEY 		"consumer_key",

-  OCR_CONSUMER_SECRET 	"consumer_secret",

-  OCR_SIGNATURE_METHODS	"signature_methods",

-  OCR_SERVER_URI			"server_uri",

-  OCR_REQUEST_TOKEN_URI	"request_token_uri",

-  OCR_AUTHORIZE_URI		"authorize_uri",

-  OCR_ACCESS_TOKEN_URI	"access_token_uri"

-  FROM OAUTH_CONSUMER_REGISTRY

-  WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY

-  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL);

-        

-              

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_FOR_URI.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_FOR_URI.prc
deleted file mode 100644
index d838b51..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_FOR_URI.prc
+++ /dev/null
@@ -1,41 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SERVER_FOR_URI

-(

-P_HOST                      IN        VARCHAR2,

-P_PATH                      IN        VARCHAR2,

-P_USER_ID                   IN        NUMBER,

-P_ROWS                      OUT       TYPES.REF_CURSOR,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Find the server details that might be used for a request

-BEGIN

-P_RESULT := 0;

-

-OPEN P_ROWS FOR

-SELECT * FROM (

-  SELECT	OCR_ID					"id",

-  OCR_USA_ID_REF			"user_id",

-  OCR_CONSUMER_KEY		"consumer_key",

-  OCR_CONSUMER_SECRET		"consumer_secret",

-  OCR_SIGNATURE_METHODS	"signature_methods",

-  OCR_SERVER_URI			"server_uri",

-  OCR_REQUEST_TOKEN_URI	"request_token_uri",

-  OCR_AUTHORIZE_URI		"authorize_uri",

-  OCR_ACCESS_TOKEN_URI	"access_token_uri"

-  FROM OAUTH_CONSUMER_REGISTRY

-  WHERE OCR_SERVER_URI_HOST = P_HOST

-  AND OCR_SERVER_URI_PATH = SUBSTR(P_PATH, 1, LENGTH(OCR_SERVER_URI_PATH))

-  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL)

-  ORDER BY ocr_usa_id_ref DESC, OCR_CONSUMER_KEY DESC, LENGTH(ocr_server_uri_path) DESC

-) WHERE ROWNUM<=1;

-              

-        

-              

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN.prc
deleted file mode 100644
index fefbe8a..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN.prc
+++ /dev/null
@@ -1,45 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SERVER_TOKEN

-(

-P_CONSUMER_KEY              IN        VARCHAR2,

-P_USER_ID                   IN        NUMBER,

-P_TOKEN                     IN        VARCHAR2,

-P_ROWS                      OUT       TYPES.REF_CURSOR,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Get a specific server token for the given user

-BEGIN

-P_RESULT := 0;

-

-OPEN P_ROWS FOR

-  SELECT	OCR_CONSUMER_KEY		"consumer_key",

-    OCR_CONSUMER_SECRET		"consumer_secret",

-    OCT_TOKEN				"token",

-    OCT_TOKEN_SECRET		"token_secret",

-    OCT_USA_ID_REF			"usr_id",

-    OCR_SIGNATURE_METHODS	"signature_methods",

-    OCR_SERVER_URI			"server_uri",

-    OCR_SERVER_URI_HOST		"server_uri_host",

-    OCR_SERVER_URI_PATH		"server_uri_path",

-    OCR_REQUEST_TOKEN_URI	"request_token_uri",

-    OCR_AUTHORIZE_URI		"authorize_uri",

-    OCR_ACCESS_TOKEN_URI	"access_token_uri",

-    OCT_TIMESTAMP			"timestamp"

-    FROM OAUTH_CONSUMER_REGISTRY

-    JOIN OAUTH_CONSUMER_TOKEN

-    ON OCT_OCR_ID_REF = OCR_ID

-    WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY

-    AND OCT_USA_ID_REF   = P_USER_ID

-    AND OCT_TOKEN_TYPE   = 'ACCESS'

-    AND OCT_TOKEN        = P_TOKEN

-    AND OCT_TOKEN_TTL    >= SYSDATE;

-   

-              

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN_SECRETS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN_SECRETS.prc
deleted file mode 100644
index 95eec88..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_GET_SERVER_TOKEN_SECRETS.prc
+++ /dev/null
@@ -1,47 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_GET_SERVER_TOKEN_SECRETS

-(

-P_CONSUMER_KEY      IN        VARCHAR2,

-P_TOKEN             IN        VARCHAR2,

-P_TOKEN_TYPE        IN        VARCHAR2,

-P_USER_ID           IN        NUMBER,

-P_ROWS              OUT       TYPES.REF_CURSOR,

-P_RESULT            OUT       NUMBER

-)

-AS

-

- --  Get the token and token secret we obtained from a server.

- 

-BEGIN

-P_RESULT := 0;

-

-

-   OPEN P_ROWS FOR

-   SELECT	OCR.OCR_CONSUMER_KEY		"consumer_key",

-      OCR.OCR_CONSUMER_SECRET		"consumer_secret",

-      OCT.OCT_TOKEN				"token",

-      OCT.OCT_TOKEN_SECRET		"token_secret",

-      OCT.OCT_NAME				"token_name",

-      OCR.OCR_SIGNATURE_METHODS	"signature_methods",

-      OCR.OCR_SERVER_URI			"server_uri",

-      OCR.OCR_REQUEST_TOKEN_URI	"request_token_uri",

-      OCR.OCR_AUTHORIZE_URI		"authorize_uri",

-      OCR.OCR_ACCESS_TOKEN_URI	"access_token_uri",

-      CASE WHEN OCT.OCT_TOKEN_TTL >= TO_DATE('9999.12.31', 'yyyy.mm.dd') THEN NULL 

-                 ELSE OCT.OCT_TOKEN_TTL - SYSDATE 

-            END "token_ttl"

-      FROM OAUTH_CONSUMER_REGISTRY OCR, OAUTH_CONSUMER_TOKEN OCT

-      WHERE OCT.OCT_OCR_ID_REF = OCR_ID

-      AND OCR.OCR_CONSUMER_KEY = P_CONSUMER_KEY

-      AND upper(OCT.OCT_TOKEN_TYPE)   = upper(P_TOKEN_TYPE)

-      AND OCT.OCT_TOKEN        = P_TOKEN

-      AND OCT.OCT_USA_ID_REF   = P_USER_ID

-      AND OCT.OCT_TOKEN_TTL    >= SYSDATE;

-

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMERS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMERS.prc
deleted file mode 100644
index bb42465..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMERS.prc
+++ /dev/null
@@ -1,41 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_CONSUMERS

-(

-P_USER_ID                      IN        NUMBER,

-P_ROWS                         OUT       TYPES.REF_CURSOR,

-P_RESULT                       OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Fetch a list of all consumer keys, secrets etc.

- -- Returns the public (user_id is null) and the keys owned by the user

- 

-BEGIN

-

-  P_RESULT := 0;

-  

-  OPEN P_ROWS FOR

-    SELECT	OSR_ID					"id",

-    OSR_USA_ID_REF			"user_id",

-    OSR_CONSUMER_KEY 		"consumer_key",

-    OSR_CONSUMER_SECRET		"consumer_secret",

-    OSR_ENABLED				"enabled",

-    OSR_STATUS 				"status",

-    OSR_ISSUE_DATE			"issue_date",

-    OSR_APPLICATION_URI		"application_uri",

-    OSR_APPLICATION_TITLE	"application_title",

-    OSR_APPLICATION_DESCR	"application_descr",

-    OSR_REQUESTER_NAME		"requester_name",

-    OSR_REQUESTER_EMAIL		"requester_email",

-    OSR_CALLBACK_URI		"callback_uri"

-    FROM OAUTH_SERVER_REGISTRY

-    WHERE (OSR_USA_ID_REF = P_USER_ID OR OSR_USA_ID_REF IS NULL)

-    ORDER BY OSR_APPLICATION_TITLE;

-              

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMER_TOKENS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMER_TOKENS.prc
deleted file mode 100644
index dae9c72..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_CONSUMER_TOKENS.prc
+++ /dev/null
@@ -1,43 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_CONSUMER_TOKENS

-(

-P_USER_ID                      IN        NUMBER,

-P_ROWS                         OUT       TYPES.REF_CURSOR,

-P_RESULT                       OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Fetch a list of all consumer tokens accessing the account of the given user.

- 

-BEGIN

-

-  P_RESULT := 0;

-  

-  OPEN P_ROWS FOR

-    SELECT	OSR_CONSUMER_KEY 		"consumer_key",

-    OSR_CONSUMER_SECRET		"consumer_secret",

-    OSR_ENABLED				"enabled",

-    OSR_STATUS 				"status",

-    OSR_APPLICATION_URI		"application_uri",

-    OSR_APPLICATION_TITLE	"application_title",

-    OSR_APPLICATION_DESCR	"application_descr",

-    OST_TIMESTAMP			"timestamp",

-    OST_TOKEN				"token",

-    OST_TOKEN_SECRET		"token_secret",

-    OST_REFERRER_HOST		"token_referrer_host",

-    OSR_CALLBACK_URI		"callback_uri"

-    FROM OAUTH_SERVER_REGISTRY

-    JOIN OAUTH_SERVER_TOKEN

-    ON OST_OSR_ID_REF = OSR_ID

-    WHERE OST_USA_ID_REF = P_USER_ID

-    AND OST_TOKEN_TYPE = 'ACCESS'

-    AND OST_TOKEN_TTL  >= SYSDATE

-    ORDER BY OSR_APPLICATION_TITLE;

-            

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_LOG.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_LOG.prc
deleted file mode 100644
index 275950e..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_LOG.prc
+++ /dev/null
@@ -1,75 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_LOG

-(

-P_OPTION_FLAG                  IN        NUMBER, -- 0:NULL; 1:OTHERWISE

-P_USA_ID                       IN        NUMBER,

-P_OSR_CONSUMER_KEY             IN        VARCHAR2,

-P_OCR_CONSUMER_KEY             IN        VARCHAR2,

-P_OST_TOKEN                    IN        VARCHAR2,

-P_OCT_TOKEN                    IN        VARCHAR2,

-P_ROWS                         OUT       TYPES.REF_CURSOR,

-P_RESULT                       OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Get a page of entries from the log.  Returns the last 100 records

- -- matching the options given.

- 

-BEGIN

-

-  P_RESULT := 0;

-  

-  IF P_OPTION_FLAG IS NULL OR P_OPTION_FLAG = 0 THEN

-      OPEN P_ROWS FOR

-      SELECT * FROM (

-         SELECT OLG_ID "olg_id",

-    							OLG_OSR_CONSUMER_KEY 	"osr_consumer_key",

-    							OLG_OST_TOKEN			"ost_token",

-    							OLG_OCR_CONSUMER_KEY	"ocr_consumer_key",

-    							OLG_OCT_TOKEN			"oct_token",

-    							OLG_USA_ID_REF			"user_id",

-    							OLG_RECEIVED			"received",

-    							OLG_SENT				"sent",

-    							OLG_BASE_STRING			"base_string",

-    							OLG_NOTES				"notes",

-    							OLG_TIMESTAMP			"timestamp",

-    							-- INET_NTOA(OLG_REMOTE_IP) "remote_ip"

-                  OLG_REMOTE_IP "remote_ip"

-    					FROM OAUTH_LOG

-    					WHERE  OLG_USA_ID_REF = P_USA_ID

-    					ORDER BY OLG_ID DESC

-       )  WHERE ROWNUM<=100; 

-  ELSE

-      OPEN P_ROWS FOR

-      SELECT * FROM (

-          SELECT OLG_ID "olg_id",

-    							OLG_OSR_CONSUMER_KEY 	"osr_consumer_key",

-    							OLG_OST_TOKEN			"ost_token",

-    							OLG_OCR_CONSUMER_KEY	"ocr_consumer_key",

-    							OLG_OCT_TOKEN			"oct_token",

-    							OLG_USA_ID_REF			"user_id",

-    							OLG_RECEIVED			"received",

-    							OLG_SENT				"sent",

-    							OLG_BASE_STRING			"base_string",

-    							OLG_NOTES				"notes",

-    							OLG_TIMESTAMP			"timestamp",

-    							-- INET_NTOA(OLG_REMOTE_IP) "remote_ip"

-                  OLG_REMOTE_IP "remote_ip"

-    					FROM OAUTH_LOG

-    					WHERE  OLG_OSR_CONSUMER_KEY = P_OSR_CONSUMER_KEY

-              AND OLG_OCR_CONSUMER_KEY = P_OCR_CONSUMER_KEY

-              AND OLG_OST_TOKEN = P_OST_TOKEN

-              AND OLG_OCT_TOKEN = P_OCT_TOKEN

-              AND (OLG_USA_ID_REF IS NULL OR OLG_USA_ID_REF = P_USA_ID)

-    					ORDER BY OLG_ID DESC

-       )  WHERE ROWNUM<=100; 

-              

-  END IF;

-               

-

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVERS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVERS.prc
deleted file mode 100644
index 51dd39a..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVERS.prc
+++ /dev/null
@@ -1,66 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_SERVERS

-(

-P_Q                         IN        VARCHAR2,

-P_USER_ID                   IN        NUMBER,

-P_ROWS                      OUT       TYPES.REF_CURSOR,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Get a list of all consumers from the consumer registry.

-BEGIN

-P_RESULT := 0;

-

-IF P_Q IS NOT NULL THEN

-

-   OPEN P_ROWS FOR

-    SELECT	OCR_ID					"id",

-    	OCR_USA_ID_REF			"user_id",

-    	OCR_CONSUMER_KEY 		"consumer_key",

-    	OCR_CONSUMER_SECRET 	"consumer_secret",

-    	OCR_SIGNATURE_METHODS	"signature_methods",

-    	OCR_SERVER_URI			"server_uri",

-    	OCR_SERVER_URI_HOST		"server_uri_host",

-    	OCR_SERVER_URI_PATH		"server_uri_path",

-    	OCR_REQUEST_TOKEN_URI	"request_token_uri",

-    	OCR_AUTHORIZE_URI		"authorize_uri",

-    	OCR_ACCESS_TOKEN_URI	"access_token_uri"

-    FROM OAUTH_CONSUMER_REGISTRY

-    WHERE (	OCR_CONSUMER_KEY LIKE '%'|| P_Q ||'%'

-						  	 OR OCR_SERVER_URI LIKE '%'|| P_Q ||'%'

-						  	 OR OCR_SERVER_URI_HOST LIKE '%'|| P_Q ||'%'

-						  	 OR OCR_SERVER_URI_PATH LIKE '%'|| P_Q ||'%')

-						 AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL)

-    ORDER BY OCR_SERVER_URI_HOST, OCR_SERVER_URI_PATH;

-        

-ELSE

-

-   OPEN P_ROWS FOR

-    SELECT	OCR_ID					"id",

-    	OCR_USA_ID_REF			"user_id",

-    	OCR_CONSUMER_KEY 		"consumer_key",

-    	OCR_CONSUMER_SECRET 	"consumer_secret",

-    	OCR_SIGNATURE_METHODS	"signature_methods",

-    	OCR_SERVER_URI			"server_uri",

-    	OCR_SERVER_URI_HOST		"server_uri_host",

-    	OCR_SERVER_URI_PATH		"server_uri_path",

-    	OCR_REQUEST_TOKEN_URI	"request_token_uri",

-    	OCR_AUTHORIZE_URI		"authorize_uri",

-    	OCR_ACCESS_TOKEN_URI	"access_token_uri"

-    FROM OAUTH_CONSUMER_REGISTRY

-    WHERE OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL

-    ORDER BY OCR_SERVER_URI_HOST, OCR_SERVER_URI_PATH;

-                 

-END IF;

-

-

-  

-   

-              

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVER_TOKENS.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVER_TOKENS.prc
deleted file mode 100644
index baa62c0..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_LIST_SERVER_TOKENS.prc
+++ /dev/null
@@ -1,45 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_LIST_SERVER_TOKENS

-(

-P_USER_ID                   IN        NUMBER,

-P_ROWS                      OUT       TYPES.REF_CURSOR,

-P_RESULT                    OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Find the server details that might be used for a request

-BEGIN

-P_RESULT := 0;

-

-OPEN P_ROWS FOR

-  SELECT	OCR_CONSUMER_KEY		"consumer_key",

-  OCR_CONSUMER_SECRET		"consumer_secret",

-  OCT_ID					"token_id",

-  OCT_TOKEN				"token",

-  OCT_TOKEN_SECRET		"token_secret",

-  OCT_USA_ID_REF			"user_id",

-  OCR_SIGNATURE_METHODS	"signature_methods",

-  OCR_SERVER_URI			"server_uri",

-  OCR_SERVER_URI_HOST		"server_uri_host",

-  OCR_SERVER_URI_PATH		"server_uri_path",

-  OCR_REQUEST_TOKEN_URI	"request_token_uri",

-  OCR_AUTHORIZE_URI		"authorize_uri",

-  OCR_ACCESS_TOKEN_URI	"access_token_uri",

-  OCT_TIMESTAMP			"timestamp"

-  FROM OAUTH_CONSUMER_REGISTRY

-  JOIN OAUTH_CONSUMER_TOKEN

-  ON OCT_OCR_ID_REF = OCR_ID

-  WHERE OCT_USA_ID_REF = P_USER_ID

-  AND OCT_TOKEN_TYPE = 'ACCESS'

-  AND OCT_TOKEN_TTL  >= SYSDATE

-  ORDER BY OCR_SERVER_URI_HOST, OCR_SERVER_URI_PATH;

-              

-              

-        

-              

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_CONSUMER_ACC_TOKEN_TTL.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_CONSUMER_ACC_TOKEN_TTL.prc
deleted file mode 100644
index e5a96c9..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_CONSUMER_ACC_TOKEN_TTL.prc
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_SET_CONSUMER_ACC_TOKEN_TTL

-(

-P_TOKEN                        IN        VARCHAR2,

-P_TOKEN_TTL                    IN        NUMBER,

-P_RESULT                       OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Set the ttl of a consumer access token.  This is done when the

- -- server receives a valid request with a xoauth_token_ttl parameter in it.

- 

-BEGIN

-

-  P_RESULT := 0;

-  

-  UPDATE OAUTH_SERVER_TOKEN

-  SET OST_TOKEN_TTL = SYSDATE + (P_TOKEN_TTL/(24*60*60))

-  WHERE OST_TOKEN 	 = P_TOKEN

-  AND OST_TOKEN_TYPE = 'ACCESS';

-        

-  

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_SERVER_TOKEN_TTL.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_SERVER_TOKEN_TTL.prc
deleted file mode 100644
index 34a99de..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_SET_SERVER_TOKEN_TTL.prc
+++ /dev/null
@@ -1,29 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_SET_SERVER_TOKEN_TTL

-(

-P_TOKEN_TTL                    IN        NUMBER, -- IN SECOND

-P_CONSUMER_KEY                 IN        VARCHAR2,

-P_TOKEN                        IN        VARCHAR2,

-P_RESULT                       OUT       NUMBER

-)

-AS

-

- -- PROCEDURE TO Set the ttl of a server access token.

-

-BEGIN

-

-  P_RESULT := 0;

-  

-

-UPDATE OAUTH_CONSUMER_TOKEN

-SET OCT_TOKEN_TTL = SYSDATE + (P_TOKEN_TTL/(24*60*60)) -- DATE_ADD(NOW(), INTERVAL %D SECOND)

-WHERE OCT_TOKEN = P_TOKEN

-AND OCT_OCR_ID_REF IN (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY);

-              

-  

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_CONSUMER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_CONSUMER.prc
deleted file mode 100644
index a79e64c..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_CONSUMER.prc
+++ /dev/null
@@ -1,40 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_UPDATE_CONSUMER

-(

-P_OSR_USA_ID_REF                              IN      NUMBER, 

-P_OSR_CONSUMER_KEY                            IN      VARCHAR2, 

-P_OSR_CONSUMER_SECRET                         IN      VARCHAR2,

-P_OSR_REQUESTER_NAME                          IN      VARCHAR2,

-P_OSR_REQUESTER_EMAIL                         IN      VARCHAR2, 

-P_OSR_CALLBACK_URI                            IN      VARCHAR2, 

-P_OSR_APPLICATION_URI                         IN      VARCHAR2, 

-P_OSR_APPLICATION_TITLE                       IN      VARCHAR2, 

-P_OSR_APPLICATION_DESCR                       IN      VARCHAR2,

-P_OSR_APPLICATION_NOTES                       IN      VARCHAR2, 

-P_OSR_APPLICATION_TYPE                        IN      VARCHAR2, 

-P_OSR_APPLICATION_COMMERCIAL                  IN      INTEGER,

-P_RESULT                                      OUT     NUMBER

-)

-AS

-

- -- PROCEDURE TO Insert a new consumer with this server (we will be the server)

-BEGIN

-P_RESULT := 0;

-

-

- INSERT INTO OAUTH_SERVER_REGISTRY

- ( OSR_ID, OSR_ENABLED, OSR_STATUS,OSR_USA_ID_REF,OSR_CONSUMER_KEY, OSR_CONSUMER_SECRET,OSR_REQUESTER_NAME,

-					OSR_REQUESTER_EMAIL, OSR_CALLBACK_URI, OSR_APPLICATION_URI, OSR_APPLICATION_TITLE, OSR_APPLICATION_DESCR,

-					OSR_APPLICATION_NOTES, OSR_APPLICATION_TYPE, OSR_APPLICATION_COMMERCIAL, OSR_TIMESTAMP, OSR_ISSUE_DATE)

- VALUES

- ( SEQ_OSR_ID.NEXTVAL, 1, 'ACTIVE', P_OSR_USA_ID_REF, P_OSR_CONSUMER_KEY, P_OSR_CONSUMER_SECRET,P_OSR_REQUESTER_NAME,

-					P_OSR_REQUESTER_EMAIL, P_OSR_CALLBACK_URI, P_OSR_APPLICATION_URI, P_OSR_APPLICATION_TITLE, P_OSR_APPLICATION_DESCR,

-					P_OSR_APPLICATION_NOTES, P_OSR_APPLICATION_TYPE, P_OSR_APPLICATION_COMMERCIAL, SYSDATE, SYSDATE); 

-    

-              

-EXCEPTION

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_SERVER.prc b/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_SERVER.prc
deleted file mode 100644
index 7826eb6..0000000
--- a/vendor/oauth-php/library/store/oracle/OracleDB/3_Procedures/SP_UPDATE_SERVER.prc
+++ /dev/null
@@ -1,139 +0,0 @@
-CREATE OR REPLACE PROCEDURE SP_UPDATE_SERVER

-(

-P_CONSUMER_KEY                          IN        VARCHAR2,

-P_USER_ID                               IN        NUMBER,

-P_OCR_ID                                IN        NUMBER,

-P_USER_IS_ADMIN                         IN        NUMBER, -- 0:NO; 1:YES;

-P_OCR_CONSUMER_SECRET                   IN        VARCHAR2,

-P_OCR_SERVER_URI                        IN        VARCHAR2,

-P_OCR_SERVER_URI_HOST                   IN        VARCHAR2,

-P_OCR_SERVER_URI_PATH                   IN        VARCHAR2,

-P_OCR_REQUEST_TOKEN_URI                 IN        VARCHAR2,

-P_OCR_AUTHORIZE_URI                     IN        VARCHAR2,

-P_OCR_ACCESS_TOKEN_URI                  IN        VARCHAR2,

-P_OCR_SIGNATURE_METHODS                 IN        VARCHAR2,

-P_OCR_USA_ID_REF                        IN        NUMBER,

-P_UPDATE_P_OCR_USA_ID_REF_FLAG          IN        NUMBER, -- 1:TRUE; 0:FALSE

-P_RESULT                                OUT       NUMBER

-)

-AS

-

- -- Add a request token we obtained from a server.

-V_OCR_ID_EXIST                                  NUMBER;

-V_OCR_USA_ID_REF                                NUMBER;

-

-V_EXC_DUPLICATE_CONSUMER_KEY              EXCEPTION;

-V_EXC_UNAUTHORISED_USER_ID                EXCEPTION;

-BEGIN

-P_RESULT := 0;

-

-V_OCR_USA_ID_REF := P_OCR_USA_ID_REF;

-

-      IF P_OCR_ID IS NOT NULL THEN

-        BEGIN

-          SELECT 1 INTO V_OCR_ID_EXIST FROM DUAL WHERE EXISTS 

-          (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY 

-  						WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY

-  						  AND OCR_ID != P_OCR_ID

-  						  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL));

-           

-        EXCEPTION

-        WHEN NO_DATA_FOUND THEN

-             V_OCR_ID_EXIST :=0;

-        END;

-      ELSE

-         BEGIN

-          SELECT 1 INTO V_OCR_ID_EXIST FROM DUAL WHERE EXISTS 

-          (SELECT OCR_ID FROM OAUTH_CONSUMER_REGISTRY 

-  						WHERE OCR_CONSUMER_KEY = P_CONSUMER_KEY

-  						  AND (OCR_USA_ID_REF = P_USER_ID OR OCR_USA_ID_REF IS NULL));

-           

-        EXCEPTION

-        WHEN NO_DATA_FOUND THEN

-             V_OCR_ID_EXIST :=0;

-        END;

-      END IF;

-      

-      IF V_OCR_ID_EXIST = 1 THEN

-         RAISE V_EXC_DUPLICATE_CONSUMER_KEY;

-      END IF;

-      

-      

-      IF P_OCR_ID IS NOT NULL THEN

-         IF P_USER_IS_ADMIN != 1 THEN

-            BEGIN

-              SELECT OCR_USA_ID_REF INTO V_OCR_USA_ID_REF

-  									FROM OAUTH_CONSUMER_REGISTRY

-  									WHERE OCR_ID = P_OCR_ID;

-               

-            EXCEPTION

-            WHEN NO_DATA_FOUND THEN

-                 NULL;

-            END;

-            

-            IF V_OCR_USA_ID_REF != P_USER_ID THEN

-               RAISE V_EXC_UNAUTHORISED_USER_ID;

-            END IF;

-         END IF; 

-         

-         IF P_UPDATE_P_OCR_USA_ID_REF_FLAG = 0 THEN

-         

-            UPDATE OAUTH_CONSUMER_REGISTRY

-              SET OCR_CONSUMER_KEY  = P_CONSUMER_KEY,

-              OCR_CONSUMER_SECRET 	= P_OCR_CONSUMER_SECRET,

-              OCR_SERVER_URI	    	= P_OCR_SERVER_URI,

-              OCR_SERVER_URI_HOST 	= P_OCR_SERVER_URI_HOST,

-              OCR_SERVER_URI_PATH 	= P_OCR_SERVER_URI_PATH,

-              OCR_TIMESTAMP       	= SYSDATE,

-              OCR_REQUEST_TOKEN_URI	= P_OCR_REQUEST_TOKEN_URI,

-              OCR_AUTHORIZE_URI		  = P_OCR_AUTHORIZE_URI,

-              OCR_ACCESS_TOKEN_URI	= P_OCR_ACCESS_TOKEN_URI,

-              OCR_SIGNATURE_METHODS	= P_OCR_SIGNATURE_METHODS

-              WHERE OCR_ID = P_OCR_ID;

-                  

-         ELSIF P_UPDATE_P_OCR_USA_ID_REF_FLAG = 1 THEN

-             UPDATE OAUTH_CONSUMER_REGISTRY

-              SET OCR_CONSUMER_KEY  = P_CONSUMER_KEY,

-              OCR_CONSUMER_SECRET 	= P_OCR_CONSUMER_SECRET,

-              OCR_SERVER_URI	    	= P_OCR_SERVER_URI,

-              OCR_SERVER_URI_HOST 	= P_OCR_SERVER_URI_HOST,

-              OCR_SERVER_URI_PATH 	= P_OCR_SERVER_URI_PATH,

-              OCR_TIMESTAMP       	= SYSDATE,

-              OCR_REQUEST_TOKEN_URI	= P_OCR_REQUEST_TOKEN_URI,

-              OCR_AUTHORIZE_URI		  = P_OCR_AUTHORIZE_URI,

-              OCR_ACCESS_TOKEN_URI	= P_OCR_ACCESS_TOKEN_URI,

-              OCR_SIGNATURE_METHODS	= P_OCR_SIGNATURE_METHODS,

-              OCR_USA_ID_REF        = P_OCR_USA_ID_REF

-              WHERE OCR_ID = P_OCR_ID;

-                    

-         END IF;

-      

-      ELSE

-          IF P_UPDATE_P_OCR_USA_ID_REF_FLAG = 0 THEN

-             V_OCR_USA_ID_REF := P_USER_ID;

-          END IF;

-          

-          INSERT INTO OAUTH_CONSUMER_REGISTRY

-          (OCR_ID, OCR_CONSUMER_KEY ,OCR_CONSUMER_SECRET, OCR_SERVER_URI, OCR_SERVER_URI_HOST, OCR_SERVER_URI_PATH,

-						OCR_TIMESTAMP, OCR_REQUEST_TOKEN_URI, OCR_AUTHORIZE_URI, OCR_ACCESS_TOKEN_URI, OCR_SIGNATURE_METHODS,

-						OCR_USA_ID_REF)

-          VALUES

-          (SEQ_OCR_ID.NEXTVAL, P_CONSUMER_KEY, P_OCR_CONSUMER_SECRET, P_OCR_SERVER_URI, P_OCR_SERVER_URI_HOST, P_OCR_SERVER_URI_PATH,

-						SYSDATE, P_OCR_REQUEST_TOKEN_URI, P_OCR_AUTHORIZE_URI, P_OCR_ACCESS_TOKEN_URI, P_OCR_SIGNATURE_METHODS,

-						V_OCR_USA_ID_REF);

-              

-      END IF;

-      

-      

-EXCEPTION

-WHEN V_EXC_DUPLICATE_CONSUMER_KEY THEN

-P_RESULT := 2; -- DUPLICATE_CONSUMER_KEY

-WHEN V_EXC_UNAUTHORISED_USER_ID THEN

-P_RESULT := 3; -- UNAUTHORISED_USER_ID

-

-WHEN OTHERS THEN

--- CALL THE FUNCTION TO LOG ERRORS

-ROLLBACK;

-P_RESULT := 1; -- ERROR

-END;

-/

diff --git a/vendor/oauth-php/library/store/oracle/install.php b/vendor/oauth-php/library/store/oracle/install.php
deleted file mode 100644
index 5a80f04..0000000
--- a/vendor/oauth-php/library/store/oracle/install.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php

-

-

-/**

- Added by Vinay Kant Sahu.

-vinaykant.sahu@gmail.com

- * Storage container for the oauth credentials, both server and consumer side.

- * Based on Oracle

- * 

- 

- * 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.

-

-

-

- */

-

-echo 'Right now we do not have Oracle DB installer.

-Please find OracleDB folder here with this Table, Sequences and Procedures. You need to manually install/create DB schema and SP with your oracle DB. ';

-?>
\ No newline at end of file
diff --git a/vendor/oauth-php/library/store/postgresql/pgsql.sql b/vendor/oauth-php/library/store/postgresql/pgsql.sql
deleted file mode 100644
index 8f0e4d3..0000000
--- a/vendor/oauth-php/library/store/postgresql/pgsql.sql
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-# Log table to hold all OAuth request when you enabled logging
-#
-
-CREATE TABLE oauth_log (
-    olg_id                  serial primary key,
-    olg_osr_consumer_key    varchar(64),
-    olg_ost_token           varchar(64),
-    olg_ocr_consumer_key    varchar(64),
-    olg_oct_token           varchar(64),
-    olg_usa_id_ref          text,
-    olg_received            text not null,
-    olg_sent                text not null,
-    olg_base_string         text not null,
-    olg_notes               text not null,
-    olg_timestamp           timestamp not null default current_timestamp,
-    olg_remote_ip           inet not null
-);
-
-COMMENT ON TABLE oauth_log IS 'Log table to hold all OAuth request when you enabled logging';
-
-
-#
-# /////////////////// CONSUMER SIDE ///////////////////
-#
-
-# This is a registry of all consumer codes we got from other servers
-# The consumer_key/secret is obtained from the server
-# We also register the server uri, so that we can find the consumer key and secret
-# for a certain server.  From that server we can check if we have a token for a
-# particular user.
-
-CREATE TABLE oauth_consumer_registry (
-    ocr_id                  serial primary key,
-    ocr_usa_id_ref          text,
-    ocr_consumer_key        varchar(128) not null,
-    ocr_consumer_secret     varchar(128) not null,
-    ocr_signature_methods   varchar(255) not null default 'HMAC-SHA1,PLAINTEXT',
-    ocr_server_uri          varchar(255) not null,
-    ocr_server_uri_host     varchar(128) not null,
-    ocr_server_uri_path     varchar(128) not null,
-
-    ocr_request_token_uri   varchar(255) not null,
-    ocr_authorize_uri       varchar(255) not null,
-    ocr_access_token_uri    varchar(255) not null,
-    ocr_timestamp           timestamp not null default current_timestamp,
-
-    unique (ocr_consumer_key, ocr_usa_id_ref, ocr_server_uri)
-);
-
-COMMENT ON TABLE oauth_consumer_registry IS 'This is a registry of all consumer codes we got from other servers';
-
-# Table used to sign requests for sending to a server by the consumer
-# The key is defined for a particular user.  Only one single named
-# key is allowed per user/server combination
-
--- Create enum type token_type
-CREATE TYPE consumer_token_type AS ENUM (
-    'request',
-    'authorized',
-    'access'
-);
-
-CREATE TABLE oauth_consumer_token (
-    oct_id                  serial primary key,
-    oct_ocr_id_ref          integer not null,
-    oct_usa_id_ref          text not null,
-    oct_name                varchar(64) not null default '',
-    oct_token               varchar(64) not null,
-    oct_token_secret        varchar(64) not null,
-    oct_token_type          consumer_token_type,
-    oct_token_ttl           timestamp not null default timestamp '9999-12-31',
-    oct_timestamp           timestamp not null default current_timestamp,
-
-    unique (oct_ocr_id_ref, oct_token),
-    unique (oct_usa_id_ref, oct_ocr_id_ref, oct_token_type, oct_name),
-
-    foreign key (oct_ocr_id_ref) references oauth_consumer_registry (ocr_id)
-        on update cascade
-        on delete cascade
-);
-
-
-COMMENT ON TABLE oauth_consumer_token IS 'Table used to sign requests for sending to a server by the consumer';
-
-#
-# ////////////////// SERVER SIDE /////////////////
-#
-
-# Table holding consumer key/secret combos an user issued to consumers.
-# Used for verification of incoming requests.
-
-CREATE TABLE oauth_server_registry (
-    osr_id                      serial primary key,
-    osr_usa_id_ref              text,
-    osr_consumer_key            varchar(64) not null,
-    osr_consumer_secret         varchar(64) not null,
-    osr_enabled                 boolean not null default true,
-    osr_status                  varchar(16) not null,
-    osr_requester_name          varchar(64) not null,
-    osr_requester_email         varchar(64) not null,
-    osr_callback_uri            varchar(255) not null,
-    osr_application_uri         varchar(255) not null,
-    osr_application_title       varchar(80) not null,
-    osr_application_descr       text not null,
-    osr_application_notes       text not null,
-    osr_application_type        varchar(20) not null,
-    osr_application_commercial  boolean not null default false,
-    osr_issue_date              timestamp not null,
-    osr_timestamp               timestamp not null default current_timestamp,
-
-    unique (osr_consumer_key)
-);
-
-
-COMMENT ON TABLE oauth_server_registry IS 'Table holding consumer key/secret combos an user issued to consumers';
-
-# Nonce used by a certain consumer, every used nonce should be unique, this prevents
-# replaying attacks.  We need to store all timestamp/nonce combinations for the
-# maximum timestamp received.
-
-CREATE TABLE oauth_server_nonce (
-    osn_id                  serial primary key,
-    osn_consumer_key        varchar(64) not null,
-    osn_token               varchar(64) not null,
-    osn_timestamp           bigint not null,
-    osn_nonce               varchar(80) not null,
-
-    unique (osn_consumer_key, osn_token, osn_timestamp, osn_nonce)
-);
-
-
-COMMENT ON TABLE oauth_server_nonce IS 'Nonce used by a certain consumer, every used nonce should be unique, this prevents replaying attacks';
-
-# Table used to verify signed requests sent to a server by the consumer
-# When the verification is succesful then the associated user id is returned.
-
--- Create enum type token_type
-CREATE TYPE server_token_type AS ENUM (
-    'request',
-    'access'
-);
-
-CREATE TABLE oauth_server_token (
-    ost_id                  serial primary key,
-    ost_osr_id_ref          integer not null,
-    ost_usa_id_ref          text not null,
-    ost_token               varchar(64) not null,
-    ost_token_secret        varchar(64) not null,
-    ost_token_type          server_token_type,
-    ost_authorized          boolean not null default false,
-	ost_referrer_host       varchar(128) not null default '',
-	ost_token_ttl           timestamp not null default timestamp '9999-12-31',
-    ost_timestamp           timestamp not null default current_timestamp,
-    ost_verifier            char(10),
-    ost_callback_url        varchar(512),
-
-    unique (ost_token),
-
-	foreign key (ost_osr_id_ref) references oauth_server_registry (osr_id)
-        on update cascade
-        on delete cascade
-);
-
-
-COMMENT ON TABLE oauth_server_token IS 'Table used to verify signed requests sent to a server by the consumer';