clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move Core\Session::set() to DI::session()->set()

This commit is contained in:
Philipp 2022-10-18 21:12:23 +02:00
parent dfb5792773
commit 3a8bcb3fbf
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
7 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.php
View File

@ -634,8 +634,8 @@ class App
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == '') && if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == '') &&
strstr(parse_url($_GET['zrl'], PHP_URL_PATH), '/profile/')) { strstr(parse_url($_GET['zrl'], PHP_URL_PATH), '/profile/')) {
if ($this->session->get('visitor_home') != $_GET['zrl']) { if ($this->session->get('visitor_home') != $_GET['zrl']) {
Core\Session::set('my_url', $_GET['zrl']); $this->session->set('my_url', $_GET['zrl']);
Core\Session::set('authenticated', 0); $this->session->set('authenticated', 0);
$remote_contact = Contact::getByURL($_GET['zrl'], false, ['subscribe']); $remote_contact = Contact::getByURL($_GET['zrl'], false, ['subscribe']);
if (!empty($remote_contact['subscribe'])) { if (!empty($remote_contact['subscribe'])) {

5
src/Core/Session.php
View File

@ -34,11 +34,6 @@ class Session
public static $exists = false; public static $exists = false;
public static $expire = 180000; public static $expire = 180000;
public static function set($name, $value)
{
DI::session()->set($name, $value);
}
public static function setMultiple(array $values) public static function setMultiple(array $values)
{ {
DI::session()->setMultiple($values); DI::session()->setMultiple($values);

2
src/Module/Conversation/Network.php
View File

@ -345,7 +345,7 @@ class Network extends BaseModule
self::$star = false; self::$star = false;
} }
Session::set('network-tab', self::$selectedTab); DI::session()->set('network-tab', self::$selectedTab);
DI::pConfig()->set(local_user(), 'network.view', 'selected_tab', self::$selectedTab); DI::pConfig()->set(local_user(), 'network.view', 'selected_tab', self::$selectedTab);
self::$accountTypeString = $get['accounttype'] ?? $this->parameters['accounttype'] ?? ''; self::$accountTypeString = $get['accounttype'] ?? $this->parameters['accounttype'] ?? '';

2
src/Module/Delegation.php
View File

@ -102,7 +102,7 @@ class Delegation extends BaseModule
DI::auth()->setForUser(DI::app(), $user, true, true); DI::auth()->setForUser(DI::app(), $user, true, true);
if ($limited_id) { if ($limited_id) {
Session::set('submanage', $original_id); DI::session()->set('submanage', $original_id);
} }
$ret = []; $ret = [];

2
src/Module/Profile/Status.php
View File

@ -189,7 +189,7 @@ class Status extends BaseProfile
// Set a time stamp for this page. We will make use of it when we // Set a time stamp for this page. We will make use of it when we
// search for new items (update routine) // search for new items (update routine)
$last_updated_array[$last_updated_key] = time(); $last_updated_array[$last_updated_key] = time();
Session::set('last_updated', $last_updated_array); DI::session()->set('last_updated', $last_updated_array);
if ($is_owner && !DI::config()->get('theme', 'hide_eventlist')) { if ($is_owner && !DI::config()->get('theme', 'hide_eventlist')) {
$o .= ProfileModel::getBirthdays(); $o .= ProfileModel::getBirthdays();

2
src/Module/Settings/TwoFactor/Verify.php
View File

@ -86,7 +86,7 @@ class Verify extends BaseSettings
if ($valid) { if ($valid) {
$this->pConfig->set(local_user(), '2fa', 'verified', true); $this->pConfig->set(local_user(), '2fa', 'verified', true);
Session::set('2fa', true); DI::session()->set('2fa', true);
DI::sysmsg()->addInfo($this->t('Two-factor authentication successfully activated.')); DI::sysmsg()->addInfo($this->t('Two-factor authentication successfully activated.'));

2
src/Module/Update/Profile.php
View File

@ -102,7 +102,7 @@ class Profile extends BaseModule
// Set a time stamp for this page. We will make use of it when we // Set a time stamp for this page. We will make use of it when we
// search for new items (update routine) // search for new items (update routine)
$last_updated_array[$last_updated_key] = time(); $last_updated_array[$last_updated_key] = time();
Session::set('last_updated', $last_updated_array); DI::session()->set('last_updated', $last_updated_array);
if ($is_owner && !$a->getProfileOwner() && !DI::config()->get('theme', 'hide_eventlist')) { if ($is_owner && !$a->getProfileOwner() && !DI::config()->get('theme', 'hide_eventlist')) {
$o .= ProfileModel::getBirthdays(); $o .= ProfileModel::getBirthdays();