Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index 7b66bbb37eb121aba6993d9f8d8f133fb257559a..68d19a398e2264fa6c9655f47248657e6f6f2c83 100644 (file)
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -22,7 +22,7 @@
  * @category  API
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2010-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -31,11 +31,8 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apioauth.php';
-require_once INSTALLDIR . '/lib/info.php';
-
 /**
- * Authorize an Oputh request token
+ * Authorize an OAuth request token
  *
  * @category API
  * @package  StatusNet
@@ -43,7 +40,7 @@ require_once INSTALLDIR . '/lib/info.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 ApiOauthAuthorizeAction extends Action
+class ApiOAuthAuthorizeAction extends ApiOAuthAction
 {
     var $oauthTokenParam;
     var $reqToken;
@@ -58,13 +55,12 @@ class ApiOauthAuthorizeAction extends Action
      *
      * @return boolean false
      */
-
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return false;
     }
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -72,7 +68,7 @@ class ApiOauthAuthorizeAction extends Action
         $this->password        = $this->arg('password');
         $this->oauthTokenParam = $this->arg('oauth_token');
         $this->mode            = $this->arg('mode');
-        $this->store           = new ApiStatusNetOAuthDataStore();
+        $this->store           = new ApiGNUsocialOAuthDataStore();
 
         try {
             $this->app = $this->store->getAppByRequestToken($this->oauthTokenParam);
@@ -92,7 +88,7 @@ class ApiOauthAuthorizeAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -197,12 +193,6 @@ class ApiOauthAuthorizeAction extends Action
                 )
             );
 
-            // XXX: Make sure we have a oauth_token_association table. The table
-            // is now in the main schema, but because it is being added with
-            // a point release, it's unlikely to be there. This code can be
-            // removed as of 1.0.
-            $this->ensureOauthTokenAssociationTable();
-
             $tokenAssoc = new Oauth_token_association();
 
             $tokenAssoc->profile_id     = $user->id;
@@ -296,30 +286,6 @@ class ApiOauthAuthorizeAction extends Action
         }
     }
 
-    // XXX Remove this function when we hit 1.0
-    function ensureOauthTokenAssociationTable()
-    {
-        $schema = Schema::get();
-
-        $reqTokenCols = array(
-            new ColumnDef('profile_id', 'integer', null, true, 'PRI'),
-            new ColumnDef('application_id', 'integer', null, true, 'PRI'),
-            new ColumnDef('token', 'varchar', 255, true, 'PRI'),
-            new ColumnDef('created', 'datetime', null, false),
-            new ColumnDef(
-                'modified',
-                'timestamp',
-                null,
-                false,
-                null,
-                'CURRENT_TIMESTAMP',
-                'on update CURRENT_TIMESTAMP'
-            )
-        );
-
-        $schema->ensureTable('oauth_token_association', $reqTokenCols);
-    }
-
     /**
      * Show body - override to add a special CSS class for the authorize
      * page's "desktop mode" (minimal display)
@@ -398,7 +364,7 @@ class ApiOauthAuthorizeAction extends Action
         $this->elementStart('form', array('method' => 'post',
                                           'id' => 'form_apioauthauthorize',
                                           'class' => 'form_settings',
-                                          'action' => common_local_url('ApiOauthAuthorize')));
+                                          'action' => common_local_url('ApiOAuthAuthorize')));
         $this->elementStart('fieldset');
         $this->element('legend', array('id' => 'apioauthauthorize_allowdeny'),
                                  // TRANS: Fieldset legend.
@@ -419,16 +385,18 @@ class ApiOauthAuthorizeAction extends Action
         $access = ($this->app->access_type & Oauth_application::$writeAccess) ?
           'access and update' : 'access';
 
-        // TRANS: User notification of external application requesting account access.
-        // TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
-        // TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
         if ($this->app->name == 'anonymous') {
-        // Special message for the anonymous app and consumer
+            // Special message for the anonymous app and consumer.
+            // TRANS: User notification of external application requesting account access.
+            // TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
             $msg = _('An application would like the ability ' .
                  'to <strong>%3$s</strong> your %4$s account data. ' .
                  'You should only give access to your %4$s account ' .
                  'to third parties you trust.');
         } else {
+            // TRANS: User notification of external application requesting account access.
+            // TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
+            // TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
             $msg = _('The application <strong>%1$s</strong> by ' .
                      '<strong>%2$s</strong> would like the ability ' .
                      'to <strong>%3$s</strong> your %4$s account data. ' .
@@ -642,7 +610,7 @@ class ApiOauthAuthorizeAction extends Action
         }
 
         if ($this->reqToken->verified_callback == 'oob') {
-            $pin = new ApiOauthPinAction(
+            $pin = new ApiOAuthPinAction(
                 $title,
                 $msg,
                 $this->reqToken->verifier,