X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapioauthauthorize.php;h=68d19a398e2264fa6c9655f47248657e6f6f2c83;hb=b53e1439969bfa2c0b551d8cc2fc8fe15652c62a;hp=1755c36be3190fa68e0e87230b2c025cb51d9b13;hpb=d594c83a5a9a9d42fce917b544c28591fcadb1aa;p=quix0rs-gnu-social.git diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index 1755c36be3..68d19a398e 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -31,9 +31,6 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/lib/apioauth.php'; -require_once INSTALLDIR . '/lib/info.php'; - /** * Authorize an OAuth request token * @@ -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,12 +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); @@ -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); @@ -91,7 +88,7 @@ class ApiOauthAuthorizeAction extends Action * * @return void */ - function handle($args) + function handle(array $args=array()) { parent::handle($args); @@ -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,