Merge branch 'nginx-sample' into 'nightly'

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

diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index 0590b729cb1672d86542a782e01b992cbb9437db..0c5a14344370e609df043fb67262683df6501a96 100644 (file)
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -27,13 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/connectsettingsaction.php';
-require_once INSTALLDIR . '/lib/applicationlist.php';
-require_once INSTALLDIR . '/lib/apioauthstore.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Show connected OAuth applications
@@ -46,19 +40,16 @@ require_once INSTALLDIR . '/lib/apioauthstore.php';
  *
  * @see      SettingsAction
  */
-
-class OauthconnectionssettingsAction extends ConnectSettingsAction
+class OauthconnectionssettingsAction extends SettingsAction
 {
+    var $page = null;
 
-    var $page        = null;
-    var $oauth_token = null;
+    protected $oauth_token = null;
 
-    function prepare($args)
+    protected function doPreparation()
     {
-        parent::prepare($args);
         $this->oauth_token = $this->arg('oauth_token');
-        $this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
-        return true;
+        $this->page = $this->int('page') ?: 1;
     }
 
     /**
@@ -66,9 +57,9 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
      *
      * @return string Title of the page
      */
-
     function title()
     {
+        // TRANS: Title for OAuth connection settings.
         return _('Connected applications');
     }
 
@@ -77,9 +68,9 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
+        // TRANS: Instructions for OAuth connection settings.
         return _('The following connections exist for your account.');
     }
 
@@ -91,18 +82,15 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
 
     function showContent()
     {
-        $user    = common_current_user();
-        $profile = $user->getProfile();
-
         $offset = ($this->page - 1) * APPS_PER_PAGE;
         $limit  =  APPS_PER_PAGE + 1;
 
-        $connection = $profile->getConnectedApps($offset, $limit);
+        $connection = $this->scoped->getConnectedApps($offset, $limit);
 
         $cnt = 0;
 
         if (!empty($connection)) {
-            $cal = new ConnectedAppsList($connection, $user, $this);
+            $cal = new ConnectedAppsList($connection, $this->scoped, $this);
             $cnt = $cal->show();
         }
 
@@ -115,7 +103,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
             $cnt > APPS_PER_PAGE,
             $this->page,
             'connectionssettings',
-            array('nickname' => $user->nickname)
+            array('nickname' => $this->scoped->getNickname())
         );
     }
 
@@ -129,24 +117,14 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
-    function handlePost()
+    protected function doPost()
     {
-        // CSRF protection
-
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->showForm(_('There was a problem with your session token. '.
-                              'Try again, please.'));
-            return;
-        }
-
         if ($this->arg('revoke')) {
-            $this->revokeAccess($this->oauth_token);
-        } else {
-            $this->clientError(_('Unexpected form submission.'), 401);
-            return false;
+            return $this->revokeAccess($this->oauth_token);
         }
+
+        // TRANS: Client error when submitting a form with unexpected information.
+        throw new ClientException(_('Unexpected form submission.'), 401);
     }
 
     /**
@@ -157,7 +135,6 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
      * @param int $appId the ID of the application
      *
      */
-
     function revokeAccess($token)
     {
         $cur = common_current_user();
@@ -165,21 +142,22 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
         $appUser = Oauth_application_user::getByUserAndToken($cur, $token);
 
         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();
 
         if (!$result) {
             common_log_db_error($orig, 'DELETE', __FILE__);
-            $this->clientError(sprintf(_('Unable to revoke access for app: %s.'), $app->id));
-            return false;
+            // 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));
         }
 
         $msg = 'API OAuth - user %s (id: %d) revoked access token %s for app id %d';
@@ -195,7 +173,9 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
         );
 
         $msg = sprintf(
-            _('You have successfully revoked access for %s and the access token starting with %s'),
+            // TRANS: Success message after revoking access for an application.
+            // TRANS: %1$s is the application name, %2$s is the first part of the user token.
+            _('You have successfully revoked access for %1$s and the access token starting with %2$s.'),
              $app->name,
              substr($appUser->token, 0, 7)
         );
@@ -205,6 +185,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
 
     function showEmptyListMessage()
     {
+        // TRANS: Empty list message when no applications have been authorised yet.
         $message = _('You have not authorized any applications to use your account.');
 
         $this->elementStart('div', 'guide');
@@ -222,6 +203,9 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
         $this->elementStart('p');
 
         $devMsg = sprintf(
+            // TRANS: Note for developers in the OAuth connection settings form.
+            // TRANS: This message contains a Markdown link. Do not separate "](".
+            // TRANS: %s is the URL to the OAuth settings.
             _('Are you a developer? [Register an OAuth client application](%s) to use with this instance of StatusNet.'),
             common_local_url('oauthappssettings')
         );
@@ -233,5 +217,4 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
 
         $this->elementEnd('section');
     }
-
 }