X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fapi.php;h=4a1db1be5511c7a0f7f6d19daeae38065cc14d6d;hb=73835118550f4bf9c0df510283c905f89224d612;hp=e44fcc493ca9de313141bd820d2595756ba6e6eb;hpb=5a6da8b447430174ae231a3b8203fd4bd8416cc1;p=friendica.git diff --git a/mod/api.php b/mod/api.php index e44fcc493c..4a1db1be55 100644 --- a/mod/api.php +++ b/mod/api.php @@ -1,116 +1,118 @@ 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'", - dbesc($token)); + AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", DBA::escape($token)); - if (!dbm::is_result($r)) + if (!DBA::isResult($r)) { return null; + } return $r[0]; } -function api_post(App $a) { - - if (! local_user()) { - notice( t('Permission denied.') . EOL); +function api_post(App $a) +{ + if (!local_user()) { + notice(L10n::t('Permission denied.') . EOL); return; } - if (count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) { - notice( t('Permission denied.') . EOL); + if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) { + notice(L10n::t('Permission denied.') . EOL); return; } - } -function api_content(App $a) { - if ($a->cmd=='api/oauth/authorize'){ +function api_content(App $a) +{ + 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(); - } catch(Exception $e) { - echo "
"; var_dump($e); killme(); + } catch (Exception $e) { + echo ""; + var_dump($e); + exit(); } - - if (x($_POST,'oauth_yes')){ - + if (!empty($_POST['oauth_yes'])) { $app = oauth_get_client($request); - if (is_null($app)) return "Invalid request. Unknown token."; + 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()); - set_config("oauth", $verifier, local_user()); + $verifier = md5($app['secret'] . local_user()); + Config::set("oauth", $verifier, local_user()); - - 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)); - killme(); + $glue = "?"; + if (strstr($consumer->callback_url, $glue)) { + $glue = "?"; + } + $a->internalRedirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier)); + exit(); } - - - $tpl = get_markup_template("oauth_authorize_done.tpl"); - $o = replace_macros($tpl, array( - '$title' => t('Authorize application connection'), - '$info' => t('Return to your app and insert this Securty Code:'), + $tpl = Renderer::getMarkupTemplate("oauth_authorize_done.tpl"); + $o = Renderer::replaceMacros($tpl, [ + '$title' => L10n::t('Authorize application connection'), + '$info' => L10n::t('Return to your app and insert this Securty Code:'), '$code' => $verifier, - )); + ]); return $o; - - } - - if (! local_user()) { + if (!local_user()) { /// @TODO We need login form to redirect to this page - notice( t('Please login to continue.') . EOL ); - return login(false,$request->get_parameters()); + notice(L10n::t('Please login to continue.') . EOL); + return Login::form($a->query_string, false, $request->get_parameters()); } //FKOAuth1::loginUser(4); $app = oauth_get_client($request); - if (is_null($app)) return "Invalid request. Unknown token."; - - - + if (is_null($app)) { + return "Invalid request. Unknown token."; + } - $tpl = get_markup_template('oauth_authorize.tpl'); - $o = replace_macros($tpl, array( - '$title' => t('Authorize application connection'), + $tpl = Renderer::getMarkupTemplate('oauth_authorize.tpl'); + $o = Renderer::replaceMacros($tpl, [ + '$title' => L10n::t('Authorize application connection'), '$app' => $app, - '$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'), - '$yes' => t('Yes'), - '$no' => t('No'), - )); - - //echo ""; var_dump($app); killme(); + '$authorize' => L10n::t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'), + '$yes' => L10n::t('Yes'), + '$no' => L10n::t('No'), + ]); return $o; } echo api_call($a); - killme(); + exit(); }