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

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2014-07-11 22:57:22 +04:00
parent 1241b14b9d
commit 310dbf9224
7 changed files with 160 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/ViewModels/PopupsAddOpenPgpKeyViewModel.js
View file

@ -22,10 +22,13 @@ function PopupsAddOpenPgpKeyViewModel()
iCount = 30, iCount = 30,
aMatch = null, aMatch = null,
sKey = Utils.trim(this.key()), sKey = Utils.trim(this.key()),
oReg = /[\-]{3,6}BEGIN PGP (PRIVATE|PUBLIC) KEY BLOCK[\-]{3,6}[\s\S]+[\-]{3,6}END PGP (PRIVATE|PUBLIC) KEY BLOCK[\-]{3,6}/gi, oReg = /[\-]{3,6}BEGIN[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[\-]{3,6}[\s\S]+?[\-]{3,6}END[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[\-]{3,6}/gi,
oOpenpgpKeyring = RL.data().openpgpKeyring oOpenpgpKeyring = RL.data().openpgpKeyring
; ;
sKey = sKey.replace(/[\r\n]([a-zA-Z0-9]{2,}:[^\r\n]+)[\r\n]+([a-zA-Z0-9\/\\+=]{10,})/g, '\n$1!-!N!-!$2')
.replace(/[\n\r]+/g, '\n').replace(/!-!N!-!/g, '\n\n');
this.key.error('' === sKey); this.key.error('' === sKey);
if (!oOpenpgpKeyring || this.key.error()) if (!oOpenpgpKeyring || this.key.error())

2
rainloop/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
View file

@ -564,8 +564,6 @@ class HtmlUtils
if ($oElement->hasAttribute('src')) if ($oElement->hasAttribute('src'))
{ {
// file_put_contents('f:/fff', $oElement->getAttribute('src')."\r\n", FILE_APPEND);
$sSrc = \trim($oElement->getAttribute('src')); $sSrc = \trim($oElement->getAttribute('src'));
$oElement->removeAttribute('src'); $oElement->removeAttribute('src');

5
rainloop/v/0.0.0/static/js/app.js
View file

@ -11212,10 +11212,13 @@ function PopupsAddOpenPgpKeyViewModel()
iCount = 30, iCount = 30,
aMatch = null, aMatch = null,
sKey = Utils.trim(this.key()), sKey = Utils.trim(this.key()),
oReg = /[\-]{3,6}BEGIN PGP (PRIVATE|PUBLIC) KEY BLOCK[\-]{3,6}[\s\S]+[\-]{3,6}END PGP (PRIVATE|PUBLIC) KEY BLOCK[\-]{3,6}/gi, oReg = /[\-]{3,6}BEGIN[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[\-]{3,6}[\s\S]+?[\-]{3,6}END[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[\-]{3,6}/gi,
oOpenpgpKeyring = RL.data().openpgpKeyring oOpenpgpKeyring = RL.data().openpgpKeyring
; ;
sKey = sKey.replace(/[\r\n]([a-zA-Z0-9]{2,}:[^\r\n]+)[\r\n]+([a-zA-Z0-9\/\\+=]{10,})/g, '\n$1!-!N!-!$2')
.replace(/[\n\r]+/g, '\n').replace(/!-!N!-!/g, '\n\n');
this.key.error('' === sKey); this.key.error('' === sKey);
if (!oOpenpgpKeyring || this.key.error()) if (!oOpenpgpKeyring || this.key.error())

4
rainloop/v/0.0.0/static/js/app.min.js vendored
View file

File diff suppressed because one or more lines are too long