Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

LoginManager: remove unused parameter

Browse source 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
This commit is contained in:
VirtualTam 2018-04-27 22:00:35 +02:00
parent 89ccc83ba4
commit 68dcaccfa4
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
application/LoginManager.php
View file

@ -48,7 +48,6 @@ public function __construct(& $globals, $configManager, $sessionManager)
/** /**
* Check user session state and validity (expiration) * Check user session state and validity (expiration)
* *
* @param array $session The $_SESSION array (reference)
* @param array $cookie The $_COOKIE array * @param array $cookie The $_COOKIE array
* @param string $webPath Path on the server in which the cookie will be available on * @param string $webPath Path on the server in which the cookie will be available on
* @param string $clientIpId Client IP address identifier * @param string $clientIpId Client IP address identifier
@ -56,7 +55,7 @@ public function __construct(& $globals, $configManager, $sessionManager)
* *
* @return bool true if the user session is valid, false otherwise * @return bool true if the user session is valid, false otherwise
*/ */
public function checkLoginState(& $session, $cookie, $webPath, $clientIpId, $token) public function checkLoginState($cookie, $webPath, $clientIpId, $token)
{ {
if (! $this->configManager->exists('credentials.login')) { if (! $this->configManager->exists('credentials.login')) {
// Shaarli is not configured yet // Shaarli is not configured yet

2
index.php
View file

@ -179,7 +179,7 @@
// a token depending of deployment salt, user password, and the current ip // a token depending of deployment salt, user password, and the current ip
define('STAY_SIGNED_IN_TOKEN', sha1($conf->get('credentials.hash') . $_SERVER['REMOTE_ADDR'] . $conf->get('credentials.salt'))); define('STAY_SIGNED_IN_TOKEN', sha1($conf->get('credentials.hash') . $_SERVER['REMOTE_ADDR'] . $conf->get('credentials.salt')));
$loginManager->checkLoginState($_SESSION, $_COOKIE, WEB_PATH, $clientIpId, STAY_SIGNED_IN_TOKEN); $loginManager->checkLoginState($_COOKIE, WEB_PATH, $clientIpId, STAY_SIGNED_IN_TOKEN);
/** /**
* Adapter function to ensure compatibility with third-party templates * Adapter function to ensure compatibility with third-party templates