diff --git a/dev/View/Popup/AddOpenPgpKey.js b/dev/View/Popup/AddOpenPgpKey.js index a978936d3..7ac467ea9 100644 --- a/dev/View/Popup/AddOpenPgpKey.js +++ b/dev/View/Popup/AddOpenPgpKey.js @@ -41,8 +41,11 @@ oOpenpgpKeyring = PgpStore.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'); + if (/[\n]/.test(sKey)) + { + sKey = sKey.replace(/[\r]+/g, '') + .replace(/[\n]{2,}/g, '\n\n'); + } this.key.error('' === sKey); diff --git a/gulpfile.js b/gulpfile.js index 45046d3b2..f80806e5a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -120,7 +120,7 @@ cfg.paths.js = { openpgp: { name: 'openpgp.js', src: [ - 'vendors/openpgp/openpgp-0.7.2.min.js' + 'vendors/openpgp/openpgp-0.10.1.min.js' ] }, encrypt: { diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html index a074aaa6f..6e5dbfb63 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html +++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html @@ -121,7 +121,7 @@ - + diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html index d0ad861a8..19eb9c04d 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html @@ -180,6 +180,7 @@