Fixed PGP import

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')
+			if (/[\n]/.test(sKey))
-				.replace(/[\n\r]+/g, '\n').replace(/!-!N!-!/g, '\n\n');
+			{
+				sKey = sKey.replace(/[\r]+/g, '')
+					.replace(/[\n]{2,}/g, '\n\n');
+			}
 
 			this.key.error('' === sKey);
 

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: {

rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html

@@ -121,7 +121,7 @@
 					<span data-bind="text: uploadDataDesc"></span>
 				</span>
 				&nbsp;&nbsp;&nbsp;
-				<a href="#" target="_blank" class="btn btn-small" data-bind="link: phpInfoLink()">
+				<a href="#" target="_blank" class="btn btn-thin" data-bind="link: phpInfoLink()">
 					<i class="icon-info"></i>
 				</a>
 			</div>

rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html

@@ -180,6 +180,7 @@
 									<div class="pull-right" style="margin-right: 4px;">
 										<div class="btn-group pull-right">
 											<a class="btn first" data-tooltip-placement="top"
+												style="padding-left: 10px; padding-right: 10px;"
 												data-bind="visible: addAttachmentEnabled(), initDom: composeUploaderButton, tooltip: 'COMPOSE/ATTACH_FILES'">
 												<sup style="font-weight: bold; font-size: 100%; top: -0.3em;">+</sup><i class="icon-attachment"></i>
 											</a>