aboutsummaryrefslogtreecommitdiffstats
path: root/mod/api.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-12-13 15:35:45 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-12-13 15:35:45 -0800
commitbb0e4044bf08bbac9d73a3e3b75d74c33dcacd7f (patch)
tree1c6292b26b08bb86ef36cc258cd617197f5844a8 /mod/api.php
parent395268da22bf5ec773de7fdc42a338a9cbe87d40 (diff)
downloadvolse-hubzilla-bb0e4044bf08bbac9d73a3e3b75d74c33dcacd7f.tar.gz
volse-hubzilla-bb0e4044bf08bbac9d73a3e3b75d74c33dcacd7f.tar.bz2
volse-hubzilla-bb0e4044bf08bbac9d73a3e3b75d74c33dcacd7f.zip
remove the unqualified "OAuth" namespace from the project. We need to reference either OAuth1 or OAuth2.
Diffstat (limited to 'mod/api.php')
-rw-r--r--mod/api.php22
1 files changed, 9 insertions, 13 deletions
diff --git a/mod/api.php b/mod/api.php
index 08978ee96..232349292 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -35,42 +35,40 @@ function api_post(&$a) {
}
function api_content(&$a) {
- if ($a->cmd=='api/oauth/authorize'){
+ if($a->cmd=='api/oauth/authorize'){
+
/*
* api/oauth/authorize interact with the user. return a standard page
*/
$a->page['template'] = "minimal";
-
-
+
// get consumer/client from request token
try {
- $request = OAuthRequest::from_request();
+ $request = OAuth1Request::from_request();
} catch(Exception $e) {
echo "<pre>"; var_dump($e); killme();
}
- if (x($_POST,'oauth_yes')){
+ if(x($_POST,'oauth_yes')){
$app = oauth_get_client($request);
if (is_null($app)) return "Invalid request. Unknown token.";
- $consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
+ $consumer = new OAuth1Consumer($app['client_id'], $app['pw'], $app['redirect_uri']);
$verifier = md5($app['secret'].local_channel());
set_config("oauth", $verifier, local_channel());
- if ($consumer->callback_url!=null) {
+ if($consumer->callback_url!=null) {
$params = $request->get_parameters();
$glue="?";
if (strstr($consumer->callback_url,$glue)) $glue="?";
- goaway($consumer->callback_url.$glue."oauth_token=".OAuthUtil::urlencode_rfc3986($params['oauth_token'])."&oauth_verifier=".OAuthUtil::urlencode_rfc3986($verifier));
+ goaway($consumer->callback_url . $glue . "oauth_token=" . OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuth1Util::urlencode_rfc3986($verifier));
killme();
}
-
-
-
+
$tpl = get_markup_template("oauth_authorize_done.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Authorize application connection'),
@@ -79,8 +77,6 @@ function api_content(&$a) {
));
return $o;
-
-
}