From 68dcaccfa46649addc66674b627a83064798bbc0 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Fri, 27 Apr 2018 22:00:35 +0200 Subject: LoginManager: remove unused parameter Signed-off-by: VirtualTam --- application/LoginManager.php | 3 +-- 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 /** * Check user session state and validity (expiration) * - * @param array $session The $_SESSION array (reference) * @param array $cookie The $_COOKIE array * @param string $webPath Path on the server in which the cookie will be available on * @param string $clientIpId Client IP address identifier @@ -56,7 +55,7 @@ class LoginManager * * @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')) { // Shaarli is not configured yet diff --git a/index.php b/index.php index c87ebf65..30bfc170 100644 --- a/index.php +++ b/index.php @@ -179,7 +179,7 @@ if (! is_file($conf->getConfigFileExt())) { // 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'))); -$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 -- cgit v1.2.3