Merge branch 'master' into sieve-gui

# Conflicts:
#	dev/Sieve/Parser.js

.docker/release/files/etc/nginx/nginx.conf

@@ -52,6 +52,8 @@ http {
 
   server {
     listen 8888;
+    listen [::]:8888;
+    #listen [::]:8888 ipv6only=off;
     root /snappymail;
     index index.php;
     charset utf-8;

dev/Sieve/Grammar.js

@@ -45,8 +45,16 @@ export class GrammarString /*extends String*/
 /**
  * abstract
  */
-export class GrammarComment extends GrammarString
+export /*abstract*/ class GrammarComment extends GrammarString
 {
+/*
+	constructor()
+	{
+		if (this.constructor == GrammarComment) {
+			throw Error("Abstract class can't be instantiated.");
+		}
+	}
+*/
 }
 
 /**

dev/Sieve/Parser.js

@@ -18,6 +18,7 @@ import {
 import {
 	GrammarBracketComment,
 	GrammarCommand,
+	GrammarComment,
 	GrammarHashComment,
 	GrammarMultiLine,
 	GrammarNumber,
@@ -28,7 +29,7 @@ import {
 } from 'Sieve/Grammar';
 
 import { availableCommands } from 'Sieve/Commands';
-import { ConditionalCommand, RequireCommand } from 'Sieve/Commands/Controls';
+import { ConditionalCommand, IfCommand, RequireCommand } from 'Sieve/Commands/Controls';
 import { NotTest } from 'Sieve/Commands/Tests';
 
 const
@@ -156,7 +157,17 @@ export const parseScript = (script, name = 'script.sieve') => {
 			let new_command;
 			if (Commands[value]) {
 				if ('elsif' === value || 'else' === value) {
-//					(prev_command instanceof ConditionalCommand) || error('Not after IF condition');
+					let valid = false, cmd = (command ? command?.commands : tree), i = cmd?.length;
+					while (i) {
+						cmd[--i];
+						if (cmd[i] instanceof IfCommand) {
+							valid = true;
+							break;
+						} else if (typeof cmd[i] !== 'string' && !(cmd[i] instanceof GrammarComment)) {
+							break;
+						}
+					}
+					valid || error('Not after IF/ELSIF condition');
 				}
 				if ('allof' === value || 'anyof' === value) {
 //					(command instanceof ConditionalCommand || command instanceof NotTest) || error('Test-list not in conditional');
@@ -266,7 +277,6 @@ export const parseScript = (script, name = 'script.sieve') => {
 			break;
 		case T_BLOCK_END:
 			(command instanceof ConditionalCommand) || error(TokenError[type]);
-//			prev_command = command;
 			command = levels.up();
 			break;
 

snappymail/v/0.0.0/app/localization/fr/user.json

@@ -219,9 +219,9 @@
 		"DISPLAY_NAME": "Nom à afficher",
 		"LAST_NAME": "Nom",
 		"FIRST_NAME": "Prénom",
-		"MIDDLE_NAME": "Middle name",
-		"NAME_PREFIX": "Name prefix",
-		"NAME_SUFFIX": "Name suffix",
+		"MIDDLE_NAME": "Deuxième Prénom",
+		"NAME_PREFIX": "Civilité",
+		"NAME_SUFFIX": "Suffix",
 		"NICK_NAME": "Pseudonyme",
 		"LABEL_READ_ONLY": "Lecture seule",
 		"ADD_MENU_LABEL": "Ajouter",

snappymail/v/0.0.0/app/localization/pl/user.json

@@ -502,8 +502,8 @@
 		"IMAGES_OPTION_ALWAYS": "Zawsze pokazuj",
 		"IMAGES_WHITELIST": "Biała lista obrazów",
 		"MESSAGE_POPUP_WINDOW": "Pokaż w nowym oknie zamiast w nowej karcie",
-		"MAILTO": "Register as 'mailto:' links handler",
-		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
+		"MAILTO": "Zarejestruj obsługę linków 'mailto:' jako domyślnego klienta poczty",
+		"HTML_TO_MD": "Konwertuj HTML na Markdown zamiast zwykłego tekstu"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatycznie dodawaj odbiorców do książki adresowej",

snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html

@@ -11,7 +11,7 @@
 
 	<div class="control-group" data-bind="css: {'error': nameError}, hidden: exists">
 		<input type="text" class="span5"
-			data-bind="value: name, hasfocus: !exists()"
+			data-bind="value: name"
 			autocorrect="off" autocapitalize="off"
 			data-i18n="[placeholder]GLOBAL/NAME">
 	</div>