Added missing isPrivateScope().

[quix0rs-gnu-social.git] / actions / oauthconnectionssettings.php

diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index b2e6f713a95dded43d15ef948fa5bca4fe75a6be..2256dc397ffab15eecc91d49f9fba6b9ee686075 100644 (file)
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apioauthstore.php';
+require_once INSTALLDIR . '/lib/applicationlist.php';
 
 /**
  * Show connected OAuth applications
@@ -49,7 +49,7 @@ class OauthconnectionssettingsAction extends SettingsAction
     var $page        = null;
     var $oauth_token = null;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
         $this->oauth_token = $this->arg('oauth_token');
@@ -131,6 +131,7 @@ class OauthconnectionssettingsAction extends SettingsAction
 
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->showForm(_('There was a problem with your session token. '.
                               'Try again, please.'));
             return;
@@ -141,7 +142,6 @@ class OauthconnectionssettingsAction extends SettingsAction
         } else {
             // TRANS: Client error when submitting a form with unexpected information.
             $this->clientError(_('Unexpected form submission.'), 401);
-            return false;
         }
     }
 
@@ -162,12 +162,11 @@ class OauthconnectionssettingsAction extends SettingsAction
         if (empty($appUser)) {
             // TRANS: Client error when trying to revoke access for an application while not being a user of it.
             $this->clientError(_('You are not a user of that application.'), 401);
-            return false;
         }
 
-        $app = Oauth_application::staticGet('id', $appUser->application_id);
+        $app = Oauth_application::getKV('id', $appUser->application_id);
 
-        $datastore = new ApiStatusNetOAuthDataStore();
+        $datastore = new ApiGNUsocialOAuthDataStore();
         $datastore->revoke_token($appUser->token, 1);
 
         $result = $appUser->delete();
@@ -177,7 +176,6 @@ class OauthconnectionssettingsAction extends SettingsAction
             // TRANS: Client error when revoking access has failed for some reason.
             // TRANS: %s is the application ID revoking access failed for.
             $this->clientError(sprintf(_('Unable to revoke access for application: %s.'), $app->id));
-            return false;
         }
 
         $msg = 'API OAuth - user %s (id: %d) revoked access token %s for app id %d';