MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Non Static calls

Browse source 
update calls to non static
This commit is contained in:
Adam Magness 2017-12-04 21:10:54 -05:00
parent e997128c9f
commit 0c48b4188b
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/api.php
View file

@ -157,11 +157,12 @@ function api_register_func($path, $func, $auth = false, $method = API_METHOD_ANY
*/ */
function api_login(App $a) function api_login(App $a)
{ {
$oauth1 = new FKOAuth1();
// login with oauth // login with oauth
try { try {
list($consumer, $token) = FKOAuth1::verify_request(OAuthRequest::from_request()); list($consumer, $token) = $oauth1->verify_request(OAuthRequest::from_request());
if (!is_null($token)) { if (!is_null($token)) {
FKOAuth1::loginUser($token->uid); $oauth1->loginUser($token->uid);
call_hooks('logged_in', $a->user); call_hooks('logged_in', $a->user);
return; return;
} }
@ -3363,8 +3364,9 @@ api_register_func('api/direct_messages', 'api_direct_messages_inbox', true);
function api_oauth_request_token($type) function api_oauth_request_token($type)
{ {
$oauth1 = new FKOAuth1();
try { try {
$r = FKOAuth1::fetch_request_token(OAuthRequest::from_request()); $r = $oauth1->fetch_request_token(OAuthRequest::from_request());
} catch (Exception $e) { } catch (Exception $e) {
echo "error=" . OAuthUtil::urlencode_rfc3986($e->getMessage()); echo "error=" . OAuthUtil::urlencode_rfc3986($e->getMessage());
killme(); killme();
@ -3375,8 +3377,9 @@ function api_oauth_request_token($type)
function api_oauth_access_token($type) function api_oauth_access_token($type)
{ {
$oauth1 = new FKOAuth1();
try { try {
$r = FKOAuth1::fetch_access_token(OAuthRequest::from_request()); $r = $oauth1->fetch_access_token(OAuthRequest::from_request());
} catch (Exception $e) { } catch (Exception $e) {
echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage());
killme(); killme();