v2.13.0

.docker/release/files/usr/local/include/application.ini

@@ -289,5 +289,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.12.2"
+current = "2.13.0"
 saved = "Mon, 23 Aug 2021 07:55:13 +0000"

README.md

@@ -139,23 +139,23 @@ RainLoop 1.15 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.158.025	|   86.330	|
+|admin.js        	|2.158.025	|   84.080	|
-|app.js          	|4.215.733	|  442.968	|
+|app.js          	|4.215.733	|  434.705	|
-|boot.js         	|  672.433	|    2.049	|
+|boot.js         	|  672.433	|    2.042	|
-|libs.js         	|  647.679	|  206.717	|
+|libs.js         	|  647.679	|  200.928	|
 |polyfills.js    	|  325.908	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.019.778	|  738.349	|
+|TOTAL           	|8.019.778	|  722.040	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  255.514	|   43.341	| 73.899	| 13.994	| 60.674  	| 12.482	|
+|admin.min.js    	|  255.514	|   41.747	| 73.899	| 13.727	| 60.674  	| 12.266	|
-|app.min.js      	|  516.000	|  219.211	|140.430	| 68.665	|110.657  	| 58.612	|
+|app.min.js      	|  516.000	|  209.913	|140.430	| 67.140	|110.657  	| 57.339	|
-|boot.min.js     	|   66.456	|    1.278	| 22.553	|    789	| 20.043  	|    632	|
+|boot.min.js     	|   66.456	|    1.271	| 22.553	|    781	| 20.043  	|    629	|
-|libs.min.js     	|  574.626	|   98.988	|177.280	| 36.290	|151.855  	| 32.467	|
+|libs.min.js     	|  574.626	|   96.683	|177.280	| 35.654	|151.855  	| 31.874	|
 |polyfills.min.js	|   32.608	|        0	| 11.315	|      0	| 10.072  	|      0	|
-|TOTAL           	|1.445.204	|  362.818	|425.477	|119.738	|353.301  	|104.193	|
+|TOTAL           	|1.445.204	|  349.614	|425.477	|117.302	|353.301  	|102.108	|
-|TOTAL (no admin)	|1.189.690	|  319.477	|351.061	|105.744	|292.627  	| 91.711	|
+|TOTAL (no admin)	|1.189.690	|  307.867	|351.061	|103.575	|292.627  	| 89.842	|
 
 For a user its around 69% smaller and faster than traditional RainLoop.
 
@@ -183,8 +183,8 @@ For a user its around 69% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.334	| 82.315	| 46.959	| 16.904	| 14.555	|
+|app.css     	| 340.334	| 81.461	| 46.959	| 16.860	| 14.518	|
-|app.min.css 	| 274.791	| 66.384	| 39.618	| 14.984	| 13.193	|
+|app.min.css 	| 274.791	| 65.573	| 39.618	| 14.925	| 13.155	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
 |admin.css    	|       	| 30.212	|       	|  6.840	|  5.929	|

build/deb.php

@@ -1,4 +1,6 @@
 <?php
+echo "\x1b[33;1m === Debian === \x1b[0m\n";
+
 // Debian Repository
 define('DEB_SOURCE_DIR', __DIR__ . '/deb');
 define('DEB_DEST_DIR', DEB_SOURCE_DIR . "/snappymail_{$package->version}-1_all");

dev/shortcuts.js

@@ -64,7 +64,7 @@ const
 	keydown = event => {
 		let key = (event.key || '').toLowerCase().replace(' ','space'),
 			target = event.target;
-		 // ignore keydown in any element that supports keyboard input unless it's the Escape key
+		// ignore keydown in any element that supports keyboard input unless it's the Escape key
 		if ('escape' === key || !target.closest || !target.closest('input,select,textarea,[contenteditable]')) {
 			let modifiers = ['alt','ctrl','meta','shift'].filter(v => event[v+'Key']).join('+');
 			scope[key] && scope[key][modifiers] && scope[key][modifiers].forEach(cmd => exec(event, cmd));

integrations/cloudron/DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.12.2</upstream>.
+This app packages SnappyMail <upstream>2.13.0</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 

integrations/cloudron/Dockerfile

@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
-VERSION=2.12.2
+VERSION=2.13.0
 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \

integrations/nextcloud/snappymail/VERSION

@@ -1 +1 @@
-2.12.2
+2.13.0

integrations/nextcloud/snappymail/appinfo/info.xml

@@ -4,7 +4,7 @@
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
 	<description>Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07).</description>
-	<version>2.12.2</version>
+	<version>2.13.0</version>
 	<licence>agpl</licence>
 	<author>SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
   <namespace>SnappyMail</namespace>

integrations/virtualmin/snappymail.pl

@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
 # script_snappymail_versions()
 sub script_snappymail_versions
 {
-return ( "2.12.2" );
+return ( "2.13.0" );
 }
 
 sub script_snappymail_version_desc

makedeb.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-#Build SnappyMail Webmail Debian Package
-PACKAGEVERSION="0";
-
-#Build snappymail
-gulp build;
-cd build/dist/releases/webmail;
-cd $(ls -t);	#Most recent build folder
-
-#Working directory
-mkdir snappymail-deb-build;
-cd snappymail-deb-build;
-
-#Prepare zip file
-unzip ../snappymail-community-latest.zip;
-find . -type d -exec chmod 755 {} \;
-find . -type f -exec chmod 644 {} \;
-
-#Set up package directory
-VERSION=$(cat data/VERSION);
-DIR="snappymail_$VERSION-$PACKAGEVERSION";
-mkdir -m 0755 -p $DIR;
-mkdir -m 0755 -p $DIR/usr;
-mkdir -m 0755 -p $DIR/usr/share;
-mkdir -m 0755 -p $DIR/usr/share/snappymail;
-mkdir -m 0755 -p $DIR/var;
-mkdir -m 0755 -p $DIR/var/lib;
-
-#Move files into package directory
-mv snappymail $DIR/usr/share/snappymail/snappymail;
-mv index.php $DIR/usr/share/snappymail/index.php;
-mv data $DIR/var/lib/snappymail;
-
-#Update settings for Debian package
-sed -i "s/\$sCustomDataPath = '';/\$sCustomDataPath = '\/var\/lib\/snappymail';/" $DIR/usr/share/snappymail/snappymail/v/$VERSION/include.php
-
-#Set up Debian packaging tools
-cd $DIR;
-mkdir -m 0755 DEBIAN;
-
-#Create Debian packging control file
-cat >> DEBIAN/control <<-EOF
-	Package: snappymail
-	Version: $VERSION
-	Section: web
-	Priority: optional
-	Architecture: all
-	Depends: php7-fpm (>= 7.3), php7-curl, php7-json
-	Maintainer: SnappyMail <support@snappymail.net>
-	Installed-Size: 20330
-	Description: SnappyMail Webmail
-	 A modern PHP webmail client.
-EOF
-
-#Create Debian packaging post-install script
-cat >> DEBIAN/postinst <<-EOF
-	#!/bin/sh
-	chown -R www-data:www-data /var/lib/snappymail
-EOF
-chmod +x DEBIAN/postinst;
-
-#Build Debian package
-cd ..;
-fakeroot dpkg-deb -b $DIR;
-
-#Clean up
-mv $DIR.deb ..;
-cd ..;
-rm -rf snappymail-deb-build;

package.json

@@ -3,7 +3,7 @@
   "title": "SnappyMail",
   "description": "Simple, modern & fast web-based email client",
   "private": true,
-  "version": "2.12.2",
+  "version": "2.13.0",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",

release.php

@@ -178,12 +178,6 @@ echo "{$zip_destination} created\n{$tar_destination} created\n";
 
 rename("snappymail/v/{$package->version}", 'snappymail/v/0.0.0');
 
-if (isset($options['sign'])) {
-	echo "\x1b[33;1m === PGP Sign === \x1b[0m\n";
-	passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($tar_destination), $return_var);
-	passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($zip_destination), $return_var);
-}
-
 // Arch User Repository
 if ($options['aur']) {
 	// extension_loaded('blake2')
@@ -247,3 +241,13 @@ else if ($options['docker']) {
 		echo "Docker not installed!\n";
 	}
 }
+
+if (isset($options['sign'])) {
+	echo "\x1b[33;1m === PGP Sign === \x1b[0m\n";
+	passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($tar_destination), $return_var);
+	passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($zip_destination), $return_var);
+	if (isset($options['debian'])) {
+		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '
+			. escapeshellarg(__DIR__ . "/build/dist/releases/webmail/{$package->version}/" . basename(DEB_DEST_DIR.'.deb')), $return_var);
+	}
+}