X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fapi.php;h=47a809497ed03d636ee5e129b515fdcbaec555ad;hb=5ce13b210ee83a3ee3622d2106589b9c2c4c876a;hp=52ddf37bead61f9c287972b5ef895a07c1e5c4ea;hpb=35abc4bb64bbb461e6448beed10484c028b74340;p=friendica.git

diff --git a/mod/api.php b/mod/api.php
index 52ddf37bea..47a809497e 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -1,21 +1,34 @@
 <?php
 /**
- * @file mod/api.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\DI;
+use Friendica\Module\Security\Login;
 
-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'];
 
@@ -34,24 +47,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.') . EOL);
 		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.') . EOL);
 		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 {
@@ -59,10 +72,10 @@ function api_content(App $a)
 		} catch (Exception $e) {
 			echo "<pre>";
 			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.";
@@ -70,7 +83,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();
@@ -78,14 +91,14 @@ function api_content(App $a)
 				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));
-				killme();
+				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' => L10n::t('Authorize application connection'),
-				'$info' => L10n::t('Return to your app and insert this Securty Code:'),
+				'$title' => DI::l10n()->t('Authorize application connection'),
+				'$info' => DI::l10n()->t('Return to your app and insert this Securty Code:'),
 				'$code' => $verifier,
 			]);
 
@@ -94,8 +107,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.') . EOL);
+			return Login::form(DI::args()->getQueryString(), false, $request->get_parameters());
 		}
 		//FKOAuth1::loginUser(4);
 
@@ -106,16 +119,16 @@ function api_content(App $a)
 
 		$tpl = Renderer::getMarkupTemplate('oauth_authorize.tpl');
 		$o = Renderer::replaceMacros($tpl, [
-			'$title' => L10n::t('Authorize application connection'),
+			'$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();
 }