Issue 13221: Diaspora posts are now stored correctly

[friendica.git] / src / Security / BasicAuth.php

diff --git a/src/Security/BasicAuth.php b/src/Security/BasicAuth.php
index fc31d34b0717507f3dce391bef656b2785ed8b0a..51da7a98ad472429d7f21b0d106b2129b8eb16f9 100644 (file)
--- a/src/Security/BasicAuth.php
+++ b/src/Security/BasicAuth.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,7 +24,6 @@ namespace Friendica\Security;
 use Exception;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -32,7 +31,7 @@ use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Util\DateTimeFormat;
 
 /**
- * Authentification via the basic auth method
+ * Authentication via the basic auth method
  */
 class BasicAuth
 {
@@ -178,7 +177,7 @@ class BasicAuth
                        }
                        Logger::debug('Access denied', ['parameters' => $_SERVER]);
                        // Checking for commandline for the tests, we have to avoid to send a header
-                       if (php_sapi_name() !== 'cli') {
+                       if (DI::config()->get('system', 'basicauth') && (php_sapi_name() !== 'cli')) {
                                header('WWW-Authenticate: Basic realm="Friendica"');
                        }
                        throw new UnauthorizedException("This API requires login");
@@ -191,7 +190,7 @@ class BasicAuth
 
                Hook::callAll('logged_in', $record);
 
-               self::$current_user_id = local_user();
+               self::$current_user_id = DI::userSession()->getLocalUserId();
 
                return self::$current_user_id;
        }