Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / api.php

diff --git a/mod/api.php b/mod/api.php
index 69d7311a0b80572e2c76feb8ead8d1254cc07f01..e7214624211ca5661b25e47f7cc773d48a928f69 100644 (file)
--- a/mod/api.php
+++ b/mod/api.php
@@ -1,11 +1,16 @@
 <?php
-
+/**
+ * @file mod/api.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Module\Login;
 
-require_once('include/api.php');
+require_once 'include/api.php';
 
 function oauth_get_client($request)
 {
@@ -17,10 +22,11 @@ function oauth_get_client($request)
        $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];
 }
@@ -28,12 +34,12 @@ function oauth_get_client($request)
 function api_post(App $a)
 {
        if (!local_user()) {
-               notice(t('Permission denied.') . EOL);
+               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;
        }
 }
@@ -56,7 +62,7 @@ function api_content(App $a)
                        killme();
                }
 
-               if (x($_POST, 'oauth_yes')) {
+               if (!empty($_POST['oauth_yes'])) {
                        $app = oauth_get_client($request);
                        if (is_null($app)) {
                                return "Invalid request. Unknown token.";
@@ -72,23 +78,23 @@ 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));
+                               $a->internalRedirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier));
                                killme();
                        }
 
-                       $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()) {
                        /// @TODO We need login form to redirect to this page
-                       notice(t('Please login to continue.') . EOL);
+                       notice(L10n::t('Please login to continue.') . EOL);
                        return Login::form($a->query_string, false, $request->get_parameters());
                }
                //FKOAuth1::loginUser(4);
@@ -98,14 +104,14 @@ function api_content(App $a)
                        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'),
-               ));
+                       '$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;
        }