diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-09 17:05:39 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-09 17:05:39 -0800 |
| commit | f0798f78333ef52c0859a57c71fd7502923b4242 (patch) | |
| tree | f9c8b55df5c95cf6c338250990bd78ea4e575c87 /Zotlabs | |
| parent | 75804d7ce57a476c85a486c807ea1f5a75235a0e (diff) | |
| parent | ef7225b4f68ce032184e73b4af7444c90d1109a5 (diff) | |
| download | volse-hubzilla-f0798f78333ef52c0859a57c71fd7502923b4242.tar.gz volse-hubzilla-f0798f78333ef52c0859a57c71fd7502923b4242.tar.bz2 volse-hubzilla-f0798f78333ef52c0859a57c71fd7502923b4242.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Api.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zotlabs/Module/Api.php b/Zotlabs/Module/Api.php index a2a1aac1d..aa0fca54d 100644 --- a/Zotlabs/Module/Api.php +++ b/Zotlabs/Module/Api.php @@ -39,10 +39,12 @@ class Api extends \Zotlabs\Web\Controller { // get consumer/client from request token try { - $request = OAuth1Request::from_request(); + $request = \OAuth1Request::from_request(); } catch(\Exception $e) { - echo "<pre>"; var_dump($e); killme(); + logger('OAuth exception: ' . print_r($e,true)); + // echo "<pre>"; var_dump($e); + killme(); } @@ -52,7 +54,7 @@ class Api extends \Zotlabs\Web\Controller { if (is_null($app)) return "Invalid request. Unknown token."; - $consumer = new OAuth1Consumer($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()); @@ -63,7 +65,7 @@ class Api extends \Zotlabs\Web\Controller { $glue = '?'; if(strstr($consumer->callback_url,$glue)) $glue = '?'; - goaway($consumer->callback_url . $glue . "oauth_token=" . OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuth1Util::urlencode_rfc3986($verifier)); + goaway($consumer->callback_url . $glue . "oauth_token=" . \OAuth1Util::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . \OAuth1Util::urlencode_rfc3986($verifier)); killme(); } |