mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-08 00:47:04 +03:00
Bugfix: fetching messagelist sometimes failed
This commit is contained in:
parent
2ef0a7e382
commit
987315fb65
1 changed files with 4 additions and 5 deletions
|
|
@ -20,7 +20,7 @@ trait Messages
|
||||||
|
|
||||||
$sRawKey = $this->GetActionParam('RawKey', '');
|
$sRawKey = $this->GetActionParam('RawKey', '');
|
||||||
$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true);
|
$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true);
|
||||||
if ($aValues && 7 < \count($aValues))
|
if ($aValues && 6 < \count($aValues))
|
||||||
{
|
{
|
||||||
$this->verifyCacheByKey($sRawKey);
|
$this->verifyCacheByKey($sRawKey);
|
||||||
|
|
||||||
|
|
@ -510,7 +510,7 @@ trait Messages
|
||||||
unset($oException);
|
unset($oException);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->DefaultResponse(__FUNCTION__, '' === $sHash ? false : array($sFolder, $sHash));
|
return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFolder, $sHash) : false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -574,7 +574,7 @@ trait Messages
|
||||||
unset($oException);
|
unset($oException);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->DefaultResponse(__FUNCTION__, '' === $sHash ? false : array($sFromFolder, $sHash));
|
return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFromFolder, $sHash) : false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -602,8 +602,7 @@ trait Messages
|
||||||
throw new ClientException(Notifications::CantCopyMessage, $oException);
|
throw new ClientException(Notifications::CantCopyMessage, $oException);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->DefaultResponse(__FUNCTION__,
|
return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFromFolder, $sHash) : false);
|
||||||
'' === $sHash ? false : array($sFromFolder, $sHash));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function DoMessageUploadAttachments() : array
|
public function DoMessageUploadAttachments() : array
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue