bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

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

Browse source
This commit is contained in:
Philipp Holzer 2022-10-20 21:22:47 +02:00
commit b3f9cef94a
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
23 changed files with 120 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Security/Authentication.php
View file

@ -26,7 +26,6 @@ use Friendica\App;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Core\Hook;
use Friendica\Core\Session;
use Friendica\Core\Session\Capability\IHandleSessions;
use Friendica\Core\System;
use Friendica\Database\Database;
@ -333,7 +332,7 @@ class Authentication
'addr' => $this->remoteAddress,
]);
Session::setVisitorsContacts();
DI::userSession()->setVisitorsContacts();
$member_since = strtotime($user_record['register_date']);
$this->session->set('new_member', time() < ($member_since + (60 * 60 * 24 * 14)));

3
src/Security/BasicAuth.php
View file

@ -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;
@ -191,7 +190,7 @@ class BasicAuth
Hook::callAll('logged_in', $record);
self::$current_user_id = Session::getLocalUser();
self::$current_user_id = DI::userSession()->getLocalUserId();
return self::$current_user_id;
}

14
src/Security/Security.php
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) {