X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapioauthaccesstoken.php;h=20802466073f2cfc275327d4236d4fca5d0a2c00;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=6c3819c3bdff6dcc5b795b9e272d56874f05ff03;hpb=1543af748c7fe4be28348dfbfcdbde226c05ae29;p=quix0rs-gnu-social.git

diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index 6c3819c3bd..2080246607 100644
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -28,11 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apioauth.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Action for getting OAuth token credentials (exchange an authorized
@@ -44,7 +40,7 @@ require_once INSTALLDIR . '/lib/apioauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ApiOauthAccessTokenAction extends ApiOauthAction
+class ApiOAuthAccessTokenAction extends ApiOAuthAction
 {
     protected $reqToken = null;
     protected $verifier = null;
@@ -56,11 +52,11 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
-        $datastore   = new ApiStatusNetOAuthDataStore();
+        $datastore   = new ApiGNUsocialOAuthDataStore();
         $server      = new OAuthServer($datastore);
         $hmac_method = new OAuthSignatureMethod_HMAC_SHA1();
 
@@ -84,7 +80,6 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
             common_debug(var_export($req, true));
             $code = $e->getCode();
             $this->clientError($e->getMessage(), empty($code) ? 401 : $code, 'text');
-            return;
         }
 
         if (empty($atok)) {
@@ -99,7 +94,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
 
             common_log(LOG_WARNING, $msg);
             // TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-            $this->clientError(_("Invalid request token or verifier."), 400, 'text');
+            $this->clientError(_('Invalid request token or verifier.'), 400, 'text');
         } else {
             common_log(
                 LOG_INFO,