X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fapi.php;h=e978461655071c7774390b7d89dfe3d675ca0899;hb=a6fb3568f989f72164b435baafc63a174397b542;hp=a402bc99342ae936d5407e442cc59b6d2aa4aa00;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git

diff --git a/mod/api.php b/mod/api.php
index a402bc9934..e978461655 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -1,11 +1,14 @@
 <?php
-
+/**
+ * @file mod/api.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Core\L10n;
+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 +20,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 +32,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);
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 }
@@ -78,8 +82,8 @@ function api_content(App $a)
 
 			$tpl = get_markup_template("oauth_authorize_done.tpl");
 			$o = replace_macros($tpl, [
-				'$title' => t('Authorize application connection'),
-				'$info' => t('Return to your app and insert this Securty Code:'),
+				'$title' => L10n::t('Authorize application connection'),
+				'$info' => L10n::t('Return to your app and insert this Securty Code:'),
 				'$code' => $verifier,
 			]);
 
@@ -88,7 +92,7 @@ function api_content(App $a)
 
 		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);
@@ -100,11 +104,11 @@ function api_content(App $a)
 
 		$tpl = get_markup_template('oauth_authorize.tpl');
 		$o = replace_macros($tpl, [
-			'$title' => t('Authorize application connection'),
+			'$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;