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

Fixed Opening an email with specific content „hangs” RainLoop in the browser (Closes #308)

Browse source 
Code refactoring
This commit is contained in:
RainLoop Team 2014-09-05 19:53:44 +04:00
parent af43329902
commit 7a374ebe03
40 changed files with 1100 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2650,13 +2650,22 @@ class Actions
$bResult = false;
$oConfig = $this->Config();
$sLogin = \trim($this->GetActionParam('Login', ''));
$sPassword = $this->GetActionParam('Password', '');
$sNewPassword = $this->GetActionParam('NewPassword', '');
$this->Logger()->AddSecret($sPassword);
$this->Logger()->AddSecret($sNewPassword);
if ($oConfig->ValidatePassword($sPassword))
{
$bResult = true;
if (0 < strlen($sLogin))
{
$oConfig->Set('security', 'admin_login', $sLogin);
}
$oConfig->SetPassword($sNewPassword);
$bResult = true;
}
return $this->DefaultResponse(__FUNCTION__, $bResult ? $oConfig->Save() : false);
@ -7400,6 +7409,8 @@ class Actions
$mResult['Plain'] = $sPlain;
// $mResult['Plain'] = 0 === \strlen($sPlain) ? '' : \MailSo\Base\HtmlUtils::ConvertPlainToHtml($sPlain);
$this->Logger()->WriteDump($mResult['Html']);
$mResult['TextHash'] = \md5($mResult['Html'].$mResult['Plain']);
$mResult['TextPartIsTrimmed'] = $mResponse->TextPartIsTrimmed();

4
rainloop/v/0.0.0/app/templates/Index.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html id="id-html" class="no-js rl-booted-trigger rl-started-trigger">
<html class="no-js rl-booted-trigger rl-started-trigger">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
@ -8,7 +8,7 @@
<noscript>
<meta http-equiv="refresh" content="0; URL=./?/NoScript" />
</noscript>
<!--[if lte IE 7]>
<!--[if lte IE 8]>
<meta http-equiv="refresh" content="0; URL=./?/BadBrowser" />
<![endif]-->
<script type="text/javascript" data-cfasync="false">