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

rename usage

Browse source
This commit is contained in:
Philipp Holzer 2019-12-10 21:52:23 +01:00
parent 07d2909927
commit eca3396851
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Factory/SessionFactory.php
View file

@ -6,9 +6,7 @@ use Friendica\App;
use Friendica\Core\Cache\Cache; use Friendica\Core\Cache\Cache;
use Friendica\Core\Cache\ICache; use Friendica\Core\Cache\ICache;
use Friendica\Core\Config\Configuration; use Friendica\Core\Config\Configuration;
use Friendica\Core\Session\ISession; use Friendica\Core\Session;
use Friendica\Core\Session\Memory;
use Friendica\Core\Session\Native;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Model\User\Cookie; use Friendica\Model\User\Cookie;
@ -40,7 +38,7 @@ class SessionFactory
* @param LoggerInterface $logger * @param LoggerInterface $logger
* @param array $server * @param array $server
* *
* @return ISession * @return Session\ISession
*/ */
public function createSession(App\Mode $mode, Configuration $config, Cookie $cookie, Database $dba, ICache $cache, LoggerInterface $logger, Profiler $profiler, array $server = []) public function createSession(App\Mode $mode, Configuration $config, Cookie $cookie, Database $dba, ICache $cache, LoggerInterface $logger, Profiler $profiler, array $server = [])
{ {
@ -49,24 +47,24 @@ class SessionFactory
try { try {
if ($mode->isInstall() || $mode->isBackend()) { if ($mode->isInstall() || $mode->isBackend()) {
$session = new Memory(); $session = new Session\Memory();
} else { } else {
$session_handler = $config->get('system', 'session_handler', self::DEFAULT); $session_handler = $config->get('system', 'session_handler', self::DEFAULT);
switch ($session_handler) { switch ($session_handler) {
case self::INTERNAL: case self::INTERNAL:
$session = new Native($config, $cookie); $session = new Session\Native($config, $cookie);
break; break;
case self::DATABASE: case self::DATABASE:
default: default:
$session = new Database($config, $cookie, $dba, $logger, $server); $session = new Session\Database($config, $cookie, $dba, $logger, $server);
break; break;
case self::CACHE: case self::CACHE:
// In case we're using the db as cache driver, use the native db session, not the cache // In case we're using the db as cache driver, use the native db session, not the cache
if ($config->get('system', 'cache_driver') === Cache::TYPE_DATABASE) { if ($config->get('system', 'cache_driver') === Cache::TYPE_DATABASE) {
$session = new Database($config, $cookie, $dba, $logger, $server); $session = new Session\Database($config, $cookie, $dba, $logger, $server);
} else { } else {
$session = new Cache($config, $cookie, $cache, $logger, $server); $session = new Session\Cache($config, $cookie, $cache, $logger, $server);
} }
break; break;
} }