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

Release fixes

Browse source
This commit is contained in:
RainLoop Team 2015-05-12 20:33:02 +04:00
parent 5b6c90aea9
commit f91f74fe7c
21 changed files with 398 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1682,7 +1682,8 @@ class Actions
$aResult['UserBackgroundHash'] = '';
if (!$bAdmin && $oSettings instanceof \RainLoop\Settings &&
$oSettingsLocal instanceof \RainLoop\Settings)
$oSettingsLocal instanceof \RainLoop\Settings &&
$oAccount)
{
if ($oConfig->Get('webmail', 'allow_languages_on_settings', true))
{
@ -9277,7 +9278,8 @@ class Actions
$mResult['Html'] = 0 === \strlen($sHtml) ? '' : \MailSo\Base\HtmlUtils::ClearHtml(
$sHtml, $bHasExternals, $mFoundedCIDs, $aContentLocationUrls, $mFoundedContentLocationUrls, false, false,
$fAdditionalExternalFilter);
$fAdditionalExternalFilter
);
$mResult['ExternalProxy'] = null !== $fAdditionalExternalFilter;

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

@ -13,6 +13,25 @@ class Utils
{
}
/**
* @param string $sFileName
* @param string $sSignature
*
* @return bool
*/
static public function PgpVerifyFile($sFileName, $sSignature)
{
$sKeyFile = APP_VERSION_ROOT_PATH.'app/resources/RainLoop.asc';
if (\file_exists($sKeyFile) && \file_exists($sFileName) && !empty($sSignature))
{
$sKeyFile = @\file_get_contents($sKeyFile);
return !empty($sKeyFile); // TODO
}
return false;
}
/**
* @param string $sString
* @param string $sKey