Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 10:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix cookie bug (#800)

Browse source 
+ small fixes
This commit is contained in:
RainLoop Team 2015-08-14 23:20:47 +04:00
parent 91f3c05d5e
commit 502aebdc37
7 changed files with 47 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1524,7 +1524,6 @@ class Actions
$oSettings = $this->SettingsProvider()->Load($oAccount);
if (!$oAccount->IsAdditionalAccount() && !empty($aResult['WelcomePageUrl']) &&
('once' === $aResult['WelcomePageDisplay'] || 'always' === $aResult['WelcomePageDisplay']))
{

2
rainloop/v/0.0.0/app/libraries/RainLoop/Api.php
View file

@ -108,7 +108,7 @@ class Api
$sSslCafile = \RainLoop\Api::Config()->Get('ssl', 'cafile', '');
$sSslCapath = \RainLoop\Api::Config()->Get('ssl', 'capath', '');
\RainLoop\Utils::$CookieDefaultPath = \RainLoop\Api::Config()->Get('labs', 'cookie_path', '/');
\RainLoop\Utils::$CookieDefaultPath = \RainLoop\Api::Config()->Get('labs', 'cookie_default_path', '');
if (!empty($sSslCafile) || !empty($sSslCapath))
{

2
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -348,7 +348,7 @@ Enables caching in the system'),
'fast_cache_memcache_port' => array(11211),
'fast_cache_memcache_expire' => array(43200),
'use_local_proxy_for_external_images' => array(false),
'cookie_path' => array('/'),
'cookie_default_path' => array(''),
'startup_url' => array(''),
'emogrifier' => array(true),
'dev_email' => array(''),

8
rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
View file

@ -7,7 +7,7 @@ class Utils
/**
* @var string
*/
static $CookieDefaultPath = '/';
static $CookieDefaultPath = '';
static $Cookies = null;
@ -518,6 +518,7 @@ class Utils
if (null === $sPath)
{
$sPath = \RainLoop\Utils::$CookieDefaultPath;
$sPath = $sPath && 0 < \strlen($sPath) ? $sPath : null;
}
\RainLoop\Utils::$Cookies[$sName] = $sValue;
@ -531,8 +532,11 @@ class Utils
\RainLoop\Utils::$Cookies = is_array($_COOKIE) ? $_COOKIE : array();
}
$sPath = \RainLoop\Utils::$CookieDefaultPath;
$sPath = $sPath && 0 < \strlen($sPath) ? $sPath : null;
unset(\RainLoop\Utils::$Cookies[$sName]);
@\setcookie($sName, '', \time() - 3600 * 24 * 30);
@\setcookie($sName, '', \time() - 3600 * 24 * 30, $sPath);
}
/**