UserSession class [3] - Refactor src/ files excluding Module/Model

This commit is contained in:
Philipp 2022-10-20 21:22:47 +02:00
parent a11c125f81
commit b3f9cef94a
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
23 changed files with 120 additions and 133 deletions

View file

@ -22,10 +22,10 @@
namespace Friendica\Security;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
use Friendica\Model\User;
use Friendica\Core\Session;
/**
* Secures that User is allow to do requests
@ -36,20 +36,20 @@ class Security
{
static $verified = 0;
if (!Session::isAuthenticated()) {
if (!DI::userSession()->isAuthenticated()) {
return false;
}
$uid = Session::getLocalUser();
$uid = DI::userSession()->getLocalUserId();
if ($uid == $owner) {
return true;
}
if (Session::getLocalUser() && ($owner == 0)) {
if (DI::userSession()->getLocalUserId() && ($owner == 0)) {
return true;
}
if (!empty($cid = Session::getRemoteContactID($owner))) {
if (!empty($cid = DI::userSession()->getRemoteContactID($owner))) {
// use remembered decision and avoid a DB lookup for each and every display item
// DO NOT use this function if there are going to be multiple owners
// We have a contact-id for an authenticated remote user, this block determines if the contact
@ -93,8 +93,8 @@ class Security
*/
public static function getPermissionsSQLByUserId(int $owner_id, bool $accessible = false)
{
$local_user = Session::getLocalUser();
$remote_contact = Session::getRemoteContactID($owner_id);
$local_user = DI::userSession()->getLocalUserId();
$remote_contact = DI::userSession()->getRemoteContactID($owner_id);
$acc_sql = '';
if ($accessible) {