Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: additional account switch failed due to the old ParentEmail

Browse source
This commit is contained in:
djmaze 2021-12-01 10:51:58 +01:00
parent d4e77a97f5
commit 8aad63fcf8
3 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
View file

@ -193,7 +193,7 @@ abstract class Account implements \JsonSerializable
array $aAccountHash, array $aAccountHash,
bool $bThrowExceptionOnFalse = false): ?self bool $bThrowExceptionOnFalse = false): ?self
{ {
if (!empty($aAccountHash[0]) && 'account' === $aAccountHash[0] && 7 === \count($aAccountHash)) { if (!empty($aAccountHash[0]) && 'account' === $aAccountHash[0] && 7 <= \count($aAccountHash)) {
$oAccount = static::NewInstanceByLogin( $oAccount = static::NewInstanceByLogin(
$oActions, $oActions,
$aAccountHash[1] ?: '', $aAccountHash[1] ?: '',

7
snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php
View file

@ -17,13 +17,6 @@ class AdditionalAccount extends Account
return \md5(parent::Hash() . $this->ParentEmail()); return \md5(parent::Hash() . $this->ParentEmail());
} }
public function jsonSerialize()
{
$aData = parent::jsonSerialize();
$aData[] = ''; // was ParentEmail
return $aData;
}
public function asTokenArray(MainAccount $oMainAccount) : array public function asTokenArray(MainAccount $oMainAccount) : array
{ {
$sHash = $oMainAccount->CryptKey(); $sHash = $oMainAccount->CryptKey();

2
snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
View file

@ -192,6 +192,6 @@ abstract class Crypt
} }
\SnappyMail\Crypt::setCipher(\RainLoop\API::Config()->Get('security', 'encrypt_cipher', 'aes-256-cbc-hmac-sha1')) \SnappyMail\Crypt::setCipher(\RainLoop\Api::Config()->Get('security', 'encrypt_cipher', 'aes-256-cbc-hmac-sha1'))
|| \SnappyMail\Crypt::setCipher('aes-256-cbc-hmac-sha1') || \SnappyMail\Crypt::setCipher('aes-256-cbc-hmac-sha1')
|| \SnappyMail\Crypt::setCipher('aes-256-xts'); || \SnappyMail\Crypt::setCipher('aes-256-xts');