X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fapi.php;h=0a801a8a1e6e716f3c29f1f2bb39f440b0827b26;hb=0bb169b4edc09a99d14fa9105412c114b1bcc6f6;hp=474d57af4a84a738a0aa3b4f636136eaaba3554b;hpb=ee8689cc899beecaf0943ac175550a7fb49cf199;p=friendica.git diff --git a/mod/api.php b/mod/api.php index 474d57af4a..0a801a8a1e 100644 --- a/mod/api.php +++ b/mod/api.php @@ -1,6 +1,6 @@ get_parameters(); - $token = $params['oauth_token']; - - $r = q("SELECT `clients`.* - FROM `clients`, `tokens` - WHERE `clients`.`client_id`=`tokens`.`client_id` - AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", DBA::escape($token)); - - if (!DBA::isResult($r)) { - return null; - } - - return $r[0]; -} - function api_post(App $a) { - if (!local_user()) { - notice(DI::l10n()->t('Permission denied.')); - return; - } - - if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) { + if (!$a->isLoggedIn()) { notice(DI::l10n()->t('Permission denied.')); return; } @@ -59,76 +34,6 @@ function api_post(App $a) function api_content(App $a) { - if (DI::args()->getCommand() == 'api/oauth/authorize') { - /* - * api/oauth/authorize interact with the user. return a standard page - */ - - DI::page()['template'] = "minimal"; - - // get consumer/client from request token - try { - $request = OAuthRequest::from_request(); - } catch (Exception $e) { - echo "
"; - var_dump($e); - exit(); - } - - if (!empty($_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']); - - $verifier = md5($app['secret'] . local_user()); - DI::config()->set("oauth", $verifier, local_user()); - - if ($consumer->callback_url != null) { - $params = $request->get_parameters(); - $glue = "?"; - if (strstr($consumer->callback_url, $glue)) { - $glue = "?"; - } - DI::baseUrl()->redirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier)); - exit(); - } - - $tpl = Renderer::getMarkupTemplate("oauth_authorize_done.tpl"); - $o = Renderer::replaceMacros($tpl, [ - '$title' => DI::l10n()->t('Authorize application connection'), - '$info' => DI::l10n()->t('Return to your app and insert this Securty Code:'), - '$code' => $verifier, - ]); - - return $o; - } - - if (!local_user()) { - /// @TODO We need login form to redirect to this page - notice(DI::l10n()->t('Please login to continue.')); - return Login::form(DI::args()->getQueryString(), false, $request->get_parameters()); - } - //FKOAuth1::loginUser(4); - - $app = oauth_get_client($request); - if (is_null($app)) { - return "Invalid request. Unknown token."; - } - - $tpl = Renderer::getMarkupTemplate('oauth_authorize.tpl'); - $o = Renderer::replaceMacros($tpl, [ - '$title' => DI::l10n()->t('Authorize application connection'), - '$app' => $app, - '$authorize' => DI::l10n()->t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'), - '$yes' => DI::l10n()->t('Yes'), - '$no' => DI::l10n()->t('No'), - ]); - - return $o; - } - echo api_call($a); exit(); }