GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Zach Copley 2010-10-21 13:00:03 -07:00
parent bab012bd67
commit 648f79be10
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actions/apioauthauthorize.php
View File

@ -35,7 +35,7 @@ require_once INSTALLDIR . '/lib/apioauth.php';
require_once INSTALLDIR . '/lib/info.php'; require_once INSTALLDIR . '/lib/info.php';
/** /**
* Authorize an OAuth request token * Authorize an Oputh request token
* *
* @category API * @category API
* @package StatusNet * @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 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class ApiOauthAuthorizeAction extends Action class ApioauthauthorizeAction extends Action
{ {
var $oauthTokenParam; var $oauthTokenParam;
var $reqToken; var $reqToken;
@ -120,7 +120,7 @@ class ApiOauthAuthorizeAction extends Action
// Check to make sure we haven't already authorized the token // Check to make sure we haven't already authorized the token
if ($this->reqToken->state != 0) { if ($this->reqToken->state != 0) {
// TRANS: Client error given when an invalid request token was passed to the OAuth API. // 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() function showAside()
{ {
if ($this->desktopMode() == false) { if ($this->desktopMode() == false) {
parent::showHeader(); parent::showAside();
} }
} }
@ -471,7 +471,7 @@ class ApiOauthAuthorizeAction extends Action
function showFooter() function showFooter()
{ {
if ($this->desktopMode() == false) { if ($this->desktopMode() == false) {
parent::showHeader(); parent::showFooter();
} }
} }

2
lib/router.php
View File

@ -676,7 +676,7 @@ class Router
array('action' => 'ApiOauthAccessToken')); array('action' => 'ApiOauthAccessToken'));
$m->connect('api/oauth/authorize', $m->connect('api/oauth/authorize',
array('action' => 'ApiOauthAuthorize')); array('action' => 'apioauthauthorize'));
// Admin // Admin