Merge pull request #9843 from annando/no-filetag

[friendica.git] / mod / api.php

diff --git a/mod/api.php b/mod/api.php
index 3ed19e75bff2f9bc8c9af58e139c2aaf2197273c..c7dfe7965dcfb3a52e30c10063edf0988a0a36cc 100644 (file)
--- a/mod/api.php
+++ b/mod/api.php
@@ -1,14 +1,31 @@
 <?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\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 __DIR__ . '/../include/api.php';
 
@@ -32,12 +49,12 @@ function oauth_get_client(OAuthRequest $request)
 function api_post(App $a)
 {
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
        if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 }
@@ -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();
@@ -92,7 +109,7 @@ function api_content(App $a)
 
                if (!local_user()) {
                        /// @TODO We need login form to redirect to this page
-                       notice(DI::l10n()->t('Please login to continue.') . EOL);
+                       notice(DI::l10n()->t('Please login to continue.'));
                        return Login::form(DI::args()->getQueryString(), false, $request->get_parameters());
                }
                //FKOAuth1::loginUser(4);