From 648f79be10c1f62eb649563aa4f1cd5c51ddb19f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 21 Oct 2010 13:00:03 -0700
Subject: [PATCH] Change OAuth authorization page's action name to be inline
 with other web page action names so the body id outputs correctly. Fix some
 other bugs.

---
 actions/apioauthauthorize.php | 10 +++++-----
 lib/router.php                |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index 8bbe0d737f..82269e440c 100644
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -35,7 +35,7 @@ require_once INSTALLDIR . '/lib/apioauth.php';
 require_once INSTALLDIR . '/lib/info.php';
 
 /**
- * Authorize an OAuth request token
+ * Authorize an Oputh request token
  *
  * @category API
  * @package  StatusNet
@@ -43,7 +43,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 Action
 {
     var $oauthTokenParam;
     var $reqToken;
@@ -120,7 +120,7 @@ class ApiOauthAuthorizeAction extends Action
                     // Check to make sure we haven't already authorized the token
                     if ($this->reqToken->state != 0) {
                         // TRANS: Client error given when an invalid request token was passed to the OAuth API.
-                        $this->clientError(_('Invalid request token.'));
+                        $this->clientError(_('Request token already authorized.'));
                     }
                 }
             }
@@ -461,7 +461,7 @@ class ApiOauthAuthorizeAction extends Action
     function showAside()
     {
         if ($this->desktopMode() == false) {
-            parent::showHeader();
+            parent::showAside();
         }
     }
 
@@ -471,7 +471,7 @@ class ApiOauthAuthorizeAction extends Action
     function showFooter()
     {
         if ($this->desktopMode() == false) {
-            parent::showHeader();
+            parent::showFooter();
         }
     }
 
diff --git a/lib/router.php b/lib/router.php
index 417206e6bf..ff1b279255 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -676,7 +676,7 @@ class Router
                         array('action' => 'ApiOauthAccessToken'));
 
             $m->connect('api/oauth/authorize',
-                        array('action' => 'ApiOauthAuthorize'));
+                        array('action' => 'apioauthauthorize'));
 
             // Admin