X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapioauthauthorize.php;h=baaea6fd9bd41b25de22a6b762b1f996879ebb02;hb=cc34bb48c7243f78e198ad4d8c1806d5fe886a81;hp=3a83fd27fc2d8590da217217233902fc3c797692;hpb=01996b1a460693227ef263d44477bc12d297a70a;p=quix0rs-gnu-social.git diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index 3a83fd27fc..baaea6fd9b 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -22,7 +22,7 @@ * @category API * @package StatusNet * @author Zach Copley - * @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; @@ -71,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); @@ -367,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. @@ -613,7 +610,7 @@ class ApiOauthAuthorizeAction extends Action } if ($this->reqToken->verified_callback == 'oob') { - $pin = new ApiOauthPinAction( + $pin = new ApiOAuthPinAction( $title, $msg, $this->reqToken->verifier,