X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fapi.php;h=c7dfe7965dcfb3a52e30c10063edf0988a0a36cc;hb=6001c34525867a0aa614dbc020dcbc485e515345;hp=e9e913012dbc1f73f5b5237aad150b049557e266;hpb=c845415a99ebc348103815a7b2c55b15c75cdd24;p=friendica.git diff --git a/mod/api.php b/mod/api.php index e9e913012d..c7dfe7965d 100644 --- a/mod/api.php +++ b/mod/api.php @@ -1,28 +1,45 @@ . + * */ + use Friendica\App; -use Friendica\Core\Config; -use Friendica\Core\L10n; -use Friendica\Database\DBM; -use Friendica\Module\Login; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Module\Security\Login; +use Friendica\Security\OAuth1\OAuthRequest; +use Friendica\Security\OAuth1\OAuthUtil; -require_once 'include/api.php'; +require_once __DIR__ . '/../include/api.php'; -function oauth_get_client($request) +function oauth_get_client(OAuthRequest $request) { - - $params = $request->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; } @@ -32,24 +49,24 @@ function oauth_get_client($request) function api_post(App $a) { if (!local_user()) { - notice(L10n::t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.')); return; } - if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) { - notice(L10n::t('Permission denied.') . EOL); + if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) { + notice(DI::l10n()->t('Permission denied.')); return; } } function api_content(App $a) { - if ($a->cmd == 'api/oauth/authorize') { + if (DI::args()->getCommand() == 'api/oauth/authorize') { /* * api/oauth/authorize interact with the user. return a standard page */ - $a->page['template'] = "minimal"; + DI::page()['template'] = "minimal"; // get consumer/client from request token try { @@ -57,10 +74,10 @@ function api_content(App $a) } catch (Exception $e) { echo "
"; var_dump($e); - killme(); + 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."; @@ -68,7 +85,7 @@ function api_content(App $a) $consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']); $verifier = md5($app['secret'] . local_user()); - Config::set("oauth", $verifier, local_user()); + DI::config()->set("oauth", $verifier, local_user()); if ($consumer->callback_url != null) { $params = $request->get_parameters(); @@ -76,14 +93,14 @@ function api_content(App $a) 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(); + DI::baseUrl()->redirect($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, [ - '$title' => L10n::t('Authorize application connection'), - '$info' => L10n::t('Return to your app and insert this Securty Code:'), + $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, ]); @@ -92,8 +109,8 @@ function api_content(App $a) if (!local_user()) { /// @TODO We need login form to redirect to this page - notice(L10n::t('Please login to continue.') . EOL); - return Login::form($a->query_string, false, $request->get_parameters()); + notice(DI::l10n()->t('Please login to continue.')); + return Login::form(DI::args()->getQueryString(), false, $request->get_parameters()); } //FKOAuth1::loginUser(4); @@ -102,18 +119,18 @@ function api_content(App $a) return "Invalid request. Unknown token."; } - $tpl = get_markup_template('oauth_authorize.tpl'); - $o = replace_macros($tpl, [ - '$title' => L10n::t('Authorize application connection'), + $tpl = Renderer::getMarkupTemplate('oauth_authorize.tpl'); + $o = Renderer::replaceMacros($tpl, [ + '$title' => DI::l10n()->t('Authorize application connection'), '$app' => $app, - '$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'), + '$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); - killme(); + exit(); }