diff options
-rw-r--r-- | application/LoginManager.php | 3 | ||||
-rw-r--r-- | index.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/application/LoginManager.php b/application/LoginManager.php index 5ce836fa..27d06705 100644 --- a/application/LoginManager.php +++ b/application/LoginManager.php | |||
@@ -48,7 +48,6 @@ class LoginManager | |||
48 | /** | 48 | /** |
49 | * Check user session state and validity (expiration) | 49 | * Check user session state and validity (expiration) |
50 | * | 50 | * |
51 | * @param array $session The $_SESSION array (reference) | ||
52 | * @param array $cookie The $_COOKIE array | 51 | * @param array $cookie The $_COOKIE array |
53 | * @param string $webPath Path on the server in which the cookie will be available on | 52 | * @param string $webPath Path on the server in which the cookie will be available on |
54 | * @param string $clientIpId Client IP address identifier | 53 | * @param string $clientIpId Client IP address identifier |
@@ -56,7 +55,7 @@ class LoginManager | |||
56 | * | 55 | * |
57 | * @return bool true if the user session is valid, false otherwise | 56 | * @return bool true if the user session is valid, false otherwise |
58 | */ | 57 | */ |
59 | public function checkLoginState(& $session, $cookie, $webPath, $clientIpId, $token) | 58 | public function checkLoginState($cookie, $webPath, $clientIpId, $token) |
60 | { | 59 | { |
61 | if (! $this->configManager->exists('credentials.login')) { | 60 | if (! $this->configManager->exists('credentials.login')) { |
62 | // Shaarli is not configured yet | 61 | // Shaarli is not configured yet |
@@ -179,7 +179,7 @@ if (! is_file($conf->getConfigFileExt())) { | |||
179 | // a token depending of deployment salt, user password, and the current ip | 179 | // a token depending of deployment salt, user password, and the current ip |
180 | define('STAY_SIGNED_IN_TOKEN', sha1($conf->get('credentials.hash') . $_SERVER['REMOTE_ADDR'] . $conf->get('credentials.salt'))); | 180 | define('STAY_SIGNED_IN_TOKEN', sha1($conf->get('credentials.hash') . $_SERVER['REMOTE_ADDR'] . $conf->get('credentials.salt'))); |
181 | 181 | ||
182 | $loginManager->checkLoginState($_SESSION, $_COOKIE, WEB_PATH, $clientIpId, STAY_SIGNED_IN_TOKEN); | 182 | $loginManager->checkLoginState($_COOKIE, WEB_PATH, $clientIpId, STAY_SIGNED_IN_TOKEN); |
183 | 183 | ||
184 | /** | 184 | /** |
185 | * Adapter function to ensure compatibility with third-party templates | 185 | * Adapter function to ensure compatibility with third-party templates |