Fix owncloud template

Fix sso (logout on empty hash)
This commit is contained in:
RainLoop Team 2014-05-20 02:11:54 +04:00
parent 71af876fb5
commit 8ac9920ec8
8 changed files with 59 additions and 15 deletions

View file

@ -5,15 +5,13 @@ namespace RainLoop;
use RainLoop\Enumerations\UploadError;
use RainLoop\Enumerations\UploadClientError;
define('RL_CONTACTS_PER_PAGE', 30);
define('RL_CONTACTS_MAX', 300);
class Actions
{
const AUTH_TFA_SIGN_ME_TOKEN_KEY = 'rltfasmauth';
const AUTH_SIGN_ME_TOKEN_KEY = 'rlsmauth';
const AUTH_MAILTO_TOKEN_KEY = 'rlmailtoauth';
const AUTH_SPEC_TOKEN_KEY = 'rlspecauth';
const AUTH_SPEC_LOGOUT_TOKEN_KEY = 'rlspeclogout';
const AUTH_ADMIN_TOKEN_KEY = 'rlaauth';
const AUTH_LAST_ERROR = 'rllasterrorcode';
@ -359,6 +357,14 @@ class Actions
return $sFileName;
}
/**
* @return void
*/
public function SetAuthLogoutToken()
{
\RainLoop\Utils::SetCookie(self::AUTH_SPEC_TOKEN_KEY, \md5(APP_START_TIME), 0, '/', null, null, true);
}
/**
* @param \RainLoop\Account $oAccount
*
@ -400,6 +406,20 @@ class Actions
return $sResult;
}
/**
* @return string
*/
public function GetSpecAuthLogoutTokenWithDeletion()
{
$sResult = \RainLoop\Utils::GetCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY, '');
if (0 < strlen($sResult))
{
\RainLoop\Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY);
}
return $sResult;
}
/**
* @return void
*/
@ -5983,17 +6003,17 @@ class Actions
return $this->DefaultResponse(__FUNCTION__, true);
}
/**
* @param bool $bAdmin
* @param \RainLoop\Account $oAccount
*
*
* @return array
*/
public function Capa($bAdmin, $oAccount = null)
{
$oConfig = $this->Config();
$aResult = array(\RainLoop\Enumerations\Capa::PREM);
if ($oConfig->Get('webmail', 'allow_additional_accounts', false))