From f74fb2bbecda1745274d9aa29855440883aaebe5 Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Sun, 12 Mar 2017 20:52:40 +0100 Subject: [PATCH] * [FIX] Related #493. Try to fix issue when setting cookies in Safari on iOS. Thanks to @basil-twisleton for the feedback. --- inc/SP/Core/Crypt/SecureKeyCookie.class.php | 3 +-- inc/SP/Mgmt/Users/UserLdap.class.php | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/SP/Core/Crypt/SecureKeyCookie.class.php b/inc/SP/Core/Crypt/SecureKeyCookie.class.php index 79c431ca..e25e549e 100644 --- a/inc/SP/Core/Crypt/SecureKeyCookie.class.php +++ b/inc/SP/Core/Crypt/SecureKeyCookie.class.php @@ -28,7 +28,6 @@ use Defuse\Crypto\Exception\CryptoException; use Defuse\Crypto\Key; use SP\Core\Init; use SP\Http\Request; -use SP\Util\Checks; use SP\Util\Util; /** @@ -123,7 +122,7 @@ class SecureKeyCookie extends Cookie // $timeout = ini_get('session.gc_maxlifetime') ?: 3600; - if (setcookie(SecureKeyCookie::COOKIE_NAME, $this->sign(serialize($Vault), $key), 0, Init::$WEBURI, Request::getRequestHeaders('HTTP_HOST'))) { + if (setcookie(SecureKeyCookie::COOKIE_NAME, $this->sign(serialize($Vault), $key), 0, Init::$WEBROOT)) { debugLog('Generating a new session key.'); return $this->SecuredKey; diff --git a/inc/SP/Mgmt/Users/UserLdap.class.php b/inc/SP/Mgmt/Users/UserLdap.class.php index 4f190191..1d823e24 100644 --- a/inc/SP/Mgmt/Users/UserLdap.class.php +++ b/inc/SP/Mgmt/Users/UserLdap.class.php @@ -139,6 +139,7 @@ class UserLdap extends User } /** + * Comprobar duplicados por login e email en minĂºsculas * @return bool * @throws \SP\Core\Exceptions\QueryException * @throws \SP\Core\Exceptions\ConstraintException