From cf4cefbccd43f24b004b18da3d5c2f84e04a9227 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 14:23:26 +0200 Subject: [PATCH 01/25] Base on Alpine, still needs cleanup --- data/Dockerfiles/php-fpm/Dockerfile | 19 +++++-------------- data/Dockerfiles/php-fpm/docker-entrypoint.sh | 2 +- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/data/Dockerfiles/php-fpm/Dockerfile b/data/Dockerfiles/php-fpm/Dockerfile index 0d65040fe..cef46c4eb 100644 --- a/data/Dockerfiles/php-fpm/Dockerfile +++ b/data/Dockerfiles/php-fpm/Dockerfile @@ -1,24 +1,15 @@ -FROM php:7.1-fpm +FROM php:7.1-fpm-alpine LABEL maintainer "Andre Peters " ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y \ - g++ \ - libicu-dev \ - libidn11-dev \ - libxml2-dev \ - mysql-client \ - redis-tools \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* - +RUN apk add -U --no-cache libxml2-dev icu-dev redis mysql-client bash autoconf g++ make +RUN pecl install redis && pecl clear-cache RUN docker-php-ext-configure intl RUN docker-php-ext-install intl pdo pdo_mysql xmlrpc +RUN docker-php-ext-enable redis RUN pear install channel://pear.php.net/Net_IDNA2-0.1.1 Auth_SASL Net_IMAP NET_SMTP Net_IDNA2 Mail_mime -RUN pecl install -o -f redis \ - && rm -rf /tmp/pear \ - && docker-php-ext-enable redis +RUN apk del autoconf g++ make libxml2-dev COPY ./docker-entrypoint.sh / diff --git a/data/Dockerfiles/php-fpm/docker-entrypoint.sh b/data/Dockerfiles/php-fpm/docker-entrypoint.sh index 1e4d3fe68..2c73abfc1 100755 --- a/data/Dockerfiles/php-fpm/docker-entrypoint.sh +++ b/data/Dockerfiles/php-fpm/docker-entrypoint.sh @@ -50,7 +50,7 @@ fi for file in $(ls /data/dkim/keys/); do domain=${file%.dkim} if [[ -f /data/dkim/txt/${file} ]]; then - redis-cli -h redis-mailcow HSET DKIM_PUB_KEYS "${domain}" "$(cat /data/dkim/keys/${domain})" + redis-cli -h redis-mailcow HSET DKIM_PUB_KEYS "${domain}" "$(cat /data/dkim/txt/${file})" redis-cli -h redis-mailcow HSET DKIM_PRIV_KEYS "${domain}" "$(cat /data/dkim/keys/${file})" redis-cli -h redis-mailcow HSET DKIM_SELECTORS "${domain}" "dkim.${domain}" fi From 4b875d146855fdb02a978dcc424d8fc480ddb2f1 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 14:24:55 +0200 Subject: [PATCH 02/25] Remove some tools after installation --- data/Dockerfiles/dovecot/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile index b195510af..c56ea43ce 100644 --- a/data/Dockerfiles/dovecot/Dockerfile +++ b/data/Dockerfiles/dovecot/Dockerfile @@ -96,6 +96,8 @@ RUN groupadd -g 5000 vmail \ && useradd -c "Dovecot login user" -d /dev/null -u 402 -g dovenull -s /bin/false dovenull RUN touch /etc/default/locale +RUN apt-get purge -y build-essential automake autotools-dev \ + && apt-get autoremove --purge -y EXPOSE 24 10001 From fbac28974b1232e16b532c59b75f5c3caf837f96 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 14:25:10 +0200 Subject: [PATCH 03/25] Base on Alpine --- data/Dockerfiles/rspamd/Dockerfile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index cb097a662..0eb0b6b63 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -1,27 +1,22 @@ -FROM debian:jessie-slim +FROM alpine:edge LABEL maintainer "Andre Peters " -ARG DEBIAN_FRONTEND=noninteractive ENV LC_ALL C -RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \ - && echo "deb http://rspamd.com/apt-stable/ jessie main" > /etc/apt/sources.list.d/rspamd.list \ - && apt-get update && apt-get install -y \ - ca-certificates \ - python-pip \ - rspamd \ - && rm -rf /var/lib/apt/lists/* +RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \ + && apk add --no-cache rspamd rspamd-controller rsyslog ca-certificates \ + && adduser -S _rspamd RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local COPY settings.conf /etc/rspamd/modules.d/settings.conf COPY antivirus.conf /etc/rspamd/modules.d/antivirus.conf COPY dkim_signing.lua /usr/share/rspamd/lua/dkim_signing.lua -RUN pip install -U oletools -CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd +CMD /usr/sbin/rspamd -f -u _rspamd -g _rspamd RUN rm -rf /tmp/* /var/tmp/* +RUN mkdir /run/rspamd && chown -R _rspamd: /run/rspamd USER _rspamd From 0ea977b1a021af7dce2708821fb7d858a7dad344 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 14:25:21 +0200 Subject: [PATCH 04/25] Fix path --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 17f3862b0..21bef6ffb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,9 +71,9 @@ services: image: mailcow/rspamd build: ./data/Dockerfiles/rspamd command: > - /bin/bash -c " + /bin/sh -c " sleep 5; - /usr/bin/rspamd -f -u _rspamd -g _rspamd + /usr/sbin/rspamd -f -u _rspamd -g _rspamd " depends_on: nginx-mailcow: From ce4c5b80b8067f0eae1e3abb3e6b999346581056 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 20:07:43 +0200 Subject: [PATCH 05/25] Fix migration to Redis --- data/Dockerfiles/php-fpm/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Dockerfiles/php-fpm/docker-entrypoint.sh b/data/Dockerfiles/php-fpm/docker-entrypoint.sh index 2c73abfc1..5e88a89d9 100755 --- a/data/Dockerfiles/php-fpm/docker-entrypoint.sh +++ b/data/Dockerfiles/php-fpm/docker-entrypoint.sh @@ -52,7 +52,7 @@ for file in $(ls /data/dkim/keys/); do if [[ -f /data/dkim/txt/${file} ]]; then redis-cli -h redis-mailcow HSET DKIM_PUB_KEYS "${domain}" "$(cat /data/dkim/txt/${file})" redis-cli -h redis-mailcow HSET DKIM_PRIV_KEYS "${domain}" "$(cat /data/dkim/keys/${file})" - redis-cli -h redis-mailcow HSET DKIM_SELECTORS "${domain}" "dkim.${domain}" + redis-cli -h redis-mailcow HSET DKIM_SELECTORS "${domain}" "dkim" fi rm /data/dkim/{keys,txt}/${file} done From c92434af61c02592902b13a9d9f7924be3179142 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 20:10:32 +0200 Subject: [PATCH 06/25] Fix ipv6 --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 21bef6ffb..55ce91e18 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -271,7 +271,8 @@ services: privileged: true network_mode: "host" volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run/docker.sock:/var/run/docker.sock:ro + - /lib/modules:/lib/modules:ro networks: mailcow-network: From 1add37157df627189b75059aae03aaf556a5d5d5 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 20:15:34 +0200 Subject: [PATCH 07/25] Remove icu lib dev --- data/Dockerfiles/php-fpm/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/Dockerfiles/php-fpm/Dockerfile b/data/Dockerfiles/php-fpm/Dockerfile index cef46c4eb..5c307ce7e 100644 --- a/data/Dockerfiles/php-fpm/Dockerfile +++ b/data/Dockerfiles/php-fpm/Dockerfile @@ -3,13 +3,13 @@ LABEL maintainer "Andre Peters " ARG DEBIAN_FRONTEND=noninteractive -RUN apk add -U --no-cache libxml2-dev icu-dev redis mysql-client bash autoconf g++ make +RUN apk add -U --no-cache libxml2-dev icu-dev icu-libs redis mysql-client bash autoconf g++ make RUN pecl install redis && pecl clear-cache RUN docker-php-ext-configure intl RUN docker-php-ext-install intl pdo pdo_mysql xmlrpc RUN docker-php-ext-enable redis RUN pear install channel://pear.php.net/Net_IDNA2-0.1.1 Auth_SASL Net_IMAP NET_SMTP Net_IDNA2 Mail_mime -RUN apk del autoconf g++ make libxml2-dev +RUN apk del autoconf g++ make libxml2-dev icu-dev COPY ./docker-entrypoint.sh / From 3ab77b1303646ddcbd1eccbabc0d4e11b2f0ccf5 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 20:15:59 +0200 Subject: [PATCH 08/25] Skip domain in config --- .../web/inc/lib/vendor/owasp/csrf-protector-php/libs/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/config.php b/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/config.php index b9833d645..bab612edd 100755 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/config.php +++ b/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/config.php @@ -39,7 +39,7 @@ return array( "customErrorMessage" => "", "jsPath" => "../js/csrfprotector.js", // Fetching IS_HTTPS from sessions handler - "jsUrl" => get_trusted_hostname(), + "jsUrl" => "/inc/lib/vendor/owasp/csrf-protector-php/js/csrfprotector.js", "tokenLength" => 10, "secureCookie" => false, "disabledJavascriptMessage" => "", From 49f28ecaf89e6b2d65466a53069f5b81a61cfb09 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 21:53:08 +0200 Subject: [PATCH 09/25] Destroy session when it becomes invalid --- data/web/inc/sessions.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/web/inc/sessions.inc.php b/data/web/inc/sessions.inc.php index e6beb4853..b62418394 100644 --- a/data/web/inc/sessions.inc.php +++ b/data/web/inc/sessions.inc.php @@ -54,5 +54,9 @@ function session_check() { return true; } if (isset($_SESSION['mailcow_cc_role']) && session_check() === false) { - exit("Invalid session"); + session_regenerate_id(true); + session_unset(); + session_destroy(); + session_write_close(); + header("Location: /"); } From be044a159202b0ac3147aa4f6ffa7796b0ea6aa8 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sun, 14 May 2017 22:10:25 +0200 Subject: [PATCH 10/25] Add openssl --- data/Dockerfiles/php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Dockerfiles/php-fpm/Dockerfile b/data/Dockerfiles/php-fpm/Dockerfile index 5c307ce7e..224275fa0 100644 --- a/data/Dockerfiles/php-fpm/Dockerfile +++ b/data/Dockerfiles/php-fpm/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer "Andre Peters " ARG DEBIAN_FRONTEND=noninteractive -RUN apk add -U --no-cache libxml2-dev icu-dev icu-libs redis mysql-client bash autoconf g++ make +RUN apk add -U --no-cache libxml2-dev icu-dev icu-libs redis mysql-client bash autoconf g++ make openssl RUN pecl install redis && pecl clear-cache RUN docker-php-ext-configure intl RUN docker-php-ext-install intl pdo pdo_mysql xmlrpc From fccdabb1135d4e9b918547649a77479dd46e0e86 Mon Sep 17 00:00:00 2001 From: andryyy Date: Mon, 15 May 2017 09:00:37 +0200 Subject: [PATCH 11/25] Remove owasp csrf tool --- data/web/inc/lib/composer.json | 3 +- data/web/inc/lib/composer.lock | 42 +- .../lib/vendor/composer/autoload_classmap.php | 8 - .../lib/vendor/composer/autoload_static.php | 8 - .../inc/lib/vendor/composer/installed.json | 38 - .../owasp/csrf-protector-php/.coveralls.yml | 4 - .../owasp/csrf-protector-php/.travis.yml | 46 - .../owasp/csrf-protector-php/composer.json | 14 - .../files/libs/csrf/csrfprotector-php.html | 74 - .../owasp/csrf-protector-php/docs/index.html | 1 - .../csrf-protector-php/docs/index/Files.html | 33 - .../docs/index/Functions.html | 65 - .../docs/index/General.html | 69 - .../docs/index/Variables.html | 41 - .../docs/javascript/main.js | 841 --------- .../docs/javascript/prettify.js | 1526 ----------------- .../docs/javascript/searchdata.js | 122 -- .../docs/search/FilesC.html | 20 - .../docs/search/FunctionsA.html | 20 - .../docs/search/FunctionsC.html | 20 - .../docs/search/FunctionsF.html | 20 - .../docs/search/FunctionsG.html | 20 - .../docs/search/FunctionsI.html | 20 - .../docs/search/FunctionsL.html | 20 - .../docs/search/FunctionsO.html | 20 - .../docs/search/FunctionsR.html | 20 - .../docs/search/FunctionsU.html | 20 - .../docs/search/GeneralA.html | 20 - .../docs/search/GeneralC.html | 20 - .../docs/search/GeneralF.html | 20 - .../docs/search/GeneralG.html | 20 - .../docs/search/GeneralI.html | 20 - .../docs/search/GeneralL.html | 20 - .../docs/search/GeneralO.html | 20 - .../docs/search/GeneralR.html | 20 - .../docs/search/GeneralU.html | 20 - .../docs/search/GeneralV.html | 20 - .../docs/search/NoResults.html | 15 - .../docs/search/VariablesC.html | 20 - .../docs/search/VariablesI.html | 20 - .../docs/search/VariablesR.html | 20 - .../csrf-protector-php/docs/styles/main.css | 824 --------- .../owasp/csrf-protector-php/js/README.md | 15 - .../csrf-protector-php/js/csrfprotector.js | 366 ---- .../owasp/csrf-protector-php/js/index.php | 7 - .../owasp/csrf-protector-php/libs/README.md | 21 - .../owasp/csrf-protector-php/libs/config.php | 47 - .../csrf-protector-php/libs/csrf/README.md | 6 - .../libs/csrf/csrfprotector.php | 536 ------ .../csrf-protector-php/libs/csrf/index.php | 7 - .../owasp/csrf-protector-php/libs/index.php | 7 - .../owasp/csrf-protector-php/licence.md | 13 - .../owasp/csrf-protector-php/log/.htaccess | 1 - .../owasp/csrf-protector-php/log/index.php | 7 - .../owasp/csrf-protector-php/phpunit.xml.dist | 15 - .../vendor/owasp/csrf-protector-php/readme.md | 65 - .../csrf-protector-php/test/config.test.php | 27 - .../test/csrfprotector_test.php | 534 ------ data/web/inc/prerequisites.inc.php | 12 - 59 files changed, 3 insertions(+), 5917 deletions(-) delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/.coveralls.yml delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/.travis.yml delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/composer.json delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/files/libs/csrf/csrfprotector-php.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Files.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Functions.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/General.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Variables.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/main.js delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/prettify.js delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/searchdata.js delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FilesC.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsA.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsC.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsF.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsG.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsI.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsL.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsO.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsR.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsU.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralA.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralC.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralF.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralG.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralI.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralL.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralO.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralR.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralU.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralV.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/NoResults.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesC.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesI.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesR.html delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/styles/main.css delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/js/README.md delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/js/csrfprotector.js delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/js/index.php delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/README.md delete mode 100755 data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/config.php delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/README.md delete mode 100755 data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/csrfprotector.php delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/index.php delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/index.php delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/licence.md delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/log/.htaccess delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/log/index.php delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/phpunit.xml.dist delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/readme.md delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/test/config.test.php delete mode 100644 data/web/inc/lib/vendor/owasp/csrf-protector-php/test/csrfprotector_test.php diff --git a/data/web/inc/lib/composer.json b/data/web/inc/lib/composer.json index 7adb5ca09..d811958b5 100644 --- a/data/web/inc/lib/composer.json +++ b/data/web/inc/lib/composer.json @@ -1,7 +1,6 @@ { "require": { "robthree/twofactorauth": "^1.6", - "yubico/u2flib-server": "^1.0", - "owasp/csrf-protector-php": "dev-master" + "yubico/u2flib-server": "^1.0" } } diff --git a/data/web/inc/lib/composer.lock b/data/web/inc/lib/composer.lock index 8e9ac8c2c..ad2168903 100644 --- a/data/web/inc/lib/composer.lock +++ b/data/web/inc/lib/composer.lock @@ -4,44 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "413fc63dc6c7815f0a175217bccb490a", + "content-hash": "5652a086b6d277d72d7ae0341e517b1e", "packages": [ - { - "name": "owasp/csrf-protector-php", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/mebjas/CSRF-Protector-PHP.git", - "reference": "aec0d6966992363a7192b2ae9fb0a9643e8fa26b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mebjas/CSRF-Protector-PHP/zipball/aec0d6966992363a7192b2ae9fb0a9643e8fa26b", - "reference": "aec0d6966992363a7192b2ae9fb0a9643e8fa26b", - "shasum": "" - }, - "require-dev": { - "satooshi/php-coveralls": "~1.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "libs/csrf/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "APACHE" - ], - "description": "CSRF protector php, a standalone php library for csrf mitigation in web applications. Easy to integrate in any php web app.", - "homepage": "https://github.com/mebjas/CSRF-Protector-PHP", - "keywords": [ - "csrf", - "owasp", - "security" - ], - "time": "2017-04-12T05:47:07+00:00" - }, { "name": "robthree/twofactorauth", "version": "1.6", @@ -132,9 +96,7 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "owasp/csrf-protector-php": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [], diff --git a/data/web/inc/lib/vendor/composer/autoload_classmap.php b/data/web/inc/lib/vendor/composer/autoload_classmap.php index b62afd4e2..44393069f 100644 --- a/data/web/inc/lib/vendor/composer/autoload_classmap.php +++ b/data/web/inc/lib/vendor/composer/autoload_classmap.php @@ -6,14 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( - 'alreadyInitializedException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'baseJSFileNotFoundExceptio' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'configFileNotFoundException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'csrfProtector' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'incompleteConfigurationException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'jsFileNotFoundException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'logDirectoryNotFoundException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'logFileWriteError' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', 'u2flib_server\\Error' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php', 'u2flib_server\\RegisterRequest' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php', 'u2flib_server\\Registration' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php', diff --git a/data/web/inc/lib/vendor/composer/autoload_static.php b/data/web/inc/lib/vendor/composer/autoload_static.php index d6d626854..5e2dabab1 100644 --- a/data/web/inc/lib/vendor/composer/autoload_static.php +++ b/data/web/inc/lib/vendor/composer/autoload_static.php @@ -21,14 +21,6 @@ class ComposerStaticInit873464e4bd965a3168f133248b1b218b ); public static $classMap = array ( - 'alreadyInitializedException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'baseJSFileNotFoundExceptio' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'configFileNotFoundException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'csrfProtector' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'incompleteConfigurationException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'jsFileNotFoundException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'logDirectoryNotFoundException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', - 'logFileWriteError' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php', 'u2flib_server\\Error' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php', 'u2flib_server\\RegisterRequest' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php', 'u2flib_server\\Registration' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php', diff --git a/data/web/inc/lib/vendor/composer/installed.json b/data/web/inc/lib/vendor/composer/installed.json index cd2803e58..337448140 100644 --- a/data/web/inc/lib/vendor/composer/installed.json +++ b/data/web/inc/lib/vendor/composer/installed.json @@ -52,44 +52,6 @@ "tfa" ] }, - { - "name": "owasp/csrf-protector-php", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/mebjas/CSRF-Protector-PHP.git", - "reference": "aec0d6966992363a7192b2ae9fb0a9643e8fa26b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mebjas/CSRF-Protector-PHP/zipball/aec0d6966992363a7192b2ae9fb0a9643e8fa26b", - "reference": "aec0d6966992363a7192b2ae9fb0a9643e8fa26b", - "shasum": "" - }, - "require-dev": { - "satooshi/php-coveralls": "~1.0" - }, - "time": "2017-04-12T05:47:07+00:00", - "type": "library", - "installation-source": "source", - "autoload": { - "classmap": [ - "libs/csrf/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "APACHE" - ], - "description": "CSRF protector php, a standalone php library for csrf mitigation in web applications. Easy to integrate in any php web app.", - "homepage": "https://github.com/mebjas/CSRF-Protector-PHP", - "keywords": [ - "csrf", - "owasp", - "security" - ] - }, { "name": "yubico/u2flib-server", "version": "1.0.1", diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/.coveralls.yml b/data/web/inc/lib/vendor/owasp/csrf-protector-php/.coveralls.yml deleted file mode 100644 index bc8e74cc7..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/.coveralls.yml +++ /dev/null @@ -1,4 +0,0 @@ -service_name: travis-ci -src_dir: ./libs/ -coverage_clover: build/logs/clover.xml -json_path: build/logs/coveralls-upload.json \ No newline at end of file diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/.travis.yml b/data/web/inc/lib/vendor/owasp/csrf-protector-php/.travis.yml deleted file mode 100644 index d5821b24c..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -language: php -php: - - "5.6" - - "5.5" - - "5.4" - - "5.3" - - "7.0" - - "7.1" - - hhvm - - nightly - -matrix: - allow_failures: - - php: nightly - - php: hhvm - -os: - - linux - -install: - # Install composer packages, will also trigger dump-autoload - - composer install --no-interaction - # Install coveralls.phar - - wget -c -nc --retry-connrefused --tries=0 https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar - - chmod +x coveralls.phar - - php coveralls.phar --version - -before_script: - - mkdir -p build/logs - - ls -al - -script: - - mkdir -p build/logs - - if [ $(phpenv version-name) = 'hhvm' ]; then echo 'xdebug.enable=1' >> /etc/hhvm/php.ini; fi - - phpunit --stderr --coverage-clover build/logs/clover.xml - -after_script: - - php vendor/bin/coveralls -v - -after_success: - - travis_retry php coveralls.phar -v - -cache: - directories: - - vendor - - $HOME/.cache/composer diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/composer.json b/data/web/inc/lib/vendor/owasp/csrf-protector-php/composer.json deleted file mode 100644 index bc7836ba7..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/composer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "owasp/csrf-protector-php", - "type": "library", - "description": "CSRF protector php, a standalone php library for csrf mitigation in web applications. Easy to integrate in any php web app.", - "keywords": ["security","csrf", "owasp"], - "homepage": "https://github.com/mebjas/CSRF-Protector-PHP", - "license": "APACHE", - "require-dev": { - "satooshi/php-coveralls": "~1.0" - }, - "autoload": { - "classmap": ["libs/csrf/"] - } -} diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/files/libs/csrf/csrfprotector-php.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/files/libs/csrf/csrfprotector-php.html deleted file mode 100644 index a6eeb437f..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/files/libs/csrf/csrfprotector-php.html +++ /dev/null @@ -1,74 +0,0 @@ - - -/Users/minhazav/github/CSRF-Protector-PHP/libs/csrf/csrfprotector.php - - - - - - - - - -

csrfprotector.php

Summary
csrfprotector.php
Variables
$cookieExpiryTimeexpiry time for cookie @var int
$isSameOriginflag for cross origin/same origin request @var bool
$isValidHTMLflag to check if output file is a valid HTML or not @var bool
$requestTypeVaraible to store weather request type is post or get @var string
$configconfig file for CSRFProtector @var int Array, length = 6 Property: #1: failedAuthAction (int) => action to be taken in case autherisation fails Property: #2: logDirectory (string) => directory in which log will be saved Property: #3: customErrorMessage (string) => custom error message to be sent in case of failed authentication Property: #4: jsFile (string) => location of the CSRFProtector js file Property: #5: tokenLength (int) => default length of hash Property: #6: disabledJavascriptMessage (string) => error message if client’s js is disabled
Functions
initfunction to initialise the csrfProtector work flow
useCachedVersionfunction to check weather to use cached version of js file or not
createNewJsCacheFunction to create new cache version of js
authorisePostfunction to authorise incoming post requests
failedValidationActionfunction to be called in case of failed validation performs logging and take appropriate action
refreshTokenFunction to set auth cookie
generateAuthTokenfunction to generate random hash of length as given in parameter max length = 128
ob_handlerRewrites <form> on the fly to add CSRF tokens to them.
logCSRFattackFunctio to log CSRF Attack
getCurrentUrlFunction to return current url of executing page
isURLallowedFunction to check if a url mataches for any urls Listed in config file
- -

Variables

- -

$cookieExpiryTime

public static $cookieExpiryTime

expiry time for cookie @var int

- -

$isSameOrigin

private static $isSameOrigin

flag for cross origin/same origin request @var bool

- -

$isValidHTML

private static $isValidHTML

flag to check if output file is a valid HTML or not @var bool

- -

$requestType

protected static $requestType

Varaible to store weather request type is post or get @var string

- -

$config

public static $config

config file for CSRFProtector @var int Array, length = 6 Property: #1: failedAuthAction (int) => action to be taken in case autherisation fails Property: #2: logDirectory (string) => directory in which log will be saved Property: #3: customErrorMessage (string) => custom error message to be sent in case of failed authentication Property: #4: jsFile (string) => location of the CSRFProtector js file Property: #5: tokenLength (int) => default length of hash Property: #6: disabledJavascriptMessage (string) => error message if client’s js is disabled

- -

Functions

- -

init

public static function init($length =  null,
$action =  null)

function to initialise the csrfProtector work flow

Parameters

$lengthlength of CSRF_AUTH_TOKEN to be generated
$actionint array, for different actions to be taken in case of failed validation

Returns

void

Throws

configFileNotFoundExceptionwhen configuration file is not found
- -

useCachedVersion

public static function useCachedVersion()

function to check weather to use cached version of js file or not

Parameters

void

Returns

bool -- true if cacheversion can be used -- false otherwise

- -

createNewJsCache

public static function createNewJsCache()

Function to create new cache version of js

Parameters

void

Returns

void

Throws

baseJSFileNotFoundExceptioif baseJsFile is not found
- -

authorisePost

public static function authorisePost()

function to authorise incoming post requests

Parameters

void

Returns

void

Throws

logDirectoryNotFoundExceptionif log directory is not found
- -

failedValidationAction

private static function failedValidationAction()

function to be called in case of failed validation performs logging and take appropriate action

Parameters

void

Returns

void

- -

refreshToken

public static function refreshToken()

Function to set auth cookie

Parameters

void

Returns

void

- -

generateAuthToken

public static function generateAuthToken()

function to generate random hash of length as given in parameter max length = 128

Parameters

length to hash required, int

Returns

string, token

- -

ob_handler

public static function ob_handler($buffer,
$flags)

Rewrites <form> on the fly to add CSRF tokens to them.  This can also inject our JavaScript library.

Parameters

$bufferoutput buffer to which all output are stored
$flagINT

Return

string, complete output buffer

- -

logCSRFattack

private static function logCSRFattack()

Functio to log CSRF Attack

Parameters

void

Retruns

void

Throws

logFileWriteErrorif unable to log an attack
- -

getCurrentUrl

private static function getCurrentUrl()

Function to return current url of executing page

Parameters

void

Returns

stringcurrent url
- -

isURLallowed

public static function isURLallowed()

Function to check if a url mataches for any urls Listed in config file

Parameters

void

Returns

booleantrue is url need no validation, false if validation needed
- -
- - - - - - - - - - -
public static $cookieExpiryTime
expiry time for cookie @var int
private static $isSameOrigin
flag for cross origin/same origin request @var bool
private static $isValidHTML
flag to check if output file is a valid HTML or not @var bool
protected static $requestType
Varaible to store weather request type is post or get @var string
public static $config
config file for CSRFProtector @var int Array, length = 6 Property: #1: failedAuthAction (int) => action to be taken in case autherisation fails Property: #2: logDirectory (string) => directory in which log will be saved Property: #3: customErrorMessage (string) => custom error message to be sent in case of failed authentication Property: #4: jsFile (string) => location of the CSRFProtector js file Property: #5: tokenLength (int) => default length of hash Property: #6: disabledJavascriptMessage (string) => error message if client’s js is disabled
public static function init($length =  null,
$action =  null)
function to initialise the csrfProtector work flow
public static function useCachedVersion()
function to check weather to use cached version of js file or not
public static function createNewJsCache()
Function to create new cache version of js
public static function authorisePost()
function to authorise incoming post requests
private static function failedValidationAction()
function to be called in case of failed validation performs logging and take appropriate action
public static function refreshToken()
Function to set auth cookie
public static function generateAuthToken()
function to generate random hash of length as given in parameter max length = 128
public static function ob_handler($buffer,
$flags)
Rewrites form on the fly to add CSRF tokens to them.
private static function logCSRFattack()
Functio to log CSRF Attack
private static function getCurrentUrl()
Function to return current url of executing page
public static function isURLallowed()
Function to check if a url mataches for any urls Listed in config file
- - - - - - - - \ No newline at end of file diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index.html deleted file mode 100644 index c42fb0240..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Files.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Files.html deleted file mode 100644 index a984415af..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Files.html +++ /dev/null @@ -1,33 +0,0 @@ - - -File Index - - - - - - - - - -
File Index
$#! · 0-9 · A · B · C · D · E · F · G · H · I · J · K · L · M · N · O · P · Q · R · S · T · U · V · W · X · Y · Z
C
 csrfprotector.php
- - - -
- - - - - - - - - - - - \ No newline at end of file diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Functions.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Functions.html deleted file mode 100644 index 7a5a0f313..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Functions.html +++ /dev/null @@ -1,65 +0,0 @@ - - -Function Index - - - - - - - - - -
Function Index
$#! · 0-9 · A · B · C · D · E · F · G · H · I · J · K · L · M · N · O · P · Q · R · S · T · U · V · W · X · Y · Z
A
 authorisePost
C
 createNewJsCache
F
 failedValidationAction
G
 generateAuthToken
 getCurrentUrl
I
 init
 isURLallowed
L
 logCSRFattack
O
 ob_handler
R
 refreshToken
U
 useCachedVersion
- -
public static function authorisePost()
function to authorise incoming post requests
- - - -
public static function createNewJsCache()
Function to create new cache version of js
- - - -
private static function failedValidationAction()
function to be called in case of failed validation performs logging and take appropriate action
- - - -
public static function generateAuthToken()
function to generate random hash of length as given in parameter max length = 128
private static function getCurrentUrl()
Function to return current url of executing page
- - - -
public static function init($length =  null,
$action =  null)
function to initialise the csrfProtector work flow
public static function isURLallowed()
Function to check if a url mataches for any urls Listed in config file
- - - -
private static function logCSRFattack()
Functio to log CSRF Attack
- - - -
public static function ob_handler($buffer,
$flags)
Rewrites form on the fly to add CSRF tokens to them.
- - - -
public static function refreshToken()
Function to set auth cookie
- - - -
public static function useCachedVersion()
function to check weather to use cached version of js file or not
- -
- - - - - - - - - - - - \ No newline at end of file diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/General.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/General.html deleted file mode 100644 index adc327a65..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/General.html +++ /dev/null @@ -1,69 +0,0 @@ - - -Index - - - - - - - - - -
Index
$#! · 0-9 · A · B · C · D · E · F · G · H · I · J · K · L · M · N · O · P · Q · R · S · T · U · V · W · X · Y · Z
A
 authorisePost
C
$config
$cookieExpiryTime
 createNewJsCache
 csrfprotector.php
F
 failedValidationAction
 Functions
G
 generateAuthToken
 getCurrentUrl
I
 init
$isSameOrigin
 isURLallowed
$isValidHTML
L
 logCSRFattack
O
 ob_handler
R
 refreshToken
$requestType
U
 useCachedVersion
V
 Variables
- -
public static function authorisePost()
function to authorise incoming post requests
- - - -
public static $config
config file for CSRFProtector @var int Array, length = 6 Property: #1: failedAuthAction (int) => action to be taken in case autherisation fails Property: #2: logDirectory (string) => directory in which log will be saved Property: #3: customErrorMessage (string) => custom error message to be sent in case of failed authentication Property: #4: jsFile (string) => location of the CSRFProtector js file Property: #5: tokenLength (int) => default length of hash Property: #6: disabledJavascriptMessage (string) => error message if client’s js is disabled
public static $cookieExpiryTime
expiry time for cookie @var int
public static function createNewJsCache()
Function to create new cache version of js
- - - -
private static function failedValidationAction()
function to be called in case of failed validation performs logging and take appropriate action
- - - -
public static function generateAuthToken()
function to generate random hash of length as given in parameter max length = 128
private static function getCurrentUrl()
Function to return current url of executing page
- - - -
public static function init($length =  null,
$action =  null)
function to initialise the csrfProtector work flow
private static $isSameOrigin
flag for cross origin/same origin request @var bool
public static function isURLallowed()
Function to check if a url mataches for any urls Listed in config file
private static $isValidHTML
flag to check if output file is a valid HTML or not @var bool
- - - -
private static function logCSRFattack()
Functio to log CSRF Attack
- - - -
public static function ob_handler($buffer,
$flags)
Rewrites form on the fly to add CSRF tokens to them.
- - - -
public static function refreshToken()
Function to set auth cookie
protected static $requestType
Varaible to store weather request type is post or get @var string
- - - -
public static function useCachedVersion()
function to check weather to use cached version of js file or not
- - - - - -
- - - - - - - - - - - - \ No newline at end of file diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Variables.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Variables.html deleted file mode 100644 index 14fccdfba..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/index/Variables.html +++ /dev/null @@ -1,41 +0,0 @@ - - -Variable Index - - - - - - - - - -
Variable Index
$#! · 0-9 · A · B · C · D · E · F · G · H · I · J · K · L · M · N · O · P · Q · R · S · T · U · V · W · X · Y · Z
C
$config
$cookieExpiryTime
I
$isSameOrigin
$isValidHTML
R
$requestType
- -
public static $config
config file for CSRFProtector @var int Array, length = 6 Property: #1: failedAuthAction (int) => action to be taken in case autherisation fails Property: #2: logDirectory (string) => directory in which log will be saved Property: #3: customErrorMessage (string) => custom error message to be sent in case of failed authentication Property: #4: jsFile (string) => location of the CSRFProtector js file Property: #5: tokenLength (int) => default length of hash Property: #6: disabledJavascriptMessage (string) => error message if client’s js is disabled
public static $cookieExpiryTime
expiry time for cookie @var int
- - - -
private static $isSameOrigin
flag for cross origin/same origin request @var bool
private static $isValidHTML
flag to check if output file is a valid HTML or not @var bool
- - - -
protected static $requestType
Varaible to store weather request type is post or get @var string
- -
- - - - - - - - - - - - \ No newline at end of file diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/main.js b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/main.js deleted file mode 100644 index 3f42acde6..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/main.js +++ /dev/null @@ -1,841 +0,0 @@ -// This file is part of Natural Docs, which is Copyright 2003-2010 Greg Valure -// Natural Docs is licensed under version 3 of the GNU Affero General Public License (AGPL) -// Refer to License.txt for the complete details - -// This file may be distributed with documentation files generated by Natural Docs. -// Such documentation is not covered by Natural Docs' copyright and licensing, -// and may have its own copyright and distribution terms as decided by its author. - - -// -// Browser Styles -// ____________________________________________________________________________ - -var agt=navigator.userAgent.toLowerCase(); -var browserType; -var browserVer; - -if (agt.indexOf("opera") != -1) - { - browserType = "Opera"; - - if (agt.indexOf("opera 7") != -1 || agt.indexOf("opera/7") != -1) - { browserVer = "Opera7"; } - else if (agt.indexOf("opera 8") != -1 || agt.indexOf("opera/8") != -1) - { browserVer = "Opera8"; } - else if (agt.indexOf("opera 9") != -1 || agt.indexOf("opera/9") != -1) - { browserVer = "Opera9"; } - } - -else if (agt.indexOf("applewebkit") != -1) - { - browserType = "Safari"; - - if (agt.indexOf("version/3") != -1) - { browserVer = "Safari3"; } - else if (agt.indexOf("safari/4") != -1) - { browserVer = "Safari2"; } - } - -else if (agt.indexOf("khtml") != -1) - { - browserType = "Konqueror"; - } - -else if (agt.indexOf("msie") != -1) - { - browserType = "IE"; - - if (agt.indexOf("msie 6") != -1) - { browserVer = "IE6"; } - else if (agt.indexOf("msie 7") != -1) - { browserVer = "IE7"; } - } - -else if (agt.indexOf("gecko") != -1) - { - browserType = "Firefox"; - - if (agt.indexOf("rv:1.7") != -1) - { browserVer = "Firefox1"; } - else if (agt.indexOf("rv:1.8)") != -1 || agt.indexOf("rv:1.8.0") != -1) - { browserVer = "Firefox15"; } - else if (agt.indexOf("rv:1.8.1") != -1) - { browserVer = "Firefox2"; } - } - - -// -// Support Functions -// ____________________________________________________________________________ - - -function GetXPosition(item) - { - var position = 0; - - if (item.offsetWidth != null) - { - while (item != document.body && item != null) - { - position += item.offsetLeft; - item = item.offsetParent; - }; - }; - - return position; - }; - - -function GetYPosition(item) - { - var position = 0; - - if (item.offsetWidth != null) - { - while (item != document.body && item != null) - { - position += item.offsetTop; - item = item.offsetParent; - }; - }; - - return position; - }; - - -function MoveToPosition(item, x, y) - { - // Opera 5 chokes on the px extension, so it can use the Microsoft one instead. - - if (item.style.left != null) - { - item.style.left = x + "px"; - item.style.top = y + "px"; - } - else if (item.style.pixelLeft != null) - { - item.style.pixelLeft = x; - item.style.pixelTop = y; - }; - }; - - -// -// Menu -// ____________________________________________________________________________ - - -function ToggleMenu(id) - { - if (!window.document.getElementById) - { return; }; - - var display = window.document.getElementById(id).style.display; - - if (display == "none") - { display = "block"; } - else - { display = "none"; } - - window.document.getElementById(id).style.display = display; - } - -function HideAllBut(ids, max) - { - if (document.getElementById) - { - ids.sort( function(a,b) { return a - b; } ); - var number = 1; - - while (number < max) - { - if (ids.length > 0 && number == ids[0]) - { ids.shift(); } - else - { - document.getElementById("MGroupContent" + number).style.display = "none"; - }; - - number++; - }; - }; - } - - -// -// Tooltips -// ____________________________________________________________________________ - - -var tooltipTimer = 0; - -function ShowTip(event, tooltipID, linkID) - { - if (tooltipTimer) - { clearTimeout(tooltipTimer); }; - - var docX = event.clientX + window.pageXOffset; - var docY = event.clientY + window.pageYOffset; - - var showCommand = "ReallyShowTip('" + tooltipID + "', '" + linkID + "', " + docX + ", " + docY + ")"; - - tooltipTimer = setTimeout(showCommand, 1000); - } - -function ReallyShowTip(tooltipID, linkID, docX, docY) - { - tooltipTimer = 0; - - var tooltip; - var link; - - if (document.getElementById) - { - tooltip = document.getElementById(tooltipID); - link = document.getElementById(linkID); - } -/* else if (document.all) - { - tooltip = eval("document.all['" + tooltipID + "']"); - link = eval("document.all['" + linkID + "']"); - } -*/ - if (tooltip) - { - var left = GetXPosition(link); - var top = GetYPosition(link); - top += link.offsetHeight; - - - // The fallback method is to use the mouse X and Y relative to the document. We use a separate if and test if its a number - // in case some browser snuck through the above if statement but didn't support everything. - - if (!isFinite(top) || top == 0) - { - left = docX; - top = docY; - } - - // Some spacing to get it out from under the cursor. - - top += 10; - - // Make sure the tooltip doesnt get smushed by being too close to the edge, or in some browsers, go off the edge of the - // page. We do it here because Konqueror does get offsetWidth right even if it doesnt get the positioning right. - - if (tooltip.offsetWidth != null) - { - var width = tooltip.offsetWidth; - var docWidth = document.body.clientWidth; - - if (left + width > docWidth) - { left = docWidth - width - 1; } - - // If there's a horizontal scroll bar we could go past zero because it's using the page width, not the window width. - if (left < 0) - { left = 0; }; - } - - MoveToPosition(tooltip, left, top); - tooltip.style.visibility = "visible"; - } - } - -function HideTip(tooltipID) - { - if (tooltipTimer) - { - clearTimeout(tooltipTimer); - tooltipTimer = 0; - } - - var tooltip; - - if (document.getElementById) - { tooltip = document.getElementById(tooltipID); } - else if (document.all) - { tooltip = eval("document.all['" + tooltipID + "']"); } - - if (tooltip) - { tooltip.style.visibility = "hidden"; } - } - - -// -// Blockquote fix for IE -// ____________________________________________________________________________ - - -function NDOnLoad() - { - if (browserVer == "IE6") - { - var scrollboxes = document.getElementsByTagName('blockquote'); - - if (scrollboxes.item(0)) - { - NDDoResize(); - window.onresize=NDOnResize; - }; - }; - }; - - -var resizeTimer = 0; - -function NDOnResize() - { - if (resizeTimer != 0) - { clearTimeout(resizeTimer); }; - - resizeTimer = setTimeout(NDDoResize, 250); - }; - - -function NDDoResize() - { - var scrollboxes = document.getElementsByTagName('blockquote'); - - var i; - var item; - - i = 0; - while (item = scrollboxes.item(i)) - { - item.style.width = 100; - i++; - }; - - i = 0; - while (item = scrollboxes.item(i)) - { - item.style.width = item.parentNode.offsetWidth; - i++; - }; - - clearTimeout(resizeTimer); - resizeTimer = 0; - } - - - -/* ________________________________________________________________________________________________________ - - Class: SearchPanel - ________________________________________________________________________________________________________ - - A class handling everything associated with the search panel. - - Parameters: - - name - The name of the global variable that will be storing this instance. Is needed to be able to set timeouts. - mode - The mode the search is going to work in. Pass CommandLineOption()>, so the - value will be something like "HTML" or "FramedHTML". - - ________________________________________________________________________________________________________ -*/ - - -function SearchPanel(name, mode, resultsPath) - { - if (!name || !mode || !resultsPath) - { alert("Incorrect parameters to SearchPanel."); }; - - - // Group: Variables - // ________________________________________________________________________ - - /* - var: name - The name of the global variable that will be storing this instance of the class. - */ - this.name = name; - - /* - var: mode - The mode the search is going to work in, such as "HTML" or "FramedHTML". - */ - this.mode = mode; - - /* - var: resultsPath - The relative path from the current HTML page to the results page directory. - */ - this.resultsPath = resultsPath; - - /* - var: keyTimeout - The timeout used between a keystroke and when a search is performed. - */ - this.keyTimeout = 0; - - /* - var: keyTimeoutLength - The length of in thousandths of a second. - */ - this.keyTimeoutLength = 500; - - /* - var: lastSearchValue - The last search string executed, or an empty string if none. - */ - this.lastSearchValue = ""; - - /* - var: lastResultsPage - The last results page. The value is only relevant if is set. - */ - this.lastResultsPage = ""; - - /* - var: deactivateTimeout - - The timeout used between when a control is deactivated and when the entire panel is deactivated. Is necessary - because a control may be deactivated in favor of another control in the same panel, in which case it should stay - active. - */ - this.deactivateTimout = 0; - - /* - var: deactivateTimeoutLength - The length of in thousandths of a second. - */ - this.deactivateTimeoutLength = 200; - - - - - // Group: DOM Elements - // ________________________________________________________________________ - - - // Function: DOMSearchField - this.DOMSearchField = function() - { return document.getElementById("MSearchField"); }; - - // Function: DOMSearchType - this.DOMSearchType = function() - { return document.getElementById("MSearchType"); }; - - // Function: DOMPopupSearchResults - this.DOMPopupSearchResults = function() - { return document.getElementById("MSearchResults"); }; - - // Function: DOMPopupSearchResultsWindow - this.DOMPopupSearchResultsWindow = function() - { return document.getElementById("MSearchResultsWindow"); }; - - // Function: DOMSearchPanel - this.DOMSearchPanel = function() - { return document.getElementById("MSearchPanel"); }; - - - - - // Group: Event Handlers - // ________________________________________________________________________ - - - /* - Function: OnSearchFieldFocus - Called when focus is added or removed from the search field. - */ - this.OnSearchFieldFocus = function(isActive) - { - this.Activate(isActive); - }; - - - /* - Function: OnSearchFieldChange - Called when the content of the search field is changed. - */ - this.OnSearchFieldChange = function() - { - if (this.keyTimeout) - { - clearTimeout(this.keyTimeout); - this.keyTimeout = 0; - }; - - var searchValue = this.DOMSearchField().value.replace(/ +/g, ""); - - if (searchValue != this.lastSearchValue) - { - if (searchValue != "") - { - this.keyTimeout = setTimeout(this.name + ".Search()", this.keyTimeoutLength); - } - else - { - if (this.mode == "HTML") - { this.DOMPopupSearchResultsWindow().style.display = "none"; }; - this.lastSearchValue = ""; - }; - }; - }; - - - /* - Function: OnSearchTypeFocus - Called when focus is added or removed from the search type. - */ - this.OnSearchTypeFocus = function(isActive) - { - this.Activate(isActive); - }; - - - /* - Function: OnSearchTypeChange - Called when the search type is changed. - */ - this.OnSearchTypeChange = function() - { - var searchValue = this.DOMSearchField().value.replace(/ +/g, ""); - - if (searchValue != "") - { - this.Search(); - }; - }; - - - - // Group: Action Functions - // ________________________________________________________________________ - - - /* - Function: CloseResultsWindow - Closes the results window. - */ - this.CloseResultsWindow = function() - { - this.DOMPopupSearchResultsWindow().style.display = "none"; - this.Activate(false, true); - }; - - - /* - Function: Search - Performs a search. - */ - this.Search = function() - { - this.keyTimeout = 0; - - var searchValue = this.DOMSearchField().value.replace(/^ +/, ""); - var searchTopic = this.DOMSearchType().value; - - var pageExtension = searchValue.substr(0,1); - - if (pageExtension.match(/^[a-z]/i)) - { pageExtension = pageExtension.toUpperCase(); } - else if (pageExtension.match(/^[0-9]/)) - { pageExtension = 'Numbers'; } - else - { pageExtension = "Symbols"; }; - - var resultsPage; - var resultsPageWithSearch; - var hasResultsPage; - - // indexSectionsWithContent is defined in searchdata.js - if (indexSectionsWithContent[searchTopic][pageExtension] == true) - { - resultsPage = this.resultsPath + '/' + searchTopic + pageExtension + '.html'; - resultsPageWithSearch = resultsPage+'?'+escape(searchValue); - hasResultsPage = true; - } - else - { - resultsPage = this.resultsPath + '/NoResults.html'; - resultsPageWithSearch = resultsPage; - hasResultsPage = false; - }; - - var resultsFrame; - if (this.mode == "HTML") - { resultsFrame = window.frames.MSearchResults; } - else if (this.mode == "FramedHTML") - { resultsFrame = window.top.frames['Content']; }; - - - if (resultsPage != this.lastResultsPage || - - // Bug in IE. If everything becomes hidden in a run, none of them will be able to be reshown in the next for some - // reason. It counts the right number of results, and you can even read the display as "block" after setting it, but it - // just doesn't work in IE 6 or IE 7. So if we're on the right page but the previous search had no results, reload the - // page anyway to get around the bug. - (browserType == "IE" && hasResultsPage && - (!resultsFrame.searchResults || resultsFrame.searchResults.lastMatchCount == 0)) ) - - { - resultsFrame.location.href = resultsPageWithSearch; - } - - // So if the results page is right and there's no IE bug, reperform the search on the existing page. We have to check if there - // are results because NoResults.html doesn't have any JavaScript, and it would be useless to do anything on that page even - // if it did. - else if (hasResultsPage) - { - // We need to check if this exists in case the frame is present but didn't finish loading. - if (resultsFrame.searchResults) - { resultsFrame.searchResults.Search(searchValue); } - - // Otherwise just reload instead of waiting. - else - { resultsFrame.location.href = resultsPageWithSearch; }; - }; - - - var domPopupSearchResultsWindow = this.DOMPopupSearchResultsWindow(); - - if (this.mode == "HTML" && domPopupSearchResultsWindow.style.display != "block") - { - var domSearchType = this.DOMSearchType(); - - var left = GetXPosition(domSearchType); - var top = GetYPosition(domSearchType) + domSearchType.offsetHeight; - - MoveToPosition(domPopupSearchResultsWindow, left, top); - domPopupSearchResultsWindow.style.display = 'block'; - }; - - - this.lastSearchValue = searchValue; - this.lastResultsPage = resultsPage; - }; - - - - // Group: Activation Functions - // Functions that handle whether the entire panel is active or not. - // ________________________________________________________________________ - - - /* - Function: Activate - - Activates or deactivates the search panel, resetting things to their default values if necessary. You can call this on every - control's OnBlur() and it will handle not deactivating the entire panel when focus is just switching between them transparently. - - Parameters: - - isActive - Whether you're activating or deactivating the panel. - ignoreDeactivateDelay - Set if you're positive the action will deactivate the panel and thus want to skip the delay. - */ - this.Activate = function(isActive, ignoreDeactivateDelay) - { - // We want to ignore isActive being false while the results window is open. - if (isActive || (this.mode == "HTML" && this.DOMPopupSearchResultsWindow().style.display == "block")) - { - if (this.inactivateTimeout) - { - clearTimeout(this.inactivateTimeout); - this.inactivateTimeout = 0; - }; - - this.DOMSearchPanel().className = 'MSearchPanelActive'; - - var searchField = this.DOMSearchField(); - - if (searchField.value == 'Search') - { searchField.value = ""; } - } - else if (!ignoreDeactivateDelay) - { - this.inactivateTimeout = setTimeout(this.name + ".InactivateAfterTimeout()", this.inactivateTimeoutLength); - } - else - { - this.InactivateAfterTimeout(); - }; - }; - - - /* - Function: InactivateAfterTimeout - - Called by , which is set by . Inactivation occurs on a timeout because a control may - receive OnBlur() when focus is really transferring to another control in the search panel. In this case we don't want to - actually deactivate the panel because not only would that cause a visible flicker but it could also reset the search value. - So by doing it on a timeout instead, there's a short period where the second control's OnFocus() can cancel the deactivation. - */ - this.InactivateAfterTimeout = function() - { - this.inactivateTimeout = 0; - - this.DOMSearchPanel().className = 'MSearchPanelInactive'; - this.DOMSearchField().value = "Search"; - - this.lastSearchValue = ""; - this.lastResultsPage = ""; - }; - }; - - - - -/* ________________________________________________________________________________________________________ - - Class: SearchResults - _________________________________________________________________________________________________________ - - The class that handles everything on the search results page. - _________________________________________________________________________________________________________ -*/ - - -function SearchResults(name, mode) - { - /* - var: mode - The mode the search is going to work in, such as "HTML" or "FramedHTML". - */ - this.mode = mode; - - /* - var: lastMatchCount - The number of matches from the last run of . - */ - this.lastMatchCount = 0; - - - /* - Function: Toggle - Toggles the visibility of the passed element ID. - */ - this.Toggle = function(id) - { - if (this.mode == "FramedHTML") - { return; }; - - var parentElement = document.getElementById(id); - - var element = parentElement.firstChild; - - while (element && element != parentElement) - { - if (element.nodeName == 'DIV' && element.className == 'ISubIndex') - { - if (element.style.display == 'block') - { element.style.display = "none"; } - else - { element.style.display = 'block'; } - }; - - if (element.nodeName == 'DIV' && element.hasChildNodes()) - { element = element.firstChild; } - else if (element.nextSibling) - { element = element.nextSibling; } - else - { - do - { - element = element.parentNode; - } - while (element && element != parentElement && !element.nextSibling); - - if (element && element != parentElement) - { element = element.nextSibling; }; - }; - }; - }; - - - /* - Function: Search - - Searches for the passed string. If there is no parameter, it takes it from the URL query. - - Always returns true, since other documents may try to call it and that may or may not be possible. - */ - this.Search = function(search) - { - if (!search) - { - search = window.location.search; - search = search.substring(1); // Remove the leading ? - search = unescape(search); - }; - - search = search.replace(/^ +/, ""); - search = search.replace(/ +$/, ""); - search = search.toLowerCase(); - - if (search.match(/[^a-z0-9]/)) // Just a little speedup so it doesn't have to go through the below unnecessarily. - { - search = search.replace(/\_/g, "_und"); - search = search.replace(/\ +/gi, "_spc"); - search = search.replace(/\~/g, "_til"); - search = search.replace(/\!/g, "_exc"); - search = search.replace(/\@/g, "_att"); - search = search.replace(/\#/g, "_num"); - search = search.replace(/\$/g, "_dol"); - search = search.replace(/\%/g, "_pct"); - search = search.replace(/\^/g, "_car"); - search = search.replace(/\&/g, "_amp"); - search = search.replace(/\*/g, "_ast"); - search = search.replace(/\(/g, "_lpa"); - search = search.replace(/\)/g, "_rpa"); - search = search.replace(/\-/g, "_min"); - search = search.replace(/\+/g, "_plu"); - search = search.replace(/\=/g, "_equ"); - search = search.replace(/\{/g, "_lbc"); - search = search.replace(/\}/g, "_rbc"); - search = search.replace(/\[/g, "_lbk"); - search = search.replace(/\]/g, "_rbk"); - search = search.replace(/\:/g, "_col"); - search = search.replace(/\;/g, "_sco"); - search = search.replace(/\"/g, "_quo"); - search = search.replace(/\'/g, "_apo"); - search = search.replace(/\/g, "_ran"); - search = search.replace(/\,/g, "_com"); - search = search.replace(/\./g, "_per"); - search = search.replace(/\?/g, "_que"); - search = search.replace(/\//g, "_sla"); - search = search.replace(/[^a-z0-9\_]i/gi, "_zzz"); - }; - - var resultRows = document.getElementsByTagName("div"); - var matches = 0; - - var i = 0; - while (i < resultRows.length) - { - var row = resultRows.item(i); - - if (row.className == "SRResult") - { - var rowMatchName = row.id.toLowerCase(); - rowMatchName = rowMatchName.replace(/^sr\d*_/, ''); - - if (search.length <= rowMatchName.length && rowMatchName.substr(0, search.length) == search) - { - row.style.display = "block"; - matches++; - } - else - { row.style.display = "none"; }; - }; - - i++; - }; - - document.getElementById("Searching").style.display="none"; - - if (matches == 0) - { document.getElementById("NoMatches").style.display="block"; } - else - { document.getElementById("NoMatches").style.display="none"; } - - this.lastMatchCount = matches; - - return true; - }; - }; - diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/prettify.js b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/prettify.js deleted file mode 100644 index fda4bf1ed..000000000 --- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/prettify.js +++ /dev/null @@ -1,1526 +0,0 @@ - -// This code comes from the December 2009 release of Google Prettify, which is Copyright 2006 Google Inc. -// Minor modifications are marked with "ND Change" comments. -// As part of Natural Docs, this code is licensed under version 3 of the GNU Affero General Public License (AGPL.) -// However, it may also be obtained separately under version 2.0 of the Apache License. -// Refer to License.txt for the complete details - - -// Main code -// ____________________________________________________________________________ - -// Copyright (C) 2006 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - - -/** - * @fileoverview - * some functions for browser-side pretty printing of code contained in html. - *

- * - * For a fairly comprehensive set of languages see the - * README - * file that came with this source. At a minimum, the lexer should work on a - * number of languages including C and friends, Java, Python, Bash, SQL, HTML, - * XML, CSS, Javascript, and Makefiles. It works passably on Ruby, PHP and Awk - * and a subset of Perl, but, because of commenting conventions, doesn't work on - * Smalltalk, Lisp-like, or CAML-like languages without an explicit lang class. - *

- * Usage:

    - *
  1. include this source file in an html page via - * {@code } - *
  2. define style rules. See the example page for examples. - *
  3. mark the {@code 
    } and {@code } tags in your source with
- *    {@code class=prettyprint.}
- *    You can also use the (html deprecated) {@code } tag, but the pretty
- *    printer needs to do more substantial DOM manipulations to support that, so
- *    some css styles may not be preserved.
- * </ol>
- * That's it.  I wanted to keep the API as simple as possible, so there's no
- * need to specify which language the code is in, but if you wish, you can add
- * another class to the {@code <pre>} or {@code <code>} element to specify the
- * language, as in {@code <pre class="prettyprint lang-java">}.  Any class that
- * starts with "lang-" followed by a file extension, specifies the file type.
- * See the "lang-*.js" files in this directory for code that implements
- * per-language file handlers.
- * <p>
- * Change log:<br>
- * cbeust, 2006/08/22
- * <blockquote>
- *   Java annotations (start with "@") are now captured as literals ("lit")
- * </blockquote>
- * @requires console
- * @overrides window
- */
-
-// JSLint declarations
-/*global console, document, navigator, setTimeout, window */
-
-/**
- * Split {@code prettyPrint} into multiple timeouts so as not to interfere with
- * UI events.
- * If set to {@code false}, {@code prettyPrint()} is synchronous.
- */
-window['PR_SHOULD_USE_CONTINUATION'] = true;
-
-/** the number of characters between tab columns */
-window['PR_TAB_WIDTH'] = 8;
-
-/** Walks the DOM returning a properly escaped version of innerHTML.
-  * @param {Node} node
-  * @param {Array.<string>} out output buffer that receives chunks of HTML.
-  */
-window['PR_normalizedHtml']
-
-/** Contains functions for creating and registering new language handlers.
-  * @type {Object}
-  */
-  = window['PR']
-
-/** Pretty print a chunk of code.
-  *
-  * @param {string} sourceCodeHtml code as html
-  * @return {string} code as html, but prettier
-  */
-  = window['prettyPrintOne']
-/** Find all the {@code <pre>} and {@code <code>} tags in the DOM with
-  * {@code class=prettyprint} and prettify them.
-  * @param {Function?} opt_whenDone if specified, called when the last entry
-  *     has been finished.
-  */
-  = window['prettyPrint'] = void 0;
-
-/** browser detection. @extern @returns false if not IE, otherwise the major version. */
-window['_pr_isIE6'] = function () {
-  var ieVersion = navigator && navigator.userAgent &&
-      navigator.userAgent.match(/\bMSIE ([678])\./);
-  ieVersion = ieVersion ? +ieVersion[1] : false;
-  window['_pr_isIE6'] = function () { return ieVersion; };
-  return ieVersion;
-};
-
-
-(function () {
-  // Keyword lists for various languages.
-  var FLOW_CONTROL_KEYWORDS =
-      "break continue do else for if return while ";
-  var C_KEYWORDS = FLOW_CONTROL_KEYWORDS + "auto case char const default " +
-      "double enum extern float goto int long register short signed sizeof " +
-      "static struct switch typedef union unsigned void volatile ";
-  var COMMON_KEYWORDS = C_KEYWORDS + "catch class delete false import " +
-      "new operator private protected public this throw true try typeof ";
-  var CPP_KEYWORDS = COMMON_KEYWORDS + "alignof align_union asm axiom bool " +
-      "concept concept_map const_cast constexpr decltype " +
-      "dynamic_cast explicit export friend inline late_check " +
-      "mutable namespace nullptr reinterpret_cast static_assert static_cast " +
-      "template typeid typename using virtual wchar_t where ";
-  var JAVA_KEYWORDS = COMMON_KEYWORDS +
-      "abstract boolean byte extends final finally implements import " +
-      "instanceof null native package strictfp super synchronized throws " +
-      "transient ";
-  var CSHARP_KEYWORDS = JAVA_KEYWORDS +
-      "as base by checked decimal delegate descending event " +
-      "fixed foreach from group implicit in interface internal into is lock " +
-      "object out override orderby params partial readonly ref sbyte sealed " +
-      "stackalloc string select uint ulong unchecked unsafe ushort var ";
-  var JSCRIPT_KEYWORDS = COMMON_KEYWORDS +
-      "debugger eval export function get null set undefined var with " +
-      "Infinity NaN ";
-  var PERL_KEYWORDS = "caller delete die do dump elsif eval exit foreach for " +
-      "goto if import last local my next no our print package redo require " +
-      "sub undef unless until use wantarray while BEGIN END ";
-  var PYTHON_KEYWORDS = FLOW_CONTROL_KEYWORDS + "and as assert class def del " +
-      "elif except exec finally from global import in is lambda " +
-      "nonlocal not or pass print raise try with yield " +
-      "False True None ";
-  var RUBY_KEYWORDS = FLOW_CONTROL_KEYWORDS + "alias and begin case class def" +
-      " defined elsif end ensure false in module next nil not or redo rescue " +
-      "retry self super then true undef unless until when yield BEGIN END ";
-  var SH_KEYWORDS = FLOW_CONTROL_KEYWORDS + "case done elif esac eval fi " +
-      "function in local set then until ";
-  var ALL_KEYWORDS = (
-      CPP_KEYWORDS + CSHARP_KEYWORDS + JSCRIPT_KEYWORDS + PERL_KEYWORDS +
-      PYTHON_KEYWORDS + RUBY_KEYWORDS + SH_KEYWORDS);
-
-  // token style names.  correspond to css classes
-  /** token style for a string literal */
-  var PR_STRING = 'str';
-  /** token style for a keyword */
-  var PR_KEYWORD = 'kwd';
-  /** token style for a comment */
-  var PR_COMMENT = 'com';
-  /** token style for a type */
-  var PR_TYPE = 'typ';
-  /** token style for a literal value.  e.g. 1, null, true. */
-  var PR_LITERAL = 'lit';
-  /** token style for a punctuation string. */
-  var PR_PUNCTUATION = 'pun';
-  /** token style for a punctuation string. */
-  var PR_PLAIN = 'pln';
-
-  /** token style for an sgml tag. */
-  var PR_TAG = 'tag';
-  /** token style for a markup declaration such as a DOCTYPE. */
-  var PR_DECLARATION = 'dec';
-  /** token style for embedded source. */
-  var PR_SOURCE = 'src';
-  /** token style for an sgml attribute name. */
-  var PR_ATTRIB_NAME = 'atn';
-  /** token style for an sgml attribute value. */
-  var PR_ATTRIB_VALUE = 'atv';
-
-  /**
-   * A class that indicates a section of markup that is not code, e.g. to allow
-   * embedding of line numbers within code listings.
-   */
-  var PR_NOCODE = 'nocode';
-
-  /** A set of tokens that can precede a regular expression literal in
-    * javascript.
-    * http://www.mozilla.org/js/language/js20/rationale/syntax.html has the full
-    * list, but I've removed ones that might be problematic when seen in
-    * languages that don't support regular expression literals.
-    *
-    * <p>Specifically, I've removed any keywords that can't precede a regexp
-    * literal in a syntactically legal javascript program, and I've removed the
-    * "in" keyword since it's not a keyword in many languages, and might be used
-    * as a count of inches.
-    *
-    * <p>The link a above does not accurately describe EcmaScript rules since
-    * it fails to distinguish between (a=++/b/i) and (a++/b/i) but it works
-    * very well in practice.
-    *
-    * @private
-    */
-  var REGEXP_PRECEDER_PATTERN = function () {
-      var preceders = [
-          "!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=",
-          "&=", "(", "*", "*=", /* "+", */ "+=", ",", /* "-", */ "-=",
-          "->", /*".", "..", "...", handled below */ "/", "/=", ":", "::", ";",
-          "<", "<<", "<<=", "<=", "=", "==", "===", ">",
-          ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[",
-          "^", "^=", "^^", "^^=", "{", "|", "|=", "||",
-          "||=", "~" /* handles =~ and !~ */,
-          "break", "case", "continue", "delete",
-          "do", "else", "finally", "instanceof",
-          "return", "throw", "try", "typeof"
-          ];
-      var pattern = '(?:^^|[+-]';
-      for (var i = 0; i < preceders.length; ++i) {
-        pattern += '|' + preceders[i].replace(/([^=<>:&a-z])/g, '\\$1');
-      }
-      pattern += ')\\s*';  // matches at end, and matches empty string
-      return pattern;
-      // CAVEAT: this does not properly handle the case where a regular
-      // expression immediately follows another since a regular expression may
-      // have flags for case-sensitivity and the like.  Having regexp tokens
-      // adjacent is not valid in any language I'm aware of, so I'm punting.
-      // TODO: maybe style special characters inside a regexp as punctuation.
-    }();
-
-  // Define regexps here so that the interpreter doesn't have to create an
-  // object each time the function containing them is called.
-  // The language spec requires a new object created even if you don't access
-  // the $1 members.
-  var pr_amp = /&/g;
-  var pr_lt = /</g;
-  var pr_gt = />/g;
-  var pr_quot = /\"/g;
-  /** like textToHtml but escapes double quotes to be attribute safe. */
-  function attribToHtml(str) {
-    return str.replace(pr_amp, '&amp;')
-        .replace(pr_lt, '&lt;')
-        .replace(pr_gt, '&gt;')
-        .replace(pr_quot, '&quot;');
-  }
-
-  /** escapest html special characters to html. */
-  function textToHtml(str) {
-    return str.replace(pr_amp, '&amp;')
-        .replace(pr_lt, '&lt;')
-        .replace(pr_gt, '&gt;');
-  }
-
-
-  var pr_ltEnt = /&lt;/g;
-  var pr_gtEnt = /&gt;/g;
-  var pr_aposEnt = /&apos;/g;
-  var pr_quotEnt = /&quot;/g;
-  var pr_ampEnt = /&amp;/g;
-  var pr_nbspEnt = /&nbsp;/g;
-  /** unescapes html to plain text. */
-  function htmlToText(html) {
-    var pos = html.indexOf('&');
-    if (pos < 0) { return html; }
-    // Handle numeric entities specially.  We can't use functional substitution
-    // since that doesn't work in older versions of Safari.
-    // These should be rare since most browsers convert them to normal chars.
-    for (--pos; (pos = html.indexOf('&#', pos + 1)) >= 0;) {
-      var end = html.indexOf(';', pos);
-      if (end >= 0) {
-        var num = html.substring(pos + 3, end);
-        var radix = 10;
-        if (num && num.charAt(0) === 'x') {
-          num = num.substring(1);
-          radix = 16;
-        }
-        var codePoint = parseInt(num, radix);
-        if (!isNaN(codePoint)) {
-          html = (html.substring(0, pos) + String.fromCharCode(codePoint) +
-                  html.substring(end + 1));
-        }
-      }
-    }
-
-    return html.replace(pr_ltEnt, '<')
-        .replace(pr_gtEnt, '>')
-        .replace(pr_aposEnt, "'")
-        .replace(pr_quotEnt, '"')
-        .replace(pr_nbspEnt, ' ')
-        .replace(pr_ampEnt, '&');
-  }
-
-  /** is the given node's innerHTML normally unescaped? */
-  function isRawContent(node) {
-    return 'XMP' === node.tagName;
-  }
-
-  var newlineRe = /[\r\n]/g;
-  /**
-   * Are newlines and adjacent spaces significant in the given node's innerHTML?
-   */
-  function isPreformatted(node, content) {
-    // PRE means preformatted, and is a very common case, so don't create
-    // unnecessary computed style objects.
-    if ('PRE' === node.tagName) { return true; }
-    if (!newlineRe.test(content)) { return true; }  // Don't care
-    var whitespace = '';
-    // For disconnected nodes, IE has no currentStyle.
-    if (node.currentStyle) {
-      whitespace = node.currentStyle.whiteSpace;
-    } else if (window.getComputedStyle) {
-      // Firefox makes a best guess if node is disconnected whereas Safari
-      // returns the empty string.
-      whitespace = window.getComputedStyle(node, null).whiteSpace;
-    }
-    return !whitespace || whitespace === 'pre';
-  }
-
-  function normalizedHtml(node, out) {
-    switch (node.nodeType) {
-      case 1:  // an element
-        var name = node.tagName.toLowerCase();
-        out.push('<', name);
-        for (var i = 0; i < node.attributes.length; ++i) {
-          var attr = node.attributes[i];
-          if (!attr.specified) { continue; }
-          out.push(' ');
-          normalizedHtml(attr, out);
-        }
-        out.push('>');
-        for (var child = node.firstChild; child; child = child.nextSibling) {
-          normalizedHtml(child, out);
-        }
-        if (node.firstChild || !/^(?:br|link|img)$/.test(name)) {
-          out.push('<\/', name, '>');
-        }
-        break;
-      case 2: // an attribute
-        out.push(node.name.toLowerCase(), '="', attribToHtml(node.value), '"');
-        break;
-      case 3: case 4: // text
-        out.push(textToHtml(node.nodeValue));
-        break;
-    }
-  }
-
-  /**
-   * Given a group of {@link RegExp}s, returns a {@code RegExp} that globally
-   * matches the union o the sets o strings matched d by the input RegExp.
-   * Since it matches globally, if the input strings have a start-of-input
-   * anchor (/^.../), it is ignored for the purposes of unioning.
-   * @param {Array.<RegExp>} regexs non multiline, non-global regexs.
-   * @return {RegExp} a global regex.
-   */
-  function combinePrefixPatterns(regexs) {
-    var capturedGroupIndex = 0;
-
-    var needToFoldCase = false;
-    var ignoreCase = false;
-    for (var i = 0, n = regexs.length; i < n; ++i) {
-      var regex = regexs[i];
-      if (regex.ignoreCase) {
-        ignoreCase = true;
-      } else if (/[a-z]/i.test(regex.source.replace(
-                     /\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi, ''))) {
-        needToFoldCase = true;
-        ignoreCase = false;
-        break;
-      }
-    }
-
-    function decodeEscape(charsetPart) {
-      if (charsetPart.charAt(0) !== '\\') { return charsetPart.charCodeAt(0); }
-      switch (charsetPart.charAt(1)) {
-        case 'b': return 8;
-        case 't': return 9;
-        case 'n': return 0xa;
-        case 'v': return 0xb;
-        case 'f': return 0xc;
-        case 'r': return 0xd;
-        case 'u': case 'x':
-          return parseInt(charsetPart.substring(2), 16)
-              || charsetPart.charCodeAt(1);
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7':
-          return parseInt(charsetPart.substring(1), 8);
-        default: return charsetPart.charCodeAt(1);
-      }
-    }
-
-    function encodeEscape(charCode) {
-      if (charCode < 0x20) {
-        return (charCode < 0x10 ? '\\x0' : '\\x') + charCode.toString(16);
-      }
-      var ch = String.fromCharCode(charCode);
-      if (ch === '\\' || ch === '-' || ch === '[' || ch === ']') {
-        ch = '\\' + ch;
-      }
-      return ch;
-    }
-
-    function caseFoldCharset(charSet) {
-      var charsetParts = charSet.substring(1, charSet.length - 1).match(
-          new RegExp(
-              '\\\\u[0-9A-Fa-f]{4}'
-              + '|\\\\x[0-9A-Fa-f]{2}'
-              + '|\\\\[0-3][0-7]{0,2}'
-              + '|\\\\[0-7]{1,2}'
-              + '|\\\\[\\s\\S]'
-              + '|-'
-              + '|[^-\\\\]',
-              'g'));
-      var groups = [];
-      var ranges = [];
-      var inverse = charsetParts[0] === '^';
-      for (var i = inverse ? 1 : 0, n = charsetParts.length; i < n; ++i) {
-        var p = charsetParts[i];
-        switch (p) {
-          case '\\B': case '\\b':
-          case '\\D': case '\\d':
-          case '\\S': case '\\s':
-          case '\\W': case '\\w':
-            groups.push(p);
-            continue;
-        }
-        var start = decodeEscape(p);
-        var end;
-        if (i + 2 < n && '-' === charsetParts[i + 1]) {
-          end = decodeEscape(charsetParts[i + 2]);
-          i += 2;
-        } else {
-          end = start;
-        }
-        ranges.push([start, end]);
-        // If the range might intersect letters, then expand it.
-        if (!(end < 65 || start > 122)) {
-          if (!(end < 65 || start > 90)) {
-            ranges.push([Math.max(65, start) | 32, Math.min(end, 90) | 32]);
-          }
-          if (!(end < 97 || start > 122)) {
-            ranges.push([Math.max(97, start) & ~32, Math.min(end, 122) & ~32]);
-          }
-        }
-      }
-
-      // [[1, 10], [3, 4], [8, 12], [14, 14], [16, 16], [17, 17]]
-      // -> [[1, 12], [14, 14], [16, 17]]
-      ranges.sort(function (a, b) { return (a[0] - b[0]) || (b[1]  - a[1]); });
-      var consolidatedRanges = [];
-      var lastRange = [NaN, NaN];
-      for (var i = 0; i < ranges.length; ++i) {
-        var range = ranges[i];
-        if (range[0] <= lastRange[1] + 1) {
-          lastRange[1] = Math.max(lastRange[1], range[1]);
-        } else {
-          consolidatedRanges.push(lastRange = range);
-        }
-      }
-
-      var out = ['['];
-      if (inverse) { out.push('^'); }
-      out.push.apply(out, groups);
-      for (var i = 0; i < consolidatedRanges.length; ++i) {
-        var range = consolidatedRanges[i];
-        out.push(encodeEscape(range[0]));
-        if (range[1] > range[0]) {
-          if (range[1] + 1 > range[0]) { out.push('-'); }
-          out.push(encodeEscape(range[1]));
-        }
-      }
-      out.push(']');
-      return out.join('');
-    }
-
-    function allowAnywhereFoldCaseAndRenumberGroups(regex) {
-      // Split into character sets, escape sequences, punctuation strings
-      // like ('(', '(?:', ')', '^'), and runs of characters that do not
-      // include any of the above.
-      var parts = regex.source.match(
-          new RegExp(
-              '(?:'
-              + '\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]'  // a character set
-              + '|\\\\u[A-Fa-f0-9]{4}'  // a unicode escape
-              + '|\\\\x[A-Fa-f0-9]{2}'  // a hex escape
-              + '|\\\\[0-9]+'  // a back-reference or octal escape
-              + '|\\\\[^ux0-9]'  // other escape sequence
-              + '|\\(\\?[:!=]'  // start of a non-capturing group
-              + '|[\\(\\)\\^]'  // start/emd of a group, or line start
-              + '|[^\\x5B\\x5C\\(\\)\\^]+'  // run of other characters
-              + ')',
-              'g'));
-      var n = parts.length;
-
-      // Maps captured group numbers to the number they will occupy in
-      // the output or to -1 if that has not been determined, or to
-      // undefined if they need not be capturing in the output.
-      var capturedGroups = [];
-
-      // Walk over and identify back references to build the capturedGroups
-      // mapping.
-      for (var i = 0, groupIndex = 0; i < n; ++i) {
-        var p = parts[i];
-        if (p === '(') {
-          // groups are 1-indexed, so max group index is count of '('
-          ++groupIndex;
-        } else if ('\\' === p.charAt(0)) {
-          var decimalValue = +p.substring(1);
-          if (decimalValue && decimalValue <= groupIndex) {
-            capturedGroups[decimalValue] = -1;
-          }
-        }
-      }
-
-      // Renumber groups and reduce capturing groups to non-capturing groups
-      // where possible.
-      for (var i = 1; i < capturedGroups.length; ++i) {
-        if (-1 === capturedGroups[i]) {
-          capturedGroups[i] = ++capturedGroupIndex;
-        }
-      }
-      for (var i = 0, groupIndex = 0; i < n; ++i) {
-        var p = parts[i];
-        if (p === '(') {
-          ++groupIndex;
-          if (capturedGroups[groupIndex] === undefined) {
-            parts[i] = '(?:';
-          }
-        } else if ('\\' === p.charAt(0)) {
-          var decimalValue = +p.substring(1);
-          if (decimalValue && decimalValue <= groupIndex) {
-            parts[i] = '\\' + capturedGroups[groupIndex];
-          }
-        }
-      }
-
-      // Remove any prefix anchors so that the output will match anywhere.
-      // ^^ really does mean an anchored match though.
-      for (var i = 0, groupIndex = 0; i < n; ++i) {
-        if ('^' === parts[i] && '^' !== parts[i + 1]) { parts[i] = ''; }
-      }
-
-      // Expand letters to groupts to handle mixing of case-sensitive and
-      // case-insensitive patterns if necessary.
-      if (regex.ignoreCase && needToFoldCase) {
-        for (var i = 0; i < n; ++i) {
-          var p = parts[i];
-          var ch0 = p.charAt(0);
-          if (p.length >= 2 && ch0 === '[') {
-            parts[i] = caseFoldCharset(p);
-          } else if (ch0 !== '\\') {
-            // TODO: handle letters in numeric escapes.
-            parts[i] = p.replace(
-                /[a-zA-Z]/g,
-                function (ch) {
-                  var cc = ch.charCodeAt(0);
-                  return '[' + String.fromCharCode(cc & ~32, cc | 32) + ']';
-                });
-          }
-        }
-      }
-
-      return parts.join('');
-    }
-
-    var rewritten = [];
-    for (var i = 0, n = regexs.length; i < n; ++i) {
-      var regex = regexs[i];
-      if (regex.global || regex.multiline) { throw new Error('' + regex); }
-      rewritten.push(
-          '(?:' + allowAnywhereFoldCaseAndRenumberGroups(regex) + ')');
-    }
-
-    return new RegExp(rewritten.join('|'), ignoreCase ? 'gi' : 'g');
-  }
-
-  var PR_innerHtmlWorks = null;
-  function getInnerHtml(node) {
-    // inner html is hopelessly broken in Safari 2.0.4 when the content is
-    // an html description of well formed XML and the containing tag is a PRE
-    // tag, so we detect that case and emulate innerHTML.
-    if (null === PR_innerHtmlWorks) {
-      var testNode = document.createElement('PRE');
-      testNode.appendChild(
-          document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />'));
-      PR_innerHtmlWorks = !/</.test(testNode.innerHTML);
-    }
-
-    if (PR_innerHtmlWorks) {
-      var content = node.innerHTML;
-      // XMP tags contain unescaped entities so require special handling.
-      if (isRawContent(node)) {
-        content = textToHtml(content);
-      } else if (!isPreformatted(node, content)) {
-        content = content.replace(/(<br\s*\/?>)[\r\n]+/g, '$1')
-            .replace(/(?:[\r\n]+[ \t]*)+/g, ' ');
-      }
-      return content;
-    }
-
-    var out = [];
-    for (var child = node.firstChild; child; child = child.nextSibling) {
-      normalizedHtml(child, out);
-    }
-    return out.join('');
-  }
-
-  /** returns a function that expand tabs to spaces.  This function can be fed
-    * successive chunks of text, and will maintain its own internal state to
-    * keep track of how tabs are expanded.
-    * @return {function (string) : string} a function that takes
-    *   plain text and return the text with tabs expanded.
-    * @private
-    */
-  function makeTabExpander(tabWidth) {
-    var SPACES = '                ';
-    var charInLine = 0;
-
-    return function (plainText) {
-      // walk over each character looking for tabs and newlines.
-      // On tabs, expand them.  On newlines, reset charInLine.
-      // Otherwise increment charInLine
-      var out = null;
-      var pos = 0;
-      for (var i = 0, n = plainText.length; i < n; ++i) {
-        var ch = plainText.charAt(i);
-
-        switch (ch) {
-          case '\t':
-            if (!out) { out = []; }
-            out.push(plainText.substring(pos, i));
-            // calculate how much space we need in front of this part
-            // nSpaces is the amount of padding -- the number of spaces needed
-            // to move us to the next column, where columns occur at factors of
-            // tabWidth.
-            var nSpaces = tabWidth - (charInLine % tabWidth);
-            charInLine += nSpaces;
-            for (; nSpaces >= 0; nSpaces -= SPACES.length) {
-              out.push(SPACES.substring(0, nSpaces));
-            }
-            pos = i + 1;
-            break;
-          case '\n':
-            charInLine = 0;
-            break;
-          default:
-            ++charInLine;
-        }
-      }
-      if (!out) { return plainText; }
-      out.push(plainText.substring(pos));
-      return out.join('');
-    };
-  }
-
-  var pr_chunkPattern = new RegExp(
-      '[^<]+'  // A run of characters other than '<'
-      + '|<\!--[\\s\\S]*?--\>'  // an HTML comment
-      + '|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>'  // a CDATA section
-      // a probable tag that should not be highlighted
-      + '|<\/?[a-zA-Z](?:[^>\"\']|\'[^\']*\'|\"[^\"]*\")*>'
-      + '|<',  // A '<' that does not begin a larger chunk
-      'g');
-  var pr_commentPrefix = /^<\!--/;
-  var pr_cdataPrefix = /^<!\[CDATA\[/;
-  var pr_brPrefix = /^<br\b/i;
-  var pr_tagNameRe = /^<(\/?)([a-zA-Z][a-zA-Z0-9]*)/;
-
-  /** split markup into chunks of html tags (style null) and
-    * plain text (style {@link #PR_PLAIN}), converting tags which are
-    * significant for tokenization (<br>) into their textual equivalent.
-    *
-    * @param {string} s html where whitespace is considered significant.
-    * @return {Object} source code and extracted tags.
-    * @private
-    */
-  function extractTags(s) {
-    // since the pattern has the 'g' modifier and defines no capturing groups,
-    // this will return a list of all chunks which we then classify and wrap as
-    // PR_Tokens
-    var matches = s.match(pr_chunkPattern);
-    var sourceBuf = [];
-    var sourceBufLen = 0;
-    var extractedTags = [];
-    if (matches) {
-      for (var i = 0, n = matches.length; i < n; ++i) {
-        var match = matches[i];
-        if (match.length > 1 && match.charAt(0) === '<') {
-          if (pr_commentPrefix.test(match)) { continue; }
-          if (pr_cdataPrefix.test(match)) {
-            // strip CDATA prefix and suffix.  Don't unescape since it's CDATA
-            sourceBuf.push(match.substring(9, match.length - 3));
-            sourceBufLen += match.length - 12;
-          } else if (pr_brPrefix.test(match)) {
-            // <br> tags are lexically significant so convert them to text.
-            // This is undone later.
-            sourceBuf.push('\n');
-            ++sourceBufLen;
-          } else {
-            if (match.indexOf(PR_NOCODE) >= 0 && isNoCodeTag(match)) {
-              // A <span class="nocode"> will start a section that should be
-              // ignored.  Continue walking the list until we see a matching end
-              // tag.
-              var name = match.match(pr_tagNameRe)[2];
-              var depth = 1;
-              var j;
-              end_tag_loop:
-              for (j = i + 1; j < n; ++j) {
-                var name2 = matches[j].match(pr_tagNameRe);
-                if (name2 && name2[2] === name) {
-                  if (name2[1] === '/') {
-                    if (--depth === 0) { break end_tag_loop; }
-                  } else {
-                    ++depth;
-                  }
-                }
-              }
-              if (j < n) {
-                extractedTags.push(
-                    sourceBufLen, matches.slice(i, j + 1).join(''));
-                i = j;
-              } else {  // Ignore unclosed sections.
-                extractedTags.push(sourceBufLen, match);
-              }
-            } else {
-              extractedTags.push(sourceBufLen, match);
-            }
-          }
-        } else {
-          var literalText = htmlToText(match);
-          sourceBuf.push(literalText);
-          sourceBufLen += literalText.length;
-        }
-      }
-    }
-    return { source: sourceBuf.join(''), tags: extractedTags };
-  }
-
-  /** True if the given tag contains a class attribute with the nocode class. */
-  function isNoCodeTag(tag) {
-    return !!tag
-        // First canonicalize the representation of attributes
-        .replace(/\s(\w+)\s*=\s*(?:\"([^\"]*)\"|'([^\']*)'|(\S+))/g,
-                 ' $1="$2$3$4"')
-        // Then look for the attribute we want.
-        .match(/[cC][lL][aA][sS][sS]=\"[^\"]*\bnocode\b/);
-  }
-
-  /**
-   * Apply the given language handler to sourceCode and add the resulting
-   * decorations to out.
-   * @param {number} basePos the index of sourceCode within the chunk of source
-   *    whose decorations are already present on out.
-   */
-  function appendDecorations(basePos, sourceCode, langHandler, out) {
-    if (!sourceCode) { return; }
-    var job = {
-      source: sourceCode,
-      basePos: basePos
-    };
-    langHandler(job);
-    out.push.apply(out, job.decorations);
-  }
-
-  /** Given triples of [style, pattern, context] returns a lexing function,
-    * The lexing function interprets the patterns to find token boundaries and
-    * returns a decoration list of the form
-    * [index_0, style_0, index_1, style_1, ..., index_n, style_n]
-    * where index_n is an index into the sourceCode, and style_n is a style
-    * constant like PR_PLAIN.  index_n-1 <= index_n, and style_n-1 applies to
-    * all characters in sourceCode[index_n-1:index_n].
-    *
-    * The stylePatterns is a list whose elements have the form
-    * [style : string, pattern : RegExp, DEPRECATED, shortcut : string].
-    *
-    * Style is a style constant like PR_PLAIN, or can be a string of the
-    * form 'lang-FOO', where FOO is a language extension describing the
-    * language of the portion of the token in $1 after pattern executes.
-    * E.g., if style is 'lang-lisp', and group 1 contains the text
-    * '(hello (world))', then that portion of the token will be passed to the
-    * registered lisp handler for formatting.
-    * The text before and after group 1 will be restyled using this decorator
-    * so decorators should take care that this doesn't result in infinite
-    * recursion.  For example, the HTML lexer rule for SCRIPT elements looks
-    * something like ['lang-js', /<[s]cript>(.+?)<\/script>/].  This may match
-    * '<script>foo()<\/script>', which would cause the current decorator to
-    * be called with '<script>' which would not match the same rule since
-    * group 1 must not be empty, so it would be instead styled as PR_TAG by
-    * the generic tag rule.  The handler registered for the 'js' extension would
-    * then be called with 'foo()', and finally, the current decorator would
-    * be called with '<\/script>' which would not match the original rule and
-    * so the generic tag rule would identify it as a tag.
-    *
-    * Pattern must only match prefixes, and if it matches a prefix, then that
-    * match is considered a token with the same style.
-    *
-    * Context is applied to the last non-whitespace, non-comment token
-    * recognized.
-    *
-    * Shortcut is an optional string of characters, any of which, if the first
-    * character, gurantee that this pattern and only this pattern matches.
-    *
-    * @param {Array} shortcutStylePatterns patterns that always start with
-    *   a known character.  Must have a shortcut string.
-    * @param {Array} fallthroughStylePatterns patterns that will be tried in
-    *   order if the shortcut ones fail.  May have shortcuts.
-    *
-    * @return {function (Object)} a
-    *   function that takes source code and returns a list of decorations.
-    */
-  function createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns) {
-    var shortcuts = {};
-    var tokenizer;
-    (function () {
-      var allPatterns = shortcutStylePatterns.concat(fallthroughStylePatterns);
-      var allRegexs = [];
-      var regexKeys = {};
-      for (var i = 0, n = allPatterns.length; i < n; ++i) {
-        var patternParts = allPatterns[i];
-        var shortcutChars = patternParts[3];
-        if (shortcutChars) {
-          for (var c = shortcutChars.length; --c >= 0;) {
-            shortcuts[shortcutChars.charAt(c)] = patternParts;
-          }
-        }
-        var regex = patternParts[1];
-        var k = '' + regex;
-        if (!regexKeys.hasOwnProperty(k)) {
-          allRegexs.push(regex);
-          regexKeys[k] = null;
-        }
-      }
-      allRegexs.push(/[\0-\uffff]/);
-      tokenizer = combinePrefixPatterns(allRegexs);
-    })();
-
-    var nPatterns = fallthroughStylePatterns.length;
-    var notWs = /\S/;
-
-    /**
-     * Lexes job.source and produces an output array job.decorations of style
-     * classes preceded by the position at which they start in job.source in
-     * order.
-     *
-     * @param {Object} job an object like {@code
-     *    source: {string} sourceText plain text,
-     *    basePos: {int} position of job.source in the larger chunk of
-     *        sourceCode.
-     * }
-     */
-    var decorate = function (job) {
-      var sourceCode = job.source, basePos = job.basePos;
-      /** Even entries are positions in source in ascending order.  Odd enties
-        * are style markers (e.g., PR_COMMENT) that run from that position until
-        * the end.
-        * @type {Array.<number|string>}
-        */
-      var decorations = [basePos, PR_PLAIN];
-      var pos = 0;  // index into sourceCode
-      var tokens = sourceCode.match(tokenizer) || [];
-      var styleCache = {};
-
-      for (var ti = 0, nTokens = tokens.length; ti < nTokens; ++ti) {
-        var token = tokens[ti];
-        var style = styleCache[token];
-        var match = void 0;
-
-        var isEmbedded;
-        if (typeof style === 'string') {
-          isEmbedded = false;
-        } else {
-          var patternParts = shortcuts[token.charAt(0)];
-          if (patternParts) {
-            match = token.match(patternParts[1]);
-            style = patternParts[0];
-          } else {
-            for (var i = 0; i < nPatterns; ++i) {
-              patternParts = fallthroughStylePatterns[i];
-              match = token.match(patternParts[1]);
-              if (match) {
-                style = patternParts[0];
-                break;
-              }
-            }
-
-            if (!match) {  // make sure that we make progress
-              style = PR_PLAIN;
-            }
-          }
-
-          isEmbedded = style.length >= 5 && 'lang-' === style.substring(0, 5);
-          if (isEmbedded && !(match && typeof match[1] === 'string')) {
-            isEmbedded = false;
-            style = PR_SOURCE;
-          }
-
-          if (!isEmbedded) { styleCache[token] = style; }
-        }
-
-        var tokenStart = pos;
-        pos += token.length;
-
-        if (!isEmbedded) {
-          decorations.push(basePos + tokenStart, style);
-        } else {  // Treat group 1 as an embedded block of source code.
-          var embeddedSource = match[1];
-          var embeddedSourceStart = token.indexOf(embeddedSource);
-          var embeddedSourceEnd = embeddedSourceStart + embeddedSource.length;
-          if (match[2]) {
-            // If embeddedSource can be blank, then it would match at the
-            // beginning which would cause us to infinitely recurse on the
-            // entire token, so we catch the right context in match[2].
-            embeddedSourceEnd = token.length - match[2].length;
-            embeddedSourceStart = embeddedSourceEnd - embeddedSource.length;
-          }
-          var lang = style.substring(5);
-          // Decorate the left of the embedded source
-          appendDecorations(
-              basePos + tokenStart,
-              token.substring(0, embeddedSourceStart),
-              decorate, decorations);
-          // Decorate the embedded source
-          appendDecorations(
-              basePos + tokenStart + embeddedSourceStart,
-              embeddedSource,
-              langHandlerForExtension(lang, embeddedSource),
-              decorations);
-          // Decorate the right of the embedded section
-          appendDecorations(
-              basePos + tokenStart + embeddedSourceEnd,
-              token.substring(embeddedSourceEnd),
-              decorate, decorations);
-        }
-      }
-      job.decorations = decorations;
-    };
-    return decorate;
-  }
-
-  /** returns a function that produces a list of decorations from source text.
-    *
-    * This code treats ", ', and ` as string delimiters, and \ as a string
-    * escape.  It does not recognize perl's qq() style strings.
-    * It has no special handling for double delimiter escapes as in basic, or
-    * the tripled delimiters used in python, but should work on those regardless
-    * although in those cases a single string literal may be broken up into
-    * multiple adjacent string literals.
-    *
-    * It recognizes C, C++, and shell style comments.
-    *
-    * @param {Object} options a set of optional parameters.
-    * @return {function (Object)} a function that examines the source code
-    *     in the input job and builds the decoration list.
-    */
-  function sourceDecorator(options) {
-    var shortcutStylePatterns = [], fallthroughStylePatterns = [];
-    if (options['tripleQuotedStrings']) {
-      // '''multi-line-string''', 'single-line-string', and double-quoted
-      shortcutStylePatterns.push(
-          [PR_STRING,  /^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,
-           null, '\'"']);
-    } else if (options['multiLineStrings']) {
-      // 'multi-line-string', "multi-line-string"
-      shortcutStylePatterns.push(
-          [PR_STRING,  /^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,
-           null, '\'"`']);
-    } else {
-      // 'single-line-string', "single-line-string"
-      shortcutStylePatterns.push(
-          [PR_STRING,
-           /^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,
-           null, '"\'']);
-    }
-    if (options['verbatimStrings']) {
-      // verbatim-string-literal production from the C# grammar.  See issue 93.
-      fallthroughStylePatterns.push(
-          [PR_STRING, /^@\"(?:[^\"]|\"\")*(?:\"|$)/, null]);
-    }
-    if (options['hashComments']) {
-      if (options['cStyleComments']) {
-        // Stop C preprocessor declarations at an unclosed open comment
-        shortcutStylePatterns.push(
-            [PR_COMMENT, /^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,
-             null, '#']);
-        fallthroughStylePatterns.push(
-            [PR_STRING,
-             /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,
-             null]);
-      } else {
-        shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']);
-      }
-    }
-    if (options['cStyleComments']) {
-      fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]);
-      fallthroughStylePatterns.push(
-          [PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]);
-    }
-    if (options['regexLiterals']) {
-      var REGEX_LITERAL = (
-          // A regular expression literal starts with a slash that is
-          // not followed by * or / so that it is not confused with
-          // comments.
-          '/(?=[^/*])'
-          // and then contains any number of raw characters,
-          + '(?:[^/\\x5B\\x5C]'
-          // escape sequences (\x5C),
-          +    '|\\x5C[\\s\\S]'
-          // or non-nesting character sets (\x5B\x5D);
-          +    '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+'
-          // finally closed by a /.
-          + '/');
-      fallthroughStylePatterns.push(
-          ['lang-regex',
-           new RegExp('^' + REGEXP_PRECEDER_PATTERN + '(' + REGEX_LITERAL + ')')
-           ]);
-    }
-
-    var keywords = options['keywords'].replace(/^\s+|\s+$/g, '');
-    if (keywords.length) {
-      fallthroughStylePatterns.push(
-          [PR_KEYWORD,
-           new RegExp('^(?:' + keywords.replace(/\s+/g, '|') + ')\\b'), null]);
-    }
-
-    shortcutStylePatterns.push([PR_PLAIN,       /^\s+/, null, ' \r\n\t\xA0']);
-    fallthroughStylePatterns.push(
-        // TODO(mikesamuel): recognize non-latin letters and numerals in idents
-        [PR_LITERAL,     /^@[a-z_$][a-z_$@0-9]*/i, null],
-        [PR_TYPE,        /^@?[A-Z]+[a-z][A-Za-z_$@0-9]*/, null],
-        [PR_PLAIN,       /^[a-z_$][a-z_$@0-9]*/i, null],
-        [PR_LITERAL,
-         new RegExp(
-             '^(?:'
-             // A hex number
-             + '0x[a-f0-9]+'
-             // or an octal or decimal number,
-             + '|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)'
-             // possibly in scientific notation
-             + '(?:e[+\\-]?\\d+)?'
-             + ')'
-             // with an optional modifier like UL for unsigned long
-             + '[a-z]*', 'i'),
-         null, '0123456789'],
-        [PR_PUNCTUATION, /^.[^\s\w\.$@\'\"\`\/\#]*/, null]);
-
-    return createSimpleLexer(shortcutStylePatterns, fallthroughStylePatterns);
-  }
-
-  var decorateSource = sourceDecorator({
-        'keywords': ALL_KEYWORDS,
-        'hashComments': true,
-        'cStyleComments': true,
-        'multiLineStrings': true,
-        'regexLiterals': true
-      });
-
-  /** Breaks {@code job.source} around style boundaries in
-    * {@code job.decorations} while re-interleaving {@code job.extractedTags},
-    * and leaves the result in {@code job.prettyPrintedHtml}.
-    * @param {Object} job like {
-    *    source: {string} source as plain text,
-    *    extractedTags: {Array.<number|string>} extractedTags chunks of raw
-    *                   html preceded by their position in {@code job.source}
-    *                   in order
-    *    decorations: {Array.<number|string} an array of style classes preceded
-    *                 by the position at which they start in job.source in order
-    * }
-    * @private
-    */
-  function recombineTagsAndDecorations(job) {
-    var sourceText = job.source;
-    var extractedTags = job.extractedTags;
-    var decorations = job.decorations;
-
-    var html = [];
-    // index past the last char in sourceText written to html
-    var outputIdx = 0;
-
-    var openDecoration = null;
-    var currentDecoration = null;
-    var tagPos = 0;  // index into extractedTags
-    var decPos = 0;  // index into decorations
-    var tabExpander = makeTabExpander(window['PR_TAB_WIDTH']);
-
-    var adjacentSpaceRe = /([\r\n ]) /g;
-    var startOrSpaceRe = /(^| ) /gm;
-    var newlineRe = /\r\n?|\n/g;
-    var trailingSpaceRe = /[ \r\n]$/;
-    var lastWasSpace = true;  // the last text chunk emitted ended with a space.
-
-    // A helper function that is responsible for opening sections of decoration
-    // and outputing properly escaped chunks of source
-    function emitTextUpTo(sourceIdx) {
-      if (sourceIdx > outputIdx) {
-        if (openDecoration && openDecoration !== currentDecoration) {
-          // Close the current decoration
-          html.push('</span>');
-          openDecoration = null;
-        }
-        if (!openDecoration && currentDecoration) {
-          openDecoration = currentDecoration;
-          html.push('<span class="', openDecoration, '">');
-        }
-        // This interacts badly with some wikis which introduces paragraph tags
-        // into pre blocks for some strange reason.
-        // It's necessary for IE though which seems to lose the preformattedness
-        // of <pre> tags when their innerHTML is assigned.
-        // http://stud3.tuwien.ac.at/~e0226430/innerHtmlQuirk.html
-        // and it serves to undo the conversion of <br>s to newlines done in
-        // chunkify.
-        var htmlChunk = textToHtml(
-            tabExpander(sourceText.substring(outputIdx, sourceIdx)))
-            .replace(lastWasSpace
-                     ? startOrSpaceRe
-                     : adjacentSpaceRe, '$1&nbsp;');
-        // Keep track of whether we need to escape space at the beginning of the
-        // next chunk.
-        lastWasSpace = trailingSpaceRe.test(htmlChunk);
-        // IE collapses multiple adjacient <br>s into 1 line break.
-        // Prefix every <br> with '&nbsp;' can prevent such IE's behavior.
-        var lineBreakHtml = window['_pr_isIE6']() ? '&nbsp;<br />' : '<br />';
-        html.push(htmlChunk.replace(newlineRe, lineBreakHtml));
-        outputIdx = sourceIdx;
-      }
-    }
-
-    while (true) {
-      // Determine if we're going to consume a tag this time around.  Otherwise
-      // we consume a decoration or exit.
-      var outputTag;
-      if (tagPos < extractedTags.length) {
-        if (decPos < decorations.length) {
-          // Pick one giving preference to extractedTags since we shouldn't open
-          // a new style that we're going to have to immediately close in order
-          // to output a tag.
-          outputTag = extractedTags[tagPos] <= decorations[decPos];
-        } else {
-          outputTag = true;
-        }
-      } else {
-        outputTag = false;
-      }
-      // Consume either a decoration or a tag or exit.
-      if (outputTag) {
-        emitTextUpTo(extractedTags[tagPos]);
-        if (openDecoration) {
-          // Close the current decoration
-          html.push('</span>');
-          openDecoration = null;
-        }
-        html.push(extractedTags[tagPos + 1]);
-        tagPos += 2;
-      } else if (decPos < decorations.length) {
-        emitTextUpTo(decorations[decPos]);
-        currentDecoration = decorations[decPos + 1];
-        decPos += 2;
-      } else {
-        break;
-      }
-    }
-    emitTextUpTo(sourceText.length);
-    if (openDecoration) {
-      html.push('</span>');
-    }
-    job.prettyPrintedHtml = html.join('');
-  }
-
-  /** Maps language-specific file extensions to handlers. */
-  var langHandlerRegistry = {};
-  /** Register a language handler for the given file extensions.
-    * @param {function (Object)} handler a function from source code to a list
-    *      of decorations.  Takes a single argument job which describes the
-    *      state of the computation.   The single parameter has the form
-    *      {@code {
-    *        source: {string} as plain text.
-    *        decorations: {Array.<number|string>} an array of style classes
-    *                     preceded by the position at which they start in
-    *                     job.source in order.
-    *                     The language handler should assigned this field.
-    *        basePos: {int} the position of source in the larger source chunk.
-    *                 All positions in the output decorations array are relative
-    *                 to the larger source chunk.
-    *      } }
-    * @param {Array.<string>} fileExtensions
-    */
-  function registerLangHandler(handler, fileExtensions) {
-    for (var i = fileExtensions.length; --i >= 0;) {
-      var ext = fileExtensions[i];
-      if (!langHandlerRegistry.hasOwnProperty(ext)) {
-        langHandlerRegistry[ext] = handler;
-      } else if ('console' in window) {
-        console.warn('cannot override language handler %s', ext);
-      }
-    }
-  }
-  function langHandlerForExtension(extension, source) {
-    if (!(extension && langHandlerRegistry.hasOwnProperty(extension))) {
-      // Treat it as markup if the first non whitespace character is a < and
-      // the last non-whitespace character is a >.
-      extension = /^\s*</.test(source)
-          ? 'default-markup'
-          : 'default-code';
-    }
-    return langHandlerRegistry[extension];
-  }
-  registerLangHandler(decorateSource, ['default-code']);
-  registerLangHandler(
-      createSimpleLexer(
-          [],
-          [
-           [PR_PLAIN,       /^[^<?]+/],
-           [PR_DECLARATION, /^<!\w[^>]*(?:>|$)/],
-           [PR_COMMENT,     /^<\!--[\s\S]*?(?:-\->|$)/],
-           // Unescaped content in an unknown language
-           ['lang-',        /^<\?([\s\S]+?)(?:\?>|$)/],
-           ['lang-',        /^<%([\s\S]+?)(?:%>|$)/],
-           [PR_PUNCTUATION, /^(?:<[%?]|[%?]>)/],
-           ['lang-',        /^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],
-           // Unescaped content in javascript.  (Or possibly vbscript).
-           ['lang-js',      /^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],
-           // Contains unescaped stylesheet content
-           ['lang-css',     /^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],
-           ['lang-in.tag',  /^(<\/?[a-z][^<>]*>)/i]
-          ]),
-      ['default-markup', 'htm', 'html', 'mxml', 'xhtml', 'xml', 'xsl']);
-  registerLangHandler(
-      createSimpleLexer(
-          [
-           [PR_PLAIN,        /^[\s]+/, null, ' \t\r\n'],
-           [PR_ATTRIB_VALUE, /^(?:\"[^\"]*\"?|\'[^\']*\'?)/, null, '\"\'']
-           ],
-          [
-           [PR_TAG,          /^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],
-           [PR_ATTRIB_NAME,  /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],
-           ['lang-uq.val',   /^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],
-           [PR_PUNCTUATION,  /^[=<>\/]+/],
-           ['lang-js',       /^on\w+\s*=\s*\"([^\"]+)\"/i],
-           ['lang-js',       /^on\w+\s*=\s*\'([^\']+)\'/i],
-           ['lang-js',       /^on\w+\s*=\s*([^\"\'>\s]+)/i],
-           ['lang-css',      /^style\s*=\s*\"([^\"]+)\"/i],
-           ['lang-css',      /^style\s*=\s*\'([^\']+)\'/i],
-           ['lang-css',      /^style\s*=\s*([^\"\'>\s]+)/i]
-           ]),
-      ['in.tag']);
-  registerLangHandler(
-      createSimpleLexer([], [[PR_ATTRIB_VALUE, /^[\s\S]+/]]), ['uq.val']);
-  registerLangHandler(sourceDecorator({
-          'keywords': CPP_KEYWORDS,
-          'hashComments': true,
-          'cStyleComments': true
-        }), ['c', 'cc', 'cpp', 'cxx', 'cyc', 'm']);
-  registerLangHandler(sourceDecorator({
-          'keywords': 'null true false'
-        }), ['json']);
-  registerLangHandler(sourceDecorator({
-          'keywords': CSHARP_KEYWORDS,
-          'hashComments': true,
-          'cStyleComments': true,
-          'verbatimStrings': true
-        }), ['cs']);
-  registerLangHandler(sourceDecorator({
-          'keywords': JAVA_KEYWORDS,
-          'cStyleComments': true
-        }), ['java']);
-  registerLangHandler(sourceDecorator({
-          'keywords': SH_KEYWORDS,
-          'hashComments': true,
-          'multiLineStrings': true
-        }), ['bsh', 'csh', 'sh']);
-  registerLangHandler(sourceDecorator({
-          'keywords': PYTHON_KEYWORDS,
-          'hashComments': true,
-          'multiLineStrings': true,
-          'tripleQuotedStrings': true
-        }), ['cv', 'py']);
-  registerLangHandler(sourceDecorator({
-          'keywords': PERL_KEYWORDS,
-          'hashComments': true,
-          'multiLineStrings': true,
-          'regexLiterals': true
-        }), ['perl', 'pl', 'pm']);
-  registerLangHandler(sourceDecorator({
-          'keywords': RUBY_KEYWORDS,
-          'hashComments': true,
-          'multiLineStrings': true,
-          'regexLiterals': true
-        }), ['rb']);
-  registerLangHandler(sourceDecorator({
-          'keywords': JSCRIPT_KEYWORDS,
-          'cStyleComments': true,
-          'regexLiterals': true
-        }), ['js']);
-  registerLangHandler(
-      createSimpleLexer([], [[PR_STRING, /^[\s\S]+/]]), ['regex']);
-
-  function applyDecorator(job) {
-    var sourceCodeHtml = job.sourceCodeHtml;
-    var opt_langExtension = job.langExtension;
-
-    // Prepopulate output in case processing fails with an exception.
-    job.prettyPrintedHtml = sourceCodeHtml;
-
-    try {
-      // Extract tags, and convert the source code to plain text.
-      var sourceAndExtractedTags = extractTags(sourceCodeHtml);
-      /** Plain text. @type {string} */
-      var source = sourceAndExtractedTags.source;
-      job.source = source;
-      job.basePos = 0;
-
-      /** Even entries are positions in source in ascending order.  Odd entries
-        * are tags that were extracted at that position.
-        * @type {Array.<number|string>}
-        */
-      job.extractedTags = sourceAndExtractedTags.tags;
-
-      // Apply the appropriate language handler
-      langHandlerForExtension(opt_langExtension, source)(job);
-      // Integrate the decorations and tags back into the source code to produce
-      // a decorated html string which is left in job.prettyPrintedHtml.
-      recombineTagsAndDecorations(job);
-    } catch (e) {
-      if ('console' in window) {
-        console.log(e);
-        console.trace();
-      }
-    }
-  }
-
-  function prettyPrintOne(sourceCodeHtml, opt_langExtension) {
-    var job = {
-      sourceCodeHtml: sourceCodeHtml,
-      langExtension: opt_langExtension
-    };
-    applyDecorator(job);
-    return job.prettyPrintedHtml;
-  }
-
-  function prettyPrint(opt_whenDone) {
-    var isIE678 = window['_pr_isIE6']();
-    var ieNewline = isIE678 === 6 ? '\r\n' : '\r';
-    // See bug 71 and http://stackoverflow.com/questions/136443/why-doesnt-ie7-
-
-    // fetch a list of nodes to rewrite
-    var codeSegments = [
-        document.getElementsByTagName('pre'),
-        document.getElementsByTagName('code'),
-        document.getElementsByTagName('td'),  /* ND Change: Add tables to support prototypes. */
-        document.getElementsByTagName('xmp') ];
-    var elements = [];
-    for (var i = 0; i < codeSegments.length; ++i) {
-      for (var j = 0, n = codeSegments[i].length; j < n; ++j) {
-        elements.push(codeSegments[i][j]);
-      }
-    }
-    codeSegments = null;
-
-    var clock = Date;
-    if (!clock['now']) {
-      clock = { 'now': function () { return (new Date).getTime(); } };
-    }
-
-    // The loop is broken into a series of continuations to make sure that we
-    // don't make the browser unresponsive when rewriting a large page.
-    var k = 0;
-    var prettyPrintingJob;
-
-    function doWork() {
-      var endTime = (window['PR_SHOULD_USE_CONTINUATION'] ?
-                     clock.now() + 250 /* ms */ :
-                     Infinity);
-      for (; k < elements.length && clock.now() < endTime; k++) {
-        var cs = elements[k];
-        if (cs.className && cs.className.indexOf('prettyprint') >= 0) {
-          // If the classes includes a language extensions, use it.
-          // Language extensions can be specified like
-          //     <pre class="prettyprint lang-cpp">
-          // the language extension "cpp" is used to find a language handler as
-          // passed to PR_registerLangHandler.
-          var langExtension = cs.className.match(/\blang-(\w+)\b/);
-          if (langExtension) { langExtension = langExtension[1]; }
-
-          // make sure this is not nested in an already prettified element
-          var nested = false;
-          for (var p = cs.parentNode; p; p = p.parentNode) {
-            if ((p.tagName === 'pre' || p.tagName === 'code' ||
-                 p.tagName === 'xmp' || p.tagName === 'td') &&  /* ND Change: Add tables to support prototypes */
-                p.className && p.className.indexOf('prettyprint') >= 0) {
-              nested = true;
-              break;
-            }
-          }
-          if (!nested) {
-            // fetch the content as a snippet of properly escaped HTML.
-            // Firefox adds newlines at the end.
-            var content = getInnerHtml(cs);
-            content = content.replace(/(?:\r\n?|\n)$/, '');
-
-	  		/* ND Change: we need to preserve &nbsp;s so change them to a special character instead of a space. */
-			content = content.replace(/&nbsp;/g, '\x11');
-
-            // do the pretty printing
-            prettyPrintingJob = {
-              sourceCodeHtml: content,
-              langExtension: langExtension,
-              sourceNode: cs
-            };
-            applyDecorator(prettyPrintingJob);
-            replaceWithPrettyPrintedHtml();
-          }
-        }
-      }
-      if (k < elements.length) {
-        // finish up in a continuation
-        setTimeout(doWork, 250);
-      } else if (opt_whenDone) {
-        opt_whenDone();
-      }
-    }
-
-    function replaceWithPrettyPrintedHtml() {
-      var newContent = prettyPrintingJob.prettyPrintedHtml;
-      if (!newContent) { return; }
-
-      /* ND Change: Restore the preserved &nbsp;s.  */
-	  newContent = newContent.replace(/\x11/g, '&nbsp;');
-
-      var cs = prettyPrintingJob.sourceNode;
-
-      // push the prettified html back into the tag.
-      if (!isRawContent(cs)) {
-        // just replace the old html with the new
-        cs.innerHTML = newContent;
-      } else {
-        // we need to change the tag to a <pre> since <xmp>s do not allow
-        // embedded tags such as the span tags used to attach styles to
-        // sections of source code.
-        var pre = document.createElement('PRE');
-        for (var i = 0; i < cs.attributes.length; ++i) {
-          var a = cs.attributes[i];
-          if (a.specified) {
-            var aname = a.name.toLowerCase();
-            if (aname === 'class') {
-              pre.className = a.value;  // For IE 6
-            } else {
-              pre.setAttribute(a.name, a.value);
-            }
-          }
-        }
-        pre.innerHTML = newContent;
-
-        // remove the old
-        cs.parentNode.replaceChild(pre, cs);
-        cs = pre;
-      }
-
-      // Replace <br>s with line-feeds so that copying and pasting works
-      // on IE 6.
-      // Doing this on other browsers breaks lots of stuff since \r\n is
-      // treated as two newlines on Firefox, and doing this also slows
-      // down rendering.
-      if (isIE678 && cs.tagName === 'PRE') {
-        var lineBreaks = cs.getElementsByTagName('br');
-        for (var j = lineBreaks.length; --j >= 0;) {
-          var lineBreak = lineBreaks[j];
-          lineBreak.parentNode.replaceChild(
-              document.createTextNode(ieNewline), lineBreak);
-        }
-      }
-    }
-
-    doWork();
-  }
-
-  window['PR_normalizedHtml'] = normalizedHtml;
-  window['prettyPrintOne'] = prettyPrintOne;
-  window['prettyPrint'] = prettyPrint;
-  window['PR'] = {
-        'combinePrefixPatterns': combinePrefixPatterns,
-        'createSimpleLexer': createSimpleLexer,
-        'registerLangHandler': registerLangHandler,
-        'sourceDecorator': sourceDecorator,
-        'PR_ATTRIB_NAME': PR_ATTRIB_NAME,
-        'PR_ATTRIB_VALUE': PR_ATTRIB_VALUE,
-        'PR_COMMENT': PR_COMMENT,
-        'PR_DECLARATION': PR_DECLARATION,
-        'PR_KEYWORD': PR_KEYWORD,
-        'PR_LITERAL': PR_LITERAL,
-        'PR_NOCODE': PR_NOCODE,
-        'PR_PLAIN': PR_PLAIN,
-        'PR_PUNCTUATION': PR_PUNCTUATION,
-        'PR_SOURCE': PR_SOURCE,
-        'PR_STRING': PR_STRING,
-        'PR_TAG': PR_TAG,
-        'PR_TYPE': PR_TYPE
-      };
-})();
-
-
-// ____________________________________________________________________________
-
-
-
-// Lua extension
-
-PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[\t\n\r \xA0]+/,null,'	\n\r \xa0'],[PR.PR_STRING,/^(?:\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)|\'(?:[^\'\\]|\\[\s\S])*(?:\'|$))/,null,'\"\'']],[[PR.PR_COMMENT,/^--(?:\[(=*)\[[\s\S]*?(?:\]\1\]|$)|[^\r\n]*)/],[PR.PR_STRING,/^\[(=*)\[[\s\S]*?(?:\]\1\]|$)/],[PR.PR_KEYWORD,/^(?:and|break|do|else|elseif|end|false|for|function|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b/,null],[PR.PR_LITERAL,/^[+-]?(?:0x[\da-f]+|(?:(?:\.\d+|\d+(?:\.\d*)?)(?:e[+\-]?\d+)?))/i],[PR.PR_PLAIN,/^[a-z_]\w*/i],[PR.PR_PUNCTUATION,/^[^\w\t\n\r \xA0][^\w\t\n\r \xA0\"\'\-\+=]*/]]),['lua'])
-
-
-// Haskell extension
-
-PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[\t\n\x0B\x0C\r ]+/,null,'	\n\r '],[PR.PR_STRING,/^\"(?:[^\"\\\n\x0C\r]|\\[\s\S])*(?:\"|$)/,null,'\"'],[PR.PR_STRING,/^\'(?:[^\'\\\n\x0C\r]|\\[^&])\'?/,null,'\''],[PR.PR_LITERAL,/^(?:0o[0-7]+|0x[\da-f]+|\d+(?:\.\d+)?(?:e[+\-]?\d+)?)/i,null,'0123456789']],[[PR.PR_COMMENT,/^(?:(?:--+(?:[^\r\n\x0C]*)?)|(?:\{-(?:[^-]|-+[^-\}])*-\}))/],[PR.PR_KEYWORD,/^(?:case|class|data|default|deriving|do|else|if|import|in|infix|infixl|infixr|instance|let|module|newtype|of|then|type|where|_)(?=[^a-zA-Z0-9\']|$)/,null],[PR.PR_PLAIN,/^(?:[A-Z][\w\']*\.)*[a-zA-Z][\w\']*/],[PR.PR_PUNCTUATION,/^[^\t\n\x0B\x0C\r a-zA-Z0-9\'\"]+/]]),['hs'])
-
-
-// ML extension
-
-PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[\t\n\r \xA0]+/,null,'	\n\r \xa0'],[PR.PR_COMMENT,/^#(?:if[\t\n\r \xA0]+(?:[a-z_$][\w\']*|``[^\r\n\t`]*(?:``|$))|else|endif|light)/i,null,'#'],[PR.PR_STRING,/^(?:\"(?:[^\"\\]|\\[\s\S])*(?:\"|$)|\'(?:[^\'\\]|\\[\s\S])*(?:\'|$))/,null,'\"\'']],[[PR.PR_COMMENT,/^(?:\/\/[^\r\n]*|\(\*[\s\S]*?\*\))/],[PR.PR_KEYWORD,/^(?:abstract|and|as|assert|begin|class|default|delegate|do|done|downcast|downto|elif|else|end|exception|extern|false|finally|for|fun|function|if|in|inherit|inline|interface|internal|lazy|let|match|member|module|mutable|namespace|new|null|of|open|or|override|private|public|rec|return|static|struct|then|to|true|try|type|upcast|use|val|void|when|while|with|yield|asr|land|lor|lsl|lsr|lxor|mod|sig|atomic|break|checked|component|const|constraint|constructor|continue|eager|event|external|fixed|functor|global|include|method|mixin|object|parallel|process|protected|pure|sealed|trait|virtual|volatile)\b/],[PR.PR_LITERAL,/^[+\-]?(?:0x[\da-f]+|(?:(?:\.\d+|\d+(?:\.\d*)?)(?:e[+\-]?\d+)?))/i],[PR.PR_PLAIN,/^(?:[a-z_]\w*[!?#]?|``[^\r\n\t`]*(?:``|$))/i],[PR.PR_PUNCTUATION,/^[^\t\n\r \xA0\"\'\w]+/]]),['fs','ml'])
-
-
-// SQL extension
-
-PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[\t\n\r \xA0]+/,null,'	\n\r \xa0'],[PR.PR_STRING,/^(?:"(?:[^\"\\]|\\.)*"|'(?:[^\'\\]|\\.)*')/,null,'\"\'']],[[PR.PR_COMMENT,/^(?:--[^\r\n]*|\/\*[\s\S]*?(?:\*\/|$))/],[PR.PR_KEYWORD,/^(?:ADD|ALL|ALTER|AND|ANY|AS|ASC|AUTHORIZATION|BACKUP|BEGIN|BETWEEN|BREAK|BROWSE|BULK|BY|CASCADE|CASE|CHECK|CHECKPOINT|CLOSE|CLUSTERED|COALESCE|COLLATE|COLUMN|COMMIT|COMPUTE|CONSTRAINT|CONTAINS|CONTAINSTABLE|CONTINUE|CONVERT|CREATE|CROSS|CURRENT|CURRENT_DATE|CURRENT_TIME|CURRENT_TIMESTAMP|CURRENT_USER|CURSOR|DATABASE|DBCC|DEALLOCATE|DECLARE|DEFAULT|DELETE|DENY|DESC|DISK|DISTINCT|DISTRIBUTED|DOUBLE|DROP|DUMMY|DUMP|ELSE|END|ERRLVL|ESCAPE|EXCEPT|EXEC|EXECUTE|EXISTS|EXIT|FETCH|FILE|FILLFACTOR|FOR|FOREIGN|FREETEXT|FREETEXTTABLE|FROM|FULL|FUNCTION|GOTO|GRANT|GROUP|HAVING|HOLDLOCK|IDENTITY|IDENTITYCOL|IDENTITY_INSERT|IF|IN|INDEX|INNER|INSERT|INTERSECT|INTO|IS|JOIN|KEY|KILL|LEFT|LIKE|LINENO|LOAD|NATIONAL|NOCHECK|NONCLUSTERED|NOT|NULL|NULLIF|OF|OFF|OFFSETS|ON|OPEN|OPENDATASOURCE|OPENQUERY|OPENROWSET|OPENXML|OPTION|OR|ORDER|OUTER|OVER|PERCENT|PLAN|PRECISION|PRIMARY|PRINT|PROC|PROCEDURE|PUBLIC|RAISERROR|READ|READTEXT|RECONFIGURE|REFERENCES|REPLICATION|RESTORE|RESTRICT|RETURN|REVOKE|RIGHT|ROLLBACK|ROWCOUNT|ROWGUIDCOL|RULE|SAVE|SCHEMA|SELECT|SESSION_USER|SET|SETUSER|SHUTDOWN|SOME|STATISTICS|SYSTEM_USER|TABLE|TEXTSIZE|THEN|TO|TOP|TRAN|TRANSACTION|TRIGGER|TRUNCATE|TSEQUAL|UNION|UNIQUE|UPDATE|UPDATETEXT|USE|USER|VALUES|VARYING|VIEW|WAITFOR|WHEN|WHERE|WHILE|WITH|WRITETEXT)(?=[^\w-]|$)/i,null],[PR.PR_LITERAL,/^[+-]?(?:0x[\da-f]+|(?:(?:\.\d+|\d+(?:\.\d*)?)(?:e[+\-]?\d+)?))/i],[PR.PR_PLAIN,/^[a-z_][\w-]*/i],[PR.PR_PUNCTUATION,/^[^\w\t\n\r \xA0\"\'][^\w\t\n\r \xA0+\-\"\']*/]]),['sql'])
-
-
-// VB extension
-
-PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[\t\n\r \xA0\u2028\u2029]+/,null,'	\n\r \xa0\u2028\u2029'],[PR.PR_STRING,/^(?:[\"\u201C\u201D](?:[^\"\u201C\u201D]|[\"\u201C\u201D]{2})(?:[\"\u201C\u201D]c|$)|[\"\u201C\u201D](?:[^\"\u201C\u201D]|[\"\u201C\u201D]{2})*(?:[\"\u201C\u201D]|$))/i,null,'\"\u201c\u201d'],[PR.PR_COMMENT,/^[\'\u2018\u2019][^\r\n\u2028\u2029]*/,null,'\'\u2018\u2019']],[[PR.PR_KEYWORD,/^(?:AddHandler|AddressOf|Alias|And|AndAlso|Ansi|As|Assembly|Auto|Boolean|ByRef|Byte|ByVal|Call|Case|Catch|CBool|CByte|CChar|CDate|CDbl|CDec|Char|CInt|Class|CLng|CObj|Const|CShort|CSng|CStr|CType|Date|Decimal|Declare|Default|Delegate|Dim|DirectCast|Do|Double|Each|Else|ElseIf|End|EndIf|Enum|Erase|Error|Event|Exit|Finally|For|Friend|Function|Get|GetType|GoSub|GoTo|Handles|If|Implements|Imports|In|Inherits|Integer|Interface|Is|Let|Lib|Like|Long|Loop|Me|Mod|Module|MustInherit|MustOverride|MyBase|MyClass|Namespace|New|Next|Not|NotInheritable|NotOverridable|Object|On|Option|Optional|Or|OrElse|Overloads|Overridable|Overrides|ParamArray|Preserve|Private|Property|Protected|Public|RaiseEvent|ReadOnly|ReDim|RemoveHandler|Resume|Return|Select|Set|Shadows|Shared|Short|Single|Static|Step|Stop|String|Structure|Sub|SyncLock|Then|Throw|To|Try|TypeOf|Unicode|Until|Variant|Wend|When|While|With|WithEvents|WriteOnly|Xor|EndIf|GoSub|Let|Variant|Wend)\b/i,null],[PR.PR_COMMENT,/^REM[^\r\n\u2028\u2029]*/i],[PR.PR_LITERAL,/^(?:True\b|False\b|Nothing\b|\d+(?:E[+\-]?\d+[FRD]?|[FRDSIL])?|(?:&H[0-9A-F]+|&O[0-7]+)[SIL]?|\d*\.\d+(?:E[+\-]?\d+)?[FRD]?|#\s+(?:\d+[\-\/]\d+[\-\/]\d+(?:\s+\d+:\d+(?::\d+)?(\s*(?:AM|PM))?)?|\d+:\d+(?::\d+)?(\s*(?:AM|PM))?)\s+#)/i],[PR.PR_PLAIN,/^(?:(?:[a-z]|_\w)\w*|\[(?:[a-z]|_\w)\w*\])/i],[PR.PR_PUNCTUATION,/^[^\w\t\n\r \"\'\[\]\xA0\u2018\u2019\u201C\u201D\u2028\u2029]+/],[PR.PR_PUNCTUATION,/^(?:\[|\])/]]),['vb','vbs'])
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/searchdata.js b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/searchdata.js
deleted file mode 100644
index 229a815f5..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/javascript/searchdata.js
+++ /dev/null
@@ -1,122 +0,0 @@
-var indexSectionsWithContent = {
-   "General": {
-      "Symbols": false,
-      "Numbers": false,
-      "A": true,
-      "B": false,
-      "C": true,
-      "D": false,
-      "E": false,
-      "F": true,
-      "G": true,
-      "H": false,
-      "I": true,
-      "J": false,
-      "K": false,
-      "L": true,
-      "M": false,
-      "N": false,
-      "O": true,
-      "P": false,
-      "Q": false,
-      "R": true,
-      "S": false,
-      "T": false,
-      "U": true,
-      "V": true,
-      "W": false,
-      "X": false,
-      "Y": false,
-      "Z": false
-      },
-   "Variables": {
-      "Symbols": false,
-      "Numbers": false,
-      "A": false,
-      "B": false,
-      "C": true,
-      "D": false,
-      "E": false,
-      "F": false,
-      "G": false,
-      "H": false,
-      "I": true,
-      "J": false,
-      "K": false,
-      "L": false,
-      "M": false,
-      "N": false,
-      "O": false,
-      "P": false,
-      "Q": false,
-      "R": true,
-      "S": false,
-      "T": false,
-      "U": false,
-      "V": false,
-      "W": false,
-      "X": false,
-      "Y": false,
-      "Z": false
-      },
-   "Functions": {
-      "Symbols": false,
-      "Numbers": false,
-      "A": true,
-      "B": false,
-      "C": true,
-      "D": false,
-      "E": false,
-      "F": true,
-      "G": true,
-      "H": false,
-      "I": true,
-      "J": false,
-      "K": false,
-      "L": true,
-      "M": false,
-      "N": false,
-      "O": true,
-      "P": false,
-      "Q": false,
-      "R": true,
-      "S": false,
-      "T": false,
-      "U": true,
-      "V": false,
-      "W": false,
-      "X": false,
-      "Y": false,
-      "Z": false
-      },
-   "Files": {
-      "Symbols": false,
-      "Numbers": false,
-      "A": false,
-      "B": false,
-      "C": true,
-      "D": false,
-      "E": false,
-      "F": false,
-      "G": false,
-      "H": false,
-      "I": false,
-      "J": false,
-      "K": false,
-      "L": false,
-      "M": false,
-      "N": false,
-      "O": false,
-      "P": false,
-      "Q": false,
-      "R": false,
-      "S": false,
-      "T": false,
-      "U": false,
-      "V": false,
-      "W": false,
-      "X": false,
-      "Y": false,
-      "Z": false
-      }
-   }
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FilesC.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FilesC.html
deleted file mode 100644
index 9b13d7eac..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FilesC.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_csrfprotector_perphp><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#csrfprotector.php" target=_parent class=ISymbol>csrfprotector.php</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsA.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsA.html
deleted file mode 100644
index 2a3a150e3..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsA.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_authorisePost><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#authorisePost" target=_parent class=ISymbol>authorisePost</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsC.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsC.html
deleted file mode 100644
index c02adb848..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsC.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_createNewJsCache><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#createNewJsCache" target=_parent class=ISymbol>createNewJsCache</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsF.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsF.html
deleted file mode 100644
index 88d092874..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsF.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_failedValidationAction><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#failedValidationAction" target=_parent class=ISymbol>failedValidationAction</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsG.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsG.html
deleted file mode 100644
index 4c9b125a8..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsG.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_generateAuthToken><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#generateAuthToken" target=_parent class=ISymbol>generateAuthToken</a></div></div><div class=SRResult id=SR_getCurrentUrl><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#getCurrentUrl" target=_parent class=ISymbol>getCurrentUrl</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsI.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsI.html
deleted file mode 100644
index 9dc7a592d..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsI.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_init><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#init" target=_parent class=ISymbol>init</a></div></div><div class=SRResult id=SR_isURLallowed><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#isURLallowed" target=_parent class=ISymbol>isURLallowed</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsL.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsL.html
deleted file mode 100644
index c2cbb5049..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsL.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_logCSRFattack><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#logCSRFattack" target=_parent class=ISymbol>logCSRFattack</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsO.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsO.html
deleted file mode 100644
index 0c67005f3..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsO.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_ob_undhandler><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#ob_handler" target=_parent class=ISymbol>ob_handler</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsR.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsR.html
deleted file mode 100644
index c25cffe0a..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsR.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_refreshToken><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#refreshToken" target=_parent class=ISymbol>refreshToken</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsU.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsU.html
deleted file mode 100644
index a43aa753c..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/FunctionsU.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_useCachedVersion><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#useCachedVersion" target=_parent class=ISymbol>useCachedVersion</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralA.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralA.html
deleted file mode 100644
index 2a3a150e3..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralA.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_authorisePost><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#authorisePost" target=_parent class=ISymbol>authorisePost</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralC.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralC.html
deleted file mode 100644
index edb09c50a..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralC.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_config><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$config" target=_parent class=ISymbol>config</a></div></div><div class=SRResult id=SR_cookieExpiryTime><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$cookieExpiryTime" target=_parent class=ISymbol>cookieExpiryTime</a></div></div><div class=SRResult id=SR_createNewJsCache><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#createNewJsCache" target=_parent class=ISymbol>createNewJsCache</a></div></div><div class=SRResult id=SR_csrfprotector_perphp><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#csrfprotector.php" target=_parent class=ISymbol>csrfprotector.php</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralF.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralF.html
deleted file mode 100644
index b624d11bf..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralF.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_failedValidationAction><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#failedValidationAction" target=_parent class=ISymbol>failedValidationAction</a></div></div><div class=SRResult id=SR_Functions><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#Functions" target=_parent class=ISymbol>Functions</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralG.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralG.html
deleted file mode 100644
index 4c9b125a8..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralG.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_generateAuthToken><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#generateAuthToken" target=_parent class=ISymbol>generateAuthToken</a></div></div><div class=SRResult id=SR_getCurrentUrl><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#getCurrentUrl" target=_parent class=ISymbol>getCurrentUrl</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralI.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralI.html
deleted file mode 100644
index 0bdb7a477..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralI.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_init><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#init" target=_parent class=ISymbol>init</a></div></div><div class=SRResult id=SR_isSameOrigin><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$isSameOrigin" target=_parent class=ISymbol>isSameOrigin</a></div></div><div class=SRResult id=SR_isURLallowed><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#isURLallowed" target=_parent class=ISymbol>isURLallowed</a></div></div><div class=SRResult id=SR_isValidHTML><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$isValidHTML" target=_parent class=ISymbol>isValidHTML</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralL.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralL.html
deleted file mode 100644
index c2cbb5049..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralL.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_logCSRFattack><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#logCSRFattack" target=_parent class=ISymbol>logCSRFattack</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralO.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralO.html
deleted file mode 100644
index 0c67005f3..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralO.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_ob_undhandler><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#ob_handler" target=_parent class=ISymbol>ob_handler</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralR.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralR.html
deleted file mode 100644
index e6d917c17..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralR.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_refreshToken><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#refreshToken" target=_parent class=ISymbol>refreshToken</a></div></div><div class=SRResult id=SR_requestType><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$requestType" target=_parent class=ISymbol>requestType</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralU.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralU.html
deleted file mode 100644
index a43aa753c..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralU.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_useCachedVersion><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#useCachedVersion" target=_parent class=ISymbol>useCachedVersion</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralV.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralV.html
deleted file mode 100644
index ce09ee7c7..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/GeneralV.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_Variables><div class=IEntry><a href="../files/libs/csrf/csrfprotector-php.html#Variables" target=_parent class=ISymbol>Variables</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/NoResults.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/NoResults.html
deleted file mode 100644
index 8c7249660..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/NoResults.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=NoMatches>No Matches</div></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesC.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesC.html
deleted file mode 100644
index 8b8dc9dc2..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesC.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_config><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$config" target=_parent class=ISymbol>config</a></div></div><div class=SRResult id=SR_cookieExpiryTime><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$cookieExpiryTime" target=_parent class=ISymbol>cookieExpiryTime</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesI.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesI.html
deleted file mode 100644
index a32aac1df..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesI.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_isSameOrigin><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$isSameOrigin" target=_parent class=ISymbol>isSameOrigin</a></div></div><div class=SRResult id=SR_isValidHTML><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$isValidHTML" target=_parent class=ISymbol>isValidHTML</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesR.html b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesR.html
deleted file mode 100644
index 3a06b30eb..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/search/VariablesR.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
-if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>
-
-<!--  Generated by Natural Docs, version 1.52 -->
-<!--  http://www.naturaldocs.org  -->
-
-<!-- saved from url=(0026)http://www.naturaldocs.org -->
-
-
-
-
-<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_requestType><div class=IEntry><span class=ISymbolPrefix>$</span><a href="../files/libs/csrf/csrfprotector-php.html#$requestType" target=_parent class=ISymbol>requestType</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
-document.getElementById("Loading").style.display="none";
-document.getElementById("NoMatches").style.display="none";
-var searchResults = new SearchResults("searchResults", "HTML");
-searchResults.Search();
---></script></div><script language=JavaScript><!--
-if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/styles/main.css b/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/styles/main.css
deleted file mode 100644
index 1832d8f39..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/docs/styles/main.css
+++ /dev/null
@@ -1,824 +0,0 @@
-/*
-   IMPORTANT: If you're editing this file in the output directory of one of
-   your projects, your changes will be overwritten the next time you run
-   Natural Docs.  Instead, copy this file to your project directory, make your
-   changes, and you can use it with -s.  Even better would be to make a CSS
-   file in your project directory with only your changes, which you can then
-   use with -s [original style] [your changes].
-
-   On the other hand, if you're editing this file in the Natural Docs styles
-   directory, the changes will automatically be applied to all your projects
-   that use this style the next time Natural Docs is run on them.
-
-   This file is part of Natural Docs, which is Copyright  2003-2010 Greg Valure.
-   Natural Docs is licensed under version 3 of the GNU Affero General Public
-   License (AGPL).  Refer to License.txt for the complete details.
-
-   This file may be distributed with documentation files generated by Natural Docs.
-   Such documentation is not covered by Natural Docs' copyright and licensing,
-   and may have its own copyright and distribution terms as decided by its author.
-*/
-
-body {
-    font: 8pt Verdana, Arial, sans-serif;
-    color: #000000;
-    margin: 0; padding: 0;
-    }
-
-.ContentPage,
-.IndexPage,
-.FramedMenuPage {
-    background-color: #E8E8E8;
-    }
-.FramedContentPage,
-.FramedIndexPage,
-.FramedSearchResultsPage,
-.PopupSearchResultsPage {
-    background-color: #FFFFFF;
-    }
-
-
-a:link,
-a:visited { color: #900000; text-decoration: none }
-a:hover { color: #900000; text-decoration: underline }
-a:active { color: #FF0000; text-decoration: underline }
-
-td {
-    vertical-align: top }
-
-img { border: 0;  }
-
-
-/*
-    Comment out this line to use web-style paragraphs (blank line between
-    paragraphs, no indent) instead of print-style paragraphs (no blank line,
-    indented.)
-*/
-p {
-    text-indent: 5ex; margin: 0 }
-
-
-/*  Opera doesn't break with just wbr, but will if you add this.  */
-.Opera wbr:after {
-	content: "\00200B";
-	}
-
-/*  Blockquotes are used as containers for things that may need to scroll.  */
-blockquote {
-    padding: 0;
-    margin: 0;
-    overflow: auto;
-    }
-
-
-.Firefox1 blockquote {
-    padding-bottom: .5em;
-    }
-
-/*  Turn off scrolling when printing.  */
-@media print {
-    blockquote {
-        overflow: visible;
-        }
-    .IE blockquote {
-        width: auto;
-        }
-    }
-
-
-
-#Menu {
-    font-size: 8pt;
-    padding: 10px 0 0 0;
-    }
-.ContentPage #Menu,
-.IndexPage #Menu {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 31ex;
-    overflow: hidden;
-    }
-.ContentPage .Firefox #Menu,
-.IndexPage .Firefox #Menu {
-    width: 27ex;
-    }
-
-
-    .MTitle {
-        font-size: 16pt; font-weight: bold; font-variant: small-caps;
-        text-align: center;
-        padding: 5px 10px 15px 10px;
-        border-bottom: 1px dotted #000000;
-        margin-bottom: 15px }
-
-    .MSubTitle {
-        font-size: 9pt; font-weight: normal; font-variant: normal;
-        margin-top: 1ex; margin-bottom: 5px }
-
-
-    .MEntry a:link,
-    .MEntry a:hover,
-    .MEntry a:visited { color: #606060; margin-right: 0 }
-    .MEntry a:active { color: #A00000; margin-right: 0 }
-
-
-    .MGroup {
-        font-variant: small-caps; font-weight: bold;
-        margin: 1em 0 1em 10px;
-        }
-
-    .MGroupContent {
-        font-variant: normal; font-weight: normal }
-
-    .MGroup a:link,
-    .MGroup a:hover,
-    .MGroup a:visited { color: #545454; margin-right: 10px }
-    .MGroup a:active { color: #A00000; margin-right: 10px }
-
-
-    .MFile,
-    .MText,
-    .MLink,
-    .MIndex {
-        padding: 1px 17px 2px 10px;
-        margin: .25em 0 .25em 0;
-        }
-
-    .MText {
-        font-size: 8pt; font-style: italic }
-
-    .MLink {
-        font-style: italic }
-
-    #MSelected {
-        color: #000000; background-color: #FFFFFF;
-        /*  Replace padding with border.  */
-        padding: 0 10px 0 10px;
-        border-width: 1px 2px 2px 0; border-style: solid; border-color: #000000;
-        margin-right: 5px;
-        }
-
-    /*  Close off the left side when its in a group.  */
-    .MGroup #MSelected {
-        padding-left: 9px; border-left-width: 1px }
-
-    /*  A treat for Mozilla users.  Blatantly non-standard.  Will be replaced with CSS 3 attributes when finalized/supported.  */
-    .Firefox #MSelected {
-        -moz-border-radius-topright: 10px;
-        -moz-border-radius-bottomright: 10px }
-    .Firefox .MGroup #MSelected {
-        -moz-border-radius-topleft: 10px;
-        -moz-border-radius-bottomleft: 10px }
-
-
-    #MSearchPanel {
-        padding: 0px 6px;
-        margin: .25em 0;
-        }
-
-
-    #MSearchField {
-        font: italic 8pt Verdana, sans-serif;
-        color: #606060;
-        background-color: #E8E8E8;
-        border: none;
-        padding: 2px 4px;
-        width: 100%;
-        }
-    /* Only Opera gets it right. */
-    .Firefox #MSearchField,
-    .IE #MSearchField,
-    .Safari #MSearchField {
-        width: 94%;
-        }
-    .Opera9 #MSearchField,
-    .Konqueror #MSearchField {
-        width: 97%;
-        }
-    .FramedMenuPage .Firefox #MSearchField,
-    .FramedMenuPage .Safari #MSearchField,
-    .FramedMenuPage .Konqueror #MSearchField {
-        width: 98%;
-        }
-
-    /* Firefox doesn't do this right in frames without #MSearchPanel added on.
-        It's presence doesn't hurt anything other browsers. */
-    #MSearchPanel.MSearchPanelInactive:hover #MSearchField {
-        background-color: #FFFFFF;
-        border: 1px solid #C0C0C0;
-        padding: 1px 3px;
-        }
-    .MSearchPanelActive #MSearchField {
-        background-color: #FFFFFF;
-        border: 1px solid #C0C0C0;
-        font-style: normal;
-        padding: 1px 3px;
-        }
-
-    #MSearchType {
-        visibility: hidden;
-        font: 8pt Verdana, sans-serif;
-        width: 98%;
-        padding: 0;
-        border: 1px solid #C0C0C0;
-        }
-    .MSearchPanelActive #MSearchType,
-    /*  As mentioned above, Firefox doesn't do this right in frames without #MSearchPanel added on. */
-    #MSearchPanel.MSearchPanelInactive:hover #MSearchType,
-    #MSearchType:focus {
-        visibility: visible;
-        color: #606060;
-        }
-    #MSearchType option#MSearchEverything {
-        font-weight: bold;
-        }
-
-    .Opera8 .MSearchPanelInactive:hover,
-    .Opera8 .MSearchPanelActive {
-        margin-left: -1px;
-        }
-
-
-    iframe#MSearchResults {
-        width: 60ex;
-        height: 15em;
-        }
-    #MSearchResultsWindow {
-        display: none;
-        position: absolute;
-        left: 0; top: 0;
-        border: 1px solid #000000;
-        background-color: #E8E8E8;
-        }
-    #MSearchResultsWindowClose {
-        font-weight: bold;
-        font-size: 8pt;
-        display: block;
-        padding: 2px 5px;
-        }
-    #MSearchResultsWindowClose:link,
-    #MSearchResultsWindowClose:visited {
-        color: #000000;
-        text-decoration: none;
-        }
-    #MSearchResultsWindowClose:active,
-    #MSearchResultsWindowClose:hover {
-        color: #800000;
-        text-decoration: none;
-        background-color: #F4F4F4;
-        }
-
-
-
-
-#Content {
-    padding-bottom: 15px;
-    }
-
-.ContentPage #Content {
-    border-width: 0 0 1px 1px;
-    border-style: solid;
-    border-color: #000000;
-    background-color: #FFFFFF;
-    font-size: 8pt;  /* To make 31ex match the menu's 31ex. */
-    margin-left: 31ex;
-    }
-.ContentPage .Firefox #Content {
-    margin-left: 27ex;
-    }
-
-
-
-    .CTopic {
-        font-size: 8pt;
-        margin-bottom: 3em;
-        }
-
-
-    .CTitle {
-        font-size: 11pt; font-weight: bold;
-        border-width: 0 0 1px 0; border-style: solid; border-color: #A0A0A0;
-        margin: 0 15px .5em 15px }
-
-    .CGroup .CTitle {
-        font-size: 16pt; font-variant: small-caps;
-        padding-left: 15px; padding-right: 15px;
-        border-width: 0 0 2px 0; border-color: #000000;
-        margin-left: 0; margin-right: 0 }
-
-    .CClass .CTitle,
-    .CInterface .CTitle,
-    .CDatabase .CTitle,
-    .CDatabaseTable .CTitle,
-    .CSection .CTitle {
-        font-size: 18pt;
-        color: #FFFFFF; background-color: #A0A0A0;
-        padding: 10px 15px 10px 15px;
-        border-width: 2px 0; border-color: #000000;
-        margin-left: 0; margin-right: 0 }
-
-    #MainTopic .CTitle {
-        font-size: 20pt;
-        color: #FFFFFF; background-color: #7070C0;
-        padding: 10px 15px 10px 15px;
-        border-width: 0 0 3px 0; border-color: #000000;
-        margin-left: 0; margin-right: 0 }
-
-    .CBody {
-        margin-left: 15px; margin-right: 15px }
-
-
-    .CToolTip {
-        position: absolute; visibility: hidden;
-        left: 0; top: 0;
-        background-color: #FFFFE0;
-        padding: 5px;
-        border-width: 1px 2px 2px 1px; border-style: solid; border-color: #000000;
-        font-size: 8pt;
-        }
-
-    .Opera .CToolTip {
-        max-width: 98%;
-        }
-
-    /*  Scrollbars would be useless.  */
-    .CToolTip blockquote {
-        overflow: hidden;
-        }
-    .IE6 .CToolTip blockquote {
-        overflow: visible;
-        }
-
-    .CHeading {
-        font-weight: bold; font-size: 9pt;
-        margin: 1.5em 0 .5em 0;
-        }
-
-    .CBody pre {
-        font: 8pt "Courier New", Courier, monospace;
-	    background-color: #FCFCFC;
-	    margin: 1em 35px;
-	    padding: 10px 15px 10px 10px;
-	    border-color: #E0E0E0 #E0E0E0 #E0E0E0 #E4E4E4;
-	    border-width: 1px 1px 1px 6px;
-	    border-style: dashed dashed dashed solid;
-        }
-
-    .CBody ul {
-        /*  I don't know why CBody's margin doesn't apply, but it's consistent across browsers so whatever.
-             Reapply it here as padding.  */
-        padding-left: 15px; padding-right: 15px;
-        margin: .5em 5ex .5em 5ex;
-        }
-
-    .CDescriptionList {
-        margin: .5em 5ex 0 5ex }
-
-        .CDLEntry {
-            font: 8pt "Courier New", Courier, monospace; color: #808080;
-            padding-bottom: .25em;
-            white-space: nowrap }
-
-        .CDLDescription {
-            font-size: 8pt;  /*  For browsers that don't inherit correctly, like Opera 5.  */
-            padding-bottom: .5em; padding-left: 5ex }
-
-
-    .CTopic img {
-        text-align: center;
-        display: block;
-        margin: 1em auto;
-        }
-    .CImageCaption {
-        font-variant: small-caps;
-        font-size: 8pt;
-        color: #808080;
-        text-align: center;
-        position: relative;
-        top: 1em;
-        }
-
-    .CImageLink {
-        color: #808080;
-        font-style: italic;
-        }
-    a.CImageLink:link,
-    a.CImageLink:visited,
-    a.CImageLink:hover { color: #808080 }
-
-
-
-
-
-.Prototype {
-    font: 8pt "Courier New", Courier, monospace;
-    padding: 5px 3ex;
-    border-width: 1px; border-style: solid;
-    margin: 0 5ex 1.5em 5ex;
-    }
-
-    .Prototype td {
-        font-size: 8pt;
-        }
-
-    .PDefaultValue,
-    .PDefaultValuePrefix,
-    .PTypePrefix {
-        color: #8F8F8F;
-        }
-    .PTypePrefix {
-        text-align: right;
-        }
-    .PAfterParameters {
-        vertical-align: bottom;
-        }
-
-    .IE .Prototype table {
-        padding: 0;
-        }
-
-    .CFunction .Prototype {
-        background-color: #F4F4F4; border-color: #D0D0D0 }
-    .CProperty .Prototype {
-        background-color: #F4F4FF; border-color: #C0C0E8 }
-    .CVariable .Prototype {
-        background-color: #FFFFF0; border-color: #E0E0A0 }
-
-    .CClass .Prototype {
-        border-width: 1px 2px 2px 1px; border-style: solid; border-color: #A0A0A0;
-        background-color: #F4F4F4;
-        }
-    .CInterface .Prototype {
-        border-width: 1px 2px 2px 1px; border-style: solid; border-color: #A0A0D0;
-        background-color: #F4F4FF;
-        }
-
-    .CDatabaseIndex .Prototype,
-    .CConstant .Prototype {
-        background-color: #D0D0D0; border-color: #000000 }
-    .CType .Prototype,
-    .CEnumeration .Prototype {
-        background-color: #FAF0F0; border-color: #E0B0B0;
-        }
-    .CDatabaseTrigger .Prototype,
-    .CEvent .Prototype,
-    .CDelegate .Prototype {
-        background-color: #F0FCF0; border-color: #B8E4B8 }
-
-    .CToolTip .Prototype {
-        margin: 0 0 .5em 0;
-        white-space: nowrap;
-        }
-
-
-
-
-
-.Summary {
-    margin: 1.5em 5ex 0 5ex }
-
-    .STitle {
-        font-size: 11pt; font-weight: bold;
-        margin-bottom: .5em }
-
-
-    .SBorder {
-        background-color: #FFFFF0;
-        padding: 15px;
-        border: 1px solid #C0C060 }
-
-    /* In a frame IE 6 will make them too long unless you set the width to 100%.  Without frames it will be correct without a width
-        or slightly too long (but not enough to scroll) with a width.  This arbitrary weirdness simply astounds me.  IE 7 has the same
-        problem with frames, haven't tested it without.  */
-    .FramedContentPage .IE .SBorder {
-        width: 100% }
-
-    /*  A treat for Mozilla users.  Blatantly non-standard.  Will be replaced with CSS 3 attributes when finalized/supported.  */
-    .Firefox .SBorder {
-        -moz-border-radius: 20px }
-
-
-    .STable {
-        font-size: 8pt; width: 100% }
-
-    .SEntry {
-        width: 30% }
-    .SDescription {
-        width: 70% }
-
-
-    .SMarked {
-        background-color: #F8F8D8 }
-
-    .SDescription { padding-left: 2ex }
-    .SIndent1 .SEntry { padding-left: 1.5ex }   .SIndent1 .SDescription { padding-left: 3.5ex }
-    .SIndent2 .SEntry { padding-left: 3.0ex }   .SIndent2 .SDescription { padding-left: 5.0ex }
-    .SIndent3 .SEntry { padding-left: 4.5ex }   .SIndent3 .SDescription { padding-left: 6.5ex }
-    .SIndent4 .SEntry { padding-left: 6.0ex }   .SIndent4 .SDescription { padding-left: 8.0ex }
-    .SIndent5 .SEntry { padding-left: 7.5ex }   .SIndent5 .SDescription { padding-left: 9.5ex }
-
-    .SDescription a { color: #800000}
-    .SDescription a:active { color: #A00000 }
-
-    .SGroup td {
-        padding-top: .5em; padding-bottom: .25em }
-
-    .SGroup .SEntry {
-        font-weight: bold; font-variant: small-caps }
-
-    .SGroup .SEntry a { color: #800000 }
-    .SGroup .SEntry a:active { color: #F00000 }
-
-
-    .SMain td,
-    .SClass td,
-    .SDatabase td,
-    .SDatabaseTable td,
-    .SSection td {
-        font-size: 10pt;
-        padding-bottom: .25em }
-
-    .SClass td,
-    .SDatabase td,
-    .SDatabaseTable td,
-    .SSection td {
-        padding-top: 1em }
-
-    .SMain .SEntry,
-    .SClass .SEntry,
-    .SDatabase .SEntry,
-    .SDatabaseTable .SEntry,
-    .SSection .SEntry {
-        font-weight: bold;
-        }
-
-    .SMain .SEntry a,
-    .SClass .SEntry a,
-    .SDatabase .SEntry a,
-    .SDatabaseTable .SEntry a,
-    .SSection .SEntry a { color: #000000 }
-
-    .SMain .SEntry a:active,
-    .SClass .SEntry a:active,
-    .SDatabase .SEntry a:active,
-    .SDatabaseTable .SEntry a:active,
-    .SSection .SEntry a:active { color: #A00000 }
-
-
-
-
-
-.ClassHierarchy {
-    margin: 0 15px 1em 15px }
-
-    .CHEntry {
-        border-width: 1px 2px 2px 1px; border-style: solid; border-color: #A0A0A0;
-        margin-bottom: 3px;
-        padding: 2px 2ex;
-        font-size: 8pt;
-        background-color: #F4F4F4; color: #606060;
-        }
-
-    .Firefox .CHEntry {
-        -moz-border-radius: 4px;
-        }
-
-    .CHCurrent .CHEntry {
-        font-weight: bold;
-        border-color: #000000;
-        color: #000000;
-        }
-
-    .CHChildNote .CHEntry {
-        font-style: italic;
-        font-size: 8pt;
-        }
-
-    .CHIndent {
-        margin-left: 3ex;
-        }
-
-    .CHEntry a:link,
-    .CHEntry a:visited,
-    .CHEntry a:hover {
-        color: #606060;
-        }
-    .CHEntry a:active {
-        color: #800000;
-        }
-
-
-
-
-
-#Index {
-    background-color: #FFFFFF;
-    }
-
-/*  As opposed to .PopupSearchResultsPage #Index  */
-.IndexPage #Index,
-.FramedIndexPage #Index,
-.FramedSearchResultsPage #Index {
-    padding: 15px;
-    }
-
-.IndexPage #Index {
-    border-width: 0 0 1px 1px;
-    border-style: solid;
-    border-color: #000000;
-    font-size: 8pt;  /* To make 27ex match the menu's 27ex. */
-    margin-left: 27ex;
-    }
-
-
-    .IPageTitle {
-        font-size: 20pt; font-weight: bold;
-        color: #FFFFFF; background-color: #7070C0;
-        padding: 10px 15px 10px 15px;
-        border-width: 0 0 3px 0; border-color: #000000; border-style: solid;
-        margin: -15px -15px 0 -15px }
-
-    .FramedSearchResultsPage .IPageTitle {
-        margin-bottom: 15px;
-        }
-
-    .INavigationBar {
-        text-align: center;
-        background-color: #FFFFF0;
-        padding: 5px;
-        border-bottom: solid 1px black;
-        margin: 0 -15px 15px -15px;
-        }
-
-    .INavigationBar a {
-        font-weight: bold }
-
-    .IHeading {
-        font-size: 14pt; font-weight: bold;
-        padding: 2.5em 0 .5em 0;
-        text-align: center;
-        width: 3.5ex;
-        }
-    #IFirstHeading {
-        padding-top: 0;
-        }
-
-    .IEntry {
-        padding-left: 1ex;
-        }
-    .PopupSearchResultsPage .IEntry {
-        font-size: 8pt;
-        padding: 1px 5px;
-        }
-    .PopupSearchResultsPage .Opera9 .IEntry,
-    .FramedSearchResultsPage .Opera9 .IEntry {
-        text-align: left;
-        }
-    .FramedSearchResultsPage .IEntry {
-        padding: 0;
-        }
-
-    .ISubIndex {
-        padding-left: 3ex; padding-bottom: .5em }
-    .PopupSearchResultsPage .ISubIndex {
-        display: none;
-        }
-
-    /*  While it may cause some entries to look like links when they aren't, I found it's much easier to read the
-         index if everything's the same color.  */
-    .ISymbol {
-        font-weight: bold; color: #900000  }
-
-    .IndexPage .ISymbolPrefix,
-    .FramedIndexPage .ISymbolPrefix {
-        text-align: right;
-        color: #C47C7C;
-        background-color: #F8F8F8;
-        border-right: 3px solid #E0E0E0;
-        border-left: 1px solid #E0E0E0;
-        padding: 0 1px 0 2px;
-        }
-    .PopupSearchResultsPage .ISymbolPrefix,
-    .FramedSearchResultsPage .ISymbolPrefix {
-        color: #900000;
-        }
-    .PopupSearchResultsPage .ISymbolPrefix {
-        font-size: 8pt;
-        }
-
-    .IndexPage #IFirstSymbolPrefix,
-    .FramedIndexPage #IFirstSymbolPrefix {
-        border-top: 1px solid #E0E0E0;
-        }
-    .IndexPage #ILastSymbolPrefix,
-    .FramedIndexPage #ILastSymbolPrefix {
-        border-bottom: 1px solid #E0E0E0;
-        }
-    .IndexPage #IOnlySymbolPrefix,
-    .FramedIndexPage #IOnlySymbolPrefix {
-        border-top: 1px solid #E0E0E0;
-        border-bottom: 1px solid #E0E0E0;
-        }
-
-    a.IParent,
-    a.IFile {
-        display: block;
-        }
-
-    .PopupSearchResultsPage .SRStatus {
-        padding: 2px 5px;
-        font-size: 8pt;
-        font-style: italic;
-        }
-    .FramedSearchResultsPage .SRStatus {
-        font-size: 8pt;
-        font-style: italic;
-        }
-
-    .SRResult {
-        display: none;
-        }
-
-
-
-#Footer {
-    font-size: 8pt;
-    color: #989898;
-    text-align: right;
-    }
-
-#Footer p {
-    text-indent: 0;
-    margin-bottom: .5em;
-    }
-
-.ContentPage #Footer,
-.IndexPage #Footer {
-    text-align: right;
-    margin: 2px;
-    }
-
-.FramedMenuPage #Footer {
-    text-align: center;
-    margin: 5em 10px 10px 10px;
-    padding-top: 1em;
-    border-top: 1px solid #C8C8C8;
-    }
-
-    #Footer a:link,
-    #Footer a:hover,
-    #Footer a:visited { color: #989898 }
-    #Footer a:active { color: #A00000 }
-
-
-
-.prettyprint .kwd { color: #800000; }  /* keywords */
-
-    .prettyprint.PDefaultValue .kwd,
-    .prettyprint.PDefaultValuePrefix .kwd,
-    .prettyprint.PTypePrefix .kwd {
-        color: #C88F8F;
-        }
-
-.prettyprint .com { color: #008000; }  /* comments */
-
-    .prettyprint.PDefaultValue .com,
-    .prettyprint.PDefaultValuePrefix .com,
-    .prettyprint.PTypePrefix .com {
-        color: #8FC88F;
-        }
-
-.prettyprint .str { color: #0000B0; }  /* strings */
-.prettyprint .lit { color: #0000B0; }  /* literals */
-
-    .prettyprint.PDefaultValue .str,
-    .prettyprint.PDefaultValuePrefix .str,
-    .prettyprint.PTypePrefix .str,
-    .prettyprint.PDefaultValue .lit,
-    .prettyprint.PDefaultValuePrefix .lit,
-    .prettyprint.PTypePrefix .lit {
-        color: #8F8FC0;
-        }
-
-.prettyprint .typ { color: #000000; }  /* types */
-.prettyprint .pun { color: #000000; }  /* punctuation */
-.prettyprint .pln { color: #000000; }  /* punctuation */
-
-    .prettyprint.PDefaultValue .typ,
-    .prettyprint.PDefaultValuePrefix .typ,
-    .prettyprint.PTypePrefix .typ,
-    .prettyprint.PDefaultValue .pun,
-    .prettyprint.PDefaultValuePrefix .pun,
-    .prettyprint.PTypePrefix .pun,
-    .prettyprint.PDefaultValue .pln,
-    .prettyprint.PDefaultValuePrefix .pln,
-    .prettyprint.PTypePrefix .pln {
-        color: #8F8F8F;
-        }
-
-.prettyprint .tag { color: #008; }
-.prettyprint .atn { color: #606; }
-.prettyprint .atv { color: #080; }
-.prettyprint .dec { color: #606; }
-
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/js/README.md b/data/web/inc/lib/vendor/owasp/csrf-protector-php/js/README.md
deleted file mode 100644
index 9b9dbbc0b..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/js/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Compatiblity with different browsers
-===================================
-**OS: `windows`**<br>
-
-
- Cases               | IE (Win)   | Opera | Chrome | Mozilla | Safari 
- ------------------  | ------- | ----- | ------ | ------- | ------ 
- XHR wrapping        | ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)     | ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)      |     ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)   |    ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)     | ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)
- HTML dom-0 wrapping |   ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)   |    ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)   |    ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)    |     ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)    | ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)
- HTML dom-2 wrapping |   ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)    |    ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)   |   ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)     |      ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)   | ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png) 
- URL rewriting       |   ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)   |   ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)    |     ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)   |    ![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)     |![yes](https://cdn3.iconfinder.com/data/icons/fatcow/32/accept.png)
-
-<pre>Note: Missing tick means, this has not yet been implemented or tested</pre>
-
-
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/js/csrfprotector.js b/data/web/inc/lib/vendor/owasp/csrf-protector-php/js/csrfprotector.js
deleted file mode 100644
index aa548cb31..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/js/csrfprotector.js
+++ /dev/null
@@ -1,366 +0,0 @@
-/** 
- * =================================================================
- * Javascript code for OWASP CSRF Protector
- * Task it does: Fetch csrftoken from cookie, and attach it to every
- * 		POST request
- *		Allowed GET url
- *			-- XHR
- *			-- Static Forms
- *			-- URLS (GET only)
- *			-- dynamic forms
- * =================================================================
- */
-
-var CSRFP_FIELD_TOKEN_NAME = 'csrfp_hidden_data_token';
-var CSRFP_FIELD_URLS = 'csrfp_hidden_data_urls';
-
-var CSRFP = {
-	CSRFP_TOKEN: 'csrfp_token',
-	/**
-	 * Array of patterns of url, for which csrftoken need to be added
-	 * In case of GET request also, provided from server
-	 *
-	 * @var string array
-	 */
-	checkForUrls: [],
-	/**
-	 * Function to check if a certain url is allowed to perform the request
-	 * With or without csrf token
-	 *
-	 * @param: string, url
-	 *
-	 * @return: boolean, 	true if csrftoken is not needed
-	 * 						false if csrftoken is needed
-	 */
-	_isValidGetRequest: function(url) {
-		for (var i = 0; i < CSRFP.checkForUrls.length; i++) {
-			var match = CSRFP.checkForUrls[i].exec(url);
-			if (match !== null && match.length > 0) {
-				return false;
-			}
-		}
-		return true;
-	},
-	/** 
-	 * function to get Auth key from cookie Andreturn it to requesting function
-	 *
-	 * @param: void
-	 *
-	 * @return: string, csrftoken retrieved from cookie
-	 */
-	_getAuthKey: function() {
-		var re = new RegExp(CSRFP.CSRFP_TOKEN +"=([^;]+)(;|$)");
-		var RegExpArray = re.exec(document.cookie);
-		
-		if (RegExpArray === null) {
-			return false;
-		}
-		return RegExpArray[1];
-	},
-	/** 
-	 * Function to get domain of any url
-	 *
-	 * @param: string, url
-	 *
-	 * @return: string, domain of url
-	 */
-	_getDomain: function(url) {
-		if (url.indexOf("http://") !== 0 
-			&& url.indexOf("https://") !== 0)
-			return document.domain;
-		return /http(s)?:\/\/([^\/]+)/.exec(url)[2];
-	},
-	/**
-	 * Function to create and return a hidden input element
-	 * For stroing the CSRFP_TOKEN
-	 *
-	 * @param void
-	 *
-	 * @return input element
-	 */
-	_getInputElt: function() {
-		var hiddenObj = document.createElement("input");
-		hiddenObj.setAttribute('name', CSRFP.CSRFP_TOKEN);
-		hiddenObj.setAttribute('class', CSRFP.CSRFP_TOKEN);
-		hiddenObj.type = 'hidden';
-		hiddenObj.value = CSRFP._getAuthKey();
-		return hiddenObj;
-	},
-	/**
-	 * Returns absolute path for relative path
-	 * 
-	 * @param base, base url
-	 * @param relative, relative url
-	 *
-	 * @return absolute path (string)
-	 */
-	_getAbsolutePath: function(base, relative) {
-		var stack = base.split("/");
-		var parts = relative.split("/");
-		// remove current file name (or empty string)
-		// (omit if "base" is the current folder without trailing slash)
-		stack.pop(); 
-			 
-		for (var i = 0; i < parts.length; i++) {
-			if (parts[i] == ".")
-				continue;
-			if (parts[i] == "..")
-				stack.pop();
-			else
-				stack.push(parts[i]);
-		}
-		return stack.join("/");
-	},
-	/** 
-	 * Remove jcsrfp-token run fun and then put them back 
-	 *
-	 * @param function
-	 * @param reference form obj
-	 *
-	 * @retrun function
-	 */
-	_csrfpWrap: function(fun, obj) {
-		return function(event) {
-			// Remove CSRf token if exists
-			if (typeof obj[CSRFP.CSRFP_TOKEN] !== 'undefined') {
-				var target = obj[CSRFP.CSRFP_TOKEN];
-				target.parentNode.removeChild(target);
-			}
-			
-			// Trigger the functions
-			var result = fun.apply(this, [event]);
-			
-			// Now append the csrfp_token back
-			obj.appendChild(CSRFP._getInputElt());
-			
-			return result;
-		};
-	},
-	/**
-	 * Initialises the CSRFProtector js script
-	 *
-	 * @param void
-	 *
-	 * @return void
-	 */
-	_init: function() {
-		CSRFP.CSRFP_TOKEN = document.getElementById(CSRFP_FIELD_TOKEN_NAME).value;
-		try {
-			CSRFP.checkForUrls = JSON.parse(document.getElementById(CSRFP_FIELD_URLS).value);
-		} catch (err) {
-			console.error(err);
-			console.error('[ERROR] [CSRF Protector] unable to parse blacklisted url fields.');
-		}
-
-		//convert these rules received from php lib to regex objects
-		for (var i = 0; i < CSRFP.checkForUrls.length; i++) {
-			CSRFP.checkForUrls[i] = CSRFP.checkForUrls[i].replace(/\*/g, '(.*)')
-								.replace(/\//g, "\\/");
-			CSRFP.checkForUrls[i] = new RegExp(CSRFP.checkForUrls[i]);
-		}
-	
-	}
-	
-}; 
-
-//==========================================================
-// Adding tokens, wrappers on window onload
-//==========================================================
-
-function csrfprotector_init() {
-	
-	// Call the init funcion
-	CSRFP._init();
-
-	// definition of basic FORM submit event handler to intercept the form request
-	// and attach a CSRFP TOKEN if it's not already available
-	var BasicSubmitInterceptor = function(event) {
-		if (typeof event.target[CSRFP.CSRFP_TOKEN] === 'undefined') {
-			event.target.appendChild(CSRFP._getInputElt());
-		} else {
-			//modify token to latest value
-			event.target[CSRFP.CSRFP_TOKEN].value = CSRFP._getAuthKey();
-		}
-	}
-
-	//==================================================================
-	// Adding csrftoken to request resulting from <form> submissions
-	// Add for each POST, while for mentioned GET request
-	// TODO - check for method
-	//==================================================================
-	// run time binding
-	document.querySelector('body').addEventListener('submit', function(event) {
-		if (event.target.tagName.toLowerCase() === 'form') {
-			BasicSubmitInterceptor(event);
-		};
-	});
-
-	// intial binding
-	// for(var i = 0; i < document.forms.length; i++) {
-	// 	document.forms[i].addEventListener("submit", BasicSubmitInterceptor);
-	// }
-
-	//==================================================================
-	// Adding csrftoken to request resulting from direct form.submit() call
-	// Add for each POST, while for mentioned GET request
-	// TODO - check for form method
-	//==================================================================
-	HTMLFormElement.prototype.submit_ = HTMLFormElement.prototype.submit;
-	HTMLFormElement.prototype.submit = function() {
-		// check if the FORM already contains the token element
-		if (!this.getElementsByClassName(CSRFP.CSRFP_TOKEN).length)
-			this.appendChild(CSRFP._getInputElt());
-		this.submit_();
-	}
-
-
-	/**
-	 * Add wrapper for HTMLFormElements addEventListener so that any further 
-	 * addEventListens won't have trouble with CSRF token
-	 * todo - check for method
-	 */
-	HTMLFormElement.prototype.addEventListener_ = HTMLFormElement.prototype.addEventListener;
-	HTMLFormElement.prototype.addEventListener = function(eventType, fun, bubble) {
-		if (eventType === 'submit') {
-			var wrapped = CSRFP._csrfpWrap(fun, this);
-			this.addEventListener_(eventType, wrapped, bubble);
-		} else {
-			this.addEventListener_(eventType, fun, bubble);
-		}	
-	}
-
-	/**
-	 * Add wrapper for IE's attachEvent
-	 * todo - check for method
-	 * todo - typeof is now obselete for IE 11, use some other method.
-	 */
-	if (typeof HTMLFormElement.prototype.attachEvent !== 'undefined') {
-		HTMLFormElement.prototype.attachEvent_ = HTMLFormElement.prototype.attachEvent;
-		HTMLFormElement.prototype.attachEvent = function(eventType, fun) {
-			if (eventType === 'onsubmit') {
-				var wrapped = CSRFP._csrfpWrap(fun, this);
-				this.attachEvent_(eventType, wrapped);
-			} else {
-				this.attachEvent_(eventType, fun);
-			}
-		}
-	}
-
-
-	//==================================================================
-	// Wrapper for XMLHttpRequest & ActiveXObject (for IE 6 & below)
-	// Set X-No-CSRF to true before sending if request method is 
-	//==================================================================
-
-	/** 
-	 * Wrapper to XHR open method
-	 * Add a property method to XMLHttpRequst class
-	 * @param: all parameters to XHR open method
-	 * @return: object returned by default, XHR open method
-	 */
-	function new_open(method, url, async, username, password) {
-		this.method = method;
-		var isAbsolute = (url.indexOf("./") === -1) ? true : false;
-		if (!isAbsolute) {
-			var base = location.protocol +'//' +location.host 
-							+ location.pathname;
-			url = CSRFP._getAbsolutePath(base, url);
-		}
-		if (method.toLowerCase() === 'get' 
-			&& !CSRFP._isValidGetRequest(url)) {
-			//modify the url
-			if (url.indexOf('?') === -1) {
-				url += "?" +CSRFP.CSRFP_TOKEN +"=" +CSRFP._getAuthKey();
-			} else {
-				url += "&" +CSRFP.CSRFP_TOKEN +"=" +CSRFP._getAuthKey();
-			}
-		}
-
-		return this.old_open(method, url, async, username, password);
-	}
-
-	/** 
-	 * Wrapper to XHR send method
-	 * Add query paramter to XHR object
-	 *
-	 * @param: all parameters to XHR send method
-	 *
-	 * @return: object returned by default, XHR send method
-	 */
-	function new_send(data) {
-		if (this.method.toLowerCase() === 'post') {
-			if (data !== null && typeof data === 'object') {
-				data.append(CSRFP.CSRFP_TOKEN, CSRFP._getAuthKey());
-			} else {
-				if (typeof data != "undefined") {
-					data += "&";
-				} else {
-					data = "";
-				}
-				data += CSRFP.CSRFP_TOKEN +"=" +CSRFP._getAuthKey();
-			}
-		}
-		return this.old_send(data);
-	}
-
-	if (window.XMLHttpRequest) {
-		// Wrapping
-		XMLHttpRequest.prototype.old_send = XMLHttpRequest.prototype.send;
-		XMLHttpRequest.prototype.old_open = XMLHttpRequest.prototype.open;
-		XMLHttpRequest.prototype.open = new_open;
-		XMLHttpRequest.prototype.send = new_send;
-	}
-	if (typeof ActiveXObject !== 'undefined') {
-		ActiveXObject.prototype.old_send = ActiveXObject.prototype.send;
-		ActiveXObject.prototype.old_open = ActiveXObject.prototype.open;
-		ActiveXObject.prototype.open = new_open;
-		ActiveXObject.prototype.send = new_send;	
-	}
-	//==================================================================
-	// Rewrite existing urls ( Attach CSRF token )
-	// Rules:
-	// Rewrite those urls which matches the regex sent by Server
-	// Ignore cross origin urls & internal links (one with hashtags)
-	// Append the token to those url already containig GET query parameter(s)
-	// Add the token to those which does not contain GET query parameter(s)
-	//==================================================================
-
-	for (var i = 0; i < document.links.length; i++) {
-		document.links[i].addEventListener("mousedown", function(event) {
-			var href = event.target.href;
-			if(typeof href === "string")
-			{
-				var urlDisect = href.split('#');
-				var url = urlDisect[0];
-				var hash = urlDisect[1];
-
-				if(CSRFP._getDomain(url).indexOf(document.domain) === -1
-					|| CSRFP._isValidGetRequest(url)) {
-					//cross origin or not to be protected by rules -- ignore
-					return;
-				}
-
-				if (url.indexOf('?') !== -1) {
-					if(url.indexOf(CSRFP.CSRFP_TOKEN) === -1) {
-						url += "&" +CSRFP.CSRFP_TOKEN +"=" +CSRFP._getAuthKey();
-					} else {
-						url = url.replace(new RegExp(CSRFP.CSRFP_TOKEN +"=.*?(&|$)", 'g'),
-							CSRFP.CSRFP_TOKEN +"=" +CSRFP._getAuthKey() + "$1");
-					}
-				} else {
-					url += "?" +CSRFP.CSRFP_TOKEN +"=" +CSRFP._getAuthKey();
-				}
-
-				event.target.href = url;
-				if (typeof hash !== 'undefined') {
-					event.target.href += '#' +hash;
-				}
-			}
-		});
-	}
-
-}
-
-window.addEventListener("DOMContentLoaded", function() {
-	csrfprotector_init();
-}, false);
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/js/index.php b/data/web/inc/lib/vendor/owasp/csrf-protector-php/js/index.php
deleted file mode 100644
index 03e25a69f..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/js/index.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * OWASP CSRF Protector Project
- * Code to redirect the user to previosus directory
- * In case a user try to access this directory directly
- */
-header('location: ../index.php');
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/README.md b/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/README.md
deleted file mode 100644
index 6562a9d97..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-CSRFProtector configuration
-==========================================
-
- - `CSRFP_TOKEN`: name of the csrf nonce, used for cookie or posting as argument. default: `csrfp_token` (if left blank)
- - `logDirectory`: location of the directory at which log files will be saved **relative** to `config.php` file. This is required for file based logging (default), Not needed, in case you override logging function to implement your logging logic. (View [Overriding logging function](https://github.com/mebjas/CSRF-Protector-PHP/wiki/Overriding-logging-function))
- <br>**Default value:** `../log/`
- - `failedAuthAction`: Action code (integer) for action to be taken in case of failed validation. Has two different values for bot `GET` and `POST`. Different action codes are specified as follows, (<br>**Default:** `0` for both `GET` & `POST`):
-*  `0` Send **403, Forbidden** Header
-*  `1` **Strip the POST/GET query** and forward the request! unset($_POST)
-*  `2` **Redirect to custom error page** mentioned in `errorRedirectionPage` 
-*  `3` **Show custom error message** to user, mentioned in `customErrorMessage` 
-*  `4` Send **500, Internal Server Error** header
-
- - `errorRedirectionPage`: **Absolute url** of the file to which user should be redirected. <br>**Default: null**
- - `customErrorMessage`: **Error Message** to be shown to user. Only this text will be shown!<br>**Default: null**
- - `jsPath`: location of the js file **relative** to `config.php`. <br>**Default:** `../js/csrfprotector.js`
- - `jsUrl`: **Absolute url** of the js file. (See [Setting up](https://github.com/mebjas/CSRF-Protector-PHP/wiki/Setting-up-CSRF-Protector-PHP-in-your-web-application) for more information)
- - `tokenLength`: length of csrfp token, Default `10`
- - `secureCookie`: sets the "secure" HTTPS flag on the cookie. <br>**Default: `false`**
- - `disabledJavascriptMessage`: messaged to be shown if js is disabled (string)
- - `verifyGetFor`: regex rules for those urls for which csrfp validation should be enabled for `GET` requests also. (View [verifyGetFor rules](https://github.com/mebjas/CSRF-Protector-PHP/wiki/verifyGetFor-rules) for more information)
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/config.php b/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/config.php
deleted file mode 100755
index bab612edd..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/config.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Configuration file for CSRF Protector
- * Necessary configurations are (library would throw exception otherwise)
- * ---- logDirectory
- * ---- failedAuthAction
- * ---- jsPath
- * ---- jsUrl
- * ---- tokenLength
- */
-
-function get_trusted_hostname() {
-  $js_path = "/inc/lib/vendor/owasp/csrf-protector-php/js/csrfprotector.js";
-  if ((isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == "https") || isset($_SERVER['HTTPS'])) {
-    $is_scheme = "https://";
-  }
-  else {
-    $is_scheme = "http://";
-  }
-  if (isset(explode(':', $_SERVER['HTTP_HOST'])[1])) {
-    $is_port = intval(explode(':', $_SERVER['HTTP_HOST'])[1]);
-    if (filter_var($is_port, FILTER_VALIDATE_INT, array("options" => array("min_range" =>1, "max_range" => 65535))) === false) {
-      return false;
-    }
-  }
-  if (!isset($is_port) || $is_port == 0) {
-    $is_port = ($is_scheme == "https://") ? 443 : 80;
-  }
-  return $is_scheme . $GLOBALS['mailcow_hostname'] . ':' . $is_port . $js_path;
-}
-
-return array(
-	"CSRFP_TOKEN" => "MAILCOW_CSRF",
-	"logDirectory" => "../log",
-	"failedAuthAction" => array(
-		"GET" => 1,
-		"POST" => 1),
-	"errorRedirectionPage" => "",
-	"customErrorMessage" => "",
-	"jsPath" => "../js/csrfprotector.js",
-  // Fetching IS_HTTPS from sessions handler
-	"jsUrl" => "/inc/lib/vendor/owasp/csrf-protector-php/js/csrfprotector.js",
-	"tokenLength" => 10,
-	"secureCookie" => false,
-	"disabledJavascriptMessage" => "",
-	 "verifyGetFor" => array()
-);
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/README.md b/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/README.md
deleted file mode 100644
index 286bcbade..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Placeholder for **CSRF Protector - php library**
-=====================================================
-
-**Dependency:** `None`<br>
-**Configuration-File:** `../config.php`<br>
-**Configuration-Format:** `PHP ARRAY`<br>
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/csrfprotector.php b/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/csrfprotector.php
deleted file mode 100755
index c09a5b034..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/csrfprotector.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-
-if (!defined('__CSRF_PROTECTOR__')) {
-	define('__CSRF_PROTECTOR__', true); 	// to avoid multiple declaration errors
-
-	// name of HTTP POST variable for authentication
-	define("CSRFP_TOKEN","csrfp_token");
-
-	// We insert token name and list of url patterns for which
-	// GET requests are validated against CSRF as hidden input fields
-	// these are the names of the input fields
-	define("CSRFP_FIELD_TOKEN_NAME", "csrfp_hidden_data_token");
-	define("CSRFP_FIELD_URLS", "csrfp_hidden_data_urls");
-
-	/**
-	 * child exception classes
-	 */
-	class configFileNotFoundException extends \exception {};
-	class logDirectoryNotFoundException extends \exception {};
-	class jsFileNotFoundException extends \exception {};
-	class logFileWriteError extends \exception {};
-	class baseJSFileNotFoundExceptio extends \exception {};
-	class incompleteConfigurationException extends \exception {};
-	class alreadyInitializedException extends \exception {};
-
-	class csrfProtector
-	{
-		/*
-		 * Variable: $cookieExpiryTime
-		 * expiry time for cookie
-		 * @var int
-		 */
-		public static $cookieExpiryTime = 1800;	//30 minutes
-
-		/*
-		 * Variable: $isSameOrigin
-		 * flag for cross origin/same origin request
-		 * @var bool
-		 */
-		private static $isSameOrigin = true;
-
-		/*
-		 * Variable: $isValidHTML
-		 * flag to check if output file is a valid HTML or not
-		 * @var bool
-		 */
-		private static $isValidHTML = false;
-
-		/*
-		 * Variable: $requestType
-		 * Varaible to store weather request type is post or get
-		 * @var string
-		 */
-		protected static $requestType = "GET";
-
-		/*
-		 * Variable: $config
-		 * config file for CSRFProtector
-		 * @var int Array, length = 6
-		 * Property: #1: failedAuthAction (int) => action to be taken in case autherisation fails
-		 * Property: #2: logDirectory (string) => directory in which log will be saved
-		 * Property: #3: customErrorMessage (string) => custom error message to be sent in case
-		 *						of failed authentication
-		 * Property: #4: jsFile (string) => location of the CSRFProtector js file
-		 * Property: #5: tokenLength (int) => default length of hash
-		 * Property: #6: disabledJavascriptMessage (string) => error message if client's js is disabled
-		 */
-		public static $config = array();
-
-		/*
-		 * Variable: $requiredConfigurations
-		 * Contains list of those parameters that are required to be there
-		 * 	in config file for csrfp to work
-		 */
-		public static $requiredConfigurations  = array('logDirectory', 'failedAuthAction', 'jsPath', 'jsUrl', 'tokenLength');
-		
-		/*
-		 *	Function: init
-	 	 *
-		 *	function to initialise the csrfProtector work flow
-		 *
-		 *	Parameters:
-		 *	$length - length of CSRF_AUTH_TOKEN to be generated
-		 *	$action - int array, for different actions to be taken in case of failed validation
-		 *
-		 *	Returns:
-		 *		void
-		 *
-		 *	Throws:
-		 *		configFileNotFoundException - when configuration file is not found
-		 * 		incompleteConfigurationException - when all required fields in config
-		 *											file are not available
-		 *
-		 */
-		public static function init($length = null, $action = null)
-		{
-			/*
-			 * Check if init has already been called.
-			 */
-			 if (count(self::$config) > 0) {
-				 throw new alreadyInitializedException("OWASP CSRFProtector: library was already initialized.");
-			 }
-
-			/*
-			 * if mod_csrfp already enabled, no verification, no filtering
-			 * Already done by mod_csrfp
-			 */
-			if (getenv('mod_csrfp_enabled'))
-				return;
-
-			//start session in case its not
-			if (session_id() == '')
-			    session_start();
-
-			/*
-			 * load configuration file and properties
-			 * Check locally for a config.php then check for 
-			 * a config/csrf_config.php file in the root folder
-			 * for composer installations
-			 */
-			$standard_config_location = __DIR__ ."/../config.php";
-			$composer_config_location = __DIR__ ."/../../../../../config/csrf_config.php";
-
-			if (file_exists($standard_config_location)) {
-				self::$config = include($standard_config_location);
-			} elseif(file_exists($composer_config_location)) {
-				self::$config = include($composer_config_location);
-			} else {
-				throw new configFileNotFoundException("OWASP CSRFProtector: configuration file not found for CSRFProtector!");
-			}
-
-			//overriding length property if passed in parameters
-			if ($length != null)
-				self::$config['tokenLength'] = intval($length);
-			
-			//action that is needed to be taken in case of failed authorisation
-			if ($action != null)
-				self::$config['failedAuthAction'] = $action;
-
-			if (self::$config['CSRFP_TOKEN'] == '')
-				self::$config['CSRFP_TOKEN'] = CSRFP_TOKEN;
-
-			// Validate the config if everythings filled out
-			// TODO: collect all missing values and throw exception together
-			foreach (self::$requiredConfigurations as $value) {
-				if (!isset(self::$config[$value]) || self::$config[$value] == '') {
-					throw new incompleteConfigurationException(
-						sprintf(
-							"OWASP CSRFProtector: Incomplete configuration file, Value: %s missing ",
-							$value
-						)
-					);
-					exit;
-				}
-			}
-
-			// Authorise the incoming request
-			self::authorizePost();
-
-			// Initialize output buffering handler
-			if (!defined('__TESTING_CSRFP__'))
-				ob_start('csrfProtector::ob_handler');
-
-			if (!isset($_COOKIE[self::$config['CSRFP_TOKEN']])
-				|| !isset($_SESSION[self::$config['CSRFP_TOKEN']])
-				|| !is_array($_SESSION[self::$config['CSRFP_TOKEN']])
-				|| !in_array($_COOKIE[self::$config['CSRFP_TOKEN']],
-					$_SESSION[self::$config['CSRFP_TOKEN']]))
-				self::refreshToken();
-
-			// Set protected by CSRF Protector header
-			header('X-CSRF-Protection: OWASP CSRFP 1.0.0');
-		}
-
-		/*
-		 * Function: authorizePost
-		 * function to authorise incoming post requests
-		 *
-		 * Parameters: 
-		 * void
-		 *
-		 * Returns: 
-		 * void
-		 *
-		 * Throws: 
-		 * logDirectoryNotFoundException - if log directory is not found
-		 */
-		public static function authorizePost()
-		{
-			//#todo this method is valid for same origin request only, 
-			//enable it for cross origin also sometime
-			//for cross origin the functionality is different
-			if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-
-				//set request type to POST
-				self::$requestType = "POST";
-
-				//currently for same origin only
-				if (!(isset($_POST[self::$config['CSRFP_TOKEN']]) 
-					&& isset($_SESSION[self::$config['CSRFP_TOKEN']])
-					&& (self::isValidToken($_POST[self::$config['CSRFP_TOKEN']]))
-					)) {
-
-					//action in case of failed validation
-					self::failedValidationAction();			
-				} else {
-					self::refreshToken();	//refresh token for successfull validation
-				}
-			} else if (!static::isURLallowed()) {
-				
-				//currently for same origin only
-				if (!(isset($_GET[self::$config['CSRFP_TOKEN']]) 
-					&& isset($_SESSION[self::$config['CSRFP_TOKEN']])
-					&& (self::isValidToken($_GET[self::$config['CSRFP_TOKEN']]))
-					)) {
-
-					//action in case of failed validation
-					self::failedValidationAction();			
-				} else {
-					self::refreshToken();	//refresh token for successfull validation
-				}
-			}	
-		}
-
-		/*
-		 * Function: isValidToken
-		 * function to check the validity of token in session array
-		 * Function also clears all tokens older than latest one
-		 *
-		 * Parameters: 
-		 * $token - the token sent with GET or POST payload
-		 *
-		 * Returns: 
-		 * bool - true if its valid else false
-		 */
-		private static function isValidToken($token) {
-			if (!isset($_SESSION[self::$config['CSRFP_TOKEN']])) return false;
-			if (!is_array($_SESSION[self::$config['CSRFP_TOKEN']])) return false;
-			foreach ($_SESSION[self::$config['CSRFP_TOKEN']] as $key => $value) {
-				if ($value == $token) {
-
-					// Clear all older tokens assuming they have been consumed
-					foreach ($_SESSION[self::$config['CSRFP_TOKEN']] as $_key => $_value) {
-						if ($_value == $token) break;
-						array_shift($_SESSION[self::$config['CSRFP_TOKEN']]);
-					}
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/*
-		 * Function: failedValidationAction
-		 * function to be called in case of failed validation
-		 * performs logging and take appropriate action
-		 *
-		 * Parameters: 
-		 * void
-		 *
-		 * Returns: 
-		 * void
-		 */
-		private static function failedValidationAction()
-		{
-			if (!file_exists(__DIR__ ."/../" .self::$config['logDirectory']))
-				throw new logDirectoryNotFoundException("OWASP CSRFProtector: Log Directory Not Found!");
-		
-			//call the logging function
-			static::logCSRFattack();
-
-			//#todo: ask mentors if $failedAuthAction is better as an int or string
-			//default case is case 0
-			switch (self::$config['failedAuthAction'][self::$requestType]) {
-				case 0:
-					//send 403 header
-					header('HTTP/1.0 403 Forbidden');
-					exit("<h2>403 Access Forbidden by CSRFProtector!</h2>");
-					break;
-				case 1:
-					//unset the query parameters and forward
-					if (self::$requestType === 'GET') {
-						$_GET = array();
-					} else {
-						$_POST = array();
-					}
-					break;
-				case 2:
-					//redirect to custom error page
-					$location  = self::$config['errorRedirectionPage'];
-					header("location: $location");
-				case 3:
-					//send custom error message
-					exit(self::$config['customErrorMessage']);
-					break;
-				case 4:
-					//send 500 header -- internal server error
-					header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, 500);
-					exit("<h2>500 Internal Server Error!</h2>");
-					break;
-				default:
-					//unset the query parameters and forward
-					if (self::$requestType === 'GET') {
-						$_GET = array();
-					} else {
-						$_POST = array();
-					}
-					break;
-			}		
-		}
-
-		/*
-		 * Function: refreshToken
-		 * Function to set auth cookie
-		 *
-		 * Parameters: 
-		 * void
-		 *
-		 * Returns: 
-		 * void
-		 */
-		public static function refreshToken()
-		{
-			$token = self::generateAuthToken();
-
-			if (!isset($_SESSION[self::$config['CSRFP_TOKEN']])
-				|| !is_array($_SESSION[self::$config['CSRFP_TOKEN']]))
-				$_SESSION[self::$config['CSRFP_TOKEN']] = array();
-
-			//set token to session for server side validation
-			array_push($_SESSION[self::$config['CSRFP_TOKEN']], $token);
-
-			//set token to cookie for client side processing
-			setcookie(self::$config['CSRFP_TOKEN'], 
-				$token, 
-				time() + self::$cookieExpiryTime,
-				'',
-				'',
-				(array_key_exists('secureCookie', self::$config) ? (bool)self::$config['secureCookie'] : false));
-		}
-
-		/*
-		 * Function: generateAuthToken
-		 * function to generate random hash of length as given in parameter
-		 * max length = 128
-		 *
-		 * Parameters: 
-		 * length to hash required, int
-		 *
-		 * Returns:
-		 * string, token
-		 */
-		public static function generateAuthToken()
-		{
-			// todo - make this a member method / configurable
-			$randLength = 64;
-			
-			//if config tokenLength value is 0 or some non int
-			if (intval(self::$config['tokenLength']) == 0) {
-				self::$config['tokenLength'] = 32;	//set as default
-			}
-
-			//#todo - if $length > 128 throw exception 
-
-			if (function_exists("random_bytes")) {
-				$token = bin2hex(random_bytes($randLength));
-			} elseif (function_exists("openssl_random_pseudo_bytes")) {
-				$token = bin2hex(openssl_random_pseudo_bytes($randLength));
-			} else {
-				$token = '';
-				for ($i = 0; $i < 128; ++$i) {
-					$r = mt_rand (0, 35);
-					if ($r < 26) {
-						$c = chr(ord('a') + $r);
-					} else { 
-						$c = chr(ord('0') + $r - 26);
-					}
-					$token .= $c;
-				}
-			}
-			return substr($token, 0, self::$config['tokenLength']);
-		}
-
-		/*
-		 * Function: ob_handler
-		 * Rewrites <form> on the fly to add CSRF tokens to them. This can also
-		 * inject our JavaScript library.
-		 *
-		 * Parameters: 
-		 * $buffer - output buffer to which all output are stored
-		 * $flag - INT
-		 *
-		 * Return:
-		 * string, complete output buffer
-		 */
-		public static function ob_handler($buffer, $flags)
-		{
-			// Even though the user told us to rewrite, we should do a quick heuristic
-		    // to check if the page is *actually* HTML. We don't begin rewriting until
-		    // we hit the first <html tag.
-		    if (!self::$isValidHTML) {
-		        // not HTML until proven otherwise
-		        if (stripos($buffer, '<html') !== false) {
-		            self::$isValidHTML = true; 
-		        } else {
-		            return $buffer;
-		        }
-		    }
-		    
-		    // TODO: statically rewrite all forms as well so that if a form is submitted
-		    // before the js has worked on, it will still have token to send
-		    // @priority: medium @labels: important @assign: mebjas
-		    // @deadline: 1 week
-
-		    //add a <noscript> message to outgoing HTML output,
-		    //informing the user to enable js for CSRFProtector to work
-		    //best section to add, after <body> tag
-		    $buffer = preg_replace("/<body[^>]*>/", "$0 <noscript>" .self::$config['disabledJavascriptMessage'] .
-		    	"</noscript>", $buffer);
-
-		    $hiddenInput = '<input type="hidden" id="' . CSRFP_FIELD_TOKEN_NAME.'" value="' 
-		    				.self::$config['CSRFP_TOKEN'] .'">' .PHP_EOL;
-
-		    $hiddenInput .= '<input type="hidden" id="' .CSRFP_FIELD_URLS .'" value=\''
-		    				.json_encode(self::$config['verifyGetFor']) .'\'>';
-
-		    //implant hidden fields with check url information for reading in javascript
-	        $buffer = str_ireplace('</body>', $hiddenInput . '</body>', $buffer);
-
-		    //implant the CSRFGuard js file to outgoing script
-		    $script = '<script type="text/javascript" src="' . self::$config['jsUrl'] . '"></script>' . PHP_EOL;
-		    $buffer = str_ireplace('</body>', $script . '</body>', $buffer, $count);
-
-		    if (!$count)
-		        $buffer .= $script;
-
-		    return $buffer;
-		}
-
-		/*
-		 * Function: logCSRFattack
-		 * Function to log CSRF Attack
-		 * 
-		 * Parameters: 
-		 * void
-		 *
-		 * Retruns: 
-		 * void
-		 *
-		 * Throws: 
-		 * logFileWriteError - if unable to log an attack
-		 */
-		protected static function logCSRFattack()
-		{
-			//if file doesnot exist for, create it
-			$logFile = fopen(__DIR__ ."/../" .self::$config['logDirectory']
-			."/" .date("m-20y") .".log", "a+");
-			
-			//throw exception if above fopen fails
-			if (!$logFile)
-				throw new logFileWriteError("OWASP CSRFProtector: Unable to write to the log file");	
-
-			//miniature version of the log
-			$log = array();
-			$log['timestamp'] = time();
-			$log['HOST'] = $_SERVER['HTTP_HOST'];
-			$log['REQUEST_URI'] = $_SERVER['REQUEST_URI'];
-			$log['requestType'] = self::$requestType;
-
-			if (self::$requestType === "GET")
-				$log['query'] = $_GET;
-			else
-				$log['query'] = $_POST;
-
-			$log['cookie'] = $_COOKIE;
-
-			//convert log array to JSON format to be logged
-			$log = json_encode($log) .PHP_EOL;
-
-			//append log to the file
-			fwrite($logFile, $log);
-
-			//close the file handler
-			fclose($logFile);
-		}
-
-		/*
-		 * Function: getCurrentUrl
-		 * Function to return current url of executing page
-		 * 
-		 * Parameters: 
-		 * void
-		 *
-		 * Returns: 
-		 * string - current url
-		 */
-		private static function getCurrentUrl()
-		{
-			$request_scheme = 'https';
-
-			if (isset($_SERVER['REQUEST_SCHEME'])) {
-				$request_scheme = $_SERVER['REQUEST_SCHEME'];
-			} else {
-				if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
-					$request_scheme = 'https';
-				} else {
-					$request_scheme = 'http';
-				}
-			}
-
-			return $request_scheme . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
-		}
-
-		/*
-		 * Function: isURLallowed
-		 * Function to check if a url mataches for any urls
-		 * Listed in config file
-		 *
-		 * Parameters: 
-		 * void
-		 *
-		 * Returns: 
-		 * boolean - true is url need no validation, false if validation needed
-		 */  
-		public static function isURLallowed() {
-			foreach (self::$config['verifyGetFor'] as $key => $value) {
-				$value = str_replace(array('/','*'), array('\/','(.*)'), $value);
-				preg_match('/' .$value .'/', self::getCurrentUrl(), $output);
-				if (count($output) > 0)
-					return false;
-			}
-			return true;
-		}
-	};
-}
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/index.php b/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/index.php
deleted file mode 100644
index 03e25a69f..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/csrf/index.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * OWASP CSRF Protector Project
- * Code to redirect the user to previosus directory
- * In case a user try to access this directory directly
- */
-header('location: ../index.php');
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/index.php b/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/index.php
deleted file mode 100644
index 03e25a69f..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/libs/index.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * OWASP CSRF Protector Project
- * Code to redirect the user to previosus directory
- * In case a user try to access this directory directly
- */
-header('location: ../index.php');
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/licence.md b/data/web/inc/lib/vendor/owasp/csrf-protector-php/licence.md
deleted file mode 100644
index eba85e5b5..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/licence.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2014 OWASP Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/log/.htaccess b/data/web/inc/lib/vendor/owasp/csrf-protector-php/log/.htaccess
deleted file mode 100644
index 3418e55a6..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/log/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/log/index.php b/data/web/inc/lib/vendor/owasp/csrf-protector-php/log/index.php
deleted file mode 100644
index 03e25a69f..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/log/index.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * OWASP CSRF Protector Project
- * Code to redirect the user to previosus directory
- * In case a user try to access this directory directly
- */
-header('location: ../index.php');
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/phpunit.xml.dist b/data/web/inc/lib/vendor/owasp/csrf-protector-php/phpunit.xml.dist
deleted file mode 100644
index 34814a25e..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/phpunit.xml.dist
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit verbose="true">
-    <php>
-        <ini name="memory_limit" value="1024M" />
-        <ini name="error_reporting" value="E_ALL"/>
-    </php>
-    <testsuite name="OWASP CSRF Protector php">
-        <directory>./test/csrfprotector_test.php</directory>
-    </testsuite>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-        <file>libs/csrf/csrfprotector.php</file>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/readme.md b/data/web/inc/lib/vendor/owasp/csrf-protector-php/readme.md
deleted file mode 100644
index fa4278117..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/readme.md
+++ /dev/null
@@ -1,65 +0,0 @@
-CSRF Protector
-==========================
-[![Todo Status](http://todofy.org/b/mebjas/CSRF-Protector-PHP)](http://todofy.org/r/mebjas/CSRF-Protector-PHP) [![Build Status](https://travis-ci.org/mebjas/CSRF-Protector-PHP.svg?branch=master)](https://travis-ci.org/mebjas/CSRF-Protector-PHP)  [![codecov](https://codecov.io/gh/mebjas/CSRF-Protector-PHP/branch/master/graph/badge.svg)](https://codecov.io/gh/mebjas/CSRF-Protector-PHP)
-<br>CSRF protector php, a standalone php library for csrf mitigation in web applications. Easy to integrate in any php web app. 
-
-Add to your project using packagist
-==========
- Add a `composer.json` file to your project directory
- ```json
- {
-    "require": {
-        "owasp/csrf-protector-php": "dev-master"
-    }
-}
-```
-Then open terminal (or command prompt), move to project directory and run
-```shell
-composer install
-```
-OR
-```
-php composer.phar install
-```
-This will add CSRFP (library will be downloaded at ./vendor/owasp/csrf-protector-php) to your project directory. View [packagist.org](https://packagist.org/) for more help with composer!
-
-Configuration
-==========
-For composer installations: Copy the config.sample.php file into your root folder at config/csrf_config.php
-For non-composer installations: Copy the libs/csrf/config.sample.php file into libs/csrc/config.php
-Edit config accordingly. See Detailed Information link below.
-
-How to use
-==========
-```php
-<?php
-include_once __DIR__ .'/vendor/owasp/csrf-protector-php/libs/csrf/csrfprotector.php';
-
-//Initialise CSRFGuard library
-csrfProtector::init();
-```
-simply include the library and call the `init()` function!
-
-### Detailed information @[Project wiki on github](https://github.com/mebjas/CSRF-Protector-PHP/wiki)
-
-### More information @[OWASP wiki](https://www.owasp.org/index.php/CSRFProtector_Project)
-
-### Contribute
-
-* Fork the repo
-* Create your branch
-* Commit your changes
-* Create a pull request
-
-### Note
-This version (`master`) requires the clients to have Javascript enabled. However if your application can work without javascript & you require a nojs version of this library, check our [nojs version](https://github.com/mebjas/CSRF-Protector-PHP/tree/nojs-support)
-
-## Discussion
-Join Discussions on the [mailing list](https://lists.owasp.org/mailman/listinfo/owasp-csrfprotector)
-
-For any other queries contact me at: **minhaz@owasp.org**
-
-### FAQ:
-1. What happens if token expires? - https://github.com/mebjas/CSRF-Protector-PHP/wiki/what-if-token-expires
-2. Secure flag in cookie? - https://github.com/mebjas/CSRF-Protector-PHP/issues/54
-3. NoJS support? - https://github.com/mebjas/CSRF-Protector-PHP/tree/nojs-support
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/test/config.test.php b/data/web/inc/lib/vendor/owasp/csrf-protector-php/test/config.test.php
deleted file mode 100644
index 14bc18288..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/test/config.test.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Configuration file for CSRF Protector
- * Necessary configurations are (library would throw exception otherwise)
- * ---- logDirectory
- * ---- failedAuthAction
- * ---- jsPath
- * ---- jsUrl
- * ---- tokenLength
- */
-return array(
-	"CSRFP_TOKEN" => "csrfp_token",
-	"logDirectory" => "../log",
-	"failedAuthAction" => array(
-		"GET" => 0,
-		"POST" => 0),
-	"errorRedirectionPage" => "",
-	"customErrorMessage" => "",
-	"jsPath" => "../js/csrfprotector.js",
-	"jsUrl" => "http://localhost/csrfp/js/csrfprotector.js",
-	"tokenLength" => 10,
-	"secureCookie" => false,
-	"disabledJavascriptMessage" => "This site attempts to protect users against <a href=\"https://www.owasp.org/index.php/Cross-Site_Request_Forgery_%28CSRF%29\">
-	Cross-Site Request Forgeries </a> attacks. In order to do so, you must have JavaScript enabled in your web browser otherwise this site will fail to work correctly for you.
-	 See details of your web browser for how to enable JavaScript.",
-	 "verifyGetFor" => array()
-);
\ No newline at end of file
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php/test/csrfprotector_test.php b/data/web/inc/lib/vendor/owasp/csrf-protector-php/test/csrfprotector_test.php
deleted file mode 100644
index ca5404e5c..000000000
--- a/data/web/inc/lib/vendor/owasp/csrf-protector-php/test/csrfprotector_test.php
+++ /dev/null
@@ -1,534 +0,0 @@
-<?php
-date_default_timezone_set('UTC');
-require_once __DIR__ .'/../libs/csrf/csrfprotector.php';
-
-if (intval(phpversion('tidy')) >= 7 && !class_exists('\PHPUnit_Framework_TestCase', true)) {
-    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
-}
-
-/**
- * Wrapper class for testing purpose
- */
-class csrfp_wrapper extends csrfprotector
-{
-    /**
-     * Function to provide wrapper methode to set the protected var, requestType
-     */
-    public static function changeRequestType($type)
-    {
-        self::$requestType = $type;
-    }
-
-    /**
-     * Function to check for a string value anywhere within HTTP response headers
-     * Returns true on first match of $needle in header names or values
-     */
-    public static function checkHeader($needle)
-    {
-        $haystack = xdebug_get_headers();
-        foreach ($haystack as $key => $value) {
-            if (strpos($value, $needle) !== false)
-                return true;
-        }
-        return false;
-    }
-
-    /**
-     * Function to return the string value of the last response header
-     * identified by name $needle
-     */
-    public static function getHeaderValue($needle)
-    {
-        $haystack = xdebug_get_headers();
-        foreach ($haystack as $key => $value) {
-            if (strpos($value, $needle) === 0) {
-                // Deliberately overwrite to accept the last rather than first match
-                // as xdebug_get_headers() will accumulate all set headers
-                list(,$hvalue) = explode(':', $value, 2);
-            }
-        }
-        return $hvalue;
-    } 
-}
-
-/**
- * helper methods
- */
-class Helper {
-    /**
-     * Function to recusively delete a dir
-     */
-    public static function delTree($dir) { 
-        $files = array_diff(scandir($dir), array('.','..')); 
-        foreach ($files as $file) { 
-            (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file"); 
-        } 
-        return rmdir($dir); 
-    }
-}
-
-
-/**
- * main test class
- */
-class csrfp_test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var to hold current configurations
-     */
-    protected $config = array();
-
-    /**
-     * @var log directory for testing
-     */
-    private $logDir;
-
-    /**
-     * Function to be run before every test*() functions.
-     */
-    public function setUp()
-    {
-        $this->logDir = __DIR__ .'/logs';
-
-        csrfprotector::$config['jsPath'] = '../js/csrfprotector.js';
-        csrfprotector::$config['CSRFP_TOKEN'] = 'csrfp_token';
-        csrfprotector::$config['secureCookie'] = false;
-        csrfprotector::$config['logDirectory'] = '../test/logs';
-
-        $_SERVER['REQUEST_URI'] = 'temp';       // For logging
-        $_SERVER['REQUEST_SCHEME'] = 'http';    // For authorizePost
-        $_SERVER['HTTP_HOST'] = 'test';         // For isUrlAllowed
-        $_SERVER['PHP_SELF'] = '/index.php';     // For authorizePost
-        $_POST[csrfprotector::$config['CSRFP_TOKEN']]
-          = $_GET[csrfprotector::$config['CSRFP_TOKEN']] = '123';
-
-        //token mismatch - leading to failed validation
-        $_SESSION[csrfprotector::$config['CSRFP_TOKEN']] = array('abc');
-        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-        $_SERVER['HTTPS'] = null;
-
-        $this->config = include(__DIR__ .'/config.test.php');
-
-        // Create an instance of config file -- for testing
-        $data = file_get_contents(__DIR__ .'/config.test.php');
-        file_put_contents(__DIR__ .'/../libs/config.php', $data);
-
-        if (!defined('__TESTING_CSRFP__')) define('__TESTING_CSRFP__', true);
-    }
-
-    /**
-     * tearDown()
-     */
-    public function tearDown()
-    {
-        unlink(__DIR__ .'/../libs/config.php');
-        if (is_dir(__DIR__ .'/logs'))
-            Helper::delTree(__DIR__ .'/logs');
-    }
-
-    /**
-     * Function to check refreshToken() functionality
-     */
-    public function testRefreshToken()
-    {
-        $val = $_COOKIE[csrfprotector::$config['CSRFP_TOKEN']] = '123abcd';
-        $_SESSION[csrfprotector::$config['CSRFP_TOKEN']] = array('123abcd');
-        csrfProtector::$config['tokenLength'] = 20;
-        csrfProtector::refreshToken();
-
-        $this->assertTrue(strcmp($val, $_SESSION[csrfprotector::$config['CSRFP_TOKEN']][1]) != 0);
-
-        $this->assertTrue(csrfP_wrapper::checkHeader('Set-Cookie'));
-        $this->assertTrue(csrfP_wrapper::checkHeader('csrfp_token'));
-        $this->assertTrue(csrfp_wrapper::checkHeader($_SESSION[csrfprotector::$config['CSRFP_TOKEN']][1]));
-    }
-
-    /**
-     * test secure flag is set in the token cookie when requested
-     */
-    public function testSecureCookie()
-    {
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        $_SESSION[csrfprotector::$config['CSRFP_TOKEN']] = array('123abcd');
-
-        csrfprotector::$config['secureCookie'] = false;
-        csrfprotector::refreshToken();
-        $this->assertNotRegExp('/; secure/', csrfp_wrapper::getHeaderValue('Set-Cookie'));
-
-        csrfprotector::$config['secureCookie'] = true;
-        csrfprotector::refreshToken();
-        $this->assertRegExp('/; secure/', csrfp_wrapper::getHeaderValue('Set-Cookie'));
-    }
-
-    /**
-     * test authorise post -> log directory exception
-     */
-    public function testAuthorisePost_logdirException()
-    {
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        csrfprotector::$config['logDirectory'] = 'unknown_location';
-
-        try {
-            csrfprotector::authorizePost();
-        } catch (logDirectoryNotFoundException $ex) {
-            $this->assertTrue(true);
-            return;;
-        }
-        $this->fail('logDirectoryNotFoundException has not been raised.');
-    }
-
-    /**
-     * test authorise post -> action = 403, forbidden
-     */
-    public function testAuthorisePost_failedAction_1()
-    {
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        csrfprotector::$config['verifyGetFor'] = array('http://test/index*');
-        csrfprotector::$config['logDirectory'] = '../log';
-        csrfprotector::$config['failedAuthAction']['POST'] = 0;
-        csrfprotector::$config['failedAuthAction']['GET'] = 0;
-
-        //csrfprotector::authorizePost();
-        $this->markTestSkipped('Cannot add tests as code exit here');
-
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        csrfp_wrapper::changeRequestType('GET');
-        //csrfprotector::authorizePost();
-
-        $this->markTestSkipped('Cannot add tests as code exit here');
-    }
-
-    /**
-     * test authorise post -> strip $_GET, $_POST
-     */
-    public function testAuthorisePost_failedAction_2()
-    {
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-
-        csrfprotector::$config['logDirectory'] = '../log';
-        csrfprotector::$config['verifyGetFor'] = array('http://test/index*');
-        csrfprotector::$config['failedAuthAction']['POST'] = 1;
-        csrfprotector::$config['failedAuthAction']['GET'] = 1;
-
-        $_POST = array('param1' => 1, 'param2' => 2);
-        csrfprotector::authorizePost();
-        $this->assertEmpty($_POST);
-
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        csrfp_wrapper::changeRequestType('GET');
-        $_GET = array('param1' => 1, 'param2' => 2);
-
-        csrfprotector::authorizePost();
-        $this->assertEmpty($_GET);
-    }
-
-    /**
-     * test authorise post -> redirect
-     */
-    public function testAuthorisePost_failedAction_3()
-    {
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-
-        csrfprotector::$config['logDirectory'] = '../log';
-        csrfprotector::$config['verifyGetFor'] = array('http://test/index*');
-        csrfprotector::$config['errorRedirectionPage'] = 'http://test';
-        csrfprotector::$config['failedAuthAction']['POST'] = 2;
-        csrfprotector::$config['failedAuthAction']['GET'] = 2;
-
-        //csrfprotector::authorizePost();
-        $this->markTestSkipped('Cannot add tests as code exit here');
-
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        csrfp_wrapper::changeRequestType('GET');
-        //csrfprotector::authorizePost();
-        $this->markTestSkipped('Cannot add tests as code exit here');
-    }
-
-    /**
-     * test authorise post -> error message & exit
-     */
-    public function testAuthorisePost_failedAction_4()
-    {
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-
-        csrfprotector::$config['logDirectory'] = '../log';
-        csrfprotector::$config['verifyGetFor'] = array('http://test/index*');
-        csrfprotector::$config['customErrorMessage'] = 'custom error message';
-        csrfprotector::$config['failedAuthAction']['POST'] = 3;
-        csrfprotector::$config['failedAuthAction']['POST'] = 3;
-
-        //csrfprotector::authorizePost();
-        $this->markTestSkipped('Cannot add tests as code exit here');
-
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        csrfp_wrapper::changeRequestType('GET');
-        //csrfprotector::authorizePost();
-        $this->markTestSkipped('Cannot add tests as code exit here');
-    }
-
-    /**
-     * test authorise post -> 500 internal server error
-     */
-    public function testAuthorisePost_failedAction_5()
-    {
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-
-        csrfprotector::$config['logDirectory'] = '../log';
-        csrfprotector::$config['verifyGetFor'] = array('http://test/index*');
-        csrfprotector::$config['failedAuthAction']['POST'] = 4;
-        csrfprotector::$config['failedAuthAction']['GET'] = 4;
-
-        //csrfprotector::authorizePost();
-        //$this->markTestSkipped('Cannot add tests as code exit here');
-
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        csrfp_wrapper::changeRequestType('GET');
-        //csrfprotector::authorizePost();
-        //csrfp_wrapper::checkHeader('500');
-        //$this->markTestSkipped('Cannot add tests as code exit here');
-    }
-
-    /**
-     * test authorise post -> default action: strip $_GET, $_POST
-     */
-    public function testAuthorisePost_failedAction_6()
-    {
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-
-        csrfprotector::$config['logDirectory'] = '../log';
-        csrfprotector::$config['verifyGetFor'] = array('http://test/index*');
-        csrfprotector::$config['failedAuthAction']['POST'] = 10;
-        csrfprotector::$config['failedAuthAction']['GET'] = 10;
-
-        $_POST = array('param1' => 1, 'param2' => 2);
-        csrfprotector::authorizePost();
-        $this->assertEmpty($_POST);
-
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        csrfp_wrapper::changeRequestType('GET');
-        $_GET = array('param1' => 1, 'param2' => 2);
-
-        csrfprotector::authorizePost();
-        $this->assertEmpty($_GET);
-    }
-
-    /**
-     * test authorise success
-     */
-    public function testAuthorisePost_success()
-    {
-
-        $_SERVER['REQUEST_METHOD'] = 'POST';
-        $_POST[csrfprotector::$config['CSRFP_TOKEN']]
-            = $_GET[csrfprotector::$config['CSRFP_TOKEN']]
-            = $_SESSION[csrfprotector::$config['CSRFP_TOKEN']][0];
-        $temp = $_SESSION[csrfprotector::$config['CSRFP_TOKEN']];
-
-        csrfprotector::authorizePost(); //will create new session and cookies
-        $this->assertFalse($temp == $_SESSION[csrfprotector::$config['CSRFP_TOKEN']][0]);
-        $this->assertTrue(csrfp_wrapper::checkHeader('Set-Cookie'));
-        $this->assertTrue(csrfp_wrapper::checkHeader('csrfp_token'));
-        // $this->assertTrue(csrfp_wrapper::checkHeader($_SESSION[csrfprotector::$config['CSRFP_TOKEN']][0]));  // Combine these 3 later
-
-        // For get method
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        csrfp_wrapper::changeRequestType('GET');
-        $_POST[csrfprotector::$config['CSRFP_TOKEN']]
-            = $_GET[csrfprotector::$config['CSRFP_TOKEN']]
-            = $_SESSION[csrfprotector::$config['CSRFP_TOKEN']][0];
-        $temp = $_SESSION[csrfprotector::$config['CSRFP_TOKEN']];
-
-        csrfprotector::authorizePost(); //will create new session and cookies
-        $this->assertFalse($temp == $_SESSION[csrfprotector::$config['CSRFP_TOKEN']]);
-        $this->assertTrue(csrfp_wrapper::checkHeader('Set-Cookie'));
-        $this->assertTrue(csrfp_wrapper::checkHeader('csrfp_token'));
-        // $this->assertTrue(csrfp_wrapper::checkHeader($_SESSION[csrfprotector::$config['CSRFP_TOKEN']][0]));  // Combine these 3 later
-    }
-
-    /**
-     * test for generateAuthToken()
-     */
-    public function testGenerateAuthToken()
-    {
-        csrfprotector::$config['tokenLength'] = 20;
-        $token1 = csrfprotector::generateAuthToken();
-        $token2 = csrfprotector::generateAuthToken();
-
-        $this->assertFalse($token1 == $token2);
-        $this->assertEquals(strlen($token1), 20);
-        $this->assertRegExp('/^[a-z0-9]{20}$/', $token1);
-
-        csrfprotector::$config['tokenLength'] = 128;
-        $token = csrfprotector::generateAuthToken();
-        $this->assertEquals(strlen($token), 128);
-        $this->assertRegExp('/^[a-z0-9]{128}$/', $token);
-    }
-
-    /**
-     * test ob_handler_function
-     */
-    public function testob_handler()
-    {
-        csrfprotector::$config['disabledJavascriptMessage'] = 'test message';
-        csrfprotector::$config['jsUrl'] = 'http://localhost/test/csrf/js/csrfprotector.js';
-
-        $testHTML = '<html>';
-        $testHTML .= '<head><title>1</title>';
-        $testHTML .= '<body onload="test()">';
-        $testHTML .= '-- some static content --';
-        $testHTML .= '-- some static content --';
-        $testHTML .= '</body>';
-        $testHTML .= '</head></html>';
-
-        $modifiedHTML = csrfprotector::ob_handler($testHTML, 0);
-        $inpLength = strlen($testHTML);
-        $outLength = strlen($modifiedHTML);
-
-        //Check if file has been modified
-        $this->assertFalse($outLength == $inpLength);
-        $this->assertTrue(strpos($modifiedHTML, '<noscript>') !== false);
-        $this->assertTrue(strpos($modifiedHTML, '<script') !== false);
-
-    }
-
-    /**
-     * test ob_handler_function for output filter
-     */
-    public function testob_handler_positioning()
-    {
-        csrfprotector::$config['disabledJavascriptMessage'] = 'test message';
-        csrfprotector::$config['jsUrl'] = 'http://localhost/test/csrf/js/csrfprotector.js';
-
-        $testHTML = '<html>';
-        $testHTML .= '<head><title>1</title>';
-        $testHTML .= '<body onload="test()">';
-        $testHTML .= '-- some static content --';
-        $testHTML .= '-- some static content --';
-        $testHTML .= '</body>';
-        $testHTML .= '</head></html>';
-
-        $modifiedHTML = csrfprotector::ob_handler($testHTML, 0);
-
-        $this->assertEquals(strpos($modifiedHTML, '<body') + 23, strpos($modifiedHTML, '<noscript'));
-        // Check if content before </body> is </script> #todo
-        //$this->markTestSkipped('todo, add appropriate test here');
-    }
-
-    /**
-     * testing exception in logging function
-     */
-    public function testgetCurrentUrl()
-    {
-        $stub = new ReflectionClass('csrfprotector');
-        $method = $stub->getMethod('getCurrentUrl');
-        $method->setAccessible(true);
-        $this->assertEquals($method->invoke(null, array()), "http://test/index.php");
-
-        $tmp_request_scheme = $_SERVER['REQUEST_SCHEME'];
-        unset($_SERVER['REQUEST_SCHEME']);
-
-        // server-https is not set
-        $this->assertEquals($method->invoke(null, array()), "http://test/index.php");
-
-        $_SERVER['HTTPS'] = 'on';
-        $this->assertEquals($method->invoke(null, array()), "https://test/index.php");
-        unset($_SERVER['HTTPS']);
-
-        $_SERVER['REQUEST_SCHEME'] = "https";
-        $this->assertEquals($method->invoke(null, array()), "https://test/index.php");
-
-        $_SERVER['REQUEST_SCHEME'] = $tmp_request_scheme;
-    }
-
-    /**
-     * testing exception in logging function
-     */
-    public function testLoggingException()
-    {
-        $stub = new ReflectionClass('csrfprotector');
-        $method = $stub->getMethod('logCSRFattack');
-        $method->setAccessible(true);
-
-        try {
-            $method->invoke(null, array());
-            $this->fail("logFileWriteError was not caught");
-        } catch (Exception $ex) {
-            // pass
-            $this->assertTrue(true);
-        }
-
-        if (!is_dir($this->logDir))
-            mkdir($this->logDir);
-        $method->invoke(null, array());
-        $this->assertTrue(file_exists($this->logDir ."/" .date("m-20y") .".log"));
-    }
-
-    /**
-     * Tests isUrlAllowed() function for various urls and configuration
-     */
-    public function testisURLallowed()
-    {
-        csrfprotector::$config['verifyGetFor'] = array('http://test/delete*', 'https://test/*');
-
-        $_SERVER['PHP_SELF'] = '/nodelete.php';
-        $this->assertTrue(csrfprotector::isURLallowed());
-
-        $_SERVER['PHP_SELF'] = '/index.php';
-        $this->assertTrue(csrfprotector::isURLallowed('http://test/index.php'));
-
-        $_SERVER['PHP_SELF'] = '/delete.php';
-        $this->assertFalse(csrfprotector::isURLallowed('http://test/delete.php'));
-
-        $_SERVER['PHP_SELF'] = '/delete_user.php';
-        $this->assertFalse(csrfprotector::isURLallowed('http://test/delete_users.php'));
-
-        $_SERVER['REQUEST_SCHEME'] = 'https';
-        $_SERVER['PHP_SELF'] = '/index.php';
-        $this->assertFalse(csrfprotector::isURLallowed('https://test/index.php'));
-
-        $_SERVER['PHP_SELF'] = '/delete_user.php';
-        $this->assertFalse(csrfprotector::isURLallowed('https://test/delete_users.php'));
-    }
-
-    /**
-     * Test for exception thrown when env variable is set by mod_csrfprotector
-     */
-    public function testModCSRFPEnabledException()
-    {
-        putenv('mod_csrfp_enabled=true');
-        $temp = $_COOKIE[csrfprotector::$config['CSRFP_TOKEN']] = 'abc';
-        $_SESSION[csrfprotector::$config['CSRFP_TOKEN']] = array('abc');
-
-        csrfProtector::$config = array();
-        csrfProtector::init();
-
-        // Assuming no config was added
-        $this->assertTrue(count(csrfProtector::$config) == 0);
-        
-        // unset the env variable
-        putenv('mod_csrfp_enabled');
-    }
-
-    /**
-     * Test for exception thrown when init() method is called multiple times
-     */
-    public function testMultipleInitializeException()
-    {
-        csrfProtector::$config = array();
-        $this->assertTrue(count(csrfProtector::$config) == 0);
-
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        csrfProtector::init();
-
-        $this->assertTrue(count(csrfProtector::$config) == 11);
-        try {
-            csrfProtector::init();
-            $this->fail("alreadyInitializedException not raised");
-        }  catch (alreadyInitializedException $ex) {
-            // pass
-            $this->assertTrue(true);
-        } catch (Exception $ex) {
-            $this->fail("exception other than alreadyInitializedException failed");            
-        }
-    }
-}
diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php
index 19b63e9ba..8a96e66eb 100644
--- a/data/web/inc/prerequisites.inc.php
+++ b/data/web/inc/prerequisites.inc.php
@@ -16,18 +16,6 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/lib/vendor/autoload.php';
 $u2f = new u2flib_server\U2F('https://' . $_SERVER['HTTP_HOST']);
 $tfa = new RobThree\Auth\TwoFactorAuth('mailcow UI');
 
-// OWASP CSRF Protector
-$csrfProtector = new csrfProtector;
-class mailcowCsrfProtector extends csrfprotector {
-  public static function logCSRFattack() {
-    $_SESSION['return'] = array(
-      'type' => 'danger',
-      'msg' => 'CSRF violation'
-    );
-  }
-}
-mailcowCsrfProtector::init();
-
 // Redis
 $redis = new Redis();
 $redis->connect('redis-mailcow', 6379);

From e91c6916abd1e727f3089c34f53e4b445f9b50d8 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Mon, 15 May 2017 11:37:12 +0200
Subject: [PATCH 12/25] CSRF protection

---
 data/web/admin.php            |  1 +
 data/web/inc/footer.inc.php   |  1 +
 data/web/inc/sessions.inc.php | 51 +++++++++++++++++++++--------------
 data/web/js/admin.js          |  2 +-
 data/web/js/mailbox.js        |  4 +--
 data/web/mailbox.php          |  1 +
 6 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/data/web/admin.php b/data/web/admin.php
index 384e20dac..e3f978f09 100644
--- a/data/web/admin.php
+++ b/data/web/admin.php
@@ -351,6 +351,7 @@ $tfa_data = get_tfa();
 <?php
 $lang_admin = json_encode($lang['admin']);
 echo "var lang = ". $lang_admin . ";\n";
+echo "var csrf_token = '". $_SESSION['CSRF']['TOKEN'] . "';\n";
 echo "var pagination_size = '". $PAGINATION_SIZE . "';\n";
 ?>
 </script>
diff --git a/data/web/inc/footer.inc.php b/data/web/inc/footer.inc.php
index 05b7a5990..605a4e7c8 100644
--- a/data/web/inc/footer.inc.php
+++ b/data/web/inc/footer.inc.php
@@ -225,6 +225,7 @@ $(document).ready(function() {
 			}
 		});
 	});
+  $("<input type='hidden' value='<?=$_SESSION['CSRF']['TOKEN'];?>' />").attr("id", "csrf_token").attr("name", "csrf_token").appendTo("form");
 });
 </script>
 
diff --git a/data/web/inc/sessions.inc.php b/data/web/inc/sessions.inc.php
index b62418394..1b2c986c0 100644
--- a/data/web/inc/sessions.inc.php
+++ b/data/web/inc/sessions.inc.php
@@ -15,21 +15,8 @@ else {
 }
 session_set_cookie_params($GLOBALS['SESSION_LIFETIME'], '/', $_SERVER['SERVER_NAME'], $IS_HTTPS, true);
 session_start();
-
-// Handle logouts
-if (isset($_POST["logout"])) {
-  if (isset($_SESSION["dual-login"])) {
-    $_SESSION["mailcow_cc_username"] = $_SESSION["dual-login"]["username"];
-    $_SESSION["mailcow_cc_role"] = $_SESSION["dual-login"]["role"];
-    unset($_SESSION["dual-login"]);
-  }
-  else {
-    session_regenerate_id(true);
-    session_unset();
-    session_destroy();
-    session_write_close();
-    header("Location: /");
-  }
+if (!isset($_SESSION['CSRF']['TOKEN'])) {
+  $_SESSION['CSRF']['TOKEN'] = bin2hex(random_bytes(32));
 }
 
 // Set session IP and UA
@@ -51,12 +38,36 @@ function session_check() {
   if ($_SESSION['SESS_REMOTE_UA'] != $_SERVER['HTTP_USER_AGENT']) {
     return false;
   }
+  if (!empty($_POST)) {
+    if ($_SESSION['CSRF']['TOKEN'] != $_POST['csrf_token']) {
+      return false;
+    }
+    $_SESSION['CSRF']['TOKEN'] = bin2hex(random_bytes(32));
+    $_SESSION['CSRF']['TIME'] = time();
+  }
   return true;
 }
+
 if (isset($_SESSION['mailcow_cc_role']) && session_check() === false) {
-  session_regenerate_id(true);
-  session_unset();
-  session_destroy();
-  session_write_close();
-  header("Location: /");
+  $_SESSION['return'] = array(
+    'type' => 'warning',
+    'msg' => 'Form token invalid or timed out'
+  );
+  $_POST = array();
 }
+
+// Handle logouts
+if (isset($_POST["logout"])) {
+  if (isset($_SESSION["dual-login"])) {
+    $_SESSION["mailcow_cc_username"] = $_SESSION["dual-login"]["username"];
+    $_SESSION["mailcow_cc_role"] = $_SESSION["dual-login"]["role"];
+    unset($_SESSION["dual-login"]);
+  }
+  else {
+    session_regenerate_id(true);
+    session_unset();
+    session_destroy();
+    session_write_close();
+    header("Location: /");
+  }
+}
\ No newline at end of file
diff --git a/data/web/js/admin.js b/data/web/js/admin.js
index 96c189be6..711070ddc 100644
--- a/data/web/js/admin.js
+++ b/data/web/js/admin.js
@@ -52,7 +52,7 @@ $(document).ready(function() {
         $.ajax({
           type: "POST",
           dataType: "json",
-          data: { "items": JSON.stringify(data_array) },
+          data: { "items": JSON.stringify(data_array), "csrf_token": csrf_token },
           url: '/api/v1/' + api_url,
           jsonp: false,
           complete: function (data) {
diff --git a/data/web/js/mailbox.js b/data/web/js/mailbox.js
index 5bd9a64ed..bd802fe92 100644
--- a/data/web/js/mailbox.js
+++ b/data/web/js/mailbox.js
@@ -43,7 +43,7 @@ $(document).ready(function() {
       $.ajax({
         type: "POST",
         dataType: "json",
-        data: { "items": JSON.stringify(data_array), "attr": JSON.stringify(api_attr) },
+        data: { "items": JSON.stringify(data_array), "attr": JSON.stringify(api_attr), "csrf_token": csrf_token },
         url: '/api/v1/' + api_url,
         jsonp: false,
         complete: function (data) {
@@ -76,7 +76,7 @@ $(document).ready(function() {
         $.ajax({
           type: "POST",
           dataType: "json",
-          data: { "items": JSON.stringify(data_array) },
+          data: { "items": JSON.stringify(data_array), "csrf_token": csrf_token },
           url: '/api/v1/' + api_url,
           jsonp: false,
           complete: function (data) {
diff --git a/data/web/mailbox.php b/data/web/mailbox.php
index 6853a9d96..b04ae9684 100644
--- a/data/web/mailbox.php
+++ b/data/web/mailbox.php
@@ -172,6 +172,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
 <?php
 $lang_mailbox = json_encode($lang['mailbox']);
 echo "var lang = ". $lang_mailbox . ";\n";
+echo "var csrf_token = '". $_SESSION['CSRF']['TOKEN'] . "';\n";
 $role = ($_SESSION['mailcow_cc_role'] == "admin") ? 'admin' : 'domainadmin';
 echo "var role = '". $role . "';\n";
 echo "var pagination_size = '". $PAGINATION_SIZE . "';\n";

From 08ad62a253f055297deb6333a09b7057654253ce Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Tue, 16 May 2017 09:51:05 +0200
Subject: [PATCH 13/25] Fix domain actions

---
 data/web/js/mailbox.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/web/js/mailbox.js b/data/web/js/mailbox.js
index bd802fe92..0ec0d5e2d 100644
--- a/data/web/js/mailbox.js
+++ b/data/web/js/mailbox.js
@@ -128,6 +128,7 @@ jQuery(function($){
         {"name":"max_quota_for_mbox","title":lang.mailbox_quota,"breakpoints":"xs sm"},
         {"name":"backupmx","filterable": false,"style":{"maxWidth":"120px","width":"120px"},"title":lang.backup_mx,"breakpoints":"xs sm"},
         {"name":"active","filterable": false,"style":{"maxWidth":"80px","width":"80px"},"title":lang.active},
+        {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","maxWidth":"180px","width":"180px"},"type":"html","title":lang.action,"breakpoints":"xs sm"}
       ],
       "rows": $.ajax({
         dataType: 'json',

From cab5277ce57dfe5387a3e9988e58244f435c5873 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Tue, 16 May 2017 11:59:20 +0200
Subject: [PATCH 14/25] Check if variable is not empty to prevent warnings

---
 data/web/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/web/admin.php b/data/web/admin.php
index e3f978f09..a6f032bef 100644
--- a/data/web/admin.php
+++ b/data/web/admin.php
@@ -58,7 +58,7 @@ $tfa_data = get_tfa();
           <div class="col-sm-9 col-xs-7">
             <p id="tfa_pretty"><?=$tfa_data['pretty'];?></p>
               <div id="tfa_additional">
-                <?php if($tfa_data['additional']):
+                <?php if (!empty($tfa_data['additional'])):
                 foreach ($tfa_data['additional'] as $key_info): ?>
                 <form style="display:inline;" method="post">
                   <input type="hidden" name="unset_tfa_key" value="<?=$key_info['id'];?>" />

From 4a9c9c220a4ed44ddd7fe5517e6f8d37fe839597 Mon Sep 17 00:00:00 2001
From: Dennis Neufeld <info@dennis14e.de>
Date: Tue, 16 May 2017 18:11:00 +0200
Subject: [PATCH 15/25] Updated languages

Use HTML5-linebreak instead of XHTML
---
 data/web/lang/lang.de.php |  978 ++++++++++++++++++------------------
 data/web/lang/lang.en.php | 1002 ++++++++++++++++++-------------------
 data/web/lang/lang.es.php |   24 +-
 data/web/lang/lang.nl.php |   23 +-
 data/web/lang/lang.pt.php |   20 +-
 data/web/lang/lang.ru.php |  900 +++++++++++++++++----------------
 6 files changed, 1468 insertions(+), 1479 deletions(-)

diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php
index a182ff4a9..b5d5470ed 100644
--- a/data/web/lang/lang.de.php
+++ b/data/web/lang/lang.de.php
@@ -1,490 +1,488 @@
-<?php
-/*
-//
-//  German language file
-//
-*/
-$lang['footer']['loading'] = 'Einen Moment bitte...';
-$lang['header']['restart_sogo'] = 'SOGo neustarten';
-$lang['footer']['restart_sogo'] = 'SOGo neustarten';
-$lang['footer']['restart_now'] = 'Jetzt neustarten';
-$lang['footer']['restart_sogo_info'] = 'Einige Änderungen an Domains benötigen einen Neustart SOGos. Hier können Sie SOGo neustarten.<br /><br /><b>Wichtig:</b> Ein korrekter Neustart SOGos kann eine Weile in Anspruch nehmen, bitte warten Sie, bis der Prozess vollständig beendet wurde.';
-
-$lang['footer']['confirm_delete'] = 'Löschen bestätigen';
-$lang['footer']['delete_these_items'] = 'Sind Sie sicher, dass die folgenden Elemente entfernt werden sollen?';
-$lang['footer']['delete_now'] = 'Jetzt löschen';
-$lang['footer']['cancel'] = 'Abbrechen';
-
-$lang['dkim']['confirm'] = 'Sind Sie sicher?';
-$lang['danger']['dkim_not_found'] = 'DKIM-Key nicht gefunden';
-$lang['danger']['dkim_remove_failed'] = 'Kann DKIM-Key nicht entfernen';
-$lang['danger']['dkim_add_failed'] = 'Kann DKIM-Key nicht hinzufügen';
-$lang['danger']['dkim_domain_or_sel_invalid'] = 'DKIM-Domain oder -Selector nicht korrekt';
-$lang['danger']['dkim_key_length_invalid'] = 'DKIM Schlüssellänge ungültig';
-$lang['success']['dkim_removed'] = 'DKIM-Key wurde entfernt';
-$lang['success']['dkim_added'] = 'DKIM-Key wurde hinzugefügt';
-$lang['danger']['access_denied'] = 'Zugriff verweigert oder unvollständige/ungültige Daten';
-$lang['danger']['whitelist_from_invalid'] = 'Whitelist-Eintrag ist ungültig';
-$lang['danger']['domain_invalid'] = 'Domainname ist ungültig';
-$lang['danger']['mailbox_quota_exceeds_domain_quota'] = 'Maximale Größe für Mailboxen überschreitet das Domain Speicherlimit';
-$lang['danger']['object_is_not_numeric'] = 'Wert %s ist nicht numerisch';
-$lang['success']['domain_added'] = 'Domain %s wurde angelegt';
-$lang['danger']['alias_empty'] = 'Alias-Adresse darf nicht leer sein';
-$lang['danger']['goto_empty'] = 'Ziel-Adresse darf nicht leer sein';
-$lang['danger']['policy_list_from_exists'] = 'Ein Eintrag mit diesem Wert existiert bereits';
-$lang['danger']['policy_list_from_invalid'] = 'Eintrag hat ungültiges Format';
-$lang['danger']['alias_invalid'] = 'Alias-Adresse ist ungültig';
-$lang['danger']['goto_invalid'] = 'Ziel-Adresse ist ungültig';
-$lang['danger']['last_key'] = 'Letzter Key kann nicht gelöscht werden';
-$lang['danger']['alias_domain_invalid'] = 'Alias-Domain ist ungültig';
-$lang['danger']['target_domain_invalid'] = 'Ziel-Domain ist ungültig';
-$lang['danger']['object_exists'] = 'Objekt %s existiert bereits';
-$lang['danger']['domain_exists'] = 'Domain %s existiert bereits';
-$lang['danger']['alias_goto_identical'] = 'Alias- und Ziel-Adresse dürfen nicht identisch sein';
-$lang['danger']['aliasd_targetd_identical'] = 'Alias-Domain darf nicht gleich Ziel-Domain sein';
-$lang['danger']['maxquota_empty'] = 'Max. Speicherplatz pro Mailbox darf nicht 0 sein.';
-$lang['success']['alias_added'] = 'Alias-Adresse(n) wurden angelegt';
-$lang['success']['alias_modified'] = 'Änderungen an Alias %s wurden gespeichert';
-$lang['success']['aliasd_modified'] = 'Änderungen an Alias-Domain %s wurden gespeichert';
-$lang['success']['mailbox_modified'] = 'Änderungen an Mailbox %s wurden gespeichert';
-$lang['success']['resource_modified'] = "Änderungen an Ressource %s wurden gespeichert";
-$lang['success']['object_modified'] = "Änderungen an Objekt %s wurden gespeichert";
-$lang['success']['msg_size_saved'] = 'Limit wurde gesetzt';
-$lang['danger']['aliasd_not_found'] = 'Alias-Domain nicht gefunden';
-$lang['danger']['targetd_not_found'] = 'Ziel-Domain nicht gefunden';
-$lang['danger']['aliasd_exists'] = 'Alias-Domain existiert bereits';
-$lang['success']['aliasd_added'] = 'Alias-Domain %s wurde angelegt';
-$lang['success']['aliasd_modified'] = 'Änderungen an Alias-Domain %s wurden gespeichert';
-$lang['success']['domain_modified'] = 'Änderungen an Domain %s wurden gespeichert';
-$lang['success']['domain_admin_modified'] = 'Änderungen an Domain-Administrator %s wurden gespeichert';
-$lang['success']['domain_admin_added'] = 'Domain-Administrator %s wurde angelegt';
-$lang['success']['changes_general'] = 'Änderungen wurden gespeichert';
-$lang['success']['admin_modified'] = 'Änderungen am Administrator wurden gespeichert';
-$lang['danger']['exit_code_not_null'] = 'Fehler: Exit-Code ist %d';
-$lang['danger']['mailbox_not_available'] = 'Mailbox nicht verfügbar';
-$lang['danger']['username_invalid'] = 'Benutzername kann nicht verwendet werden';
-$lang['danger']['password_mismatch'] = 'Passwort-Wiederholung stimmt nicht überein';
-$lang['danger']['password_complexity'] = 'Passwort entspricht nicht den Richtlinien';
-$lang['danger']['password_empty'] = 'Passwort darf nicht leer sein';
-$lang['danger']['login_failed'] = 'Anmeldung fehlgeschlagen';
-$lang['danger']['mailbox_invalid'] = 'Mailboxname ist ungültig';
-$lang['danger']['resource_invalid'] = 'Ressourcenname ist ungültig';
-$lang['danger']['description_invalid'] = 'Ressourcenbeschreibung ist ungültig';
-$lang['danger']['mailbox_invalid_suggest'] = 'Mailboxname ist ungültig, meinten Sie vielleicht %s?';
-$lang['danger']['is_alias'] = '%s lautet bereits eine Alias-Adresse';
-$lang['danger']['is_alias_or_mailbox'] = "Eine Mailbox oder ein Alias mit der Adresse %s ist bereits vorhanden";
-$lang['danger']['is_spam_alias'] = '%s lautet bereits eine Spam-Alias-Adresse';
-$lang['danger']['quota_not_0_not_numeric'] = 'Speicherplatz muss numerisch und >= 0 sein';
-$lang['danger']['domain_not_found'] = 'Domain %s nicht gefunden';
-$lang['danger']['max_mailbox_exceeded'] = 'Anzahl an Mailboxen überschritten (%d von %d)';
-$lang['danger']['max_alias_exceeded'] = 'Anzahl an Alias-Adressen überschritten';
-$lang['danger']['mailbox_quota_exceeded'] = 'Speicherplatz überschreitet das Limit (max. %d MiB)';
-$lang['danger']['mailbox_quota_left_exceeded'] = 'Nicht genügend Speicherplatz vorhanden (Speicherplatz anwendbar: %d MiB)';
-$lang['success']['mailbox_added'] = 'Mailbox %s wurde angelegt';
-$lang['success']['resource_added'] = 'Ressource %s wurde angelegt';
-$lang['success']['domain_removed'] = 'Domain %s wurde entfernt';
-$lang['success']['alias_removed'] = 'Alias-Adresse %s wurde entfernt';
-$lang['success']['alias_domain_removed'] = 'Alias-Domain %s wurde entfernt';
-$lang['success']['domain_admin_removed'] = 'Domain-Administrator %s wurde entfernt';
-$lang['success']['mailbox_removed'] = 'Mailbox %s wurde entfernt';
-$lang['success']['eas_reset'] = "ActiveSync Gerät des Benutzers %s wurden zurückgesetzt";
-$lang['success']['resource_removed'] = 'Ressource %s wurde entfernt';
-$lang['danger']['max_quota_in_use'] = 'Mailbox Speicherplatzlimit muss größer oder gleich %d MiB sein';
-$lang['danger']['domain_quota_m_in_use'] = 'Domain Speicherplatzlimit muss größer oder gleich %d MiB sein';
-$lang['danger']['mailboxes_in_use'] = 'Maximale Anzahl an Mailboxen muss größer oder gleich %d sein';
-$lang['danger']['aliases_in_use'] = 'Maximale Anzahl an Aliassen muss größer oder gleich %d sein';
-$lang['danger']['sender_acl_invalid'] = 'Sender ACL Wert muss eine Adresse oder Domain sein';
-$lang['danger']['domain_not_empty'] = 'Kann nur leere Domains entfernen';
-$lang['warning']['spam_alias_temp_error'] = 'Kann zur Zeit keinen Spam-Alias erstellen, bitte versuchen Sie es später noch einmal.';
-$lang['danger']['spam_alias_max_exceeded'] = 'Maximale Anzahl an Spam-Alias-Adressen erreicht';
-$lang['danger']['validity_missing'] = 'Bitte geben Sie eine Gültigkeitsdauer an';
-$lang['user']['on'] = 'Ein';
-$lang['user']['off'] = 'Aus';
-$lang['user']['messages'] = "Nachrichten";
-$lang['user']['in_use'] = "Verwendet";
-$lang['user']['user_change_fn'] = '';
-$lang['user']['user_settings'] = 'Benutzereinstellungen';
-$lang['user']['mailbox_settings'] = 'Mailbox-Einstellungen';
-$lang['user']['mailbox_details'] = 'Mailbox-Details';
-$lang['user']['change_password'] = 'Passwort ändern';
-$lang['user']['new_password'] = 'Neues Passwort';
-$lang['user']['save_changes'] = 'Änderungen speichern';
-$lang['user']['password_now'] = 'Aktuelles Passwort (Änderungen bestätigen)';
-$lang['user']['new_password_repeat'] = 'Neues Passwort (Wiederholung)';
-$lang['user']['new_password_description'] = 'Mindestanforderung: 6 Zeichen lang, Buchstaben und Zahlen.';
-$lang['user']['did_you_know'] = '<b>Wussten Sie schon?</b> Sie können Ihre E-Mail-Adresse mit Tags versehen, etwa "ich+<b>Privat</b>@example.com", um Nachrichten automatisch in einem Unterordner (Beispiel: "Privat") abzulegen.';
-$lang['user']['spam_aliases'] = 'Temporäre E-Mail Aliasse';
-$lang['user']['alias'] = 'Alias';
-$lang['user']['aliases'] = 'Aliasse';
-$lang['user']['domain_aliases'] = 'Domain-Alias Adressen';
-$lang['user']['is_catch_all'] = 'Ist Catch-All Adresse für Domain(s)';
-$lang['user']['aliases_also_send_as'] = 'Darf außerdem versenden als Benutzer';
-$lang['user']['aliases_send_as_all'] = 'Absender für folgende Domains und zugehörige Alias-Domains nicht prüfen';
-$lang['user']['alias_create_random'] = 'Zufälligen Alias generieren';
-$lang['user']['alias_extend_all'] = 'Gültigkeit +1h';
-$lang['user']['alias_valid_until'] = 'Gültig bis';
-$lang['user']['alias_remove_all'] = 'Alle entfernen';
-$lang['user']['alias_time_left'] = 'Zeit verbleibend';
-$lang['user']['alias_full_date'] = 'd.m.Y, H:i:s T';
-$lang['user']['syncjob_full_date'] = 'd.m.Y, H:i:s T';
-$lang['user']['alias_select_validity'] = 'Bitte Gültigkeit auswählen';
-$lang['user']['sync_jobs'] = 'Sync Jobs';
-$lang['user']['hour'] = 'Stunde';
-$lang['user']['hours'] = 'Stunden';
-$lang['user']['day'] = 'Tag';
-$lang['user']['week'] = 'Woche';
-$lang['user']['weeks'] = 'Wochen';
-$lang['user']['spamfilter'] = 'Spamfilter';
-$lang['admin']['spamfilter'] = 'Spamfilter';
-$lang['user']['spamfilter_wl'] = 'Whitelist';
-$lang['user']['spamfilter_wl_desc'] = 'Für E-Mail-Adressen, die vom Spamfilter <b>nicht</b> erfasst werden sollen. Die Verwendung von Wildcards ist gestattet.';
-$lang['user']['spamfilter_bl'] = 'Blacklist';
-$lang['user']['spamfilter_bl_desc'] = 'Für E-Mail-Adressen, die vom Spamfilter <b>immer</b> als Spam erfasst und abgelehnt werden. Die Verwendung von Wildcards ist gestattet.';
-$lang['user']['spamfilter_table_rule'] = 'Regel';
-$lang['user']['spamfilter_table_action'] = 'Aktion';
-$lang['user']['spamfilter_table_empty'] = 'Keine Einträge vorhanden';
-$lang['user']['spamfilter_table_remove'] = 'entfernen';
-$lang['user']['spamfilter_table_add'] = 'Eintrag hinzufügen';
-$lang['user']['spamfilter_behavior'] = 'Bewertung';
-$lang['user']['spamfilter_default_score'] = 'Spam-Score:';
-$lang['user']['spamfilter_green'] = 'Grün: Die Nachricht ist kein Spam';
-$lang['user']['spamfilter_yellow'] = 'Gelb: Die Nachricht ist vielleicht Spam, wird als Spam markiert und in den Junk-Ordner verschoben';
-$lang['user']['spamfilter_red'] = 'Rot: Die Nachricht ist eindeutig Spam und wird vom Server abgelehnt';
-$lang['user']['spamfilter_default_score'] = 'Standardwert:';
-$lang['user']['spamfilter_hint'] = 'Der erste Wert beschreibt den "low spam score", der zweite Wert den "high spam score".';
-$lang['user']['spamfilter_table_domain_policy'] = "n.v. (Domainrichtlinie)";
-
-$lang['user']['tls_policy_warning'] = '<strong>Vorsicht:</strong> Entscheiden Sie sich unverschlüsselte Verbindungen abzulehnen, kann dies dazu führen, dass Kontakte Sie nicht mehr erreichen.<br />Nachrichten, die die Richtlinie nicht erfüllen, werden durch einen Hard-Fail im Mailsystem abgewiesen.<br />Diese Einstellung ist aktiv für die primäre Mailbox, für alle Alias-Adressen, die dieser Mailbox <b>direkt zugeordnet</b> sind (lediglich eine einzige Ziel-Adresse) und der Adressen, die sich aus Alias-Domains ergeben. Ausgeschlossen sind temporäre Aliasse ("Spam-Alias-Adressen"), Catch-All Alias-Adressen sowie Alias-Adressen mit mehreren Zielen.';
-$lang['user']['tls_policy'] = 'Verschlüsselungsrichtlinie';
-$lang['user']['tls_enforce_in'] = 'TLS eingehend erzwingen';
-$lang['user']['tls_enforce_out'] = 'TLS ausgehend erzwingen';
-$lang['user']['no_record'] = 'Kein Eintrag';
-
-$lang['user']['misc_settings'] = 'Sonstige Kontoeinstellungen';
-$lang['user']['misc_delete_profile'] = 'Sonstige Kontoeinstellungen';
-
-$lang['user']['tag_handling'] = 'Umgang mit getaggten E-Mails steuern';
-$lang['user']['tag_in_subfolder'] = 'In Unterordner';
-$lang['user']['tag_in_subject'] = 'In Betreff';
-$lang['user']['tag_help_explain'] = 'Als Unterordner: Es wird ein Ordner mit dem Namen des Tags unterhalb der Inbox erstellt ("INBOX/Facebook").<br />
-In Betreff: Der Name des Tags wird dem Betreff angefügt, etwa "[Facebook] Meine Neuigkeiten".';
-$lang['user']['tag_help_example'] = 'Beispiel für eine getaggte E-Mail-Adresse: ich<b>+Facebook</b>@example.org';
-$lang['user']['eas_reset'] = 'ActiveSync Geräte-Cache zurücksetzen';
-$lang['user']['eas_reset_now'] = 'Jetzt zurücksetzen';
-$lang['user']['eas_reset_help'] = 'In vielen Fällen kann ein ActiveSync Profil durch das Zurücksetzen des Caches repariert werden.<br /><b>Vorsicht:</b> Alle Elemente werden erneut heruntergeladen!';
-
-$lang['user']['encryption'] = 'Verschlüsselung';
-$lang['user']['username'] = 'Benutzername';
-$lang['user']['password'] = 'Password';
-$lang['user']['last_run'] = 'Letzte Ausführung';
-$lang['user']['excludes'] = 'Ausschlüsse';
-$lang['user']['interval'] = 'Intervall';
-$lang['user']['active'] = 'Aktiv';
-$lang['user']['action'] = 'Aktion';
-$lang['user']['edit'] = 'Bearbeiten';
-$lang['user']['remove'] = 'Entfernen';
-$lang['user']['delete_now'] = 'Sofort löschen';
-$lang['user']['create_syncjob'] = 'Neuen Sync-Job erstellen';
-
-$lang['start']['dashboard'] = '%s - Dashboard';
-$lang['start']['start_rc'] = 'Roundcube öffnen';
-$lang['start']['start_sogo'] = 'SOGo öffnen';
-$lang['start']['mailcow_apps_detail'] = 'Verwenden Sie mailcow Apps, um E-Mails abzurufen, Kalender- und Kontakte zu verwalten und vieles mehr.';
-$lang['start']['mailcow_panel'] = 'mailcow UI starten';
-$lang['start']['mailcow_panel_description'] = 'Die mailcow Steuerung steht sowohl für Administratoren als auch Mailbox-Benutzer zur Verfügung.';
-$lang['start']['mailcow_panel_detail'] = '<b>Domain-Administratoren</b> erstellen, verändern oder löschen Mailboxen, verwalten die Domäne und sehen sonstige Einstellungen ein.<br />
-	Als <b>Mailbox-Benutzer</b> erstellen Sie hier zeitlich limitierte Aliasse, ändern das Verhalten des Spamfilters, setzen ein neues Passwort und vieles mehr.';
-$lang['start']['recommended_config'] = 'Empfohlene Software-Konfiguration (ohne ActiveSync)';
-$lang['start']['imap_smtp_server'] = 'IMAP- und SMTP-Server';
-$lang['start']['imap_smtp_server_description'] = 'Für eine optimale Verbindung empfehlen wir die Verwendung des <a href="%s" target="_blank"><b>Mozilla Thunderbirds</b></a>.';
-$lang['start']['imap_smtp_server_badge'] = 'E-Mail lesen und schreiben';
-$lang['start']['imap_smtp_server_auth_info'] = 'Bitte verwenden Sie Ihre vollständige E-Mail-Adresse sowie das PLAIN-Authentifizierungsverfahren.<br />
-Ihre Anmeldedaten werden durch die obligatorische Verschlüsselung entgegen des Begriffes "PLAIN" nicht unverschlüsselt übertragen.';
-$lang['start']['managesieve'] = 'ManageSieve';
-$lang['start']['managesieve_badge'] = 'E-Mail-Filter';
-$lang['start']['managesieve_description'] = 'Bitte verwenden Sie <b>Mozilla Thunderbirds</b> zusammen mit der <a style="text-decoration:none" target="_blank" href="%s"><b>Sieve Erweiterung</b></a>.<br />Nach dem Herunterladen der Erweiterung starten Sie Thunderbird, öffnen das Fenster für Erweiterungen und ziehen die heruntergeladene Datei in das offene Fenster.<br />Der Servername lautet <b>%s</b>, als Port konfigurieren Sie bitte <b>4190</b>. Die Anmeldedaten entsprechen dem E-Mail Login.';
-$lang['start']['service'] = 'Dienstname';
-$lang['start']['encryption'] = 'Verschlüsselungstyp';
-$lang['start']['help'] = 'Hilfe ein-/ausblenden';
-$lang['start']['hostname'] = 'Hostname';
-$lang['start']['port'] = 'Port';
-$lang['start']['footer'] = '';
-$lang['header']['mailcow_settings'] = 'Konfiguration';
-$lang['header']['administration'] = 'Administration';
-$lang['header']['mailboxes'] = 'Mailboxen';
-$lang['header']['user_settings'] = 'Benutzereinstellungen';
-$lang['header']['login'] = 'Anmeldung';
-$lang['header']['logged_in_as_logout'] = 'Eingeloggt als <b>%s</b> (abmelden)';
-$lang['header']['logged_in_as_logout_dual'] = 'Eingeloggt als <b>%s <span class="text-info">[%s]</span></b>';
-$lang['header']['locale'] = 'Sprache';
-$lang['mailbox']['domain'] = 'Domain';
-$lang['mailbox']['spam_aliases'] = 'Temp. Alias';
-$lang['mailbox']['alias'] = 'Alias';
-$lang['mailbox']['aliases'] = 'Aliasse';
-$lang['mailbox']['multiple_bookings'] = 'Mehrfachbuchen';
-$lang['mailbox']['kind'] = 'Art';
-$lang['mailbox']['description'] = 'Beschreibung';
-$lang['mailbox']['resources'] = 'Ressourcen';
-$lang['mailbox']['resource_name'] = 'Ressourcenname';
-$lang['mailbox']['domains'] = 'Domains';
-$lang['mailbox']['mailboxes'] = 'Mailboxen';
-$lang['mailbox']['mailbox_quota'] = 'Max. Größe einer Mailbox';
-$lang['mailbox']['domain_quota'] = 'Gesamtspeicher';
-$lang['mailbox']['ratelimit'] = 'Limit ausgehend/Stunde';
-$lang['mailbox']['active'] = 'Aktiv';
-$lang['mailbox']['action'] = 'Aktion';
-$lang['mailbox']['backup_mx'] = 'Backup MX';
-$lang['mailbox']['domain_aliases'] = 'Domain-Aliasse';
-$lang['mailbox']['target_domain'] = 'Ziel-Domain';
-$lang['mailbox']['target_address'] = 'Ziel-Adresse';
-$lang['mailbox']['username'] = 'Benutzername';
-$lang['mailbox']['fname'] = 'Name';
-$lang['mailbox']['filter_table'] = 'Tabelle filtern';
-$lang['mailbox']['yes'] = '&#10004;';
-$lang['mailbox']['no'] = '&#10008;';
-$lang['mailbox']['quota'] = 'Speicherplatz';
-$lang['mailbox']['in_use'] = 'Prozentualer Gebrauch';
-$lang['mailbox']['msg_num'] = 'Anzahl Nachrichten';
-$lang['mailbox']['remove'] = 'Entfernen';
-$lang['mailbox']['edit'] = 'Bearbeiten';
-$lang['mailbox']['archive'] = 'Archiv-Zugriff';
-$lang['mailbox']['no_record'] = 'Kein Eintrag für Objekt %s';
-$lang['mailbox']['no_record_single'] = 'Kein Eintrag';
-$lang['mailbox']['add_domain'] = 'Domain hinzufügen';
-$lang['mailbox']['add_domain_alias'] = 'Domain-Alias hinzufügen';
-$lang['mailbox']['add_mailbox'] = 'Mailbox hinzufügen';
-$lang['mailbox']['add_resource'] = 'Ressource hinzufügen';
-$lang['mailbox']['add_alias'] = 'Alias hinzufügen';
-$lang['mailbox']['empty'] = 'Keine Einträge vorhanden';
-$lang['mailbox']['toggle_all'] = 'Alle';
-$lang['mailbox']['quick_actions'] = 'Aktionen';
-$lang['mailbox']['activate'] = 'Aktivieren';
-$lang['mailbox']['deactivate'] = 'Deaktivieren';
-
-$lang['info']['no_action'] = 'Keine Aktion anwendbar';
-$lang['delete']['title'] = 'Objekt entfernen';
-$lang['delete']['remove_domain_warning'] = '<b>Warnung:</b> Sie entfernen die Domain <b>%s</b>!';
-$lang['delete']['remove_domainalias_warning'] = '<b>Warnung:</b> Sie entfernen die Alias-Domain <b>%s</b>!';
-$lang['delete']['remove_domainadmin_warning'] = '<b>Warnung:</b> Sie entfernen den Domain-Administrator <b>%s</b>!';
-$lang['delete']['remove_alias_warning'] = '<b>Warnung:</b> Sie entfernen die Alias-Adresse <b>%s</b>!';
-$lang['delete']['remove_syncjob_warning'] = '<b>Warnung:</b> Sie entfernen einen Sync-Job des Benutzers <b>%s</b>!';
-$lang['delete']['remove_mailbox_warning'] = '<b>Warnung:</b> Sie entfernen die Mailbox <b>%s</b>!';
-$lang['delete']['remove_mailbox_details'] = 'Die Mailbox wird <b>vollständig und permanent</b> entfernt!';
-$lang['delete']['remove_resource_warning'] = '<b>Warnung:</b> Sie entfernen die Ressource <b>%s</b>!';
-$lang['delete']['remove_resource_details'] = 'Die Ressource wird <b>vollständig und permanent</b> entfernt!';
-$lang['delete']['remove_domain_details'] = 'Diese Aktion entfernt ebenfalls Domain-Aliasse.<br /><br /><b>Eine Domain muss leer sein, um entfernt zu werden.</b>';
-$lang['delete']['remove_syncjob_details'] = 'Objekte dieses Sync-Jobs werden nicht mehr vom entfernten Server abgeholt.';
-$lang['delete']['remove_alias_details'] = 'Benutzer werden keine Nachrichten mehr von dieser Adresse erhalten und versenden koennen!</b>';
-$lang['delete']['remove_button'] = 'Entfernen';
-$lang['delete']['previous'] = 'Vorherige Seite';
-
-$lang['edit']['syncjob'] = 'Sync-Job bearbeiten';
-$lang['edit']['save'] = 'Änderungen speichern';
-$lang['edit']['username'] = 'Benutzername';
-$lang['edit']['hostname'] = 'Servername';
-$lang['edit']['encryption'] = 'Verschlüsselungsmethode';
-$lang['edit']['maxage'] = 'Maximales Alter in Tagen einer Nachricht, die kopiert werden soll</br ><small>(0 = alle Nachrichten kopieren)</small>';
-$lang['edit']['subfolder2'] = 'Ziel-Ordner<br /><small>(leer = kein Unterordner)</small>';
-$lang['edit']['mins_interval'] = 'Intervall (min)';
-$lang['edit']['exclude'] = 'Elemente ausschließen (Regex)';
-$lang['edit']['archive'] = 'Archiv-Zugriff';
-$lang['edit']['max_mailboxes'] = 'Max. Mailboxanzahl:';
-$lang['edit']['title'] = 'Objekt bearbeiten';
-$lang['edit']['target_address'] = 'Ziel-Adresse(n) <small>(getrennt durch Komma)</small>:';
-$lang['edit']['active'] = 'Aktiv';
-$lang['edit']['target_domain'] = 'Ziel-Domain:';
-$lang['edit']['password'] = 'Passwort:';
-$lang['edit']['ratelimit'] = 'Limit ausgehender Nachrichten/Stunde:';
-$lang['danger']['ratelimt_less_one'] = 'Limit ausgehender Nachrichten/Stunde darf nicht kleiner als 1 sein';
-$lang['edit']['password_repeat'] = 'Passwort (Wiederholung):';
-$lang['edit']['domain_admin'] = 'Domain-Administrator bearbeiten';
-$lang['edit']['domain'] = 'Domain bearbeiten';
-$lang['edit']['edit_alias_domain'] = 'Alias-Domain bearbeiten';
-$lang['edit']['alias_domain'] = 'Alias-Domain';
-$lang['edit']['domains'] = 'Domains';
-$lang['edit']['destroy'] = 'Manuelle Eingabe des Wertes';
-$lang['edit']['alias'] = 'Alias bearbeiten';
-$lang['edit']['mailbox'] = 'Mailbox bearbeiten';
-$lang['edit']['description'] = 'Beschreibung:';
-$lang['edit']['max_aliases'] = 'Max. Aliasse:';
-$lang['edit']['max_quota'] = 'Max. Größe per Mailbox (MiB):';
-$lang['edit']['domain_quota'] = 'Domain Speicherplatz gesamt (MiB):';
-$lang['edit']['backup_mx_options'] = 'Backup MX Optionen:';
-$lang['edit']['relay_domain'] = 'Relay Domain';
-$lang['edit']['relay_all'] = 'Alle Empfänger-Adressen relayen';
-$lang['edit']['dkim_signature'] = 'DKIM-Signatur:';
-$lang['edit']['dkim_record_info'] = '<small>Bitte hinterlegen Sie einen TXT-Record mit obigem Wert in den DNS-Einstellungen Ihrer Domainverwaltung.</small>';
-$lang['edit']['relay_all_info'] = '<small>Wenn Sie <b>nicht</b> alle Empfänger-Adressen relayen möchten, müssen Sie eine ("blinde") Mailbox für jede Adresse, die relayt werden soll, erstellen.</small>';
-$lang['edit']['full_name'] = 'Voller Name';
-$lang['edit']['quota_mb'] = 'Speicherplatz (MiB)';
-$lang['edit']['sender_acl'] = 'Darf Nachrichten versenden als';
-$lang['edit']['sender_acl_info'] = 'Aliasse sind nicht abwählbar und vorausgewählt.';
-$lang['edit']['dkim_txt_name'] = 'TXT-Record Name:';
-$lang['edit']['dkim_txt_value'] = 'TXT-Record Wert:';
-$lang['edit']['previous'] = 'Vorherige Seite';
-$lang['edit']['unchanged_if_empty'] = 'Unverändert, wenn leer';
-$lang['edit']['dont_check_sender_acl'] = 'Absender für Domain %s u. Alias-Dom. nicht prüfen';
-$lang['edit']['multiple_bookings'] = 'Mehrfaches Buchen';
-$lang['edit']['kind'] = 'Art';
-$lang['edit']['resource'] = 'Ressource';
-
-$lang['add']['syncjob'] = 'Sync-Job erstellen';
-$lang['add']['syncjob_hint'] = 'Passwörter werden unverschlüsselt abgelegt!';
-$lang['add']['hostname'] = 'Servername';
-$lang['add']['port'] = 'Port';
-$lang['add']['username'] = 'Benutzername';
-$lang['add']['enc_method'] = 'Verschlüsselungsmethode';
-$lang['add']['maxage'] = 'Maximales Alter von Nachrichten, welche vom Remote abgefragt werden (0 = Alter ignorieren)';
-$lang['add']['subfolder2'] = 'Synchronisation in Unterordner am Ziel';
-$lang['add']['mins_interval'] = 'Abrufintervall (Minuten)';
-$lang['add']['exclude'] = 'Elemente ausschließen (Regex)';
-$lang['add']['delete2duplicates'] = 'Lösche Duplikate im Ziel';
-$lang['add']['delete1'] = 'Lösche Nachricht nach Übertragung vom Quell-Server';
-$lang['edit']['delete2duplicates'] = 'Lösche Duplikate im Ziel';
-$lang['edit']['delete1'] = 'Lösche Nachricht nach Übertragung vom Quell-Server';
-
-$lang['add']['title'] = 'Objekt anlegen';
-$lang['add']['domain'] = 'Domain';
-$lang['add']['active'] = 'Aktiv';
-$lang['add']['multiple_bookings'] = 'Mehrfaches Buchen möglich';
-$lang['add']['save'] = 'Änderungen speichern';
-$lang['add']['description'] = 'Beschreibung:';
-$lang['add']['max_aliases'] = 'Max. mögliche Aliasse:';
-$lang['add']['max_mailboxes'] = 'Max. mögliche Mailboxen:';
-$lang['add']['mailbox_quota_m'] = 'Max. Speicherplatz pro Mailbox (MiB):';
-$lang['add']['domain_quota_m'] = 'Domain Speicherplatz gesamt (MiB):';
-$lang['add']['backup_mx_options'] = 'Backup MX Optionen:';
-$lang['add']['relay_all'] = 'Alle Empfänger-Adressen relayen';
-$lang['add']['relay_domain'] = 'Relay Domain';
-$lang['add']['relay_all_info'] = '<small>Wenn Sie <b>nicht</b> alle Empfänger-Adressen relayen möchten, müssen Sie eine Mailbox für jede Adresse, die relayt werden soll, erstellen.</small>';
-$lang['add']['alias'] = 'Alias(se)';
-$lang['add']['alias_spf_fail'] = '<b>Hinweis:</b> Wählen Sie ein externes Postfach als Ziel-Adresse, kann es unter Umständen zu fehlerhaften Spam-Erkennungen <b>beim Empfänger</b> kommen. Weitere Informationen zu diesem Thema finden Sie <a href="https://www.heinlein-support.de/blog/news/gmx-de-und-web-de-haben-mail-rejects-durch-spf/" target="_blank">hier.</a>';
-$lang['add']['alias_address'] = 'Alias-Adresse(n):';
-$lang['add']['alias_address_info'] = '<small>Vollständige E-Mail-Adresse(n) oder @example.com, um alle Nachrichten einer Domain weiterzuleiten. Getrennt durch Komma. <b>Nur eigene Domains</b>.</small>';
-$lang['add']['alias_domain_info'] = '<small>Nur gültige Domains. Getrennt durch Komma.</small>';
-$lang['add']['target_address'] = 'Ziel-Adresse(n):';
-$lang['add']['target_address_info'] = '<small>Vollständige E-Mail-Adresse(n). Getrennt durch Komma.</small>';
-$lang['add']['alias_domain'] = 'Alias-Domain';
-$lang['add']['select'] = 'Bitte auswählen';
-$lang['add']['target_domain'] = 'Ziel-Domain:';
-$lang['add']['mailbox'] = 'Mailbox';
-$lang['add']['resource'] = 'Ressource';
-$lang['add']['kind'] = 'Art';
-$lang['add']['mailbox_username'] = 'Benutzername (linker Teil der E-Mail-Adresse):';
-$lang['add']['resource_name'] = 'Ressourcenname:';
-$lang['add']['full_name'] = 'Vor- und Zuname:';
-$lang['add']['quota_mb'] = 'Speicherplatz (MiB):';
-$lang['add']['select_domain'] = 'Bitte zuerst eine Domain auswählen';
-$lang['add']['password'] = 'Passwort:';
-$lang['add']['password_repeat'] = 'Passwort (Wiederholung):';
-$lang['add']['previous'] = 'Vorherige Seite';
-$lang['add']['restart_sogo_hint'] = 'Der SOGo Container muss nach dem Hinzufügen einer neuen Domain neugestartet werden!';
-
-$lang['login']['title'] = 'Anmeldung';
-$lang['login']['administration'] = 'Administration';
-$lang['login']['administration_details'] = 'Bitte verwenden Sie Ihre Administrator Anmeldedaten, um administrative Aufgaben wie das Anlegen einer Mailbox zu starten.';
-$lang['login']['user_settings'] = 'Benutzereinstellungen';
-$lang['login']['user_settings_details'] = 'Als E-Mail Benutzer vewenden Sie bitte Ihre E-Mail Anmeldedaten, um Passwörter zu verändern, temporäre (Spam-)Aliasse zu erstellen, den Spamfilter einzustellen oder auch um E-Mails zu importieren.';
-$lang['login']['username'] = 'Benutzername';
-$lang['login']['password'] = 'Passwort';
-$lang['login']['reset_password'] = 'Mein Passwort zurücksetzen';
-$lang['login']['login'] = 'Anmelden';
-$lang['login']['previous'] = 'Vorherige Seite';
-$lang['login']['delayed'] = 'Login wurde zur Sicherheit um %s Sekunde/n verzögert.';
-
-$lang['tfa']['tfa'] = "Zwei-Faktor-Authentifizierung";
-$lang['tfa']['set_tfa'] = "Konfiguriere Zwei-Faktor-Authentifizierungsmethode";
-$lang['tfa']['yubi_otp'] = "Yubico OTP Authentifizierung";
-$lang['tfa']['key_id'] = "Ein Name für diesen YubiKey";
-$lang['tfa']['key_id_totp'] = "Ein eindeutiger Name";
-$lang['tfa']['api_register'] = 'mailcow verwendet die Yubico Cloud API. Ein API-Key für den Yubico Stick kann <a href="https://upgrade.yubico.com/getapikey/" target="_blank">hier</a> bezogen werden.';
-$lang['tfa']['u2f'] = "U2F Authentifizierung";
-$lang['tfa']['hotp'] = "HOTP Authentifizierung";
-$lang['tfa']['totp'] = "TOTP Authentifizierung";
-$lang['tfa']['none'] = "Deaktiviert";
-$lang['tfa']['delete_tfa'] = "Deaktiviere 2FA";
-$lang['tfa']['disable_tfa'] = "Deaktiviere 2FA bis zur nächsten erfolgreichen Anmeldung";
-$lang['tfa']['confirm_tfa'] = "Bitte bestätigen Sie Ihr Einmal-Passwort im unteren Feld";
-$lang['tfa']['confirm'] = "Bestätigen";
-$lang['tfa']['otp'] = "Einmalpasswort";
-$lang['tfa']['totp'] = "Time-based OTP (Google Authenticator etc.)";
-$lang['tfa']['trash_login'] = "Login verwerfen";
-$lang['tfa']['select'] = "Bitte auswählen";
-$lang['tfa']['waiting_usb_auth'] = "<i>Warte auf USB-Gerät...</i><br /><br />Bitte jetzt den vorgesehenen Taster des U2F USB-Gerätes berühren.";
-$lang['tfa']['waiting_usb_register'] = "<i>Warte auf USB-Gerät...</i><br /><br />Bitte zuerst das obere Passwortfeld ausfüllen und erst dann den vorgesehenen Taster des U2F USB-Gerätes berühren.";
-$lang['tfa']['scan_qr_code'] = "Bitte scannen Sie jetzt den angezeigten QR-Code:.";
-$lang['tfa']['enter_qr_code'] = "Falls Sie den angezeigten QR-Code nicht scannen können, verwenden Sie bitte nachstehenden Sicherheitsschlüssel";
-$lang['tfa']['confirm_totp_token'] = "Bitte bestätigen Sie die Änderung durch Eingabe eines generierten Tokens";
-
-$lang['admin']['search_domain_da'] = 'Domains durchsuchen';
-$lang['admin']['restrictions'] = 'Postfix Restriktionen';
-$lang['admin']['rr'] = 'Postfix Empfänger Restriktionen';
-$lang['admin']['sr'] = 'Postfix Sender Restriktionen';
-$lang['admin']['reset_defaults'] = 'Standard wiederherstellen';
-$lang['admin']['r_inactive'] = 'Inaktive Restriktionen';
-$lang['admin']['r_active'] = 'Aktive Restriktionen';
-$lang['admin']['r_info'] = 'Ausgegraute/deaktivierte Elemente sind mailcow nicht bekannt und können nicht in die Liste inaktiver Elemente verschoben werden. Unbekannte Restriktionen werden trotzdem in Reihenfolge der Erscheinung gesetzt.<br />Sie können ein Element in der Datei <code>inc/vars.local.inc.php</code> als bekannt hinzufügen, um es zu bewegen.';
-$lang['admin']['public_folders'] = 'Öffentliche Ordner';
-$lang['admin']['public_folders_text'] = 'Ein Namespace "Public" wird erstellt. Der untenstehende Ordnername betrifft den Namen der automatisch erstellten Mailbox in diesem Namespace.';
-$lang['admin']['public_folder_name'] = 'Ordnername <small>(alphanumerisch)</small>';
-$lang['admin']['public_folder_enable'] = 'Öffentliche Ordner aktivieren';
-$lang['admin']['public_folder_enable_text'] = 'Das Umschalten dieser Option entfernt keine Nachrichten aus den öffentlichen Ordnern.';
-$lang['admin']['public_folder_pusf'] = 'Aktiviere "per-user seen flag"';
-$lang['admin']['public_folder_pusf_text'] = 'Ein "per-user seen flag"-aktiviertes System markiert Nachrichten nicht als gelesen, wenn nur ein Benutzer sie gelesen hat. Jeder Benutzer verwaltet seine eigenen "seen flags".';
-$lang['admin']['privacy'] = 'Datenschutz';
-$lang['admin']['privacy_text'] = 'Diese Option aktiviert eine PCRE-Prüfung, die die Werte der Kopfzeilen "User-Agent", "X-Enigmail", "X-Mailer", "X-Originating-IP" sowie "Received: from" durch "localhost" bzw. "127.0.0.1" ersetzt.';
-$lang['admin']['privacy_anon_mail'] = 'Anonymisiere ausgehende Kopfzeilen';
-$lang['admin']['msg_size'] = 'Aktuelles Limit der Nachrichtengröße';
-$lang['admin']['msg_size_limit'] = 'Aktuelles Limit der Nachrichtengröße';
-$lang['admin']['msg_size_limit_details'] = 'Diese Einstellung wird Postfix und den Webserver neuladen.';
-$lang['admin']['save'] = 'Änderungen speichern';
-$lang['admin']['maintenance'] = 'Wartung und Information';
-$lang['admin']['sys_info'] = 'Systeminformation';
-$lang['admin']['dkim_add_key'] = 'DKIM-Key hinzufügen';
-$lang['admin']['dkim_keys'] = 'DKIM-Keys';
-$lang['admin']['dkim_key_valid'] = 'Key gültig';
-$lang['admin']['dkim_key_unused'] = 'Key ohne Zuweisung';
-$lang['admin']['dkim_key_missing'] = 'Key fehlt';
-$lang['admin']['dkim_key_hint'] = 'Der Selector für DKIM-Keys lautet immer <code>dkim</code>.';
-$lang['admin']['add'] = 'Hinzufügen';
-$lang['admin']['configuration'] = 'Konfiguration';
-$lang['admin']['password'] = 'Passwort';
-$lang['admin']['password_repeat'] = 'Passwort (Wiederholung)';
-$lang['admin']['active'] = 'Aktiv';
-$lang['admin']['inactive'] = 'Inaktiv';
-$lang['admin']['action'] = 'Aktion';
-$lang['admin']['add_domain_admin'] = 'Domain-Administrator hinzufügen';
-$lang['admin']['admin_domains'] = 'Domain-Zuweisungen';
-$lang['admin']['domain_admins'] = 'Domain-Administratoren';
-$lang['admin']['username'] = 'Benutzername';
-$lang['admin']['edit'] = 'Bearbeiten';
-$lang['admin']['remove'] = 'Entfernen';
-$lang['admin']['save'] = 'Änderungen speichern';
-$lang['admin']['admin'] = 'Administrator';
-$lang['admin']['admin_details'] = 'Administrator bearbeiten';
-$lang['admin']['unchanged_if_empty'] = 'Unverändert, wenn leer';
-$lang['admin']['yes'] = '&#10004;';
-$lang['admin']['no'] = '&#10008;';
-$lang['admin']['access'] = 'Zugang';
-$lang['admin']['invalid_max_msg_size'] = 'Maximale Nachrichtengröße ungültig';
-$lang['admin']['site_not_found'] = 'Kann mailcow Seitenkonfiguration nicht finden';
-$lang['admin']['public_folder_empty'] = 'Öffentlicher Ordner-Name darf nicht leer sein';
-$lang['admin']['set_rr_failed'] = 'Kann Postfix Restriktionen nicht setzen';
-$lang['admin']['no_record'] = 'Kein Eintrag';
-$lang['admin']['filter_table'] = 'Tabelle Filtern';
-$lang['admin']['empty'] = 'Keine Einträge vorhanden';
-$lang['admin']['time'] = 'Zeit';
-$lang['admin']['priority'] = 'Gewichtung';
-$lang['admin']['refresh'] = 'Neu laden';
-$lang['admin']['logs'] = 'Logs';
-$lang['admin']['message'] = 'Nachricht';
-$lang['admin']['forwarding_hosts'] = 'Weiterleitungs-Hosts';
-$lang['admin']['forwarding_hosts_hint'] = 'Eingehende Nachrichten werden von den hier gelisteten Hosts bedingungslos akzeptiert. Diese Hosts werden dann nicht mit DNSBLs abgeglichen oder Greylisting unterworfen. Von ihnen empfangener Spam wird nie abgelehnt, optional kann er aber in den Spam-Ordner einsortiert werden. Die übliche Verwendung für diese Funktion ist, um Mailserver anzugeben, auf denen eine Weiterleitung zu Ihrem Mailcow-Server eingerichtet wurde.';
-$lang['admin']['forwarding_hosts_add_hint'] = 'Sie können entweder IPv4/IPv6-Adressen, Netzwerke in CIDR-Notation, Hostnamen (die zu IP-Adressen aufgelöst werden), oder Domainnamen (die zu IP-Adressen aufgelöst werden, indem ihr SPF-Record abgefragt wird oder, in dessen Abwesenheit, ihre MX-Records) angeben.';
-$lang['admin']['host'] = 'Host';
-$lang['admin']['source'] = 'Quelle';
-$lang['admin']['add_forwarding_host'] = 'Weiterleitungs-Host hinzufügen';
-$lang['delete']['remove_forwardinghost_warning'] = '<b>Warnung:</b> Sie entfernen den Weiterleitungs-Host <b>%s</b>!';
-$lang['success']['forwarding_host_removed'] = "Weiterleitungs-Host %s wurde entfernt";
-$lang['success']['forwarding_host_added'] = "Weiterleitungs-Host %s wurde hinzugefügt";
-?>
+<?php
+/*
+ * German language file
+ */
+
+$lang['footer']['loading'] = 'Einen Moment bitte...';
+$lang['header']['restart_sogo'] = 'SOGo neustarten';
+$lang['footer']['restart_sogo'] = 'SOGo neustarten';
+$lang['footer']['restart_now'] = 'Jetzt neustarten';
+$lang['footer']['restart_sogo_info'] = 'Einige Änderungen an Domains benötigen einen Neustart SOGos. Hier können Sie SOGo neustarten.<br><br><b>Wichtig:</b> Ein korrekter Neustart SOGos kann eine Weile in Anspruch nehmen, bitte warten Sie, bis der Prozess vollständig beendet wurde.';
+
+$lang['footer']['confirm_delete'] = 'Löschen bestätigen';
+$lang['footer']['delete_these_items'] = 'Sind Sie sicher, dass die folgenden Elemente entfernt werden sollen?';
+$lang['footer']['delete_now'] = 'Jetzt löschen';
+$lang['footer']['cancel'] = 'Abbrechen';
+
+$lang['dkim']['confirm'] = 'Sind Sie sicher?';
+$lang['danger']['dkim_not_found'] = 'DKIM-Key nicht gefunden';
+$lang['danger']['dkim_remove_failed'] = 'Kann DKIM-Key nicht entfernen';
+$lang['danger']['dkim_add_failed'] = 'Kann DKIM-Key nicht hinzufügen';
+$lang['danger']['dkim_domain_or_sel_invalid'] = 'DKIM-Domain oder -Selector nicht korrekt';
+$lang['danger']['dkim_key_length_invalid'] = 'DKIM Schlüssellänge ungültig';
+$lang['success']['dkim_removed'] = 'DKIM-Key wurde entfernt';
+$lang['success']['dkim_added'] = 'DKIM-Key wurde hinzugefügt';
+$lang['danger']['access_denied'] = 'Zugriff verweigert oder unvollständige/ungültige Daten';
+$lang['danger']['whitelist_from_invalid'] = 'Whitelist-Eintrag ist ungültig';
+$lang['danger']['domain_invalid'] = 'Domainname ist ungültig';
+$lang['danger']['mailbox_quota_exceeds_domain_quota'] = 'Maximale Größe für Mailboxen überschreitet das Domain Speicherlimit';
+$lang['danger']['object_is_not_numeric'] = 'Wert %s ist nicht numerisch';
+$lang['success']['domain_added'] = 'Domain %s wurde angelegt';
+$lang['danger']['alias_empty'] = 'Alias-Adresse darf nicht leer sein';
+$lang['danger']['goto_empty'] = 'Ziel-Adresse darf nicht leer sein';
+$lang['danger']['policy_list_from_exists'] = 'Ein Eintrag mit diesem Wert existiert bereits';
+$lang['danger']['policy_list_from_invalid'] = 'Eintrag hat ungültiges Format';
+$lang['danger']['alias_invalid'] = 'Alias-Adresse ist ungültig';
+$lang['danger']['goto_invalid'] = 'Ziel-Adresse ist ungültig';
+$lang['danger']['last_key'] = 'Letzter Key kann nicht gelöscht werden';
+$lang['danger']['alias_domain_invalid'] = 'Alias-Domain ist ungültig';
+$lang['danger']['target_domain_invalid'] = 'Ziel-Domain ist ungültig';
+$lang['danger']['object_exists'] = 'Objekt %s existiert bereits';
+$lang['danger']['domain_exists'] = 'Domain %s existiert bereits';
+$lang['danger']['alias_goto_identical'] = 'Alias- und Ziel-Adresse dürfen nicht identisch sein';
+$lang['danger']['aliasd_targetd_identical'] = 'Alias-Domain darf nicht gleich Ziel-Domain sein';
+$lang['danger']['maxquota_empty'] = 'Max. Speicherplatz pro Mailbox darf nicht 0 sein.';
+$lang['success']['alias_added'] = 'Alias-Adresse(n) wurden angelegt';
+$lang['success']['alias_modified'] = 'Änderungen an Alias %s wurden gespeichert';
+$lang['success']['aliasd_modified'] = 'Änderungen an Alias-Domain %s wurden gespeichert';
+$lang['success']['mailbox_modified'] = 'Änderungen an Mailbox %s wurden gespeichert';
+$lang['success']['resource_modified'] = "Änderungen an Ressource %s wurden gespeichert";
+$lang['success']['object_modified'] = "Änderungen an Objekt %s wurden gespeichert";
+$lang['success']['msg_size_saved'] = 'Limit wurde gesetzt';
+$lang['danger']['aliasd_not_found'] = 'Alias-Domain nicht gefunden';
+$lang['danger']['targetd_not_found'] = 'Ziel-Domain nicht gefunden';
+$lang['danger']['aliasd_exists'] = 'Alias-Domain existiert bereits';
+$lang['success']['aliasd_added'] = 'Alias-Domain %s wurde angelegt';
+$lang['success']['aliasd_modified'] = 'Änderungen an Alias-Domain %s wurden gespeichert';
+$lang['success']['domain_modified'] = 'Änderungen an Domain %s wurden gespeichert';
+$lang['success']['domain_admin_modified'] = 'Änderungen an Domain-Administrator %s wurden gespeichert';
+$lang['success']['domain_admin_added'] = 'Domain-Administrator %s wurde angelegt';
+$lang['success']['changes_general'] = 'Änderungen wurden gespeichert';
+$lang['success']['admin_modified'] = 'Änderungen am Administrator wurden gespeichert';
+$lang['danger']['exit_code_not_null'] = 'Fehler: Exit-Code ist %d';
+$lang['danger']['mailbox_not_available'] = 'Mailbox nicht verfügbar';
+$lang['danger']['username_invalid'] = 'Benutzername kann nicht verwendet werden';
+$lang['danger']['password_mismatch'] = 'Passwort-Wiederholung stimmt nicht überein';
+$lang['danger']['password_complexity'] = 'Passwort entspricht nicht den Richtlinien';
+$lang['danger']['password_empty'] = 'Passwort darf nicht leer sein';
+$lang['danger']['login_failed'] = 'Anmeldung fehlgeschlagen';
+$lang['danger']['mailbox_invalid'] = 'Mailboxname ist ungültig';
+$lang['danger']['resource_invalid'] = 'Ressourcenname ist ungültig';
+$lang['danger']['description_invalid'] = 'Ressourcenbeschreibung ist ungültig';
+$lang['danger']['mailbox_invalid_suggest'] = 'Mailboxname ist ungültig, meinten Sie vielleicht %s?';
+$lang['danger']['is_alias'] = '%s lautet bereits eine Alias-Adresse';
+$lang['danger']['is_alias_or_mailbox'] = "Eine Mailbox oder ein Alias mit der Adresse %s ist bereits vorhanden";
+$lang['danger']['is_spam_alias'] = '%s lautet bereits eine Spam-Alias-Adresse';
+$lang['danger']['quota_not_0_not_numeric'] = 'Speicherplatz muss numerisch und >= 0 sein';
+$lang['danger']['domain_not_found'] = 'Domain %s nicht gefunden';
+$lang['danger']['max_mailbox_exceeded'] = 'Anzahl an Mailboxen überschritten (%d von %d)';
+$lang['danger']['max_alias_exceeded'] = 'Anzahl an Alias-Adressen überschritten';
+$lang['danger']['mailbox_quota_exceeded'] = 'Speicherplatz überschreitet das Limit (max. %d MiB)';
+$lang['danger']['mailbox_quota_left_exceeded'] = 'Nicht genügend Speicherplatz vorhanden (Speicherplatz anwendbar: %d MiB)';
+$lang['success']['mailbox_added'] = 'Mailbox %s wurde angelegt';
+$lang['success']['resource_added'] = 'Ressource %s wurde angelegt';
+$lang['success']['domain_removed'] = 'Domain %s wurde entfernt';
+$lang['success']['alias_removed'] = 'Alias-Adresse %s wurde entfernt';
+$lang['success']['alias_domain_removed'] = 'Alias-Domain %s wurde entfernt';
+$lang['success']['domain_admin_removed'] = 'Domain-Administrator %s wurde entfernt';
+$lang['success']['mailbox_removed'] = 'Mailbox %s wurde entfernt';
+$lang['success']['eas_reset'] = "ActiveSync Gerät des Benutzers %s wurden zurückgesetzt";
+$lang['success']['resource_removed'] = 'Ressource %s wurde entfernt';
+$lang['danger']['max_quota_in_use'] = 'Mailbox Speicherplatzlimit muss größer oder gleich %d MiB sein';
+$lang['danger']['domain_quota_m_in_use'] = 'Domain Speicherplatzlimit muss größer oder gleich %d MiB sein';
+$lang['danger']['mailboxes_in_use'] = 'Maximale Anzahl an Mailboxen muss größer oder gleich %d sein';
+$lang['danger']['aliases_in_use'] = 'Maximale Anzahl an Aliassen muss größer oder gleich %d sein';
+$lang['danger']['sender_acl_invalid'] = 'Sender ACL Wert muss eine Adresse oder Domain sein';
+$lang['danger']['domain_not_empty'] = 'Kann nur leere Domains entfernen';
+$lang['warning']['spam_alias_temp_error'] = 'Kann zur Zeit keinen Spam-Alias erstellen, bitte versuchen Sie es später noch einmal.';
+$lang['danger']['spam_alias_max_exceeded'] = 'Maximale Anzahl an Spam-Alias-Adressen erreicht';
+$lang['danger']['validity_missing'] = 'Bitte geben Sie eine Gültigkeitsdauer an';
+$lang['user']['on'] = 'Ein';
+$lang['user']['off'] = 'Aus';
+$lang['user']['messages'] = "Nachrichten";
+$lang['user']['in_use'] = "Verwendet";
+$lang['user']['user_change_fn'] = '';
+$lang['user']['user_settings'] = 'Benutzereinstellungen';
+$lang['user']['mailbox_settings'] = 'Mailbox-Einstellungen';
+$lang['user']['mailbox_details'] = 'Mailbox-Details';
+$lang['user']['change_password'] = 'Passwort ändern';
+$lang['user']['new_password'] = 'Neues Passwort';
+$lang['user']['save_changes'] = 'Änderungen speichern';
+$lang['user']['password_now'] = 'Aktuelles Passwort (Änderungen bestätigen)';
+$lang['user']['new_password_repeat'] = 'Neues Passwort (Wiederholung)';
+$lang['user']['new_password_description'] = 'Mindestanforderung: 6 Zeichen lang, Buchstaben und Zahlen.';
+$lang['user']['did_you_know'] = '<b>Wussten Sie schon?</b> Sie können Ihre E-Mail-Adresse mit Tags versehen, etwa "ich+<b>Privat</b>@example.com", um Nachrichten automatisch in einem Unterordner (Beispiel: "Privat") abzulegen.';
+$lang['user']['spam_aliases'] = 'Temporäre E-Mail Aliasse';
+$lang['user']['alias'] = 'Alias';
+$lang['user']['aliases'] = 'Aliasse';
+$lang['user']['domain_aliases'] = 'Domain-Alias Adressen';
+$lang['user']['is_catch_all'] = 'Ist Catch-All Adresse für Domain(s)';
+$lang['user']['aliases_also_send_as'] = 'Darf außerdem versenden als Benutzer';
+$lang['user']['aliases_send_as_all'] = 'Absender für folgende Domains und zugehörige Alias-Domains nicht prüfen';
+$lang['user']['alias_create_random'] = 'Zufälligen Alias generieren';
+$lang['user']['alias_extend_all'] = 'Gültigkeit +1h';
+$lang['user']['alias_valid_until'] = 'Gültig bis';
+$lang['user']['alias_remove_all'] = 'Alle entfernen';
+$lang['user']['alias_time_left'] = 'Zeit verbleibend';
+$lang['user']['alias_full_date'] = 'd.m.Y, H:i:s T';
+$lang['user']['syncjob_full_date'] = 'd.m.Y, H:i:s T';
+$lang['user']['alias_select_validity'] = 'Bitte Gültigkeit auswählen';
+$lang['user']['sync_jobs'] = 'Sync Jobs';
+$lang['user']['hour'] = 'Stunde';
+$lang['user']['hours'] = 'Stunden';
+$lang['user']['day'] = 'Tag';
+$lang['user']['week'] = 'Woche';
+$lang['user']['weeks'] = 'Wochen';
+$lang['user']['spamfilter'] = 'Spamfilter';
+$lang['admin']['spamfilter'] = 'Spamfilter';
+$lang['user']['spamfilter_wl'] = 'Whitelist';
+$lang['user']['spamfilter_wl_desc'] = 'Für E-Mail-Adressen, die vom Spamfilter <b>nicht</b> erfasst werden sollen. Die Verwendung von Wildcards ist gestattet.';
+$lang['user']['spamfilter_bl'] = 'Blacklist';
+$lang['user']['spamfilter_bl_desc'] = 'Für E-Mail-Adressen, die vom Spamfilter <b>immer</b> als Spam erfasst und abgelehnt werden. Die Verwendung von Wildcards ist gestattet.';
+$lang['user']['spamfilter_table_rule'] = 'Regel';
+$lang['user']['spamfilter_table_action'] = 'Aktion';
+$lang['user']['spamfilter_table_empty'] = 'Keine Einträge vorhanden';
+$lang['user']['spamfilter_table_remove'] = 'entfernen';
+$lang['user']['spamfilter_table_add'] = 'Eintrag hinzufügen';
+$lang['user']['spamfilter_behavior'] = 'Bewertung';
+$lang['user']['spamfilter_default_score'] = 'Spam-Score:';
+$lang['user']['spamfilter_green'] = 'Grün: Die Nachricht ist kein Spam';
+$lang['user']['spamfilter_yellow'] = 'Gelb: Die Nachricht ist vielleicht Spam, wird als Spam markiert und in den Junk-Ordner verschoben';
+$lang['user']['spamfilter_red'] = 'Rot: Die Nachricht ist eindeutig Spam und wird vom Server abgelehnt';
+$lang['user']['spamfilter_default_score'] = 'Standardwert:';
+$lang['user']['spamfilter_hint'] = 'Der erste Wert beschreibt den "low spam score", der zweite Wert den "high spam score".';
+$lang['user']['spamfilter_table_domain_policy'] = "n.v. (Domainrichtlinie)";
+
+$lang['user']['tls_policy_warning'] = '<strong>Vorsicht:</strong> Entscheiden Sie sich unverschlüsselte Verbindungen abzulehnen, kann dies dazu führen, dass Kontakte Sie nicht mehr erreichen.<br>Nachrichten, die die Richtlinie nicht erfüllen, werden durch einen Hard-Fail im Mailsystem abgewiesen.<br>Diese Einstellung ist aktiv für die primäre Mailbox, für alle Alias-Adressen, die dieser Mailbox <b>direkt zugeordnet</b> sind (lediglich eine einzige Ziel-Adresse) und der Adressen, die sich aus Alias-Domains ergeben. Ausgeschlossen sind temporäre Aliasse ("Spam-Alias-Adressen"), Catch-All Alias-Adressen sowie Alias-Adressen mit mehreren Zielen.';
+$lang['user']['tls_policy'] = 'Verschlüsselungsrichtlinie';
+$lang['user']['tls_enforce_in'] = 'TLS eingehend erzwingen';
+$lang['user']['tls_enforce_out'] = 'TLS ausgehend erzwingen';
+$lang['user']['no_record'] = 'Kein Eintrag';
+
+$lang['user']['misc_settings'] = 'Sonstige Kontoeinstellungen';
+$lang['user']['misc_delete_profile'] = 'Sonstige Kontoeinstellungen';
+
+$lang['user']['tag_handling'] = 'Umgang mit getaggten E-Mails steuern';
+$lang['user']['tag_in_subfolder'] = 'In Unterordner';
+$lang['user']['tag_in_subject'] = 'In Betreff';
+$lang['user']['tag_help_explain'] = 'Als Unterordner: Es wird ein Ordner mit dem Namen des Tags unterhalb der Inbox erstellt ("INBOX/Facebook").<br>
+In Betreff: Der Name des Tags wird dem Betreff angefügt, etwa "[Facebook] Meine Neuigkeiten".';
+$lang['user']['tag_help_example'] = 'Beispiel für eine getaggte E-Mail-Adresse: ich<b>+Facebook</b>@example.org';
+$lang['user']['eas_reset'] = 'ActiveSync Geräte-Cache zurücksetzen';
+$lang['user']['eas_reset_now'] = 'Jetzt zurücksetzen';
+$lang['user']['eas_reset_help'] = 'In vielen Fällen kann ein ActiveSync Profil durch das Zurücksetzen des Caches repariert werden.<br><b>Vorsicht:</b> Alle Elemente werden erneut heruntergeladen!';
+
+$lang['user']['encryption'] = 'Verschlüsselung';
+$lang['user']['username'] = 'Benutzername';
+$lang['user']['password'] = 'Password';
+$lang['user']['last_run'] = 'Letzte Ausführung';
+$lang['user']['excludes'] = 'Ausschlüsse';
+$lang['user']['interval'] = 'Intervall';
+$lang['user']['active'] = 'Aktiv';
+$lang['user']['action'] = 'Aktion';
+$lang['user']['edit'] = 'Bearbeiten';
+$lang['user']['remove'] = 'Entfernen';
+$lang['user']['delete_now'] = 'Sofort löschen';
+$lang['user']['create_syncjob'] = 'Neuen Sync-Job erstellen';
+
+$lang['start']['dashboard'] = '%s - Dashboard';
+$lang['start']['start_rc'] = 'Roundcube öffnen';
+$lang['start']['start_sogo'] = 'SOGo öffnen';
+$lang['start']['mailcow_apps_detail'] = 'Verwenden Sie mailcow Apps, um E-Mails abzurufen, Kalender- und Kontakte zu verwalten und vieles mehr.';
+$lang['start']['mailcow_panel'] = 'mailcow UI starten';
+$lang['start']['mailcow_panel_description'] = 'Die mailcow Steuerung steht sowohl für Administratoren als auch Mailbox-Benutzer zur Verfügung.';
+$lang['start']['mailcow_panel_detail'] = '<b>Domain-Administratoren</b> erstellen, verändern oder löschen Mailboxen, verwalten die Domäne und sehen sonstige Einstellungen ein.<br>
+	Als <b>Mailbox-Benutzer</b> erstellen Sie hier zeitlich limitierte Aliasse, ändern das Verhalten des Spamfilters, setzen ein neues Passwort und vieles mehr.';
+$lang['start']['recommended_config'] = 'Empfohlene Software-Konfiguration (ohne ActiveSync)';
+$lang['start']['imap_smtp_server'] = 'IMAP- und SMTP-Server';
+$lang['start']['imap_smtp_server_description'] = 'Für eine optimale Verbindung empfehlen wir die Verwendung des <a href="%s" target="_blank"><b>Mozilla Thunderbirds</b></a>.';
+$lang['start']['imap_smtp_server_badge'] = 'E-Mail lesen und schreiben';
+$lang['start']['imap_smtp_server_auth_info'] = 'Bitte verwenden Sie Ihre vollständige E-Mail-Adresse sowie das PLAIN-Authentifizierungsverfahren.<br>
+Ihre Anmeldedaten werden durch die obligatorische Verschlüsselung entgegen des Begriffes "PLAIN" nicht unverschlüsselt übertragen.';
+$lang['start']['managesieve'] = 'ManageSieve';
+$lang['start']['managesieve_badge'] = 'E-Mail-Filter';
+$lang['start']['managesieve_description'] = 'Bitte verwenden Sie <b>Mozilla Thunderbirds</b> zusammen mit der <a style="text-decoration:none" target="_blank" href="%s"><b>Sieve Erweiterung</b></a>.<br>Nach dem Herunterladen der Erweiterung starten Sie Thunderbird, öffnen das Fenster für Erweiterungen und ziehen die heruntergeladene Datei in das offene Fenster.<br>Der Servername lautet <b>%s</b>, als Port konfigurieren Sie bitte <b>4190</b>. Die Anmeldedaten entsprechen dem E-Mail Login.';
+$lang['start']['service'] = 'Dienstname';
+$lang['start']['encryption'] = 'Verschlüsselungstyp';
+$lang['start']['help'] = 'Hilfe ein-/ausblenden';
+$lang['start']['hostname'] = 'Hostname';
+$lang['start']['port'] = 'Port';
+$lang['start']['footer'] = '';
+$lang['header']['mailcow_settings'] = 'Konfiguration';
+$lang['header']['administration'] = 'Administration';
+$lang['header']['mailboxes'] = 'Mailboxen';
+$lang['header']['user_settings'] = 'Benutzereinstellungen';
+$lang['header']['login'] = 'Anmeldung';
+$lang['header']['logged_in_as_logout'] = 'Eingeloggt als <b>%s</b> (abmelden)';
+$lang['header']['logged_in_as_logout_dual'] = 'Eingeloggt als <b>%s <span class="text-info">[%s]</span></b>';
+$lang['header']['locale'] = 'Sprache';
+$lang['mailbox']['domain'] = 'Domain';
+$lang['mailbox']['spam_aliases'] = 'Temp. Alias';
+$lang['mailbox']['alias'] = 'Alias';
+$lang['mailbox']['aliases'] = 'Aliasse';
+$lang['mailbox']['multiple_bookings'] = 'Mehrfachbuchen';
+$lang['mailbox']['kind'] = 'Art';
+$lang['mailbox']['description'] = 'Beschreibung';
+$lang['mailbox']['resources'] = 'Ressourcen';
+$lang['mailbox']['resource_name'] = 'Ressourcenname';
+$lang['mailbox']['domains'] = 'Domains';
+$lang['mailbox']['mailboxes'] = 'Mailboxen';
+$lang['mailbox']['mailbox_quota'] = 'Max. Größe einer Mailbox';
+$lang['mailbox']['domain_quota'] = 'Gesamtspeicher';
+$lang['mailbox']['ratelimit'] = 'Limit ausgehend/Stunde';
+$lang['mailbox']['active'] = 'Aktiv';
+$lang['mailbox']['action'] = 'Aktion';
+$lang['mailbox']['backup_mx'] = 'Backup MX';
+$lang['mailbox']['domain_aliases'] = 'Domain-Aliasse';
+$lang['mailbox']['target_domain'] = 'Ziel-Domain';
+$lang['mailbox']['target_address'] = 'Ziel-Adresse';
+$lang['mailbox']['username'] = 'Benutzername';
+$lang['mailbox']['fname'] = 'Name';
+$lang['mailbox']['filter_table'] = 'Tabelle filtern';
+$lang['mailbox']['yes'] = '&#10004;';
+$lang['mailbox']['no'] = '&#10008;';
+$lang['mailbox']['quota'] = 'Speicherplatz';
+$lang['mailbox']['in_use'] = 'Prozentualer Gebrauch';
+$lang['mailbox']['msg_num'] = 'Anzahl Nachrichten';
+$lang['mailbox']['remove'] = 'Entfernen';
+$lang['mailbox']['edit'] = 'Bearbeiten';
+$lang['mailbox']['archive'] = 'Archiv-Zugriff';
+$lang['mailbox']['no_record'] = 'Kein Eintrag für Objekt %s';
+$lang['mailbox']['no_record_single'] = 'Kein Eintrag';
+$lang['mailbox']['add_domain'] = 'Domain hinzufügen';
+$lang['mailbox']['add_domain_alias'] = 'Domain-Alias hinzufügen';
+$lang['mailbox']['add_mailbox'] = 'Mailbox hinzufügen';
+$lang['mailbox']['add_resource'] = 'Ressource hinzufügen';
+$lang['mailbox']['add_alias'] = 'Alias hinzufügen';
+$lang['mailbox']['empty'] = 'Keine Einträge vorhanden';
+$lang['mailbox']['toggle_all'] = 'Alle';
+$lang['mailbox']['quick_actions'] = 'Aktionen';
+$lang['mailbox']['activate'] = 'Aktivieren';
+$lang['mailbox']['deactivate'] = 'Deaktivieren';
+
+$lang['info']['no_action'] = 'Keine Aktion anwendbar';
+$lang['delete']['title'] = 'Objekt entfernen';
+$lang['delete']['remove_domain_warning'] = '<b>Warnung:</b> Sie entfernen die Domain <b>%s</b>!';
+$lang['delete']['remove_domainalias_warning'] = '<b>Warnung:</b> Sie entfernen die Alias-Domain <b>%s</b>!';
+$lang['delete']['remove_domainadmin_warning'] = '<b>Warnung:</b> Sie entfernen den Domain-Administrator <b>%s</b>!';
+$lang['delete']['remove_alias_warning'] = '<b>Warnung:</b> Sie entfernen die Alias-Adresse <b>%s</b>!';
+$lang['delete']['remove_syncjob_warning'] = '<b>Warnung:</b> Sie entfernen einen Sync-Job des Benutzers <b>%s</b>!';
+$lang['delete']['remove_mailbox_warning'] = '<b>Warnung:</b> Sie entfernen die Mailbox <b>%s</b>!';
+$lang['delete']['remove_mailbox_details'] = 'Die Mailbox wird <b>vollständig und permanent</b> entfernt!';
+$lang['delete']['remove_resource_warning'] = '<b>Warnung:</b> Sie entfernen die Ressource <b>%s</b>!';
+$lang['delete']['remove_resource_details'] = 'Die Ressource wird <b>vollständig und permanent</b> entfernt!';
+$lang['delete']['remove_domain_details'] = 'Diese Aktion entfernt ebenfalls Domain-Aliasse.<br><br><b>Eine Domain muss leer sein, um entfernt zu werden.</b>';
+$lang['delete']['remove_syncjob_details'] = 'Objekte dieses Sync-Jobs werden nicht mehr vom entfernten Server abgeholt.';
+$lang['delete']['remove_alias_details'] = 'Benutzer werden keine Nachrichten mehr von dieser Adresse erhalten und versenden koennen!</b>';
+$lang['delete']['remove_button'] = 'Entfernen';
+$lang['delete']['previous'] = 'Vorherige Seite';
+
+$lang['edit']['syncjob'] = 'Sync-Job bearbeiten';
+$lang['edit']['save'] = 'Änderungen speichern';
+$lang['edit']['username'] = 'Benutzername';
+$lang['edit']['hostname'] = 'Servername';
+$lang['edit']['encryption'] = 'Verschlüsselungsmethode';
+$lang['edit']['maxage'] = 'Maximales Alter in Tagen einer Nachricht, die kopiert werden soll</br ><small>(0 = alle Nachrichten kopieren)</small>';
+$lang['edit']['subfolder2'] = 'Ziel-Ordner<br><small>(leer = kein Unterordner)</small>';
+$lang['edit']['mins_interval'] = 'Intervall (min)';
+$lang['edit']['exclude'] = 'Elemente ausschließen (Regex)';
+$lang['edit']['archive'] = 'Archiv-Zugriff';
+$lang['edit']['max_mailboxes'] = 'Max. Mailboxanzahl:';
+$lang['edit']['title'] = 'Objekt bearbeiten';
+$lang['edit']['target_address'] = 'Ziel-Adresse(n) <small>(getrennt durch Komma)</small>:';
+$lang['edit']['active'] = 'Aktiv';
+$lang['edit']['target_domain'] = 'Ziel-Domain:';
+$lang['edit']['password'] = 'Passwort:';
+$lang['edit']['ratelimit'] = 'Limit ausgehender Nachrichten/Stunde:';
+$lang['danger']['ratelimt_less_one'] = 'Limit ausgehender Nachrichten/Stunde darf nicht kleiner als 1 sein';
+$lang['edit']['password_repeat'] = 'Passwort (Wiederholung):';
+$lang['edit']['domain_admin'] = 'Domain-Administrator bearbeiten';
+$lang['edit']['domain'] = 'Domain bearbeiten';
+$lang['edit']['edit_alias_domain'] = 'Alias-Domain bearbeiten';
+$lang['edit']['alias_domain'] = 'Alias-Domain';
+$lang['edit']['domains'] = 'Domains';
+$lang['edit']['destroy'] = 'Manuelle Eingabe des Wertes';
+$lang['edit']['alias'] = 'Alias bearbeiten';
+$lang['edit']['mailbox'] = 'Mailbox bearbeiten';
+$lang['edit']['description'] = 'Beschreibung:';
+$lang['edit']['max_aliases'] = 'Max. Aliasse:';
+$lang['edit']['max_quota'] = 'Max. Größe per Mailbox (MiB):';
+$lang['edit']['domain_quota'] = 'Domain Speicherplatz gesamt (MiB):';
+$lang['edit']['backup_mx_options'] = 'Backup MX Optionen:';
+$lang['edit']['relay_domain'] = 'Relay Domain';
+$lang['edit']['relay_all'] = 'Alle Empfänger-Adressen relayen';
+$lang['edit']['dkim_signature'] = 'DKIM-Signatur:';
+$lang['edit']['dkim_record_info'] = '<small>Bitte hinterlegen Sie einen TXT-Record mit obigem Wert in den DNS-Einstellungen Ihrer Domainverwaltung.</small>';
+$lang['edit']['relay_all_info'] = '<small>Wenn Sie <b>nicht</b> alle Empfänger-Adressen relayen möchten, müssen Sie eine ("blinde") Mailbox für jede Adresse, die relayt werden soll, erstellen.</small>';
+$lang['edit']['full_name'] = 'Voller Name';
+$lang['edit']['quota_mb'] = 'Speicherplatz (MiB)';
+$lang['edit']['sender_acl'] = 'Darf Nachrichten versenden als';
+$lang['edit']['sender_acl_info'] = 'Aliasse sind nicht abwählbar und vorausgewählt.';
+$lang['edit']['dkim_txt_name'] = 'TXT-Record Name:';
+$lang['edit']['dkim_txt_value'] = 'TXT-Record Wert:';
+$lang['edit']['previous'] = 'Vorherige Seite';
+$lang['edit']['unchanged_if_empty'] = 'Unverändert, wenn leer';
+$lang['edit']['dont_check_sender_acl'] = 'Absender für Domain %s u. Alias-Dom. nicht prüfen';
+$lang['edit']['multiple_bookings'] = 'Mehrfaches Buchen';
+$lang['edit']['kind'] = 'Art';
+$lang['edit']['resource'] = 'Ressource';
+
+$lang['add']['syncjob'] = 'Sync-Job erstellen';
+$lang['add']['syncjob_hint'] = 'Passwörter werden unverschlüsselt abgelegt!';
+$lang['add']['hostname'] = 'Servername';
+$lang['add']['port'] = 'Port';
+$lang['add']['username'] = 'Benutzername';
+$lang['add']['enc_method'] = 'Verschlüsselungsmethode';
+$lang['add']['maxage'] = 'Maximales Alter von Nachrichten, welche vom Remote abgefragt werden (0 = Alter ignorieren)';
+$lang['add']['subfolder2'] = 'Synchronisation in Unterordner am Ziel';
+$lang['add']['mins_interval'] = 'Abrufintervall (Minuten)';
+$lang['add']['exclude'] = 'Elemente ausschließen (Regex)';
+$lang['add']['delete2duplicates'] = 'Lösche Duplikate im Ziel';
+$lang['add']['delete1'] = 'Lösche Nachricht nach Übertragung vom Quell-Server';
+$lang['edit']['delete2duplicates'] = 'Lösche Duplikate im Ziel';
+$lang['edit']['delete1'] = 'Lösche Nachricht nach Übertragung vom Quell-Server';
+
+$lang['add']['title'] = 'Objekt anlegen';
+$lang['add']['domain'] = 'Domain';
+$lang['add']['active'] = 'Aktiv';
+$lang['add']['multiple_bookings'] = 'Mehrfaches Buchen möglich';
+$lang['add']['save'] = 'Änderungen speichern';
+$lang['add']['description'] = 'Beschreibung:';
+$lang['add']['max_aliases'] = 'Max. mögliche Aliasse:';
+$lang['add']['max_mailboxes'] = 'Max. mögliche Mailboxen:';
+$lang['add']['mailbox_quota_m'] = 'Max. Speicherplatz pro Mailbox (MiB):';
+$lang['add']['domain_quota_m'] = 'Domain Speicherplatz gesamt (MiB):';
+$lang['add']['backup_mx_options'] = 'Backup MX Optionen:';
+$lang['add']['relay_all'] = 'Alle Empfänger-Adressen relayen';
+$lang['add']['relay_domain'] = 'Relay Domain';
+$lang['add']['relay_all_info'] = '<small>Wenn Sie <b>nicht</b> alle Empfänger-Adressen relayen möchten, müssen Sie eine Mailbox für jede Adresse, die relayt werden soll, erstellen.</small>';
+$lang['add']['alias'] = 'Alias(se)';
+$lang['add']['alias_spf_fail'] = '<b>Hinweis:</b> Wählen Sie ein externes Postfach als Ziel-Adresse, kann es unter Umständen zu fehlerhaften Spam-Erkennungen <b>beim Empfänger</b> kommen. Weitere Informationen zu diesem Thema finden Sie <a href="https://www.heinlein-support.de/blog/news/gmx-de-und-web-de-haben-mail-rejects-durch-spf/" target="_blank">hier.</a>';
+$lang['add']['alias_address'] = 'Alias-Adresse(n):';
+$lang['add']['alias_address_info'] = '<small>Vollständige E-Mail-Adresse(n) oder @example.com, um alle Nachrichten einer Domain weiterzuleiten. Getrennt durch Komma. <b>Nur eigene Domains</b>.</small>';
+$lang['add']['alias_domain_info'] = '<small>Nur gültige Domains. Getrennt durch Komma.</small>';
+$lang['add']['target_address'] = 'Ziel-Adresse(n):';
+$lang['add']['target_address_info'] = '<small>Vollständige E-Mail-Adresse(n). Getrennt durch Komma.</small>';
+$lang['add']['alias_domain'] = 'Alias-Domain';
+$lang['add']['select'] = 'Bitte auswählen';
+$lang['add']['target_domain'] = 'Ziel-Domain:';
+$lang['add']['mailbox'] = 'Mailbox';
+$lang['add']['resource'] = 'Ressource';
+$lang['add']['kind'] = 'Art';
+$lang['add']['mailbox_username'] = 'Benutzername (linker Teil der E-Mail-Adresse):';
+$lang['add']['resource_name'] = 'Ressourcenname:';
+$lang['add']['full_name'] = 'Vor- und Zuname:';
+$lang['add']['quota_mb'] = 'Speicherplatz (MiB):';
+$lang['add']['select_domain'] = 'Bitte zuerst eine Domain auswählen';
+$lang['add']['password'] = 'Passwort:';
+$lang['add']['password_repeat'] = 'Passwort (Wiederholung):';
+$lang['add']['previous'] = 'Vorherige Seite';
+$lang['add']['restart_sogo_hint'] = 'Der SOGo Container muss nach dem Hinzufügen einer neuen Domain neugestartet werden!';
+
+$lang['login']['title'] = 'Anmeldung';
+$lang['login']['administration'] = 'Administration';
+$lang['login']['administration_details'] = 'Bitte verwenden Sie Ihre Administrator Anmeldedaten, um administrative Aufgaben wie das Anlegen einer Mailbox zu starten.';
+$lang['login']['user_settings'] = 'Benutzereinstellungen';
+$lang['login']['user_settings_details'] = 'Als E-Mail Benutzer vewenden Sie bitte Ihre E-Mail Anmeldedaten, um Passwörter zu verändern, temporäre (Spam-)Aliasse zu erstellen, den Spamfilter einzustellen oder auch um E-Mails zu importieren.';
+$lang['login']['username'] = 'Benutzername';
+$lang['login']['password'] = 'Passwort';
+$lang['login']['reset_password'] = 'Mein Passwort zurücksetzen';
+$lang['login']['login'] = 'Anmelden';
+$lang['login']['previous'] = 'Vorherige Seite';
+$lang['login']['delayed'] = 'Login wurde zur Sicherheit um %s Sekunde/n verzögert.';
+
+$lang['tfa']['tfa'] = "Zwei-Faktor-Authentifizierung";
+$lang['tfa']['set_tfa'] = "Konfiguriere Zwei-Faktor-Authentifizierungsmethode";
+$lang['tfa']['yubi_otp'] = "Yubico OTP Authentifizierung";
+$lang['tfa']['key_id'] = "Ein Name für diesen YubiKey";
+$lang['tfa']['key_id_totp'] = "Ein eindeutiger Name";
+$lang['tfa']['api_register'] = 'mailcow verwendet die Yubico Cloud API. Ein API-Key für den Yubico Stick kann <a href="https://upgrade.yubico.com/getapikey/" target="_blank">hier</a> bezogen werden.';
+$lang['tfa']['u2f'] = "U2F Authentifizierung";
+$lang['tfa']['hotp'] = "HOTP Authentifizierung";
+$lang['tfa']['totp'] = "TOTP Authentifizierung";
+$lang['tfa']['none'] = "Deaktiviert";
+$lang['tfa']['delete_tfa'] = "Deaktiviere 2FA";
+$lang['tfa']['disable_tfa'] = "Deaktiviere 2FA bis zur nächsten erfolgreichen Anmeldung";
+$lang['tfa']['confirm_tfa'] = "Bitte bestätigen Sie Ihr Einmal-Passwort im unteren Feld";
+$lang['tfa']['confirm'] = "Bestätigen";
+$lang['tfa']['otp'] = "Einmalpasswort";
+$lang['tfa']['totp'] = "Time-based OTP (Google Authenticator etc.)";
+$lang['tfa']['trash_login'] = "Login verwerfen";
+$lang['tfa']['select'] = "Bitte auswählen";
+$lang['tfa']['waiting_usb_auth'] = "<i>Warte auf USB-Gerät...</i><br><br>Bitte jetzt den vorgesehenen Taster des U2F USB-Gerätes berühren.";
+$lang['tfa']['waiting_usb_register'] = "<i>Warte auf USB-Gerät...</i><br><br>Bitte zuerst das obere Passwortfeld ausfüllen und erst dann den vorgesehenen Taster des U2F USB-Gerätes berühren.";
+$lang['tfa']['scan_qr_code'] = "Bitte scannen Sie jetzt den angezeigten QR-Code:.";
+$lang['tfa']['enter_qr_code'] = "Falls Sie den angezeigten QR-Code nicht scannen können, verwenden Sie bitte nachstehenden Sicherheitsschlüssel";
+$lang['tfa']['confirm_totp_token'] = "Bitte bestätigen Sie die Änderung durch Eingabe eines generierten Tokens";
+
+$lang['admin']['search_domain_da'] = 'Domains durchsuchen';
+$lang['admin']['restrictions'] = 'Postfix Restriktionen';
+$lang['admin']['rr'] = 'Postfix Empfänger Restriktionen';
+$lang['admin']['sr'] = 'Postfix Sender Restriktionen';
+$lang['admin']['reset_defaults'] = 'Standard wiederherstellen';
+$lang['admin']['r_inactive'] = 'Inaktive Restriktionen';
+$lang['admin']['r_active'] = 'Aktive Restriktionen';
+$lang['admin']['r_info'] = 'Ausgegraute/deaktivierte Elemente sind mailcow nicht bekannt und können nicht in die Liste inaktiver Elemente verschoben werden. Unbekannte Restriktionen werden trotzdem in Reihenfolge der Erscheinung gesetzt.<br>Sie können ein Element in der Datei <code>inc/vars.local.inc.php</code> als bekannt hinzufügen, um es zu bewegen.';
+$lang['admin']['public_folders'] = 'Öffentliche Ordner';
+$lang['admin']['public_folders_text'] = 'Ein Namespace "Public" wird erstellt. Der untenstehende Ordnername betrifft den Namen der automatisch erstellten Mailbox in diesem Namespace.';
+$lang['admin']['public_folder_name'] = 'Ordnername <small>(alphanumerisch)</small>';
+$lang['admin']['public_folder_enable'] = 'Öffentliche Ordner aktivieren';
+$lang['admin']['public_folder_enable_text'] = 'Das Umschalten dieser Option entfernt keine Nachrichten aus den öffentlichen Ordnern.';
+$lang['admin']['public_folder_pusf'] = 'Aktiviere "per-user seen flag"';
+$lang['admin']['public_folder_pusf_text'] = 'Ein "per-user seen flag"-aktiviertes System markiert Nachrichten nicht als gelesen, wenn nur ein Benutzer sie gelesen hat. Jeder Benutzer verwaltet seine eigenen "seen flags".';
+$lang['admin']['privacy'] = 'Datenschutz';
+$lang['admin']['privacy_text'] = 'Diese Option aktiviert eine PCRE-Prüfung, die die Werte der Kopfzeilen "User-Agent", "X-Enigmail", "X-Mailer", "X-Originating-IP" sowie "Received: from" durch "localhost" bzw. "127.0.0.1" ersetzt.';
+$lang['admin']['privacy_anon_mail'] = 'Anonymisiere ausgehende Kopfzeilen';
+$lang['admin']['msg_size'] = 'Aktuelles Limit der Nachrichtengröße';
+$lang['admin']['msg_size_limit'] = 'Aktuelles Limit der Nachrichtengröße';
+$lang['admin']['msg_size_limit_details'] = 'Diese Einstellung wird Postfix und den Webserver neuladen.';
+$lang['admin']['save'] = 'Änderungen speichern';
+$lang['admin']['maintenance'] = 'Wartung und Information';
+$lang['admin']['sys_info'] = 'Systeminformation';
+$lang['admin']['dkim_add_key'] = 'DKIM-Key hinzufügen';
+$lang['admin']['dkim_keys'] = 'DKIM-Keys';
+$lang['admin']['dkim_key_valid'] = 'Key gültig';
+$lang['admin']['dkim_key_unused'] = 'Key ohne Zuweisung';
+$lang['admin']['dkim_key_missing'] = 'Key fehlt';
+$lang['admin']['dkim_key_hint'] = 'Der Selector für DKIM-Keys lautet immer <code>dkim</code>.';
+$lang['admin']['add'] = 'Hinzufügen';
+$lang['admin']['configuration'] = 'Konfiguration';
+$lang['admin']['password'] = 'Passwort';
+$lang['admin']['password_repeat'] = 'Passwort (Wiederholung)';
+$lang['admin']['active'] = 'Aktiv';
+$lang['admin']['inactive'] = 'Inaktiv';
+$lang['admin']['action'] = 'Aktion';
+$lang['admin']['add_domain_admin'] = 'Domain-Administrator hinzufügen';
+$lang['admin']['admin_domains'] = 'Domain-Zuweisungen';
+$lang['admin']['domain_admins'] = 'Domain-Administratoren';
+$lang['admin']['username'] = 'Benutzername';
+$lang['admin']['edit'] = 'Bearbeiten';
+$lang['admin']['remove'] = 'Entfernen';
+$lang['admin']['save'] = 'Änderungen speichern';
+$lang['admin']['admin'] = 'Administrator';
+$lang['admin']['admin_details'] = 'Administrator bearbeiten';
+$lang['admin']['unchanged_if_empty'] = 'Unverändert, wenn leer';
+$lang['admin']['yes'] = '&#10004;';
+$lang['admin']['no'] = '&#10008;';
+$lang['admin']['access'] = 'Zugang';
+$lang['admin']['invalid_max_msg_size'] = 'Maximale Nachrichtengröße ungültig';
+$lang['admin']['site_not_found'] = 'Kann mailcow Seitenkonfiguration nicht finden';
+$lang['admin']['public_folder_empty'] = 'Öffentlicher Ordner-Name darf nicht leer sein';
+$lang['admin']['set_rr_failed'] = 'Kann Postfix Restriktionen nicht setzen';
+$lang['admin']['no_record'] = 'Kein Eintrag';
+$lang['admin']['filter_table'] = 'Tabelle Filtern';
+$lang['admin']['empty'] = 'Keine Einträge vorhanden';
+$lang['admin']['time'] = 'Zeit';
+$lang['admin']['priority'] = 'Gewichtung';
+$lang['admin']['refresh'] = 'Neu laden';
+$lang['admin']['logs'] = 'Logs';
+$lang['admin']['message'] = 'Nachricht';
+$lang['admin']['forwarding_hosts'] = 'Weiterleitungs-Hosts';
+$lang['admin']['forwarding_hosts_hint'] = 'Eingehende Nachrichten werden von den hier gelisteten Hosts bedingungslos akzeptiert. Diese Hosts werden dann nicht mit DNSBLs abgeglichen oder Greylisting unterworfen. Von ihnen empfangener Spam wird nie abgelehnt, optional kann er aber in den Spam-Ordner einsortiert werden. Die übliche Verwendung für diese Funktion ist, um Mailserver anzugeben, auf denen eine Weiterleitung zu Ihrem Mailcow-Server eingerichtet wurde.';
+$lang['admin']['forwarding_hosts_add_hint'] = 'Sie können entweder IPv4/IPv6-Adressen, Netzwerke in CIDR-Notation, Hostnamen (die zu IP-Adressen aufgelöst werden), oder Domainnamen (die zu IP-Adressen aufgelöst werden, indem ihr SPF-Record abgefragt wird oder, in dessen Abwesenheit, ihre MX-Records) angeben.';
+$lang['admin']['host'] = 'Host';
+$lang['admin']['source'] = 'Quelle';
+$lang['admin']['add_forwarding_host'] = 'Weiterleitungs-Host hinzufügen';
+$lang['delete']['remove_forwardinghost_warning'] = '<b>Warnung:</b> Sie entfernen den Weiterleitungs-Host <b>%s</b>!';
+$lang['success']['forwarding_host_removed'] = "Weiterleitungs-Host %s wurde entfernt";
+$lang['success']['forwarding_host_added'] = "Weiterleitungs-Host %s wurde hinzugefügt";
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index f562d4980..2763e0f9b 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -1,502 +1,500 @@
-<?php
-/*
-//
-//  English language file
-//
-*/
-$lang['footer']['loading'] = "Please wait...";
-$lang['header']['restart_sogo'] = 'Restart SOGo';
-$lang['footer']['restart_sogo'] = 'Restart SOGo';
-$lang['footer']['restart_now'] = 'Restart now';
-$lang['footer']['restart_sogo_info'] = 'Some tasks, e.g. adding a domain, require you to restart SOGo to catch changes made in the mailcow UI.<br /><br /><b>Important:</b> A graceful restart may take a while to complete, please wait for it to finish.';
-
-$lang['footer']['confirm_delete'] = 'Confirm deletion';
-$lang['footer']['delete_these_items'] = 'Are you sure you want to delete the following items?';
-$lang['footer']['delete_now'] = 'Delete now';
-$lang['footer']['cancel'] = 'Cancel';
-
-$lang['dkim']['confirm'] = "Are you sure?";
-$lang['danger']['dkim_not_found'] = "DKIM key not found";
-$lang['danger']['dkim_remove_failed'] = "Cannot remove selected DKIM key";
-$lang['danger']['dkim_add_failed'] = "Cannot add given DKIM key";
-$lang['danger']['dkim_domain_or_sel_invalid'] = "DKIM domain or selector invalid";
-$lang['danger']['dkim_key_length_invalid'] = "DKIM key length invalid";
-$lang['success']['dkim_removed'] = "DKIM key has been removed";
-$lang['success']['dkim_added'] = "DKIM key has been saved";
-$lang['danger']['access_denied'] = "Access denied or invalid form data";
-$lang['danger']['whitelist_from_invalid'] = "Whitelist entry invalid";
-$lang['danger']['domain_invalid'] = "Domain name is invalid";
-$lang['danger']['mailbox_quota_exceeds_domain_quota'] = "Max. quota exceeds domain quota limit";
-$lang['danger']['object_is_not_numeric'] = "Value %s is not numeric";
-$lang['success']['domain_added'] = "Added domain %s";
-$lang['danger']['alias_empty'] = "Alias address must not be empty";
-$lang['danger']['last_key'] = 'Last key cannot be deleted';
-$lang['danger']['goto_empty'] = "Goto address must not be empty";
-$lang['danger']['policy_list_from_exists'] = "A record with given name exists";
-$lang['danger']['policy_list_from_invalid'] = "Record has invalid format";
-$lang['danger']['whitelist_exists'] = "A whitelist record with that name exists";
-$lang['danger']['whitelist_from_invalid'] = "Whitelist record has invalid format";
-$lang['danger']['alias_invalid'] = "Alias address is invalid";
-$lang['danger']['goto_invalid'] = "Goto address is invalid";
-$lang['danger']['alias_domain_invalid'] = "Alias domain is invalid";
-$lang['danger']['target_domain_invalid'] = "Goto domain is invalid";
-$lang['danger']['object_exists'] = "Object %s already exists";
-$lang['danger']['domain_exists'] = "Domain %s already exists";
-$lang['danger']['alias_goto_identical'] = "Alias and goto address must not be identical";
-$lang['danger']['aliasd_targetd_identical'] = "Alias domain must not be equal to target domain";
-$lang['danger']['maxquota_empty'] = 'Max. quota per mailbox must not be 0.';
-$lang['success']['alias_added'] = "Alias address/es has/have been added";
-$lang['success']['alias_modified'] = "Changes to alias/es %s have been saved";
-$lang['success']['aliasd_modified'] = "Changes to alias domain have been saved";
-$lang['success']['mailbox_modified'] = "Changes to mailbox %s have been saved";
-$lang['success']['resource_modified'] = "Changes to mailbox %s have been saved";
-$lang['success']['object_modified'] = "Changes to object %s have been saved";
-$lang['success']['msg_size_saved'] = "Message size limit has been set";
-$lang['danger']['aliasd_not_found'] = "Alias domain not found";
-$lang['danger']['targetd_not_found'] = "Target domain not found";
-$lang['danger']['aliasd_exists'] = "Alias domain already exists";
-$lang['success']['aliasd_added'] = "Added alias domain %s";
-$lang['success']['aliasd_modified'] = "Changes to alias domain %s have been saved";
-$lang['success']['domain_modified'] = "Changes to domain %s have been saved";
-$lang['success']['domain_admin_modified'] = "Changes to domain administrator %s have been saved";
-$lang['success']['domain_admin_added'] = "Domain administrator %s has been added";
-$lang['success']['changes_general'] = 'Changes have been saved';
-$lang['success']['admin_modified'] = "Changes to administrator have been saved";
-$lang['danger']['exit_code_not_null'] = "Error: Exit code was %d";
-$lang['danger']['mailbox_not_available'] = "Mailbox not available";
-$lang['danger']['username_invalid'] = "Username cannot be used";
-$lang['danger']['password_mismatch'] = "Confirmation password is not identical";
-$lang['danger']['password_complexity'] = "Password does not meet the policy";
-$lang['danger']['password_empty'] = "Password must not be empty";
-$lang['danger']['login_failed'] = "Login failed";
-$lang['danger']['mailbox_invalid'] = "Mailbox name is invalid";
-$lang['danger']['description_invalid'] = 'Resource description is invalid';
-$lang['danger']['resource_invalid'] = "Resource name is invalid";
-$lang['danger']['mailbox_invalid_suggest'] = 'Mailbox name is invalid, did you mean to type "%s"?';
-$lang['danger']['is_alias'] = "%s is already known as an alias address";
-$lang['danger']['is_alias_or_mailbox'] = "%s is already known as an alias or a mailbox";
-$lang['danger']['is_spam_alias'] = "%s is already known as a spam alias address";
-$lang['danger']['quota_not_0_not_numeric'] = "Quota must be numeric and >= 0";
-$lang['danger']['domain_not_found'] = 'Domain "%s" not found';
-$lang['danger']['max_mailbox_exceeded'] = "Max. mailboxes exceeded (%d of %d)";
-$lang['danger']['max_alias_exceeded'] = 'Max. aliases exceeded';
-$lang['danger']['mailbox_quota_exceeded'] = "Quota exceeds the domain limit (max. %d MiB)";
-$lang['danger']['mailbox_quota_left_exceeded'] = "Not enough space left (space left: %d MiB)";
-$lang['success']['mailbox_added'] = "Mailbox %s has been added";
-$lang['success']['resource_added'] = "Resource %s has been added";
-$lang['success']['domain_removed'] = "Domain %s has been removed";
-$lang['success']['alias_removed'] = "Alias %s has been removed";
-$lang['success']['alias_domain_removed'] = "Alias domain %s has been removed";
-$lang['success']['domain_admin_removed'] = "Domain administrator %s has been removed";
-$lang['success']['mailbox_removed'] = "Mailbox %s has been removed";
-$lang['success']['eas_reset'] = "ActiveSync devices for user %s were reset";
-$lang['success']['resource_removed'] = "Resource %s has been removed";
-$lang['danger']['max_quota_in_use'] = "Mailbox quota must be greater or equal to %d MiB";
-$lang['danger']['domain_quota_m_in_use'] = "Domain quota must be greater or equal to %s MiB";
-$lang['danger']['mailboxes_in_use'] = "Max. mailboxes must be greater or equal to %d";
-$lang['danger']['aliases_in_use'] = "Max. aliases must be greater or equal to %d";
-$lang['danger']['sender_acl_invalid'] = "Sender ACL value is invalid";
-$lang['danger']['domain_not_empty'] = "Cannot remove non-empty domain";
-$lang['warning']['spam_alias_temp_error'] = "Temporary error: Cannot add spam alias, please try again later.";
-$lang['danger']['spam_alias_max_exceeded'] = "Max. allowed spam alias addresses exceeded";
-$lang['danger']['validity_missing'] = 'Please assign a period of validity';
-$lang['user']['on'] = "On";
-$lang['user']['off'] = "Off";
-$lang['user']['messages'] = "messages"; // "123 messages"
-$lang['user']['in_use'] = "Used";
-$lang['user']['user_change_fn'] = "";
-$lang['user']['user_settings'] = 'User settings';
-$lang['user']['mailbox_settings'] = 'Mailbox settings';
-$lang['user']['mailbox_details'] = 'Mailbox details';
-$lang['user']['change_password'] = 'Change password';
-$lang['user']['new_password'] = 'New password';
-$lang['user']['save_changes'] = 'Save changes';
-$lang['user']['password_now'] = 'Current password (confirm changes)';
-$lang['user']['new_password_repeat'] = 'Confirmation password (repeat)';
-$lang['user']['new_password_description'] = 'Requirement: 6 characters long, letters and numbers.';
-$lang['user']['did_you_know'] = '<b>Did you know?</b> You can use tags in your email address ("me+<b>privat</b>@example.com") to move messages to a folder automatically (example: "privat").';
-$lang['user']['spam_aliases'] = 'Temporary email aliases';
-$lang['user']['alias'] = 'Alias';
-$lang['user']['aliases'] = 'Aliases';
-$lang['user']['domain_aliases'] = 'Domain alias addresses';
-$lang['user']['is_catch_all'] = 'Catch-all for domain/s';
-$lang['user']['aliases_also_send_as'] = 'Also allowed to send as user';
-$lang['user']['aliases_send_as_all'] = 'Do not check sender access for the following domain(s) and its alias domains';
-$lang['user']['alias_create_random'] = 'Generate random alias';
-$lang['user']['alias_extend_all'] = 'Extend aliases by 1 hour';
-$lang['user']['alias_valid_until'] = 'Valid until';
-$lang['user']['alias_remove_all'] = 'Remove all aliases';
-$lang['user']['alias_time_left'] = 'Time left';
-$lang['user']['alias_full_date'] = 'd.m.Y, H:i:s T';
-$lang['user']['syncjob_full_date'] = 'd.m.Y, H:i:s T';
-$lang['user']['alias_select_validity'] = 'Period of validity';
-$lang['user']['sync_jobs'] = 'Sync jobs';
-$lang['user']['hour'] = 'Hour';
-$lang['user']['hours'] = 'Hours';
-$lang['user']['day'] = 'Day';
-$lang['user']['week'] = 'Week';
-$lang['user']['weeks'] = 'Weeks';
-$lang['user']['spamfilter'] = 'Spam filter';
-$lang['admin']['spamfilter'] = 'Spam filter';
-$lang['user']['spamfilter_wl'] = 'Whitelist';
-$lang['user']['spamfilter_wl_desc'] = 'Whitelisted email addresses to <b>never</b> classify as spam. Wildcards maybe used.';
-$lang['user']['spamfilter_bl'] = 'Blacklist';
-$lang['user']['spamfilter_bl_desc'] = 'Blacklisted email addresses to <b>always</b> classify as spam and reject. Wildcards maybe used.';
-$lang['user']['spamfilter_behavior'] = 'Rating';
-$lang['user']['spamfilter_table_rule'] = 'Rule';
-$lang['user']['spamfilter_table_action'] = 'Action';
-$lang['user']['spamfilter_table_empty'] = 'No data to display';
-$lang['user']['spamfilter_table_remove'] = 'remove';
-$lang['user']['spamfilter_table_add'] = 'Add item';
-$lang['user']['spamfilter_default_score'] = 'Spam score:';
-$lang['user']['spamfilter_green'] = 'Green: this message is not spam';
-$lang['user']['spamfilter_yellow'] = 'Yellow: this message may be spam, will be tagged as spam and moved to your junk folder';
-$lang['user']['spamfilter_red'] = 'Red: This message is spam and will be rejected by the server';
-$lang['user']['spamfilter_default_score'] = 'Default values:';
-$lang['user']['spamfilter_hint'] = 'The first value describes the "low spam score", the second represents the "high spam score".';
-$lang['user']['spamfilter_table_domain_policy'] = "n/a (domain policy)";
-
-$lang['user']['tls_policy_warning'] = '<strong>Warning:</strong> If you decide to enforce encrypted mail transfer, you may lose emails.<br />Messages to not satisfy the policy will be bounced with a hard fail by the mail system.<br />This option applies to your primary email address (login name), all addresses derived from alias domains as well as alias addresses <b>with only this single mailbox</b> as target.';
-$lang['user']['tls_policy'] = 'Encryption policy';
-$lang['user']['tls_enforce_in'] = 'Enforce TLS incoming';
-$lang['user']['tls_enforce_out'] = 'Enforce TLS outgoing';
-$lang['user']['no_record'] = 'No record';
-
-$lang['user']['misc_settings'] = 'Other profile settings';
-$lang['user']['misc_delete_profile'] = 'Other profile settings';
-
-$lang['user']['tag_handling'] = 'Set handling for tagged mail';
-$lang['user']['tag_in_subfolder'] = 'In subfolder';
-$lang['user']['tag_in_subject'] = 'In subject';
-$lang['user']['tag_help_explain'] = 'In subfolder: a new subfolder named after the tag will be created below INBOX ("INBOX/Facebook").<br />
-In subject: the tags name will be prepended to the mails subject, example: "[Facebook] Meine Neuigkeiten".';
-$lang['user']['tag_help_example'] = 'Example for a tagged email address: ich<b>+Facebook</b>@example.org';
-$lang['user']['eas_reset'] = 'Reset ActiveSync device cache';
-$lang['user']['eas_reset_now'] = 'Reset now';
-$lang['user']['eas_reset_help'] = 'In many cases a device cache reset will help to recover a broken ActiveSync profile.<br /><b>Attention:</b> All elements will be redownloaded!';
-
-$lang['user']['encryption'] = 'Encyrption';
-$lang['user']['username'] = 'Username';
-$lang['user']['password'] = 'Password';
-$lang['user']['last_run'] = 'Last run';
-$lang['user']['excludes'] = 'Excludes';
-$lang['user']['interval'] = 'Interval';
-$lang['user']['active'] = 'Active';
-$lang['user']['action'] = 'Action';
-$lang['user']['edit'] = 'Edit';
-$lang['user']['remove'] = 'Remove';
-$lang['user']['delete_now'] = 'Remove now';
-$lang['user']['create_syncjob'] = 'Create new sync job';
-
-$lang['start']['dashboard'] = '%s - dashboard';
-$lang['start']['start_rc'] = 'Open Roundcube';
-$lang['start']['start_sogo'] = 'Open SOGo';
-$lang['start']['mailcow_apps_detail'] = 'Use a mailcow app to access your mails, calendar, contacts and more.';
-$lang['start']['mailcow_panel'] = 'Start mailcow UI';
-$lang['start']['mailcow_panel_description'] = 'The mailcow UI is available for administrators and mailbox users.';
-$lang['start']['mailcow_panel_detail'] = '<b>Domain administrators</b> create, modify or delete mailboxes and aliases, change domains and read further information about their assigned domains.<br />
-	<b>Mailbox users</b> are able to create time-limited aliases (spam aliases), change their password and spam filter settings.';
-$lang['start']['recommended_config'] = 'Recommended configuration (without ActiveSync)';
-$lang['start']['imap_smtp_server'] = 'IMAP- and SMTP server data';
-$lang['start']['imap_smtp_server_description'] = 'For the best experience we recommend to use <a href="%s" target="_blank"><b>Mozilla Thunderbird</b></a>.';
-$lang['start']['imap_smtp_server_badge'] = 'Read/Write emails';
-$lang['start']['imap_smtp_server_auth_info'] = 'Please use your full email address and the PLAIN authentication mechanism.<br />
-Your login data will be encrypted by the server-side mandatory encryption.';
-$lang['start']['managesieve'] = 'ManageSieve';
-$lang['start']['managesieve_badge'] = 'Email filter';
-$lang['start']['managesieve_description'] = 'Please use <b>Mozilla Thunderbird</b> with the <a style="text-decoration:none" target="_blank" href="%s"><b>nightly sieve extension</b></a>.<br />Start Thunderbird, open the add-on settings and drop the newly downloaded xpi file into the opened window.<br />The server name is <b>%s</b>, use port <b>4190</b> if you are asked for. The login data match your email login.';
-$lang['start']['service'] = 'Service';
-$lang['start']['encryption'] = 'Encryption method';
-$lang['start']['help'] = 'Show/Hide help panel';
-$lang['start']['hostname'] = 'Hostname';
-$lang['start']['port'] = 'Port';
-$lang['start']['footer'] = '';
-$lang['header']['mailcow_settings'] = 'Configuration';
-$lang['header']['administration'] = 'Administration';
-$lang['header']['mailboxes'] = 'Mailboxes';
-$lang['header']['user_settings'] = 'User settings';
-$lang['header']['login'] = 'Login';
-$lang['header']['logged_in_as_logout'] = 'Logged in as <b>%s</b> (logout)';
-$lang['header']['logged_in_as_logout_dual'] = 'Logged in as <b>%s <span class="text-info">[%s]</span></b>';
-$lang['header']['locale'] = 'Language';
-$lang['mailbox']['domain'] = 'Domain';
-$lang['mailbox']['spam_aliases'] = 'Temp. alias';
-$lang['mailbox']['multiple_bookings'] = 'Multiple bookings';
-$lang['mailbox']['kind'] = 'Kind';
-$lang['mailbox']['description'] = 'Description';
-$lang['mailbox']['alias'] = 'Alias';
-$lang['mailbox']['resource_name'] = 'Resource name';
-$lang['mailbox']['aliases'] = 'Aliases';
-$lang['mailbox']['domains'] = 'Domains';
-$lang['mailbox']['mailboxes'] = 'Mailboxes';
-$lang['mailbox']['resources'] = 'Resources';
-$lang['mailbox']['mailbox_quota'] = 'Max. size of a mailbox';
-$lang['mailbox']['domain_quota'] = 'Quota';
-$lang['mailbox']['active'] = 'Active';
-$lang['mailbox']['action'] = 'Action';
-$lang['mailbox']['ratelimit'] = 'Outgoing rate limit/h';
-$lang['mailbox']['backup_mx'] = 'Backup MX';
-$lang['mailbox']['domain_aliases'] = 'Domain aliases';
-$lang['mailbox']['target_domain'] = 'Target domain';
-$lang['mailbox']['target_address'] = 'Goto address';
-$lang['mailbox']['username'] = 'Username';
-$lang['mailbox']['fname'] = 'Full name';
-$lang['mailbox']['filter_table'] = 'Filter table';
-$lang['mailbox']['yes'] = '&#10004;';
-$lang['mailbox']['no'] = '&#10008;';
-$lang['mailbox']['quota'] = 'Quota';
-$lang['mailbox']['in_use'] = 'In use (%)';
-$lang['mailbox']['msg_num'] = 'Message #';
-$lang['mailbox']['remove'] = 'Remove';
-$lang['mailbox']['edit'] = 'Edit';
-$lang['mailbox']['archive'] = 'Archive';
-$lang['mailbox']['no_record'] = 'No record for object %s';
-$lang['mailbox']['no_record_single'] = 'No record';
-$lang['mailbox']['add_domain'] = 'Add domain';
-$lang['mailbox']['add_domain_alias'] = 'Add domain alias';
-$lang['mailbox']['add_mailbox'] = 'Add mailbox';
-$lang['mailbox']['add_resource'] = 'Add resource';
-$lang['mailbox']['add_alias'] = 'Add alias';
-$lang['mailbox']['add_domain_record_first'] = 'Please add a domain first';
-$lang['mailbox']['empty'] = 'No results';
-$lang['mailbox']['toggle_all'] = 'Toggle all';
-$lang['mailbox']['quick_actions'] = 'Quick actions';
-$lang['mailbox']['activate'] = 'Activate';
-$lang['mailbox']['deactivate'] = 'Deactivate';
-
-$lang['info']['no_action'] = 'No action applicable';
-
-$lang['delete']['title'] = 'Remove object';
-$lang['delete']['remove_domain_warning'] = '<b>Warning:</b> You are about to remove the domain <b>%s</b>!';
-$lang['delete']['remove_syncjob_warning'] = '<b>Warning:</b> You are about to remove a sync job for user <b>%s</b>!';
-$lang['delete']['remove_domainalias_warning'] = '<b>Warning:</b> You are about to remove the domain alias <b>%s</b>!';
-$lang['delete']['remove_domainadmin_warning'] = '<b>Warning:</b> You are about to remove the domain administrator <b>%s</b>!';
-$lang['delete']['remove_alias_warning'] = '<b>Warning:</b> You are about to remove the alias address <b>%s</b>!';
-$lang['delete']['remove_mailbox_warning'] = '<b>Warning:</b> You are about to remove the mailbox <b>%s</b>!';
-$lang['delete']['remove_mailbox_details'] = 'The mailbox will be <b>purged permanently</b>!';
-$lang['delete']['remove_resource_warning'] = '<b>Warning:</b> You are about to remove the resource <b>%s</b>!';
-$lang['delete']['remove_resource_details'] = 'The resource will be <b>purged permanently</b>!';
-$lang['delete']['remove_domain_details'] = 'This also removes domain aliases.<br /><br /><b>A domain must be empty to be removed.</b>';
-$lang['delete']['remove_syncjob_details'] = 'Objects from this sync job will not be pulled from the remote server anymore.';
-$lang['delete']['remove_alias_details'] = 'Users will no longer be able to receive mail for or send mail from this address.</b>';
-$lang['delete']['remove_button'] = 'Remove';
-$lang['delete']['previous'] = 'Previous page';
-
-$lang['edit']['syncjob'] = 'Edit sync job';
-$lang['edit']['save'] = 'Save changes';
-$lang['edit']['username'] = 'Username';
-$lang['edit']['hostname'] = 'Hostname';
-$lang['edit']['encryption'] = 'Encryption';
-$lang['edit']['maxage'] = 'Maximum age of messages in days that will be polled from remote<br /><small>(0 = ignore age)</small>';
-$lang['edit']['subfolder2'] = 'Sync into subfolder on destination<br /><small>(empty = do not use subfolder)</small>';
-$lang['edit']['mins_interval'] = 'Interval (min)';
-$lang['edit']['exclude'] = 'Exclude objects (regex)';
-$lang['edit']['save'] = 'Save changes';
-$lang['edit']['archive'] = 'Archive access';
-$lang['edit']['max_mailboxes'] = 'Max. possible mailboxes';
-$lang['edit']['title'] = 'Edit object';
-$lang['edit']['target_address'] = 'Goto address/es <small>(comma-separated)</small>';
-$lang['edit']['active'] = 'Active';
-$lang['edit']['target_domain'] = 'Target domain';
-$lang['edit']['password'] = 'Password';
-$lang['edit']['ratelimit'] = 'Outgoing rate limit/h';
-$lang['danger']['ratelimt_less_one'] = 'Outgoing rate limit/h must not be less than 1';
-$lang['edit']['password_repeat'] = 'Confirmation password (repeat)';
-$lang['edit']['domain_admin'] = 'Edit domain administrator';
-$lang['edit']['domain'] = 'Edit domain';
-$lang['edit']['alias_domain'] = 'Alias domain';
-$lang['edit']['edit_alias_domain'] = 'Edit Alias domain';
-$lang['edit']['domains'] = 'Domains';
-$lang['edit']['destroy'] = 'Manual data input';
-$lang['edit']['alias'] = 'Edit alias';
-$lang['edit']['mailbox'] = 'Edit mailbox';
-$lang['edit']['description'] = 'Description';
-$lang['edit']['max_aliases'] = 'Max. aliases';
-$lang['edit']['max_quota'] = 'Max. quota per mailbox (MiB)';
-$lang['edit']['domain_quota'] = 'Domain quota';
-$lang['edit']['backup_mx_options'] = 'Backup MX options';
-$lang['edit']['relay_domain'] = 'Relay domain';
-$lang['edit']['relay_all'] = 'Relay all recipients';
-$lang['edit']['dkim_signature'] = 'DKIM signature';
-$lang['edit']['dkim_record_info'] = '<small>Please add a TXT record with the given value to your DNS settings.</small>';
-$lang['edit']['relay_all_info'] = '<small>If you choose <b>not</b> to relay all recipients, you will need to add a ("blind") mailbox for every single recipient that should be relayed.</small>';
-$lang['edit']['full_name'] = 'Full name';
-$lang['edit']['quota_mb'] = 'Quota (MiB)';
-$lang['edit']['sender_acl'] = 'Allow to send as';
-$lang['edit']['sender_acl_info'] = 'Aliases cannot be deselected.';
-$lang['edit']['dkim_txt_name'] = 'TXT record name:';
-$lang['edit']['dkim_txt_value'] = 'TXT record value:';
-$lang['edit']['previous'] = 'Previous page';
-$lang['edit']['unchanged_if_empty'] = 'If unchanged leave blank';
-$lang['edit']['dont_check_sender_acl'] = "Disable sender check for domain %s + alias domains";
-$lang['edit']['multiple_bookings'] = 'Multiple bookings';
-$lang['edit']['kind'] = 'Kind';
-$lang['edit']['resource'] = 'Resource';
-
-$lang['add']['syncjob'] = 'Add sync job';
-$lang['add']['syncjob_hint'] = 'Be aware that passwords need to be saved plain-text!';
-$lang['add']['hostname'] = 'Hostname';
-$lang['add']['port'] = 'Port';
-$lang['add']['username'] = 'Username';
-$lang['add']['enc_method'] = 'Encryption method';
-$lang['add']['mins_interval'] = 'Polling interval (minutes)';
-$lang['add']['maxage'] = 'Maximum age of messages that will be polled from remote (0 = ignore age)';
-$lang['add']['subfolder2'] = 'Sync into subfolder on destination';
-$lang['add']['exclude'] = 'Exclude objects (regex)';
-$lang['add']['delete2duplicates'] = 'Delete duplicates on destination';
-$lang['add']['delete1'] = 'Delete from source when completed';
-$lang['edit']['delete2duplicates'] = 'Delete duplicates on destination';
-$lang['edit']['delete1'] = 'Delete from source when completed';
-
-$lang['add']['title'] = 'Add object';
-$lang['add']['domain'] = 'Domain';
-$lang['add']['active'] = 'Active';
-$lang['add']['multiple_bookings'] = 'Multiple bookings';
-$lang['add']['save'] = 'Save changes';
-$lang['add']['description'] = 'Description:';
-$lang['add']['max_aliases'] = 'Max. possible aliases:';
-$lang['add']['resource_name'] = 'Resource name';
-$lang['add']['max_mailboxes'] = 'Max. possible mailboxes:';
-$lang['add']['mailbox_quota_m'] = 'Max. quota per mailbox (MiB):';
-$lang['add']['domain_quota_m'] = 'Total domain quota (MiB):';
-$lang['add']['backup_mx_options'] = 'Backup MX options:';
-$lang['add']['relay_all'] = 'Relay all recipients';
-$lang['add']['relay_domain'] = 'Relay this domain';
-$lang['add']['relay_all_info'] = '<small>If you choose <b>not</b> to relay all recipients, you will need to add a ("blind") mailbox for every single recipient that should be relayed.</small>';
-$lang['add']['alias'] = 'Alias(es)';
-$lang['add']['alias_spf_fail'] = '<b>Note:</b> If your chosen destination address is an external mailbox, the <b>receiving mailserver</b> may reject your message due to an SPF failure.</a>';
-$lang['add']['alias_address'] = 'Alias address/es:';
-$lang['add']['alias_address_info'] = '<small>Full email address/es or @example.com, to catch all messages for a domain (comma-separated). <b>mailcow domains only</b>.</small>';
-$lang['add']['alias_domain_info'] = '<small>Valid domain names only (comma-separated).</small>';
-$lang['add']['target_address'] = 'Goto addresses:';
-$lang['add']['target_address_info'] = '<small>Full email address/es (comma-separated).</small>';
-$lang['add']['alias_domain'] = 'Alias domain';
-$lang['add']['select'] = 'Please select...';
-$lang['add']['target_domain'] = 'Target domain:';
-$lang['add']['mailbox'] = 'Mailbox';
-$lang['add']['resource'] = 'Resource';
-$lang['add']['kind'] = 'Kind';
-$lang['add']['mailbox_username'] = 'Username (left part of an email address):';
-$lang['add']['full_name'] = 'Full name:';
-$lang['add']['quota_mb'] = 'Quota (MiB):';
-$lang['add']['select_domain'] = 'Please select a domain first';
-$lang['add']['password'] = 'Password:';
-$lang['add']['password_repeat'] = 'Confirmation password (repeat):';
-$lang['add']['previous'] = 'Previous page';
-$lang['add']['restart_sogo_hint'] = 'You will need to restart the SOGo service container after adding a new domain!';
-
-$lang['login']['title'] = 'Login';
-$lang['login']['administration'] = 'Administration';
-$lang['login']['administration_details'] = 'Please use your Administrator login to perform administrative tasks.';
-$lang['login']['user_settings'] = 'User settings';
-$lang['login']['user_settings_details'] = 'Mailbox users can use mailcow UI to change their passwords, create temporary aliases (spam aliases), adjust the spam filter behaviour or import messages from a remote IMAP server.';
-$lang['login']['username'] = 'Username';
-$lang['login']['password'] = 'Password';
-$lang['login']['reset_password'] = 'Reset my password';
-$lang['login']['login'] = 'Login';
-$lang['login']['previous'] = "Previous page";
-$lang['login']['delayed'] = 'Login was delayed by %s seconds.';
-
-$lang['tfa']['tfa'] = "Two-factor authentication";
-$lang['tfa']['set_tfa'] = "Set two-factor authentication method";
-$lang['tfa']['yubi_otp'] = "Yubico OTP authentication";
-$lang['tfa']['key_id'] = "An identifier for your YubiKey";
-$lang['tfa']['key_id_totp'] = "An identifier for your key";
-$lang['tfa']['api_register'] = 'mailcow uses the Yubico Cloud API. Please get an API key for your key <a href="https://upgrade.yubico.com/getapikey/" target="_blank">here</a>';
-$lang['tfa']['u2f'] = "U2F authentication";
-$lang['tfa']['hotp'] = "HOTP authentication";
-$lang['tfa']['totp'] = "TOTP authentication";
-$lang['tfa']['none'] = "Deactivate";
-$lang['tfa']['delete_tfa'] = "Disable TFA";
-$lang['tfa']['disable_tfa'] = "Disable TFA until next successful login";
-$lang['tfa']['confirm_tfa'] = "Please confirm your one-time password in the below field";
-$lang['tfa']['confirm'] = "Confirm";
-$lang['tfa']['otp'] = "One-time password";
-$lang['tfa']['totp'] = "Time-based OTP (Google Authenticator etc.)";
-$lang['tfa']['trash_login'] = "Trash login";
-$lang['tfa']['select'] = "Please select";
-$lang['tfa']['waiting_usb_auth'] = "<i>Waiting for USB device...</i><br /><br />Please tap the button on your U2F USB device now.";
-$lang['tfa']['waiting_usb_register'] = "<i>Waiting for USB device...</i><br /><br />Please enter your password above and confirm your U2F registration by tapping the button on your U2F USB device.";
-$lang['tfa']['scan_qr_code'] = "Please scan the following code with your authenticator app or enter the code manually.";
-$lang['tfa']['enter_qr_code'] = "Your TOTP code if your device cannot scan QR codes";
-$lang['tfa']['confirm_totp_token'] = "Please confirm your changes by entering the generated token";
-
-$lang['admin']['search_domain_da'] = 'Search domains';
-$lang['admin']['restrictions'] = 'Postfix Restrictions';
-$lang['admin']['rr'] = 'Postfix Recipient Restrictions';
-$lang['admin']['sr'] = 'Postfix Sender Restrictions';
-$lang['admin']['reset_defaults'] = 'Reset to defaults';
-$lang['admin']['sr'] = 'Postfix Sender Restrictions';
-$lang['admin']['r_inactive'] = 'Inactive restrictions';
-$lang['admin']['r_active'] = 'Active restrictions';
-$lang['admin']['r_info'] = 'Greyed out/disabled elements on the list of active restrictions are not known as valid restrictions to mailcow and cannot be moved. Unknown restrictions will be set in order of appearance anyway. <br />You can add new elements in <code>inc/vars.local.inc.php</code> to be able to toggle them.';
-$lang['admin']['public_folders'] = 'Public Folders';
-$lang['admin']['public_folders_text'] = 'A namespace "Public" is created. Below\'s public folder name indicates the name of the first auto-created mailbox within this namespace.';
-$lang['admin']['public_folder_name'] = 'Folder name <small>(alphanumeric)</small>';
-$lang['admin']['public_folder_enable'] = 'Enable public folder';
-$lang['admin']['public_folder_enable_text'] = 'Toggling this option does not delete mail in any public folder.';
-$lang['admin']['public_folder_pusf'] = 'Enable per-user seen flag';
-$lang['admin']['public_folder_pusf_text'] = 'A "per-user seen flag"-enabled system will not mark a mail as read for User B, when User A has seen it, but User B did not.';
-$lang['admin']['privacy'] = 'Privacy';
-$lang['admin']['privacy_text'] = 'This option enables a PCRE table to remove "User-Agent", "X-Enigmail", "X-Mailer", "X-Originating-IP" and replaces "Received: from" headers with localhost/127.0.0.1.';
-$lang['admin']['privacy_anon_mail'] = 'Anonymize outgoing mail';
-$lang['admin']['dkim_txt_name'] = 'TXT record name:';
-$lang['admin']['dkim_txt_value'] = 'TXT record value:';
-$lang['admin']['dkim_key_length'] = 'DKIM key length (bits)';
-$lang['admin']['dkim_key_valid'] = 'Key valid';
-$lang['admin']['dkim_key_unused'] = 'Key unused';
-$lang['admin']['dkim_key_missing'] = 'Key missing';
-$lang['admin']['dkim_key_hint'] = 'Selector for DKIM keys is always <code>dkim</code>.';
-$lang['admin']['previous'] = 'Previous page';
-$lang['admin']['quota_mb'] = 'Quota (MiB):';
-$lang['admin']['sender_acl'] = 'Allow to send as:';
-$lang['admin']['msg_size'] = 'Message size';
-$lang['admin']['msg_size_limit'] = 'Message size limit now';
-$lang['admin']['msg_size_limit_details'] = 'Applying a new limit will reload Postfix and the webserver.';
-$lang['admin']['save'] = 'Save changes';
-$lang['admin']['maintenance'] = 'Maintenance and Information';
-$lang['admin']['sys_info'] = 'System information';
-$lang['admin']['dkim_add_key'] = 'Add DKIM key';
-$lang['admin']['dkim_keys'] = 'DKIM keys';
-$lang['admin']['add'] = 'Add';
-$lang['admin']['configuration'] = 'Configuration';
-$lang['admin']['password'] = 'Password';
-$lang['admin']['password_repeat'] = 'Confirmation password (repeat)';
-$lang['admin']['active'] = 'Active';
-$lang['admin']['inactive'] = 'Inactive';
-$lang['admin']['action'] = 'Action';
-$lang['admin']['add_domain_admin'] = 'Add Domain administrator';
-$lang['admin']['admin_domains'] = 'Domain assignments';
-$lang['admin']['domain_admins'] = 'Domain administrators';
-$lang['admin']['username'] = 'Username';
-$lang['admin']['edit'] = 'Edit';
-$lang['admin']['remove'] = 'Remove';
-$lang['admin']['save'] = 'Save changes';
-$lang['admin']['admin'] = 'Administrator';
-$lang['admin']['admin_details'] = 'Edit administrator details';
-$lang['admin']['unchanged_if_empty'] = 'If unchanged leave blank';
-$lang['admin']['yes'] = '&#10004;';
-$lang['admin']['no'] = '&#10008;';
-$lang['admin']['access'] = 'Access';
-$lang['admin']['invalid_max_msg_size'] = 'Invalid max. message size';
-$lang['admin']['site_not_found'] = 'Cannot locate mailcow site configuration';
-$lang['admin']['public_folder_empty'] = 'Public folder name must not be empty';
-$lang['admin']['set_rr_failed'] = 'Cannot set Postfix restrictions';
-$lang['admin']['no_record'] = 'No record';
-$lang['admin']['filter_table'] = 'Filter table';
-$lang['admin']['empty'] = 'No results';
-$lang['admin']['time'] = 'Time';
-$lang['admin']['priority'] = 'Priority';
-$lang['admin']['message'] = 'Message';
-$lang['admin']['refresh'] = 'Refresh';
-$lang['admin']['logs'] = 'Logs';
-$lang['admin']['forwarding_hosts'] = 'Forwarding Hosts';
-$lang['admin']['forwarding_hosts_hint'] = 'Incoming messages are unconditionally accepted from any hosts listed here. These hosts are then not checked against DNSBLs or subjected to greylisting. Spam received from them is never rejected, but optionally it can be filed into the Junk folder. The most common use for this is to specify mail servers on which you have set up a rule that forwards incoming emails to your Mailcow server.';
-$lang['admin']['forwarding_hosts_add_hint'] = 'You can either specify IPv4/IPv6 addresses, networks in CIDR notation, host names (which will be resolved to IP addresses), or domain names (which will be resolved to IP addresses by querying SPF records or, in their absence, MX records).';
-$lang['admin']['host'] = 'Host';
-$lang['admin']['source'] = 'Source';
-$lang['admin']['add_forwarding_host'] = 'Add Forwarding Host';
-$lang['delete']['remove_forwardinghost_warning'] = '<b>Warning:</b> You are about to remove the forwarding host <b>%s</b>!';
-$lang['success']['forwarding_host_removed'] = "Forwarding host %s has been removed";
-$lang['success']['forwarding_host_added'] = "Forwarding host %s has been added";
-?>
+<?php
+/*
+ * English language file
+ */
+
+$lang['footer']['loading'] = "Please wait...";
+$lang['header']['restart_sogo'] = 'Restart SOGo';
+$lang['footer']['restart_sogo'] = 'Restart SOGo';
+$lang['footer']['restart_now'] = 'Restart now';
+$lang['footer']['restart_sogo_info'] = 'Some tasks, e.g. adding a domain, require you to restart SOGo to catch changes made in the mailcow UI.<br><br><b>Important:</b> A graceful restart may take a while to complete, please wait for it to finish.';
+
+$lang['footer']['confirm_delete'] = 'Confirm deletion';
+$lang['footer']['delete_these_items'] = 'Are you sure you want to delete the following items?';
+$lang['footer']['delete_now'] = 'Delete now';
+$lang['footer']['cancel'] = 'Cancel';
+
+$lang['dkim']['confirm'] = "Are you sure?";
+$lang['danger']['dkim_not_found'] = "DKIM key not found";
+$lang['danger']['dkim_remove_failed'] = "Cannot remove selected DKIM key";
+$lang['danger']['dkim_add_failed'] = "Cannot add given DKIM key";
+$lang['danger']['dkim_domain_or_sel_invalid'] = "DKIM domain or selector invalid";
+$lang['danger']['dkim_key_length_invalid'] = "DKIM key length invalid";
+$lang['success']['dkim_removed'] = "DKIM key has been removed";
+$lang['success']['dkim_added'] = "DKIM key has been saved";
+$lang['danger']['access_denied'] = "Access denied or invalid form data";
+$lang['danger']['whitelist_from_invalid'] = "Whitelist entry invalid";
+$lang['danger']['domain_invalid'] = "Domain name is invalid";
+$lang['danger']['mailbox_quota_exceeds_domain_quota'] = "Max. quota exceeds domain quota limit";
+$lang['danger']['object_is_not_numeric'] = "Value %s is not numeric";
+$lang['success']['domain_added'] = "Added domain %s";
+$lang['danger']['alias_empty'] = "Alias address must not be empty";
+$lang['danger']['last_key'] = 'Last key cannot be deleted';
+$lang['danger']['goto_empty'] = "Goto address must not be empty";
+$lang['danger']['policy_list_from_exists'] = "A record with given name exists";
+$lang['danger']['policy_list_from_invalid'] = "Record has invalid format";
+$lang['danger']['whitelist_exists'] = "A whitelist record with that name exists";
+$lang['danger']['whitelist_from_invalid'] = "Whitelist record has invalid format";
+$lang['danger']['alias_invalid'] = "Alias address is invalid";
+$lang['danger']['goto_invalid'] = "Goto address is invalid";
+$lang['danger']['alias_domain_invalid'] = "Alias domain is invalid";
+$lang['danger']['target_domain_invalid'] = "Goto domain is invalid";
+$lang['danger']['object_exists'] = "Object %s already exists";
+$lang['danger']['domain_exists'] = "Domain %s already exists";
+$lang['danger']['alias_goto_identical'] = "Alias and goto address must not be identical";
+$lang['danger']['aliasd_targetd_identical'] = "Alias domain must not be equal to target domain";
+$lang['danger']['maxquota_empty'] = 'Max. quota per mailbox must not be 0.';
+$lang['success']['alias_added'] = "Alias address/es has/have been added";
+$lang['success']['alias_modified'] = "Changes to alias/es %s have been saved";
+$lang['success']['aliasd_modified'] = "Changes to alias domain have been saved";
+$lang['success']['mailbox_modified'] = "Changes to mailbox %s have been saved";
+$lang['success']['resource_modified'] = "Changes to mailbox %s have been saved";
+$lang['success']['object_modified'] = "Changes to object %s have been saved";
+$lang['success']['msg_size_saved'] = "Message size limit has been set";
+$lang['danger']['aliasd_not_found'] = "Alias domain not found";
+$lang['danger']['targetd_not_found'] = "Target domain not found";
+$lang['danger']['aliasd_exists'] = "Alias domain already exists";
+$lang['success']['aliasd_added'] = "Added alias domain %s";
+$lang['success']['aliasd_modified'] = "Changes to alias domain %s have been saved";
+$lang['success']['domain_modified'] = "Changes to domain %s have been saved";
+$lang['success']['domain_admin_modified'] = "Changes to domain administrator %s have been saved";
+$lang['success']['domain_admin_added'] = "Domain administrator %s has been added";
+$lang['success']['changes_general'] = 'Changes have been saved';
+$lang['success']['admin_modified'] = "Changes to administrator have been saved";
+$lang['danger']['exit_code_not_null'] = "Error: Exit code was %d";
+$lang['danger']['mailbox_not_available'] = "Mailbox not available";
+$lang['danger']['username_invalid'] = "Username cannot be used";
+$lang['danger']['password_mismatch'] = "Confirmation password is not identical";
+$lang['danger']['password_complexity'] = "Password does not meet the policy";
+$lang['danger']['password_empty'] = "Password must not be empty";
+$lang['danger']['login_failed'] = "Login failed";
+$lang['danger']['mailbox_invalid'] = "Mailbox name is invalid";
+$lang['danger']['description_invalid'] = 'Resource description is invalid';
+$lang['danger']['resource_invalid'] = "Resource name is invalid";
+$lang['danger']['mailbox_invalid_suggest'] = 'Mailbox name is invalid, did you mean to type "%s"?';
+$lang['danger']['is_alias'] = "%s is already known as an alias address";
+$lang['danger']['is_alias_or_mailbox'] = "%s is already known as an alias or a mailbox";
+$lang['danger']['is_spam_alias'] = "%s is already known as a spam alias address";
+$lang['danger']['quota_not_0_not_numeric'] = "Quota must be numeric and >= 0";
+$lang['danger']['domain_not_found'] = 'Domain "%s" not found';
+$lang['danger']['max_mailbox_exceeded'] = "Max. mailboxes exceeded (%d of %d)";
+$lang['danger']['max_alias_exceeded'] = 'Max. aliases exceeded';
+$lang['danger']['mailbox_quota_exceeded'] = "Quota exceeds the domain limit (max. %d MiB)";
+$lang['danger']['mailbox_quota_left_exceeded'] = "Not enough space left (space left: %d MiB)";
+$lang['success']['mailbox_added'] = "Mailbox %s has been added";
+$lang['success']['resource_added'] = "Resource %s has been added";
+$lang['success']['domain_removed'] = "Domain %s has been removed";
+$lang['success']['alias_removed'] = "Alias %s has been removed";
+$lang['success']['alias_domain_removed'] = "Alias domain %s has been removed";
+$lang['success']['domain_admin_removed'] = "Domain administrator %s has been removed";
+$lang['success']['mailbox_removed'] = "Mailbox %s has been removed";
+$lang['success']['eas_reset'] = "ActiveSync devices for user %s were reset";
+$lang['success']['resource_removed'] = "Resource %s has been removed";
+$lang['danger']['max_quota_in_use'] = "Mailbox quota must be greater or equal to %d MiB";
+$lang['danger']['domain_quota_m_in_use'] = "Domain quota must be greater or equal to %s MiB";
+$lang['danger']['mailboxes_in_use'] = "Max. mailboxes must be greater or equal to %d";
+$lang['danger']['aliases_in_use'] = "Max. aliases must be greater or equal to %d";
+$lang['danger']['sender_acl_invalid'] = "Sender ACL value is invalid";
+$lang['danger']['domain_not_empty'] = "Cannot remove non-empty domain";
+$lang['warning']['spam_alias_temp_error'] = "Temporary error: Cannot add spam alias, please try again later.";
+$lang['danger']['spam_alias_max_exceeded'] = "Max. allowed spam alias addresses exceeded";
+$lang['danger']['validity_missing'] = 'Please assign a period of validity';
+$lang['user']['on'] = "On";
+$lang['user']['off'] = "Off";
+$lang['user']['messages'] = "messages"; // "123 messages"
+$lang['user']['in_use'] = "Used";
+$lang['user']['user_change_fn'] = "";
+$lang['user']['user_settings'] = 'User settings';
+$lang['user']['mailbox_settings'] = 'Mailbox settings';
+$lang['user']['mailbox_details'] = 'Mailbox details';
+$lang['user']['change_password'] = 'Change password';
+$lang['user']['new_password'] = 'New password';
+$lang['user']['save_changes'] = 'Save changes';
+$lang['user']['password_now'] = 'Current password (confirm changes)';
+$lang['user']['new_password_repeat'] = 'Confirmation password (repeat)';
+$lang['user']['new_password_description'] = 'Requirement: 6 characters long, letters and numbers.';
+$lang['user']['did_you_know'] = '<b>Did you know?</b> You can use tags in your email address ("me+<b>privat</b>@example.com") to move messages to a folder automatically (example: "privat").';
+$lang['user']['spam_aliases'] = 'Temporary email aliases';
+$lang['user']['alias'] = 'Alias';
+$lang['user']['aliases'] = 'Aliases';
+$lang['user']['domain_aliases'] = 'Domain alias addresses';
+$lang['user']['is_catch_all'] = 'Catch-all for domain/s';
+$lang['user']['aliases_also_send_as'] = 'Also allowed to send as user';
+$lang['user']['aliases_send_as_all'] = 'Do not check sender access for the following domain(s) and its alias domains';
+$lang['user']['alias_create_random'] = 'Generate random alias';
+$lang['user']['alias_extend_all'] = 'Extend aliases by 1 hour';
+$lang['user']['alias_valid_until'] = 'Valid until';
+$lang['user']['alias_remove_all'] = 'Remove all aliases';
+$lang['user']['alias_time_left'] = 'Time left';
+$lang['user']['alias_full_date'] = 'd.m.Y, H:i:s T';
+$lang['user']['syncjob_full_date'] = 'd.m.Y, H:i:s T';
+$lang['user']['alias_select_validity'] = 'Period of validity';
+$lang['user']['sync_jobs'] = 'Sync jobs';
+$lang['user']['hour'] = 'Hour';
+$lang['user']['hours'] = 'Hours';
+$lang['user']['day'] = 'Day';
+$lang['user']['week'] = 'Week';
+$lang['user']['weeks'] = 'Weeks';
+$lang['user']['spamfilter'] = 'Spam filter';
+$lang['admin']['spamfilter'] = 'Spam filter';
+$lang['user']['spamfilter_wl'] = 'Whitelist';
+$lang['user']['spamfilter_wl_desc'] = 'Whitelisted email addresses to <b>never</b> classify as spam. Wildcards maybe used.';
+$lang['user']['spamfilter_bl'] = 'Blacklist';
+$lang['user']['spamfilter_bl_desc'] = 'Blacklisted email addresses to <b>always</b> classify as spam and reject. Wildcards maybe used.';
+$lang['user']['spamfilter_behavior'] = 'Rating';
+$lang['user']['spamfilter_table_rule'] = 'Rule';
+$lang['user']['spamfilter_table_action'] = 'Action';
+$lang['user']['spamfilter_table_empty'] = 'No data to display';
+$lang['user']['spamfilter_table_remove'] = 'remove';
+$lang['user']['spamfilter_table_add'] = 'Add item';
+$lang['user']['spamfilter_default_score'] = 'Spam score:';
+$lang['user']['spamfilter_green'] = 'Green: this message is not spam';
+$lang['user']['spamfilter_yellow'] = 'Yellow: this message may be spam, will be tagged as spam and moved to your junk folder';
+$lang['user']['spamfilter_red'] = 'Red: This message is spam and will be rejected by the server';
+$lang['user']['spamfilter_default_score'] = 'Default values:';
+$lang['user']['spamfilter_hint'] = 'The first value describes the "low spam score", the second represents the "high spam score".';
+$lang['user']['spamfilter_table_domain_policy'] = "n/a (domain policy)";
+
+$lang['user']['tls_policy_warning'] = '<strong>Warning:</strong> If you decide to enforce encrypted mail transfer, you may lose emails.<br>Messages to not satisfy the policy will be bounced with a hard fail by the mail system.<br>This option applies to your primary email address (login name), all addresses derived from alias domains as well as alias addresses <b>with only this single mailbox</b> as target.';
+$lang['user']['tls_policy'] = 'Encryption policy';
+$lang['user']['tls_enforce_in'] = 'Enforce TLS incoming';
+$lang['user']['tls_enforce_out'] = 'Enforce TLS outgoing';
+$lang['user']['no_record'] = 'No record';
+
+$lang['user']['misc_settings'] = 'Other profile settings';
+$lang['user']['misc_delete_profile'] = 'Other profile settings';
+
+$lang['user']['tag_handling'] = 'Set handling for tagged mail';
+$lang['user']['tag_in_subfolder'] = 'In subfolder';
+$lang['user']['tag_in_subject'] = 'In subject';
+$lang['user']['tag_help_explain'] = 'In subfolder: a new subfolder named after the tag will be created below INBOX ("INBOX/Facebook").<br>
+In subject: the tags name will be prepended to the mails subject, example: "[Facebook] Meine Neuigkeiten".';
+$lang['user']['tag_help_example'] = 'Example for a tagged email address: ich<b>+Facebook</b>@example.org';
+$lang['user']['eas_reset'] = 'Reset ActiveSync device cache';
+$lang['user']['eas_reset_now'] = 'Reset now';
+$lang['user']['eas_reset_help'] = 'In many cases a device cache reset will help to recover a broken ActiveSync profile.<br><b>Attention:</b> All elements will be redownloaded!';
+
+$lang['user']['encryption'] = 'Encyrption';
+$lang['user']['username'] = 'Username';
+$lang['user']['password'] = 'Password';
+$lang['user']['last_run'] = 'Last run';
+$lang['user']['excludes'] = 'Excludes';
+$lang['user']['interval'] = 'Interval';
+$lang['user']['active'] = 'Active';
+$lang['user']['action'] = 'Action';
+$lang['user']['edit'] = 'Edit';
+$lang['user']['remove'] = 'Remove';
+$lang['user']['delete_now'] = 'Remove now';
+$lang['user']['create_syncjob'] = 'Create new sync job';
+
+$lang['start']['dashboard'] = '%s - dashboard';
+$lang['start']['start_rc'] = 'Open Roundcube';
+$lang['start']['start_sogo'] = 'Open SOGo';
+$lang['start']['mailcow_apps_detail'] = 'Use a mailcow app to access your mails, calendar, contacts and more.';
+$lang['start']['mailcow_panel'] = 'Start mailcow UI';
+$lang['start']['mailcow_panel_description'] = 'The mailcow UI is available for administrators and mailbox users.';
+$lang['start']['mailcow_panel_detail'] = '<b>Domain administrators</b> create, modify or delete mailboxes and aliases, change domains and read further information about their assigned domains.<br>
+	<b>Mailbox users</b> are able to create time-limited aliases (spam aliases), change their password and spam filter settings.';
+$lang['start']['recommended_config'] = 'Recommended configuration (without ActiveSync)';
+$lang['start']['imap_smtp_server'] = 'IMAP- and SMTP server data';
+$lang['start']['imap_smtp_server_description'] = 'For the best experience we recommend to use <a href="%s" target="_blank"><b>Mozilla Thunderbird</b></a>.';
+$lang['start']['imap_smtp_server_badge'] = 'Read/Write emails';
+$lang['start']['imap_smtp_server_auth_info'] = 'Please use your full email address and the PLAIN authentication mechanism.<br>
+Your login data will be encrypted by the server-side mandatory encryption.';
+$lang['start']['managesieve'] = 'ManageSieve';
+$lang['start']['managesieve_badge'] = 'Email filter';
+$lang['start']['managesieve_description'] = 'Please use <b>Mozilla Thunderbird</b> with the <a style="text-decoration:none" target="_blank" href="%s"><b>nightly sieve extension</b></a>.<br>Start Thunderbird, open the add-on settings and drop the newly downloaded xpi file into the opened window.<br>The server name is <b>%s</b>, use port <b>4190</b> if you are asked for. The login data match your email login.';
+$lang['start']['service'] = 'Service';
+$lang['start']['encryption'] = 'Encryption method';
+$lang['start']['help'] = 'Show/Hide help panel';
+$lang['start']['hostname'] = 'Hostname';
+$lang['start']['port'] = 'Port';
+$lang['start']['footer'] = '';
+$lang['header']['mailcow_settings'] = 'Configuration';
+$lang['header']['administration'] = 'Administration';
+$lang['header']['mailboxes'] = 'Mailboxes';
+$lang['header']['user_settings'] = 'User settings';
+$lang['header']['login'] = 'Login';
+$lang['header']['logged_in_as_logout'] = 'Logged in as <b>%s</b> (logout)';
+$lang['header']['logged_in_as_logout_dual'] = 'Logged in as <b>%s <span class="text-info">[%s]</span></b>';
+$lang['header']['locale'] = 'Language';
+$lang['mailbox']['domain'] = 'Domain';
+$lang['mailbox']['spam_aliases'] = 'Temp. alias';
+$lang['mailbox']['multiple_bookings'] = 'Multiple bookings';
+$lang['mailbox']['kind'] = 'Kind';
+$lang['mailbox']['description'] = 'Description';
+$lang['mailbox']['alias'] = 'Alias';
+$lang['mailbox']['resource_name'] = 'Resource name';
+$lang['mailbox']['aliases'] = 'Aliases';
+$lang['mailbox']['domains'] = 'Domains';
+$lang['mailbox']['mailboxes'] = 'Mailboxes';
+$lang['mailbox']['resources'] = 'Resources';
+$lang['mailbox']['mailbox_quota'] = 'Max. size of a mailbox';
+$lang['mailbox']['domain_quota'] = 'Quota';
+$lang['mailbox']['active'] = 'Active';
+$lang['mailbox']['action'] = 'Action';
+$lang['mailbox']['ratelimit'] = 'Outgoing rate limit/h';
+$lang['mailbox']['backup_mx'] = 'Backup MX';
+$lang['mailbox']['domain_aliases'] = 'Domain aliases';
+$lang['mailbox']['target_domain'] = 'Target domain';
+$lang['mailbox']['target_address'] = 'Goto address';
+$lang['mailbox']['username'] = 'Username';
+$lang['mailbox']['fname'] = 'Full name';
+$lang['mailbox']['filter_table'] = 'Filter table';
+$lang['mailbox']['yes'] = '&#10004;';
+$lang['mailbox']['no'] = '&#10008;';
+$lang['mailbox']['quota'] = 'Quota';
+$lang['mailbox']['in_use'] = 'In use (%)';
+$lang['mailbox']['msg_num'] = 'Message #';
+$lang['mailbox']['remove'] = 'Remove';
+$lang['mailbox']['edit'] = 'Edit';
+$lang['mailbox']['archive'] = 'Archive';
+$lang['mailbox']['no_record'] = 'No record for object %s';
+$lang['mailbox']['no_record_single'] = 'No record';
+$lang['mailbox']['add_domain'] = 'Add domain';
+$lang['mailbox']['add_domain_alias'] = 'Add domain alias';
+$lang['mailbox']['add_mailbox'] = 'Add mailbox';
+$lang['mailbox']['add_resource'] = 'Add resource';
+$lang['mailbox']['add_alias'] = 'Add alias';
+$lang['mailbox']['add_domain_record_first'] = 'Please add a domain first';
+$lang['mailbox']['empty'] = 'No results';
+$lang['mailbox']['toggle_all'] = 'Toggle all';
+$lang['mailbox']['quick_actions'] = 'Quick actions';
+$lang['mailbox']['activate'] = 'Activate';
+$lang['mailbox']['deactivate'] = 'Deactivate';
+
+$lang['info']['no_action'] = 'No action applicable';
+
+$lang['delete']['title'] = 'Remove object';
+$lang['delete']['remove_domain_warning'] = '<b>Warning:</b> You are about to remove the domain <b>%s</b>!';
+$lang['delete']['remove_syncjob_warning'] = '<b>Warning:</b> You are about to remove a sync job for user <b>%s</b>!';
+$lang['delete']['remove_domainalias_warning'] = '<b>Warning:</b> You are about to remove the domain alias <b>%s</b>!';
+$lang['delete']['remove_domainadmin_warning'] = '<b>Warning:</b> You are about to remove the domain administrator <b>%s</b>!';
+$lang['delete']['remove_alias_warning'] = '<b>Warning:</b> You are about to remove the alias address <b>%s</b>!';
+$lang['delete']['remove_mailbox_warning'] = '<b>Warning:</b> You are about to remove the mailbox <b>%s</b>!';
+$lang['delete']['remove_mailbox_details'] = 'The mailbox will be <b>purged permanently</b>!';
+$lang['delete']['remove_resource_warning'] = '<b>Warning:</b> You are about to remove the resource <b>%s</b>!';
+$lang['delete']['remove_resource_details'] = 'The resource will be <b>purged permanently</b>!';
+$lang['delete']['remove_domain_details'] = 'This also removes domain aliases.<br><br><b>A domain must be empty to be removed.</b>';
+$lang['delete']['remove_syncjob_details'] = 'Objects from this sync job will not be pulled from the remote server anymore.';
+$lang['delete']['remove_alias_details'] = 'Users will no longer be able to receive mail for or send mail from this address.</b>';
+$lang['delete']['remove_button'] = 'Remove';
+$lang['delete']['previous'] = 'Previous page';
+
+$lang['edit']['syncjob'] = 'Edit sync job';
+$lang['edit']['save'] = 'Save changes';
+$lang['edit']['username'] = 'Username';
+$lang['edit']['hostname'] = 'Hostname';
+$lang['edit']['encryption'] = 'Encryption';
+$lang['edit']['maxage'] = 'Maximum age of messages in days that will be polled from remote<br><small>(0 = ignore age)</small>';
+$lang['edit']['subfolder2'] = 'Sync into subfolder on destination<br><small>(empty = do not use subfolder)</small>';
+$lang['edit']['mins_interval'] = 'Interval (min)';
+$lang['edit']['exclude'] = 'Exclude objects (regex)';
+$lang['edit']['save'] = 'Save changes';
+$lang['edit']['archive'] = 'Archive access';
+$lang['edit']['max_mailboxes'] = 'Max. possible mailboxes';
+$lang['edit']['title'] = 'Edit object';
+$lang['edit']['target_address'] = 'Goto address/es <small>(comma-separated)</small>';
+$lang['edit']['active'] = 'Active';
+$lang['edit']['target_domain'] = 'Target domain';
+$lang['edit']['password'] = 'Password';
+$lang['edit']['ratelimit'] = 'Outgoing rate limit/h';
+$lang['danger']['ratelimt_less_one'] = 'Outgoing rate limit/h must not be less than 1';
+$lang['edit']['password_repeat'] = 'Confirmation password (repeat)';
+$lang['edit']['domain_admin'] = 'Edit domain administrator';
+$lang['edit']['domain'] = 'Edit domain';
+$lang['edit']['alias_domain'] = 'Alias domain';
+$lang['edit']['edit_alias_domain'] = 'Edit Alias domain';
+$lang['edit']['domains'] = 'Domains';
+$lang['edit']['destroy'] = 'Manual data input';
+$lang['edit']['alias'] = 'Edit alias';
+$lang['edit']['mailbox'] = 'Edit mailbox';
+$lang['edit']['description'] = 'Description';
+$lang['edit']['max_aliases'] = 'Max. aliases';
+$lang['edit']['max_quota'] = 'Max. quota per mailbox (MiB)';
+$lang['edit']['domain_quota'] = 'Domain quota';
+$lang['edit']['backup_mx_options'] = 'Backup MX options';
+$lang['edit']['relay_domain'] = 'Relay domain';
+$lang['edit']['relay_all'] = 'Relay all recipients';
+$lang['edit']['dkim_signature'] = 'DKIM signature';
+$lang['edit']['dkim_record_info'] = '<small>Please add a TXT record with the given value to your DNS settings.</small>';
+$lang['edit']['relay_all_info'] = '<small>If you choose <b>not</b> to relay all recipients, you will need to add a ("blind") mailbox for every single recipient that should be relayed.</small>';
+$lang['edit']['full_name'] = 'Full name';
+$lang['edit']['quota_mb'] = 'Quota (MiB)';
+$lang['edit']['sender_acl'] = 'Allow to send as';
+$lang['edit']['sender_acl_info'] = 'Aliases cannot be deselected.';
+$lang['edit']['dkim_txt_name'] = 'TXT record name:';
+$lang['edit']['dkim_txt_value'] = 'TXT record value:';
+$lang['edit']['previous'] = 'Previous page';
+$lang['edit']['unchanged_if_empty'] = 'If unchanged leave blank';
+$lang['edit']['dont_check_sender_acl'] = "Disable sender check for domain %s + alias domains";
+$lang['edit']['multiple_bookings'] = 'Multiple bookings';
+$lang['edit']['kind'] = 'Kind';
+$lang['edit']['resource'] = 'Resource';
+
+$lang['add']['syncjob'] = 'Add sync job';
+$lang['add']['syncjob_hint'] = 'Be aware that passwords need to be saved plain-text!';
+$lang['add']['hostname'] = 'Hostname';
+$lang['add']['port'] = 'Port';
+$lang['add']['username'] = 'Username';
+$lang['add']['enc_method'] = 'Encryption method';
+$lang['add']['mins_interval'] = 'Polling interval (minutes)';
+$lang['add']['maxage'] = 'Maximum age of messages that will be polled from remote (0 = ignore age)';
+$lang['add']['subfolder2'] = 'Sync into subfolder on destination';
+$lang['add']['exclude'] = 'Exclude objects (regex)';
+$lang['add']['delete2duplicates'] = 'Delete duplicates on destination';
+$lang['add']['delete1'] = 'Delete from source when completed';
+$lang['edit']['delete2duplicates'] = 'Delete duplicates on destination';
+$lang['edit']['delete1'] = 'Delete from source when completed';
+
+$lang['add']['title'] = 'Add object';
+$lang['add']['domain'] = 'Domain';
+$lang['add']['active'] = 'Active';
+$lang['add']['multiple_bookings'] = 'Multiple bookings';
+$lang['add']['save'] = 'Save changes';
+$lang['add']['description'] = 'Description:';
+$lang['add']['max_aliases'] = 'Max. possible aliases:';
+$lang['add']['resource_name'] = 'Resource name';
+$lang['add']['max_mailboxes'] = 'Max. possible mailboxes:';
+$lang['add']['mailbox_quota_m'] = 'Max. quota per mailbox (MiB):';
+$lang['add']['domain_quota_m'] = 'Total domain quota (MiB):';
+$lang['add']['backup_mx_options'] = 'Backup MX options:';
+$lang['add']['relay_all'] = 'Relay all recipients';
+$lang['add']['relay_domain'] = 'Relay this domain';
+$lang['add']['relay_all_info'] = '<small>If you choose <b>not</b> to relay all recipients, you will need to add a ("blind") mailbox for every single recipient that should be relayed.</small>';
+$lang['add']['alias'] = 'Alias(es)';
+$lang['add']['alias_spf_fail'] = '<b>Note:</b> If your chosen destination address is an external mailbox, the <b>receiving mailserver</b> may reject your message due to an SPF failure.</a>';
+$lang['add']['alias_address'] = 'Alias address/es:';
+$lang['add']['alias_address_info'] = '<small>Full email address/es or @example.com, to catch all messages for a domain (comma-separated). <b>mailcow domains only</b>.</small>';
+$lang['add']['alias_domain_info'] = '<small>Valid domain names only (comma-separated).</small>';
+$lang['add']['target_address'] = 'Goto addresses:';
+$lang['add']['target_address_info'] = '<small>Full email address/es (comma-separated).</small>';
+$lang['add']['alias_domain'] = 'Alias domain';
+$lang['add']['select'] = 'Please select...';
+$lang['add']['target_domain'] = 'Target domain:';
+$lang['add']['mailbox'] = 'Mailbox';
+$lang['add']['resource'] = 'Resource';
+$lang['add']['kind'] = 'Kind';
+$lang['add']['mailbox_username'] = 'Username (left part of an email address):';
+$lang['add']['full_name'] = 'Full name:';
+$lang['add']['quota_mb'] = 'Quota (MiB):';
+$lang['add']['select_domain'] = 'Please select a domain first';
+$lang['add']['password'] = 'Password:';
+$lang['add']['password_repeat'] = 'Confirmation password (repeat):';
+$lang['add']['previous'] = 'Previous page';
+$lang['add']['restart_sogo_hint'] = 'You will need to restart the SOGo service container after adding a new domain!';
+
+$lang['login']['title'] = 'Login';
+$lang['login']['administration'] = 'Administration';
+$lang['login']['administration_details'] = 'Please use your Administrator login to perform administrative tasks.';
+$lang['login']['user_settings'] = 'User settings';
+$lang['login']['user_settings_details'] = 'Mailbox users can use mailcow UI to change their passwords, create temporary aliases (spam aliases), adjust the spam filter behaviour or import messages from a remote IMAP server.';
+$lang['login']['username'] = 'Username';
+$lang['login']['password'] = 'Password';
+$lang['login']['reset_password'] = 'Reset my password';
+$lang['login']['login'] = 'Login';
+$lang['login']['previous'] = "Previous page";
+$lang['login']['delayed'] = 'Login was delayed by %s seconds.';
+
+$lang['tfa']['tfa'] = "Two-factor authentication";
+$lang['tfa']['set_tfa'] = "Set two-factor authentication method";
+$lang['tfa']['yubi_otp'] = "Yubico OTP authentication";
+$lang['tfa']['key_id'] = "An identifier for your YubiKey";
+$lang['tfa']['key_id_totp'] = "An identifier for your key";
+$lang['tfa']['api_register'] = 'mailcow uses the Yubico Cloud API. Please get an API key for your key <a href="https://upgrade.yubico.com/getapikey/" target="_blank">here</a>';
+$lang['tfa']['u2f'] = "U2F authentication";
+$lang['tfa']['hotp'] = "HOTP authentication";
+$lang['tfa']['totp'] = "TOTP authentication";
+$lang['tfa']['none'] = "Deactivate";
+$lang['tfa']['delete_tfa'] = "Disable TFA";
+$lang['tfa']['disable_tfa'] = "Disable TFA until next successful login";
+$lang['tfa']['confirm_tfa'] = "Please confirm your one-time password in the below field";
+$lang['tfa']['confirm'] = "Confirm";
+$lang['tfa']['otp'] = "One-time password";
+$lang['tfa']['totp'] = "Time-based OTP (Google Authenticator etc.)";
+$lang['tfa']['trash_login'] = "Trash login";
+$lang['tfa']['select'] = "Please select";
+$lang['tfa']['waiting_usb_auth'] = "<i>Waiting for USB device...</i><br><br>Please tap the button on your U2F USB device now.";
+$lang['tfa']['waiting_usb_register'] = "<i>Waiting for USB device...</i><br><br>Please enter your password above and confirm your U2F registration by tapping the button on your U2F USB device.";
+$lang['tfa']['scan_qr_code'] = "Please scan the following code with your authenticator app or enter the code manually.";
+$lang['tfa']['enter_qr_code'] = "Your TOTP code if your device cannot scan QR codes";
+$lang['tfa']['confirm_totp_token'] = "Please confirm your changes by entering the generated token";
+
+$lang['admin']['search_domain_da'] = 'Search domains';
+$lang['admin']['restrictions'] = 'Postfix Restrictions';
+$lang['admin']['rr'] = 'Postfix Recipient Restrictions';
+$lang['admin']['sr'] = 'Postfix Sender Restrictions';
+$lang['admin']['reset_defaults'] = 'Reset to defaults';
+$lang['admin']['sr'] = 'Postfix Sender Restrictions';
+$lang['admin']['r_inactive'] = 'Inactive restrictions';
+$lang['admin']['r_active'] = 'Active restrictions';
+$lang['admin']['r_info'] = 'Greyed out/disabled elements on the list of active restrictions are not known as valid restrictions to mailcow and cannot be moved. Unknown restrictions will be set in order of appearance anyway. <br>You can add new elements in <code>inc/vars.local.inc.php</code> to be able to toggle them.';
+$lang['admin']['public_folders'] = 'Public Folders';
+$lang['admin']['public_folders_text'] = 'A namespace "Public" is created. Below\'s public folder name indicates the name of the first auto-created mailbox within this namespace.';
+$lang['admin']['public_folder_name'] = 'Folder name <small>(alphanumeric)</small>';
+$lang['admin']['public_folder_enable'] = 'Enable public folder';
+$lang['admin']['public_folder_enable_text'] = 'Toggling this option does not delete mail in any public folder.';
+$lang['admin']['public_folder_pusf'] = 'Enable per-user seen flag';
+$lang['admin']['public_folder_pusf_text'] = 'A "per-user seen flag"-enabled system will not mark a mail as read for User B, when User A has seen it, but User B did not.';
+$lang['admin']['privacy'] = 'Privacy';
+$lang['admin']['privacy_text'] = 'This option enables a PCRE table to remove "User-Agent", "X-Enigmail", "X-Mailer", "X-Originating-IP" and replaces "Received: from" headers with localhost/127.0.0.1.';
+$lang['admin']['privacy_anon_mail'] = 'Anonymize outgoing mail';
+$lang['admin']['dkim_txt_name'] = 'TXT record name:';
+$lang['admin']['dkim_txt_value'] = 'TXT record value:';
+$lang['admin']['dkim_key_length'] = 'DKIM key length (bits)';
+$lang['admin']['dkim_key_valid'] = 'Key valid';
+$lang['admin']['dkim_key_unused'] = 'Key unused';
+$lang['admin']['dkim_key_missing'] = 'Key missing';
+$lang['admin']['dkim_key_hint'] = 'Selector for DKIM keys is always <code>dkim</code>.';
+$lang['admin']['previous'] = 'Previous page';
+$lang['admin']['quota_mb'] = 'Quota (MiB):';
+$lang['admin']['sender_acl'] = 'Allow to send as:';
+$lang['admin']['msg_size'] = 'Message size';
+$lang['admin']['msg_size_limit'] = 'Message size limit now';
+$lang['admin']['msg_size_limit_details'] = 'Applying a new limit will reload Postfix and the webserver.';
+$lang['admin']['save'] = 'Save changes';
+$lang['admin']['maintenance'] = 'Maintenance and Information';
+$lang['admin']['sys_info'] = 'System information';
+$lang['admin']['dkim_add_key'] = 'Add DKIM key';
+$lang['admin']['dkim_keys'] = 'DKIM keys';
+$lang['admin']['add'] = 'Add';
+$lang['admin']['configuration'] = 'Configuration';
+$lang['admin']['password'] = 'Password';
+$lang['admin']['password_repeat'] = 'Confirmation password (repeat)';
+$lang['admin']['active'] = 'Active';
+$lang['admin']['inactive'] = 'Inactive';
+$lang['admin']['action'] = 'Action';
+$lang['admin']['add_domain_admin'] = 'Add Domain administrator';
+$lang['admin']['admin_domains'] = 'Domain assignments';
+$lang['admin']['domain_admins'] = 'Domain administrators';
+$lang['admin']['username'] = 'Username';
+$lang['admin']['edit'] = 'Edit';
+$lang['admin']['remove'] = 'Remove';
+$lang['admin']['save'] = 'Save changes';
+$lang['admin']['admin'] = 'Administrator';
+$lang['admin']['admin_details'] = 'Edit administrator details';
+$lang['admin']['unchanged_if_empty'] = 'If unchanged leave blank';
+$lang['admin']['yes'] = '&#10004;';
+$lang['admin']['no'] = '&#10008;';
+$lang['admin']['access'] = 'Access';
+$lang['admin']['invalid_max_msg_size'] = 'Invalid max. message size';
+$lang['admin']['site_not_found'] = 'Cannot locate mailcow site configuration';
+$lang['admin']['public_folder_empty'] = 'Public folder name must not be empty';
+$lang['admin']['set_rr_failed'] = 'Cannot set Postfix restrictions';
+$lang['admin']['no_record'] = 'No record';
+$lang['admin']['filter_table'] = 'Filter table';
+$lang['admin']['empty'] = 'No results';
+$lang['admin']['time'] = 'Time';
+$lang['admin']['priority'] = 'Priority';
+$lang['admin']['message'] = 'Message';
+$lang['admin']['refresh'] = 'Refresh';
+$lang['admin']['logs'] = 'Logs';
+$lang['admin']['forwarding_hosts'] = 'Forwarding Hosts';
+$lang['admin']['forwarding_hosts_hint'] = 'Incoming messages are unconditionally accepted from any hosts listed here. These hosts are then not checked against DNSBLs or subjected to greylisting. Spam received from them is never rejected, but optionally it can be filed into the Junk folder. The most common use for this is to specify mail servers on which you have set up a rule that forwards incoming emails to your Mailcow server.';
+$lang['admin']['forwarding_hosts_add_hint'] = 'You can either specify IPv4/IPv6 addresses, networks in CIDR notation, host names (which will be resolved to IP addresses), or domain names (which will be resolved to IP addresses by querying SPF records or, in their absence, MX records).';
+$lang['admin']['host'] = 'Host';
+$lang['admin']['source'] = 'Source';
+$lang['admin']['add_forwarding_host'] = 'Add Forwarding Host';
+$lang['delete']['remove_forwardinghost_warning'] = '<b>Warning:</b> You are about to remove the forwarding host <b>%s</b>!';
+$lang['success']['forwarding_host_removed'] = "Forwarding host %s has been removed";
+$lang['success']['forwarding_host_added'] = "Forwarding host %s has been added";
diff --git a/data/web/lang/lang.es.php b/data/web/lang/lang.es.php
index 2985ac1fc..8a318efe3 100644
--- a/data/web/lang/lang.es.php
+++ b/data/web/lang/lang.es.php
@@ -1,14 +1,13 @@
 <?php
 /*
-//
-//  Spanish language file
-//
-*/
+ * Spanish language file
+ */
+
 $lang['footer']['loading'] = "Espere Por Favor...";
 $lang['header']['restart_sogo'] = 'Reiniciar SOGo';
 $lang['footer']['restart_sogo'] = 'Reiniciar SOGo';
 $lang['footer']['restart_now'] = 'Reiniciar ahora';
-$lang['footer']['restart_sogo_info'] = 'Algunas tareas, por ejemplo agregar un dominio, requieren que reinicies SOGo para detectar cambios hechos en la UI de mailcow.<br /><br /><b>Importante:</b> Un reinicio sencillo puede tardar un poco en completarse, por favor espere a que termine.';
+$lang['footer']['restart_sogo_info'] = 'Algunas tareas, por ejemplo agregar un dominio, requieren que reinicies SOGo para detectar cambios hechos en la UI de mailcow.<br><br><b>Importante:</b> Un reinicio sencillo puede tardar un poco en completarse, por favor espere a que termine.';
 $lang['dkim']['confirm'] = "¿Estás Seguro?";
 $lang['danger']['dkim_not_found'] = "Registro DKIM no encontrado";
 $lang['danger']['dkim_remove_failed'] = "No se puede eliminar el registro DKIM seleccionado";
@@ -136,7 +135,7 @@ $lang['user']['spamfilter_red'] = 'Rojo: Este mensaje es spam y sera rechazado p
 $lang['user']['spamfilter_default_score'] = 'Valores por defecto:';
 $lang['user']['spamfilter_hint'] = 'El primer valor representa la "calificación baja de spam", el segundo representa la "calificación alta de spam".';
 
-$lang['user']['tls_policy_warning'] = '<strong>Advertencia:</strong> Si decides forzar la transmisión de correo encriptado, puedes perder correos.<br />Mensajes que no satisfagan la política serán rebotados con una falla grave en el sistema de correos .';
+$lang['user']['tls_policy_warning'] = '<strong>Advertencia:</strong> Si decides forzar la transmisión de correo encriptado, puedes perder correos.<br>Mensajes que no satisfagan la política serán rebotados con una falla grave en el sistema de correos .';
 $lang['user']['tls_policy'] = 'Política de encriptación';
 $lang['user']['tls_enforce_in'] = 'Aplicar TLS entrante';
 $lang['user']['tls_enforce_out'] = 'Aplicar TLS saliente';
@@ -148,7 +147,7 @@ $lang['user']['misc_delete_profile'] = 'Otras configuraciones de usuario';
 $lang['user']['tag_handling'] = 'Establecer manejo para el correo etiquetado';
 $lang['user']['tag_in_subfolder'] = 'En subcarpeta';
 $lang['user']['tag_in_subject'] = 'En asunto';
-$lang['user']['tag_help_explain'] = 'En subcarpeta: una nueva subcarpeta llamada como la etiqueta será creada debajo de INBOX ("INBOX/Facebook").<br />
+$lang['user']['tag_help_explain'] = 'En subcarpeta: una nueva subcarpeta llamada como la etiqueta será creada debajo de INBOX ("INBOX/Facebook").<br>
 En asunto: los nombres de las etiquetas serán añadidos al asunto de los correos, ejemplo: "[Facebook] Mis Noticias".';
 $lang['user']['tag_help_example'] = 'Ejemplo de una dirección email etiquetada: mi<b>+Facebook</b>@ejemplo.org';
 
@@ -158,17 +157,17 @@ $lang['start']['start_sogo'] = 'Abrir SOGo';
 $lang['start']['mailcow_apps_detail'] = 'Utiliza una aplicación de mailcow para acceder a tus correos, calendario, contactos y más.';
 $lang['start']['mailcow_panel'] = 'Iniciar mailcow UI';
 $lang['start']['mailcow_panel_description'] = 'Mailcow UI está disponible para administradores y usuarios de buzón.';
-$lang['start']['mailcow_panel_detail'] = '<b>Administradores del dominio</b> crean, modifican o eliminan buzones y alias, cambia dominios y lee información más detallada sobre sus dominios asignados<br />
+$lang['start']['mailcow_panel_detail'] = '<b>Administradores del dominio</b> crean, modifican o eliminan buzones y alias, cambia dominios y lee información más detallada sobre sus dominios asignados<br>
 	<b>Usuarios de buzón</b> son capaces de crear alias de tiempo limitado (spam alias), cambiar su contraseña y la configuración del filtro de spam.';
 $lang['start']['recommended_config'] = 'Configuración recomendada (sin ActiveSync)';
 $lang['start']['imap_smtp_server'] = 'IMAP- y SMTP datos del servidor';
 $lang['start']['imap_smtp_server_description'] = 'Para la mejor experiencia recomendamos utilizar <a href="%s" target="_blank"><b>Mozilla Thunderbird</b></a>.';
 $lang['start']['imap_smtp_server_badge'] = 'Leer/Escribir correos';
-$lang['start']['imap_smtp_server_auth_info'] = 'Por favor utiliza tu dirección de correo completa y el mecanismo de autenticación PLANO.<br />
+$lang['start']['imap_smtp_server_auth_info'] = 'Por favor utiliza tu dirección de correo completa y el mecanismo de autenticación PLANO.<br>
 Tus datos para iniciar sesión serán encriptados por la encriptación obligatoria del servidor';
 $lang['start']['managesieve'] = 'ManageSieve';
 $lang['start']['managesieve_badge'] = 'Filtro de correos';
-$lang['start']['managesieve_description'] = 'Por favor utiliza <b>Mozilla Thunderbird</b> con la <a style="text-decoration:none" target="_blank" href="%s"><b>extensión nightly sieve</b></a>.<br />Inicia Thunderbird, abre la configuración de complementos y suelta el archivo xpi descargado en la ventana abierta.<br />El servidor es <b>%s</b>, utiliza el puerto <b>4190</b> si se te pregunta. Los datos para iniciar sesión coinciden con los datos de tu correo.';
+$lang['start']['managesieve_description'] = 'Por favor utiliza <b>Mozilla Thunderbird</b> con la <a style="text-decoration:none" target="_blank" href="%s"><b>extensión nightly sieve</b></a>.<br>Inicia Thunderbird, abre la configuración de complementos y suelta el archivo xpi descargado en la ventana abierta.<br>El servidor es <b>%s</b>, utiliza el puerto <b>4190</b> si se te pregunta. Los datos para iniciar sesión coinciden con los datos de tu correo.';
 $lang['start']['service'] = 'Servicio';
 $lang['start']['encryption'] = 'Método de encriptación';
 $lang['start']['help'] = 'Mostrar/Ocultar panel de ayuda';
@@ -222,7 +221,7 @@ $lang['delete']['remove_domainadmin_warning'] = '<b>Advertencia:</b> ¡Estás a
 $lang['delete']['remove_alias_warning'] = '<b>Advertencia:</b> ¡Estás a punto de eliminar la dirección alias <b>%s</b>!';
 $lang['delete']['remove_mailbox_warning'] = '<b>Advertencia:</b> ¡Estás a punto de eliminar el buzón <b>%s</b>!';
 $lang['delete']['remove_mailbox_details'] = 'El buzón será <b>purgado permanentemente</b>!';
-$lang['delete']['remove_domain_details'] = 'Esto también eliminará alias de dominio.<br /><br /><b>Un dominio debe estar vacío para poder ser eliminado.</b>';
+$lang['delete']['remove_domain_details'] = 'Esto también eliminará alias de dominio.<br><br><b>Un dominio debe estar vacío para poder ser eliminado.</b>';
 $lang['delete']['remove_alias_details'] = 'Los usuarios ya no serán capaces de recibir correos o enviar correos desde esta dirección.</b>';
 $lang['delete']['remove_button'] = 'Eliminar';
 $lang['delete']['previous'] = 'Página anterior';
@@ -326,7 +325,7 @@ $lang['admin']['reset_defaults'] = 'Restablecer los valores predeterminados';
 $lang['admin']['sr'] = 'Restricciones Postfix para remitentes';
 $lang['admin']['r_inactive'] = 'Restricciones inactivas';
 $lang['admin']['r_active'] = 'Restricciones activas';
-$lang['admin']['r_info'] = 'Elementos en gris/deshabilitados en la lista de restricciones activas no son reconocidas como restricciones válidas para mailcow y no pueden ser movidas. Restricciones desconocidas serán establecidas en el orden de aparicion de todas maneras. <br />Puedes agregar nuevos elementos en <code>inc/vars.local.inc.php</code> para ser capaz de habilitarlas.';
+$lang['admin']['r_info'] = 'Elementos en gris/deshabilitados en la lista de restricciones activas no son reconocidas como restricciones válidas para mailcow y no pueden ser movidas. Restricciones desconocidas serán establecidas en el orden de aparicion de todas maneras. <br>Puedes agregar nuevos elementos en <code>inc/vars.local.inc.php</code> para ser capaz de habilitarlas.';
 $lang['admin']['public_folders'] = 'Carpetas Públicas';
 $lang['admin']['public_folders_text'] = 'Un espacio de nombres "Public" (Público) será creado. Debajo del nombre de la carpeta pública se indica el nombre del primer buzón creado automáticamente dentro de este espacio de nombres';
 $lang['admin']['public_folder_name'] = 'Nombre de la carpeta <small>(alfanumérico)</small>';
@@ -375,4 +374,3 @@ $lang['admin']['site_not_found'] = 'No se puede localizar la configuración del
 $lang['admin']['public_folder_empty'] = 'El nombre de la carpeta pública no debe estar vacío';
 $lang['admin']['set_rr_failed'] = 'No se pueden establecer las restricciones de Postfix';
 $lang['admin']['no_record'] = 'Sin registro';
-?>
diff --git a/data/web/lang/lang.nl.php b/data/web/lang/lang.nl.php
index 0118817ef..1cf560ec1 100644
--- a/data/web/lang/lang.nl.php
+++ b/data/web/lang/lang.nl.php
@@ -1,13 +1,13 @@
 <?php
 /*
-//
-//  Dutch language file
-*/
+ * Dutch language file
+ */
+
 $lang['footer']['loading'] = "Even geduld a.u.b. ...";
 $lang['header']['restart_sogo'] = 'SOGo herstarten';
 $lang['footer']['restart_sogo'] = 'SOGo herstarten';
 $lang['footer']['restart_now'] = 'Nu opnieuw starten';
-$lang['footer']['restart_sogo_info'] = 'Sommige taken, zoals het toevoegen van een domein, vereisen een herstart van SOGo om de veranderingen door te voeren.<br /><br /><b>Belangrijk:</b> Het opnieuw opstarten kan een poos duren, wacht a.u.b. totdat dit volledig voltooid is.';
+$lang['footer']['restart_sogo_info'] = 'Sommige taken, zoals het toevoegen van een domein, vereisen een herstart van SOGo om de veranderingen door te voeren.<br><br><b>Belangrijk:</b> Het opnieuw opstarten kan een poos duren, wacht a.u.b. totdat dit volledig voltooid is.';
 $lang['dkim']['confirm'] = "Weet u het zeker?";
 $lang['danger']['dkim_not_found'] = "DKIM record niet gevonden.";
 $lang['danger']['dkim_remove_failed'] = "Kan geselecteerde DKIM record niet verwijderen.";
@@ -131,7 +131,7 @@ $lang['user']['spamfilter_red'] = 'Rood: Dit bericht is spam en zal worden gewei
 $lang['user']['spamfilter_default_score'] = 'Standaardwaarden:';
 $lang['user']['spamfilter_hint'] = 'De eerste waarde omschrijft een "lage spam score", de tweede waarde een "hoge spam score".';
 
-$lang['user']['tls_policy_warning'] = '<strong>Attentie:</strong> Door versleutelde e-mails te forceren, worden mogelijk niet alle e-mails afgeleverd.<br />Berichten die niet aan het ingestelde beleid voldoen worden resoluut geweigerd (bounced met hard-fail).';
+$lang['user']['tls_policy_warning'] = '<strong>Attentie:</strong> Door versleutelde e-mails te forceren, worden mogelijk niet alle e-mails afgeleverd.<br>Berichten die niet aan het ingestelde beleid voldoen worden resoluut geweigerd (bounced met hard-fail).';
 $lang['user']['tls_policy'] = 'Versleutelbeleid';
 $lang['user']['tls_enforce_in'] = 'Forceer TLS-gebruik inkomend';
 $lang['user']['tls_enforce_out'] = 'Forceer TLS-gebruik uitgaand';
@@ -142,7 +142,7 @@ $lang['user']['misc_delete_profile'] = 'Andere profielinstellingen';
 $lang['user']['tag_handling'] = 'Omgaan met e-mail tags';
 $lang['user']['tag_in_subfolder'] = 'In onderliggende map';
 $lang['user']['tag_in_subject'] = 'In onderwerp';
-$lang['user']['tag_help_explain'] = 'In onderliggende map: maakt onder INBOX een nieuwe map aan met de naam van de tag (bijv.: "INBOX/Facebook").<br />
+$lang['user']['tag_help_explain'] = 'In onderliggende map: maakt onder INBOX een nieuwe map aan met de naam van de tag (bijv.: "INBOX/Facebook").<br>
 In onderwerp: de tag wordt vóór het oorspronkelijke e-mail onderwerp geplaatst (bijv.: "[Facebook] Mijn nieuws").';
 $lang['user']['tag_help_example'] = 'Voorbeeld van een e-mailadres met tag: ik<b>+Facebook</b>@voorbeeld.org';
 $lang['start']['dashboard'] = '%s - startpagina';
@@ -151,17 +151,17 @@ $lang['start']['start_sogo'] = 'Open SOGo';
 $lang['start']['mailcow_apps_detail'] = 'Gebruik een mailcow app om toegang te hebben tot uw e-mails, kalender, contactpersonen en meer.';
 $lang['start']['mailcow_panel'] = 'Start mailcow UI';
 $lang['start']['mailcow_panel_description'] = 'De mailcow UI is beschikbaar voor zowel beheerders als gebruikers.';
-$lang['start']['mailcow_panel_detail'] = '<b>Domeinbeheerders</b> kunnen postvakken en aliassen aanmaken, wijzigen of verwijderen, domeinen veranderen of informatie krijgen over hun domein.<br />
+$lang['start']['mailcow_panel_detail'] = '<b>Domeinbeheerders</b> kunnen postvakken en aliassen aanmaken, wijzigen of verwijderen, domeinen veranderen of informatie krijgen over hun domein.<br>
 	<b>Gebruikers</b> kunnen tijdsgelimiteerde aliassen (spam-aliasses) aanmaken, hun wachtwoord wijzigen en spamfilterinstellingen wijzigen.';
 $lang['start']['recommended_config'] = 'Aanbevoen instellingen (zonder ActiveSync)';
 $lang['start']['imap_smtp_server'] = 'IMAP- en SMTP-server gegevens';
 $lang['start']['imap_smtp_server_description'] = 'Voor de best mogelijke ervaring bevelen wij <a href="%s" target="_blank"><b>Mozilla Thunderbird</b></a> aan.';
 $lang['start']['imap_smtp_server_badge'] = 'Lees/schrijf e-mails';
-$lang['start']['imap_smtp_server_auth_info'] = 'Gebruik uw volledige e-mailadres en de onversleutelde (PLAIN) verificatiemechanisme.<br />
+$lang['start']['imap_smtp_server_auth_info'] = 'Gebruik uw volledige e-mailadres en de onversleutelde (PLAIN) verificatiemechanisme.<br>
 De aanmeldgegevens zullen door de server worden versleuteld.';
 $lang['start']['managesieve'] = 'ManageSieve';
 $lang['start']['managesieve_badge'] = 'Emailfilter';
-$lang['start']['managesieve_description'] = 'Gebruik <b>Mozilla Thunderbird</b> met een <a style="text-decoration:none" target="_blank" href="%s"><b>nightly sieve addon</b></a>.<br />Start Thunderbird, open de add-on instellingen en sleep het gedownloadde xpi-bestand naar dit venster.<br />Servernaam <b>%s</b>, Poort <b>4190</b>. De aanmeldgegevens zijn gelijk aan de gegevens voor uw e-mail.';
+$lang['start']['managesieve_description'] = 'Gebruik <b>Mozilla Thunderbird</b> met een <a style="text-decoration:none" target="_blank" href="%s"><b>nightly sieve addon</b></a>.<br>Start Thunderbird, open de add-on instellingen en sleep het gedownloadde xpi-bestand naar dit venster.<br>Servernaam <b>%s</b>, Poort <b>4190</b>. De aanmeldgegevens zijn gelijk aan de gegevens voor uw e-mail.';
 $lang['start']['service'] = 'Service';
 $lang['start']['encryption'] = 'Versleutelmethode';
 $lang['start']['help'] = 'Toon/Verberg Hulppaneel';
@@ -215,7 +215,7 @@ $lang['delete']['remove_domainadmin_warning'] = '<b>Let op:</b> U staat op het p
 $lang['delete']['remove_alias_warning'] = '<b>Let op:</b> U staat op het punt alias <b>%s</b> te verwijderen!';
 $lang['delete']['remove_mailbox_warning'] = '<b>Let op::</b> U staat op het punt postvak <b>%s</b> te verwijderen!';
 $lang['delete']['remove_mailbox_details'] = 'Het postvak zal <b>permanent</b> worden verwijderd!';
-$lang['delete']['remove_domain_details'] = 'Dit verwijdert ook de domeinaliassen. <br /><br /><b>Een domein moet leeg zijn alvorens deze verwijderd kan worden.</b>';
+$lang['delete']['remove_domain_details'] = 'Dit verwijdert ook de domeinaliassen. <br><br><b>Een domein moet leeg zijn alvorens deze verwijderd kan worden.</b>';
 $lang['delete']['remove_alias_details'] = '<b>Gebruikers zullen niet meer in staat zijn e-mails te ontvangen op -of te versturen vanaf- dit adres.</b>';
 $lang['delete']['remove_button'] = 'Verwijder';
 $lang['delete']['previous'] = 'Vorige pagina';
@@ -318,7 +318,7 @@ $lang['admin']['sr'] = 'Postifx verzendersbeperkingen';
 $lang['admin']['reset_defaults'] = 'Herstel standaardwaarden';
 $lang['admin']['r_inactive'] = 'Inactieve beperkingen';
 $lang['admin']['r_active'] = 'Actieve beperkignen';
-$lang['admin']['r_info'] = 'Grijze, uitgeschakelde, elementen in de lijst met actieve beperkingen zijn voor mailcow niet bekend als valide en kunnen daarom niet verplaatst worden.<br />U kunt nieuwe elementen toevoegen in <code>inc/vars.inc.php</code> om ze te (de)activeren.';
+$lang['admin']['r_info'] = 'Grijze, uitgeschakelde, elementen in de lijst met actieve beperkingen zijn voor mailcow niet bekend als valide en kunnen daarom niet verplaatst worden.<br>U kunt nieuwe elementen toevoegen in <code>inc/vars.inc.php</code> om ze te (de)activeren.';
 $lang['admin']['public_folders'] = 'Gemeenschappelijke mappen';
 $lang['admin']['public_folders_text'] = 'Een namespace "Public" wordt aangemaakt. Onder deze map worden de automatisch aangemaakte postvakken in deze namespace weergegeven.';
 $lang['admin']['public_folder_name'] = 'Mapnaam <small>(alphanumeriek)</small>';
@@ -367,4 +367,3 @@ $lang['admin']['site_not_found'] = 'Kan mailcow instellingenbeheer niet vinden';
 $lang['admin']['public_folder_empty'] = 'Namen van gemeenschappelijke mappen mogen niet leeg blijven.';
 $lang['admin']['set_rr_failed'] = 'Kan Postfix beperkingen niet opleggen.';
 $lang['admin']['no_record'] = 'Geen vermelding';
-?>
diff --git a/data/web/lang/lang.pt.php b/data/web/lang/lang.pt.php
index 689faaa95..086903555 100644
--- a/data/web/lang/lang.pt.php
+++ b/data/web/lang/lang.pt.php
@@ -1,9 +1,8 @@
 <?php
 /*
-//
-//  Portuguese (pt) language file - Português do Brasil (pt_BR) - ISO-8859-1
-//
-*/
+ * Portuguese (pt) language file - Português do Brasil (pt_BR) - ISO-8859-1
+ */
+
 $lang['footer']['loading'] = "Aguarde...";
 $lang['getmail']['no_status'] = "Nenhum registro anterior encontrado";
 $lang['dkim']['confirm'] = "Tem certeza?";
@@ -131,7 +130,7 @@ $lang['user']['spamfilter_yellow'] = 'Amarelo: essa mensagem <b>pode ser</b> spa
 $lang['user']['spamfilter_red'] = 'Vermelho: essa mensagem <b>é mesmo spam</b> e será rejeitada definitivamente pelo servidor';
 $lang['user']['spamfilter_default_score'] = 'Valores padrão:';
 $lang['user']['spamfilter_hint'] = 'O primeiro espaço indica "baixo nível de spam", a segunda representa "alto nível de spam".';
-$lang['user']['tls_policy_warning'] = '<strong>Aviso:</strong> Se você selecionar para forçar o envio encryptado , alguns emails poderão ser rejeitados.<br />Mensages que não satisfizerem as politicas dos outros servidores serão rejeitadas definitivamente.';
+$lang['user']['tls_policy_warning'] = '<strong>Aviso:</strong> Se você selecionar para forçar o envio encryptado , alguns emails poderão ser rejeitados.<br>Mensages que não satisfizerem as politicas dos outros servidores serão rejeitadas definitivamente.';
 $lang['user']['tls_policy'] = 'Regras de Encryptação';
 $lang['user']['tls_enforce_in'] = 'Forçar TLS na entrada';
 $lang['user']['tls_enforce_out'] = 'Forçar TLS na saída';
@@ -144,17 +143,17 @@ $lang['start']['start_sogo'] = 'Abrir SOGo';
 $lang['start']['mailcow_apps_detail'] = 'Use um mailcow app para acessar seus emails, calendário, contatos e outras informações.';
 $lang['start']['mailcow_panel'] = 'Iniciar mailcow UI';
 $lang['start']['mailcow_panel_description'] = 'O mailcow UI está disponível para Administradores e Usuários.';
-$lang['start']['mailcow_panel_detail'] = '<b>Administradores:</b> podem criar, alterar ou apagar contas e apelidos , alterar domínios e outras informações de seus domínios atribuídos.<br />
+$lang['start']['mailcow_panel_detail'] = '<b>Administradores:</b> podem criar, alterar ou apagar contas e apelidos , alterar domínios e outras informações de seus domínios atribuídos.<br>
 	<b>Usuários:</b> podem criar apelidos por tempo determinado , alterar senha e configuração do nível do filtro de spam.';
 $lang['start']['recommended_config'] = 'Configuração recomendada (sem o ActiveSync)';
 $lang['start']['imap_smtp_server'] = 'IMAP e SMTP server data';
 $lang['start']['imap_smtp_server_description'] = 'Para uma melhor utilização use o <a href="%s" target="_blank"><b>Mozilla Thunderbird</b></a>.';
 $lang['start']['imap_smtp_server_badge'] = 'Ler/Criar emails';
-$lang['start']['imap_smtp_server_auth_info'] = 'Utilize o endereço de email completo com o método de autentucação PLAIN.<br />
+$lang['start']['imap_smtp_server_auth_info'] = 'Utilize o endereço de email completo com o método de autentucação PLAIN.<br>
 Os dados de login serão encryptados pelo servidor.';
 $lang['start']['managesieve'] = 'ManageSieve';
 $lang['start']['managesieve_badge'] = 'Filtro de email';
-$lang['start']['managesieve_description'] = 'Utilize o <b>Mozilla Thunderbird</b> com a <a style="text-decoration:none" target="_blank" href="%s"><b>extensão para sieve</b></a>.<br />Inicie o Thunderbird, acesse os Complementos e solte o arquivo xpi que foi baixado, na janela aberta.<br />Preencha com o servidor <b>%s</b>, porta <b>4190</b> se for solicitado. Os dados de acesso são os mesmos da sua conta de email.';
+$lang['start']['managesieve_description'] = 'Utilize o <b>Mozilla Thunderbird</b> com a <a style="text-decoration:none" target="_blank" href="%s"><b>extensão para sieve</b></a>.<br>Inicie o Thunderbird, acesse os Complementos e solte o arquivo xpi que foi baixado, na janela aberta.<br>Preencha com o servidor <b>%s</b>, porta <b>4190</b> se for solicitado. Os dados de acesso são os mesmos da sua conta de email.';
 $lang['start']['service'] = 'Serviço';
 $lang['start']['encryption'] = 'Método de criptografia';
 $lang['start']['help'] = 'Mostrar/Ocultar painel de ajuda';
@@ -206,7 +205,7 @@ $lang['delete']['remove_domainadmin_warning'] = '<b>Aviso:</b> Você está prest
 $lang['delete']['remove_alias_warning'] = '<b>Aviso:</b> Você está prestes a remover o Apelido <b>%s</b>!';
 $lang['delete']['remove_mailbox_warning'] = '<b>Aviso:</b> Você está prestes a remover a Conta <b>%s</b>!';
 $lang['delete']['remove_mailbox_details'] = 'A Conta será <b>excluída permanentemente</b>!';
-$lang['delete']['remove_domain_details'] = 'Esse procedimento removerá o Encaminhamento de Domínio.<br /><br /><b>O Domínio deve estar sem nenhuma configuração para ser removido.</b>';
+$lang['delete']['remove_domain_details'] = 'Esse procedimento removerá o Encaminhamento de Domínio.<br><br><b>O Domínio deve estar sem nenhuma configuração para ser removido.</b>';
 $lang['delete']['remove_alias_details'] = 'Os usuários não poderão mais enviar ou receber emails através deste endereço.</b>';
 $lang['delete']['remove_button'] = 'Remover';
 $lang['delete']['previous'] = 'Voltar';
@@ -304,7 +303,7 @@ $lang['admin']['reset_defaults'] = 'Voltar configuração padrão';
 $lang['admin']['sr'] = 'Postfix Sender Restrictions';
 $lang['admin']['r_inactive'] = 'Restrictions Inativos';
 $lang['admin']['r_active'] = 'Restrictions Ativos';
-$lang['admin']['r_info'] = 'Greyed out/disabled elements on the list of active restrictions are not known as valid restrictions to mailcow and cannot be moved. Unknown restrictions will be set in order of appearance anyway. <br />You can add new elements in <code>inc/vars.local.inc.php</code> to be able to toggle them.';
+$lang['admin']['r_info'] = 'Greyed out/disabled elements on the list of active restrictions are not known as valid restrictions to mailcow and cannot be moved. Unknown restrictions will be set in order of appearance anyway. <br>You can add new elements in <code>inc/vars.local.inc.php</code> to be able to toggle them.';
 $lang['admin']['public_folders'] = 'Pastas públicas';
 $lang['admin']['public_folders_text'] = 'A pasta "Public" esta criada. Abaixo a pasta pública indica o nome da primeira pasta criada automaticamente na conta, com este nome.';
 $lang['admin']['public_folder_name'] = 'Nome da Pasta <small>(alfa numérico)</small>';
@@ -353,4 +352,3 @@ $lang['admin']['site_not_found'] = 'Não foi possível localizar as configuraç
 $lang['admin']['public_folder_empty'] = 'O nome da Pasta Pública deve ser preenchido';
 $lang['admin']['set_rr_failed'] = 'Não foi possível alterar Postfix Restrictions';
 $lang['admin']['no_record'] = 'Nenhum registro';
-?>
diff --git a/data/web/lang/lang.ru.php b/data/web/lang/lang.ru.php
index afd92572d..35257396c 100644
--- a/data/web/lang/lang.ru.php
+++ b/data/web/lang/lang.ru.php
@@ -1,451 +1,449 @@
-<?php
-/*
-//
-//  Russian language file
-//
-*/
-$lang['footer']['loading'] = "Пожалуйста, подождите...";
-$lang['header']['restart_sogo'] = "Перезагрузить SOGo";
-$lang['footer']['restart_sogo'] = "Перезагрузить SOGo";
-$lang['footer']['restart_now'] = "Перезагрузить сейчас";
-$lang['footer']['restart_sogo_info'] = "Некоторые операции, например при добавлении домена, требуют перезагрузить SOGo, для вступления в силу внесенных изменений.<br /><br /><b>Важно:</b> Перезагрузка может занять некоторое время, дождитесь ее окончания.";
-$lang['dkim']['confirm'] = "Вы уверены?";
-$lang['danger']['dkim_not_found'] = "DKIM ключ не найден";
-$lang['danger']['dkim_remove_failed'] = "Не удается удалить выбранный DKIM ключ";
-$lang['danger']['dkim_add_failed'] = "Невозможно добавить данный DKIM ключ";
-$lang['danger']['dkim_domain_or_sel_invalid'] = "Недопустимый домен";
-$lang['danger']['dkim_key_length_invalid'] = "Недопустимая длина DKIM ключа";
-$lang['success']['dkim_removed'] = "DKIM ключ удален";
-$lang['success']['dkim_added'] = "DKIM ключ сохранен";
-$lang['danger']['access_denied'] = "Доступ запрещен или неверные данные формы";
-$lang['danger']['whitelist_from_invalid'] = "Недопустимая запись белого списка";
-$lang['danger']['domain_invalid'] = "Недопустимое имя домена";
-$lang['danger']['mailbox_quota_exceeds_domain_quota'] = "Максимальная квота превышает квоту домена";
-$lang['danger']['object_is_not_numeric'] = "Значение %s не является числовым";
-$lang['success']['domain_added'] = "Добавлен домен %s";
-$lang['danger']['alias_empty'] = "Псевдоним адрес не может быть пустым";
-$lang['danger']['last_key'] = "Невозможно удалить послений ключ";
-$lang['danger']['goto_empty'] = "Основной адрес не может быть пустым";
-$lang['danger']['policy_list_from_exists'] = "Запись с указанным именем уже существует";
-$lang['danger']['policy_list_from_invalid'] = "Запись имеет недопустимый формат";
-$lang['danger']['whitelist_exists'] = "Указанная запись уже существует в белом списке";
-$lang['danger']['whitelist_from_invalid'] = "Указанная запись белого списка имеет недопустимый формат";
-$lang['danger']['alias_invalid'] = "Недопустимый псевдоним адрес";
-$lang['danger']['goto_invalid'] = "Неверный основной адрес";
-$lang['danger']['alias_domain_invalid'] = "Недопустимый псевдоним домена";
-$lang['danger']['target_domain_invalid'] = "Неверный основной домен";
-$lang['danger']['object_exists'] = "Объект %s уже существует";
-$lang['danger']['domain_exists'] = "Домен %s уже существует";
-$lang['danger']['alias_goto_identical'] = "Псевдоним адрес и основной адрес не могут быть одинаковыми";
-$lang['danger']['aliasd_targetd_identical'] = "Псевдоним домена и основной домен не могут быть одинаковыми";
-$lang['success']['alias_added'] = "Псевдоним адрес(а) был(и) добавлен(ы)";
-$lang['success']['alias_modified'] = "Изменения псевдоним адреса сохранены";
-$lang['success']['aliasd_modified'] = "Изменения псевдоним домена сохранены";
-$lang['success']['mailbox_modified'] = "Изменения почтового ящика %s сохранены";
-$lang['success']['resource_modified'] = "Изменения почтового ящика %s сохранены";
-$lang['success']['object_modified'] = "Изменения объекта %s сохранены";
-$lang['success']['msg_size_saved'] = "Установлен новый максимальный размер письма";
-$lang['danger']['aliasd_not_found'] = "Псевдоним домена не найден";
-$lang['danger']['targetd_not_found'] = "Основной домен не найден";
-$lang['danger']['aliasd_exists'] = "Псевдоним домена уже существует";
-$lang['success']['aliasd_added'] = "Добавлен псевдоним домена %s";
-$lang['success']['aliasd_modified'] = "Изменения псевдоним домена %s сохранены";
-$lang['success']['domain_modified'] = "Изменения домена %s сохранены";
-$lang['success']['domain_admin_modified'] = "Изменения администратора домена %s сохранены";
-$lang['success']['domain_admin_added'] = "Администратор домена %s добавлен";
-$lang['success']['changes_general'] = "Изменения сохранены";
-$lang['success']['admin_modified'] = "Изменения администратора сохранены";
-$lang['danger']['exit_code_not_null'] = "Ошибка: код ошибки %d";
-$lang['danger']['mailbox_not_available'] = "Почтовый ящик недоступен";
-$lang['danger']['username_invalid'] = "Нельзя использовать этот логин";
-$lang['danger']['password_mismatch'] = "Введенные пароли не совпадают";
-$lang['danger']['password_complexity'] = "Пароль не соответствует требованиям";
-$lang['danger']['password_empty'] = "Пароль не может быть пустым";
-$lang['danger']['login_failed'] = "Введен неверный логин или пароль";
-$lang['danger']['mailbox_invalid'] = "Недопустимое имя почтового ящика";
-$lang['danger']['description_invalid'] = "Недопустимое описание ресурса";
-$lang['danger']['resource_invalid'] = "Недопустимое имя ресурса";
-$lang['danger']['mailbox_invalid_suggest'] = "Имя почтового ящика недействительно, возможно вы имели в виду %s?";
-$lang['danger']['is_alias'] = "%s уже известен как псевдоним адреса";
-$lang['danger']['is_alias_or_mailbox'] = "%s уже известен как псевдоним адреса или почтовый ящик";
-$lang['danger']['is_spam_alias'] = "%s уже известен как спам псевдоним адрес";
-$lang['danger']['quota_not_0_not_numeric'] = "Размер квоты должен быть больше нуля";
-$lang['danger']['domain_not_found'] = "Домен не найден";
-$lang['danger']['max_mailbox_exceeded'] = "Превышено максимальное количество почтовых ящиков (%d из %d)";
-$lang['danger']['mailbox_quota_exceeded'] = "Квота превышает лимит домена (максимум %d MiB)";
-$lang['danger']['mailbox_quota_left_exceeded'] = "Недостаточно свободного места (места осталось: %d MiB)";
-$lang['success']['mailbox_added'] = "Почтовый ящик %s добавлен";
-$lang['success']['resource_added'] = "Ресурс %s добавлен";
-$lang['success']['domain_removed'] = "Домен %s удален";
-$lang['success']['alias_removed'] = "Псевдоним адрес %s удален";
-$lang['success']['alias_domain_removed'] = "Псевдоним домена %s удален";
-$lang['success']['domain_admin_removed'] = "Администратор домена %s удален";
-$lang['success']['mailbox_removed'] = "Почтовый ящик %s удален";
-$lang['success']['eas_reset'] = "Устройства ActiveSync для пользователя %s были сброшены";
-$lang['success']['resource_removed'] = "Ресурс %s удален";
-$lang['danger']['max_quota_in_use'] = "Квота почтового ящика должна быть больше или равна %d MiB";
-$lang['danger']['domain_quota_m_in_use'] = "Квота домена должна быть больше или равна %s MiB";
-$lang['danger']['mailboxes_in_use'] = "Максимальный лимит почтовых ящиков должен быть больше или равен %d";
-$lang['danger']['aliases_in_use'] = "Максимальный лимит псевдоним адресов должен быть больше или равен %d";
-$lang['danger']['sender_acl_invalid'] = "Недопустимое значение ACL отправителя";
-$lang['danger']['domain_not_empty'] = "Нельзя удалить непустой домен";
-$lang['warning']['spam_alias_temp_error'] = "Временная ошибка: Не удается добавить спам псевдоним, пожалуйста, попробуй снова позже";
-$lang['danger']['spam_alias_max_exceeded'] = "Превышение максимально разрешенных спам псевдонимов";
-$lang['danger']['validity_missing'] = "Пожалуйста, назначьте срок действия";
-$lang['user']['on'] = "Вкл.";
-$lang['user']['off'] = "Выкл.";
-$lang['user']['messages'] = "писем"; // "123 messages"
-$lang['user']['in_use'] = "Занято";
-$lang['user']['user_change_fn'] = "";
-$lang['user']['user_settings'] = "Настройки пользователя";
-$lang['user']['mailbox_settings'] = "Настройки почтового ящика";
-$lang['user']['mailbox_details'] = "Данные почтового ящика";
-$lang['user']['change_password'] = "Сменить пароль";
-$lang['user']['new_password'] = "Новый пароль";
-$lang['user']['save_changes'] = "Сохранить изменения";
-$lang['user']['password_now'] = "Текущий пароль";
-$lang['user']['new_password_repeat'] = "Повторить пароль";
-$lang['user']['new_password_description'] = "Требование: 6 символов, буквы и цифры.";
-$lang['user']['did_you_know'] = '<b>Вы знали?</b> You can use tags in your email address ("me+<b>privat</b>@example.com") to move messages to a folder automatically (example: "privat").';
-$lang['user']['spam_aliases'] = "Временные псевдонимы электронной почты";
-$lang['user']['alias'] = "Псевдоним";
-$lang['user']['aliases'] = "Псевдонимы";
-$lang['user']['domain_aliases'] = "Адреса псевдонимов домена";
-$lang['user']['is_catch_all'] = 'Catch-all for domain/s';
-$lang['user']['aliases_also_send_as'] = 'Also allowed to send as user';
-$lang['user']['aliases_send_as_all'] = 'Do not check sender access for the following domain(s) and its alias domains';
-$lang['user']['alias_create_random'] = "Генерировать случайный псевдоним адрес";
-$lang['user']['alias_extend_all'] = "Продлить псевдоним адреса на 1 час";
-$lang['user']['alias_valid_until'] = "Действителен до";
-$lang['user']['alias_remove_all'] = "Удалить все псевдоним адреса";
-$lang['user']['alias_time_left'] = "Осталось времени";
-$lang['user']['alias_full_date'] = "d.m.Y, H:i:s T";
-$lang['user']['syncjob_full_date'] = "d.m.Y, H:i:s T";
-$lang['user']['alias_select_validity'] = "Срок действия";
-$lang['user']['sync_jobs'] = "Синхронизировать задания";
-$lang['user']['hour'] = "час";
-$lang['user']['hours'] = "часов";
-$lang['user']['day'] = "день";
-$lang['user']['week'] = "неделя";
-$lang['user']['weeks'] = "недели";
-$lang['user']['spamfilter'] = "Спам-фильтр";
-$lang['user']['spamfilter_wl'] = "Белый список";
-$lang['user']['spamfilter_wl_desc'] = "Белый список адресов электронной почты, позволяет никогда не классифицировать все полученные письма с указанных адресов как спам. Можно добавлять маски адресов.";
-$lang['user']['spamfilter_bl'] = "Черный список";
-$lang['user']['spamfilter_bl_desc'] = "Черный список адресов электронной почты, позволяет классифицировать все полученные письма с указанных адресов как спам и отклонять их получение. Можно добавлять маски адресов.";
-$lang['user']['spamfilter_behavior'] = "Рейтинг";
-$lang['user']['spamfilter_table_rule'] = "Правила";
-$lang['user']['spamfilter_table_action'] = "Действие";
-$lang['user']['spamfilter_table_empty'] = "Нет данных для отображения";
-$lang['user']['spamfilter_table_remove'] = "Удалить";
-$lang['user']['spamfilter_table_add'] = "Добавить";
-$lang['user']['spamfilter_default_score'] = "Оценки спама";
-$lang['user']['spamfilter_green'] = "Зеленый: это сообщение не является спамом";
-$lang['user']['spamfilter_yellow'] = "Желтый: это сообщение может быть спамом, оно будет помечено как спам и перемещено в папку спам";
-$lang['user']['spamfilter_red'] = "Красный: это сообщение является спамом и не будет принято сервером";
-$lang['user']['spamfilter_default_score'] = "Значения по умолчанию";
-$lang['user']['spamfilter_hint'] = 'The first value describes the "low spam score", the second represents the "high spam score".';
-$lang['user']['spamfilter_table_domain_policy'] = "n/a (domain policy)";
-$lang['user']['tls_policy_warning'] = '<strong>Warning:</strong> If you decide to enforce encrypted mail transfer, you may lose emails.<br />Messages to not satisfy the policy will be bounced with a hard fail by the mail system.';
-$lang['user']['tls_policy'] = "Настройки TLS шифрования";
-$lang['user']['tls_enforce_in'] = "Принудительное TLS входящих";
-$lang['user']['tls_enforce_out'] = "Принудительное TLS исходящих";
-$lang['user']['no_record'] = "Нет записи";
-$lang['user']['misc_settings'] = "Другие настройки профиля";
-$lang['user']['misc_delete_profile'] = "Другие настройки профиля";
-$lang['user']['tag_handling'] = 'Set handling for tagged mail';
-$lang['user']['tag_in_subfolder'] = "В подпапку";
-$lang['user']['tag_in_subject'] = "В теме";
-$lang['user']['tag_help_explain'] = 'In subfolder: a new subfolder named after the tag will be created below INBOX ("INBOX/Facebook").<br />
-In subject: the tags name will be prepended to the mails subject, example: "[Facebook] Meine Neuigkeiten".';
-$lang['user']['tag_help_example'] = 'Example for a tagged email address: ich<b>+Facebook</b>@example.org';
-$lang['user']['eas_reset'] = "Сбросить кеш ActiveSync устройств";
-$lang['user']['eas_reset_now'] = "Сбросить сейчас";
-$lang['user']['eas_reset_help'] = 'In many cases a device cache reset will help to recover a broken ActiveSync profile.<br /><b>Attention:</b> All elements will be redownloaded!';
-$lang['user']['encryption'] = "Шифрование";
-$lang['user']['username'] = "Логин";
-$lang['user']['password'] = "Пароль";
-$lang['user']['last_run'] = "Последний запуск";
-$lang['user']['excludes'] = "Исключает";
-$lang['user']['interval'] = "Интервал";
-$lang['user']['active'] = "Статус";
-$lang['user']['action'] = "Действия";
-$lang['user']['edit'] = "Изменить";
-$lang['user']['remove'] = "Удалить";
-$lang['user']['delete_now'] = "Удалить сейчас";
-$lang['user']['create_syncjob'] = "Создание новой задачи синхронизации";
-$lang['start']['dashboard'] = '%s - dashboard';
-$lang['start']['start_rc'] = 'Открыть Roundcube';
-$lang['start']['start_sogo'] = "Открыть SOGo";
-$lang['start']['mailcow_apps_detail'] = "Приложения для доступа к электронной почте, календарю, контактам и т.д.";
-$lang['start']['mailcow_panel'] = 'Start mailcow UI';
-$lang['start']['mailcow_panel_description'] = "Пользовательский интерфейс mailcow доступен для администраторов и пользователей почтовых ящиков.";
-$lang['start']['mailcow_panel_detail'] = "<b>Администраторы</b> могут создавать, изменять или удалять почтовые ящики, псевдонимы и другие административные настройки.<br />
-	<b>Пользователи</b> могут изменять пароль, создавать временные псевдонимы (спам псевдонимы), фильтры спама и другие доступные настройки своего профиля.";
-$lang['start']['recommended_config'] = "Рекомендуемые настройки (без ActiveSync)";
-$lang['start']['imap_smtp_server'] = 'IMAP- and SMTP server data';
-$lang['start']['imap_smtp_server_description'] = 'For the best experience we recommend to use <a href="%s" target="_blank"><b>Mozilla Thunderbird</b></a>.';
-$lang['start']['imap_smtp_server_badge'] = 'Read/Write emails';
-$lang['start']['imap_smtp_server_auth_info'] = 'Please use your full email address and the PLAIN authentication mechanism.<br />
-Your login data will be encrypted by the server-side mandatory encryption.';
-$lang['start']['managesieve'] = 'ManageSieve';
-$lang['start']['managesieve_badge'] = "Фильтр почты";
-$lang['start']['managesieve_description'] = 'Please use <b>Mozilla Thunderbird</b> with the <a style="text-decoration:none" target="_blank" href="%s"><b>nightly sieve extension</b></a>.<br />Start Thunderbird, open the add-on settings and drop the newly downloaded xpi file into the opened window.<br />The server name is <b>%s</b>, use port <b>4190</b> if you are asked for. The login data match your email login.';
-$lang['start']['service'] = "Сервисы";
-$lang['start']['encryption'] = "Метод шифрования";
-$lang['start']['help'] = "Справка";
-$lang['start']['hostname'] = "Имя хоста";
-$lang['start']['port'] = "Порт";
-$lang['start']['footer'] = '';
-$lang['header']['mailcow_settings'] = "Меню";
-$lang['header']['administration'] = "Административные настройки";
-$lang['header']['mailboxes'] = "Управление почтовым сервером";
-$lang['header']['user_settings'] = "Настройки пользователя";
-$lang['header']['login'] = "Логин";
-$lang['header']['logged_in_as_logout'] = "Вы вошли как <b>%s</b> (выйти)";
-$lang['header']['logged_in_as_logout_dual'] = 'Вы вошли как <b>%s <span class="text-info">[%s]</span></b>';
-$lang['header']['locale'] = "Язык";
-$lang['mailbox']['domain'] = "Домен";
-$lang['mailbox']['spam_aliases'] = "Временный псевдоним";
-$lang['mailbox']['multiple_bookings'] = 'Multiple bookings';
-$lang['mailbox']['kind'] = "Вид";
-$lang['mailbox']['description'] = "Описание";
-$lang['mailbox']['alias'] = "Псевдоним";
-$lang['mailbox']['resource_name'] = "Имя ресурса";
-$lang['mailbox']['aliases'] = "Псевдонимы";
-$lang['mailbox']['domains'] = "Домены";
-$lang['mailbox']['mailboxes'] = "Почтовые ящики";
-$lang['mailbox']['resources'] = "Ресурсы";
-$lang['mailbox']['mailbox_quota'] = "Макс. квота почтового ящика";
-$lang['mailbox']['domain_quota'] = "Квота";
-$lang['mailbox']['active'] = "Статус";
-$lang['mailbox']['action'] = "Действия";
-$lang['mailbox']['ratelimit'] = 'Outgoing rate limit/h';
-$lang['mailbox']['backup_mx'] = "Backup MX";
-$lang['mailbox']['domain_aliases'] = "Псевдонимы домена";
-$lang['mailbox']['target_domain'] = 'Target domain';
-$lang['mailbox']['target_address'] = "Goto address";
-$lang['mailbox']['username'] = "Почтовый ящик";
-$lang['mailbox']['fname'] = "Имя";
-$lang['mailbox']['filter_table'] = "Поиск";
-$lang['mailbox']['yes'] = '&#10004;';
-$lang['mailbox']['no'] = '&#10008;';
-$lang['mailbox']['quota'] = "Квота";
-$lang['mailbox']['in_use'] = "Занято";
-$lang['mailbox']['msg_num'] = "Письма";
-$lang['mailbox']['remove'] = "Удалить";
-$lang['mailbox']['edit'] = "Изменить";
-$lang['mailbox']['archive'] = "Архив";
-$lang['mailbox']['no_record'] = 'No record for object %s';
-$lang['mailbox']['no_record_single'] = "Нет записи";
-$lang['mailbox']['add_domain'] = "Добавить домен";
-$lang['mailbox']['add_domain_alias'] = "Добавить псевдоним домена";
-$lang['mailbox']['add_mailbox'] = "Добавить почтовый ящик";
-$lang['mailbox']['add_resource'] = "Добавить ресурс";
-$lang['mailbox']['add_alias'] = "Добавить псевдоним";
-$lang['mailbox']['add_domain_record_first'] = "Сначала добавьте домен";
-$lang['info']['no_action'] = "Действий не предусмотрено";
-$lang['delete']['title'] = "Удалить объект";
-$lang['delete']['remove_domain_warning'] = "<b>Внимание:</b> Вы собираетесь удалить домен <b>%s</b>!";
-$lang['delete']['remove_syncjob_warning'] = "<b>Внимание:</b> Вы собираетесь удалить задание синхронизации для пользователя <b>%s</b>!";
-$lang['delete']['remove_domainalias_warning'] = "<b>Внимание:</b> Вы собираетесь удалить псевдоним домена <b>%s</b>!";
-$lang['delete']['remove_domainadmin_warning'] = "<b>Внимание:</b> Вы собираетесь удалить администратора домена <b>%s</b>!";
-$lang['delete']['remove_alias_warning'] = "<b>Внимание:</b> Вы собираетесь удалить псевдоним адрес <b>%s</b>!";
-$lang['delete']['remove_mailbox_warning'] = "<b>Внимание:</b> Вы собираетесь удалить почтовый ящик <b>%s</b>!";
-$lang['delete']['remove_mailbox_details'] = "Почтовый ящик будет <b>очищен навсегда</b>!";
-$lang['delete']['remove_resource_warning'] = "<b>Внимание:</b> Вы собираетесь удалить ресурс <b>%s</b>!";
-$lang['delete']['remove_resource_details'] = "Ресурс будет <b>очищен навсегда</b>!";
-$lang['delete']['remove_domain_details'] = "Это также удаляет псевдонимы доменов.<br /><br /><b>Домен должен быть пустым для удаления.</b>";
-$lang['delete']['remove_syncjob_details'] = "Объекты из этого задания синхронизации больше не будут извлекаться с удаленного сервера.";
-$lang['delete']['remove_alias_details'] = "Пользователи больше не смогут получать почту или отправлять почту с этого адреса.</b>";
-$lang['delete']['remove_button'] = "Удалить";
-$lang['delete']['previous'] = "Предыдущая страница";
-$lang['edit']['syncjob'] = "Изменить задание синхронизации";
-$lang['edit']['save'] = "Сохранить";
-$lang['edit']['username'] = "Логин";
-$lang['edit']['hostname'] = "Имя хоста";
-$lang['edit']['encryption'] = "Шифрование";
-$lang['edit']['maxage'] = 'Maximum age of messages in days that will be polled from remote<br /><small>(0 = ignore age)</small>';
-$lang['edit']['subfolder2'] = 'Sync into subfolder on destination<br /><small>(empty = do not use subfolder)</small>';
-$lang['edit']['mins_interval'] = "Интервал (минуты)";
-$lang['edit']['exclude'] = 'Exclude objects (regex)';
-$lang['edit']['save'] = "Сохранить";
-$lang['edit']['archive'] = "Доступ к архиву";
-$lang['edit']['max_mailboxes'] = "Максимум почтовых ящиков";
-$lang['edit']['title'] = "Добавить объект";
-$lang['edit']['target_address'] = 'Goto address/es <small>(comma-separated)</small>';
-$lang['edit']['active'] = "Активность";
-$lang['edit']['target_domain'] = "Основной домен";
-$lang['edit']['password'] = "Пароль";
-$lang['edit']['ratelimit'] = 'Outgoing rate limit/h';
-$lang['danger']['ratelimt_less_one'] = 'Outgoing rate limit/h must not be less than 1';
-$lang['edit']['password_repeat'] = "Повторить пароль";
-$lang['edit']['domain_admin'] = "Редактирование администратора домена";
-$lang['edit']['domain'] = "Изменить домен";
-$lang['edit']['alias_domain'] = "Псевдоним домена";
-$lang['edit']['edit_alias_domain'] = "Изменить псевдоним домена";
-$lang['edit']['domains'] = "Домены";
-$lang['edit']['destroy'] = "Ручной ввод данных";
-$lang['edit']['alias'] = "Изменить псевдоним";
-$lang['edit']['mailbox'] = "Редактирование почтового ящика";
-$lang['edit']['description'] = "Описание";
-$lang['edit']['max_aliases'] = "Максимум псевдонимов";
-$lang['edit']['max_quota'] = "Максимальная квота на почтовый ящик (MiB)";
-$lang['edit']['domain_quota'] = "Квота домена";
-$lang['edit']['backup_mx_options'] = "Backup MX";
-$lang['edit']['relay_domain'] = 'Relay domain';
-$lang['edit']['relay_all'] = 'Relay all recipients';
-$lang['edit']['dkim_signature'] = "DKIM подпись";
-$lang['edit']['dkim_record_info'] = '<small>Please add a TXT record with the given value to your DNS settings.</small>';
-$lang['edit']['relay_all_info'] = '<small>If you choose <b>not</b> to relay all recipients, you will need to add a ("blind") mailbox for every single recipient that should be relayed.</small>';
-$lang['edit']['full_name'] = "Имя";
-$lang['edit']['quota_mb'] = "Квота (MiB)";
-$lang['edit']['sender_acl'] = "Отправлять письма от <small>(выбрать какой адрес(а) можно использовать в качестве отправителя)</small>";
-$lang['edit']['sender_acl_info'] = "Псевдонимы не могут быть отменены";
-$lang['edit']['dkim_txt_name'] = "Имя TXT записи";
-$lang['edit']['dkim_txt_value'] = "Значение TXT записи";
-$lang['edit']['previous'] = "Предыдущая страница";
-$lang['edit']['unchanged_if_empty'] = "Если без изменений, оставьте поле пустым";
-$lang['edit']['dont_check_sender_acl'] = "Отключить проверку отправителя для домена %s + псевдонимы домена";
-$lang['edit']['multiple_bookings'] = 'Multiple bookings';
-$lang['edit']['kind'] = "Вид";
-$lang['edit']['resource'] = "Ресурс";
-$lang['add']['syncjob'] = "Добавить задание синхронизации";
-$lang['add']['syncjob_hint'] = "Помните, что пароли должны быть сохранены как обычный текст!";
-$lang['add']['hostname'] = "Имя хоста";
-$lang['add']['port'] = "Порт";
-$lang['add']['username'] = "Логин";
-$lang['add']['enc_method'] = "Метод шифрования";
-$lang['add']['mins_interval'] = "Интервал опроса (в минутах)";
-$lang['add']['maxage'] = 'Maximum age of messages that will be polled from remote (0 = ignore age)';
-$lang['add']['subfolder2'] = "Синхронизировать в подпапку по назначению";
-$lang['add']['exclude'] = "Исключить объекты (regex)";
-$lang['add']['delete2duplicates'] = "Удалить дубликаты в получателях";
-$lang['edit']['delete2duplicates'] = "Удалить дубликаты в получателях";
-$lang['add']['title'] = "Добавить объект";
-$lang['add']['domain'] = "Домен";
-$lang['add']['active'] = "Активный";
-$lang['add']['multiple_bookings'] = 'Multiple bookings';
-$lang['add']['save'] = "Сохранить изменения";
-$lang['add']['description'] = "Описание";
-$lang['add']['max_aliases'] = "Максимум псевдонимов";
-$lang['add']['resource_name'] = "Имя ресурса";
-$lang['add']['max_mailboxes'] = "Максимум почтовых ящиков";
-$lang['add']['mailbox_quota_m'] = "Максимальная квота на почтовый ящик (MiB)";
-$lang['add']['domain_quota_m'] = "Общая квота домена (MiB)";
-$lang['add']['backup_mx_options'] = "Backup MX";
-$lang['add']['relay_all'] = "Relay all recipients";
-$lang['add']['relay_domain'] = "Relay this domain";
-$lang['add']['relay_all_info'] = '<small>If you choose <b>not</b> to relay all recipients, you will need to add a ("blind") mailbox for every single recipient that should be relayed.</small>';
-$lang['add']['alias'] = "Псевдоним(ы)";
-$lang['add']['alias_spf_fail'] = '<b>Заметка:</b> If your chosen destination address is an external mailbox, the <b>receiving mailserver</b> may reject your message due to an SPF failure.</a>';
-$lang['add']['alias_address'] = "Псевдоним адрес(а)";
-$lang['add']['alias_address_info'] = '<small>Full email address/es or @example.com, to catch all messages for a domain (comma-separated). <b>mailcow domains only</b>.</small>';
-$lang['add']['alias_domain_info'] = '<small>Только допустимые доменные имена (через запятую).</small>';
-$lang['add']['target_address'] = "Основной адрес";
-$lang['add']['target_address_info'] = "<small>Адрес(а) электронной почты (через запятую).</small>";
-$lang['add']['alias_domain'] = "Псевдоним домена";
-$lang['add']['select'] = "Пожалуйста, выберите...";
-$lang['add']['target_domain'] = "Основной домен";
-$lang['add']['mailbox'] = "Почтовый ящик";
-$lang['add']['resource'] = "Ресурс";
-$lang['add']['kind'] = "Вид";
-$lang['add']['mailbox_username'] = "Адрес электронной почты, без @example.com";
-$lang['add']['full_name'] = "Имя";
-$lang['add']['quota_mb'] = "Квота (MiB):";
-$lang['add']['select_domain'] = "Выберите основной домен";
-$lang['add']['password'] = "Пароль";
-$lang['add']['password_repeat'] = "Повторить пароль";
-$lang['add']['previous'] = "Предыдущая страница";
-$lang['add']['restart_sogo_hint'] = "После добавления нового домена потребуется перезагрузить SOGo!";
-$lang['login']['title'] = "Логин";
-$lang['login']['administration'] = "Администрирование";
-$lang['login']['administration_details'] = "Пожалуйста, используйте вашу учетную запись администратора для выполнения административных задач";
-$lang['login']['user_settings'] = "Настройки пользователя";
-$lang['login']['user_settings_details'] = "Пользователи почтовых ящиков могут использовать пользовательский интерфейс mailcow, чтобы изменять свой пароль, создавать временные псевдонимы (псевдонимы спама), настраивать поведение спам-фильтра или импортировать сообщения с удаленного сервера IMAP.";
-$lang['login']['username'] = "Логин";
-$lang['login']['password'] = "Пароль";
-$lang['login']['reset_password'] = "Сбросить пароль";
-$lang['login']['login'] = "Войти";
-$lang['login']['previous'] = "Предыдущая страница";
-$lang['login']['delayed'] = 'Login was delayed by %s seconds.';
-$lang['tfa']['tfa'] = "Двухфакторная проверка подлинности";
-$lang['tfa']['set_tfa'] = "Использовать двухфакторный метод проверки подлинности";
-$lang['tfa']['yubi_otp'] = "Yubico OTP аутентификация";
-$lang['tfa']['key_id'] = "Идентификатор для вашего YubiKey";
-$lang['tfa']['api_register'] = 'mailcow использует Yubico Cloud API. Пожалуйста, получите ключ API для вашего ключа <a href="https://upgrade.yubico.com/getapikey/" target="_blank">тут</a>.';
-$lang['tfa']['u2f'] = "U2F проверка подлинности";
-$lang['tfa']['hotp'] = "HOTP проверка подлинности";
-$lang['tfa']['totp'] = "TOTP проверка подлинности";
-$lang['tfa']['none'] = "Отключен";
-$lang['tfa']['delete_tfa'] = "Отключить TFA";
-$lang['tfa']['disable_tfa'] = "Отключить TFA до следующего удачного входа";
-$lang['tfa']['confirm_tfa'] = "Пожалуйста, подтвердите свой одноразовый пароль в поле ниже";
-$lang['tfa']['confirm'] = "Подтвердить";
-$lang['tfa']['otp'] = "Одноразовый пароль";
-$lang['tfa']['trash_login'] = "Некорректный логин";
-$lang['tfa']['select'] = "Пожалуйста выберите";
-$lang['tfa']['waiting_usb_auth'] = "<i>Ждем USB-устройства...</i><br /><br />Пожалуйста, нажмите кнопку на USB-устройстве U2F.";
-$lang['tfa']['waiting_usb_register'] = "<i>Ждем USB-устройства...</i><br /><br />Пожалуйста, введите свой пароль выше и подтвердите регистрацию U2F, нажав кнопку на USB-устройстве U2F.";
-$lang['admin']['search_domain_da'] = "Поиск домена";
-$lang['admin']['restrictions'] = "Настройки Postfix";
-$lang['admin']['rr'] = "Настройки получателя";
-$lang['admin']['sr'] = "Настройки отправителя";
-$lang['admin']['reset_defaults'] = "Сброс по умолчанию";
-$lang['admin']['sr'] = "Настройки отправителя";
-$lang['admin']['r_inactive'] = "Неактивные элементы";
-$lang['admin']['r_active'] = "Активные элементы";
-$lang['admin']['r_info'] = "Выделенные серым цветом элементы в списке активных элементов заблокированы от перемещения в список неактивных элементов, так как их отключение может непредсказуемо повлиять на работу mailcow. Unknown restrictions will be set in order of appearance anyway. <br />Вы можете добавить новые элементы в <code>inc/vars.local.inc.php</code>, что бы иметь возможно переключать их.";
-$lang['admin']['public_folders'] = "Общие папки";
-$lang['admin']['public_folders_text'] = 'A namespace "Public" is created. Below\'s public folder name indicates the name of the first auto-created mailbox within this namespace.';
-$lang['admin']['public_folder_name'] = "Имя папки";
-$lang['admin']['public_folder_enable'] = "Включение общих папок";
-$lang['admin']['public_folder_enable_text'] = "Отключение этой опции не приведет к удалению почты из общих папок";
-$lang['admin']['public_folder_pusf'] = 'Enable per-user seen flag';
-$lang['admin']['public_folder_pusf_text'] = 'A "per-user seen flag"-enabled system will not mark a mail as read for User B, when User A has seen it, but User B did not.';
-$lang['admin']['privacy'] = "Конфедоциальность";
-$lang['admin']['privacy_text'] = 'This option enables a PCRE table to remove "User-Agent", "X-Enigmail", "X-Mailer", "X-Originating-IP" and replaces "Received: from" headers with localhost/127.0.0.1.';
-$lang['admin']['privacy_anon_mail'] = "Анонимизировать исходящую почту";
-$lang['admin']['dkim_txt_name'] = "Имя TXT записи";
-$lang['admin']['dkim_txt_value'] = "Значение TXT записи";
-$lang['admin']['dkim_key_length'] = "Длина ключа";
-$lang['admin']['dkim_key_valid'] = "Ключ действителен";
-$lang['admin']['dkim_key_unused'] = "Неиспользованный ключ";
-$lang['admin']['dkim_key_missing'] = "Ключ отсутствует";
-$lang['admin']['dkim_key_hint'] = "Селектор для DKIM ключей <code>dkim</code>. Подсказка: При добавлении записи на DNS-сервере, укажите Имя TXT записи <code>dkim._domainkey</code>.";
-$lang['admin']['previous'] = "Предыдущая страница";
-$lang['admin']['quota_mb'] = "Квота (MiB)";
-$lang['admin']['sender_acl'] = "Разрешить отправлять письма от";
-$lang['admin']['msg_size'] = "Максимальный размер письма";
-$lang['admin']['msg_size_limit'] = "Сейчас максимальный размер письма";
-$lang['admin']['msg_size_limit_details'] = "Применение нового ограничения перезагрузит Postfix и веб-сервер";
-$lang['admin']['save'] = "Сохранить изменения";
-$lang['admin']['maintenance'] = "Техническое обслуживание и информация";
-$lang['admin']['sys_info'] = "Системная информация";
-$lang['admin']['dkim_add_key'] = "Добавить DKIM ключ";
-$lang['admin']['dkim_keys'] = "DKIM ключи";
-$lang['admin']['add'] = "Добавить";
-$lang['admin']['configuration'] = "Конфигурации";
-$lang['admin']['password'] = "Пароль";
-$lang['admin']['password_repeat'] = "Повторить пароль";
-$lang['admin']['active'] = "Активный";
-$lang['admin']['action'] = "Действия";
-$lang['admin']['add_domain_admin'] = "Добавить администратора домена";
-$lang['admin']['admin_domains'] = "Домен";
-$lang['admin']['domain_admins'] = "Администраторы домена";
-$lang['admin']['username'] = "Логин";
-$lang['admin']['edit'] = "Изменить";
-$lang['admin']['remove'] = "Удалить";
-$lang['admin']['save'] = "Сохранить изменения";
-$lang['admin']['admin'] = "Администратор";
-$lang['admin']['admin_details'] = "Изменить данные администратора";
-$lang['admin']['unchanged_if_empty'] = "Если без изменений, оставьте поле пустым";
-$lang['admin']['yes'] = '&#10004;';
-$lang['admin']['no'] = '&#10008;';
-$lang['admin']['access'] = "Права доступа";
-$lang['admin']['invalid_max_msg_size'] = "Неверно указан максимальный размер письма";
-$lang['admin']['site_not_found'] = "Не удается найти конфигурацию mailcow";
-$lang['admin']['public_folder_empty'] = "Имя общей папки не может быть пустым";
-$lang['admin']['set_rr_failed'] = "Не установить настройки Postfix";
-$lang['admin']['no_record'] = "Нет записей";
-?>
+<?php
+/*
+ * Russian language file
+ */
+
+$lang['footer']['loading'] = "Пожалуйста, подождите...";
+$lang['header']['restart_sogo'] = "Перезагрузить SOGo";
+$lang['footer']['restart_sogo'] = "Перезагрузить SOGo";
+$lang['footer']['restart_now'] = "Перезагрузить сейчас";
+$lang['footer']['restart_sogo_info'] = "Некоторые операции, например при добавлении домена, требуют перезагрузить SOGo, для вступления в силу внесенных изменений.<br><br><b>Важно:</b> Перезагрузка может занять некоторое время, дождитесь ее окончания.";
+$lang['dkim']['confirm'] = "Вы уверены?";
+$lang['danger']['dkim_not_found'] = "DKIM ключ не найден";
+$lang['danger']['dkim_remove_failed'] = "Не удается удалить выбранный DKIM ключ";
+$lang['danger']['dkim_add_failed'] = "Невозможно добавить данный DKIM ключ";
+$lang['danger']['dkim_domain_or_sel_invalid'] = "Недопустимый домен";
+$lang['danger']['dkim_key_length_invalid'] = "Недопустимая длина DKIM ключа";
+$lang['success']['dkim_removed'] = "DKIM ключ удален";
+$lang['success']['dkim_added'] = "DKIM ключ сохранен";
+$lang['danger']['access_denied'] = "Доступ запрещен или неверные данные формы";
+$lang['danger']['whitelist_from_invalid'] = "Недопустимая запись белого списка";
+$lang['danger']['domain_invalid'] = "Недопустимое имя домена";
+$lang['danger']['mailbox_quota_exceeds_domain_quota'] = "Максимальная квота превышает квоту домена";
+$lang['danger']['object_is_not_numeric'] = "Значение %s не является числовым";
+$lang['success']['domain_added'] = "Добавлен домен %s";
+$lang['danger']['alias_empty'] = "Псевдоним адрес не может быть пустым";
+$lang['danger']['last_key'] = "Невозможно удалить послений ключ";
+$lang['danger']['goto_empty'] = "Основной адрес не может быть пустым";
+$lang['danger']['policy_list_from_exists'] = "Запись с указанным именем уже существует";
+$lang['danger']['policy_list_from_invalid'] = "Запись имеет недопустимый формат";
+$lang['danger']['whitelist_exists'] = "Указанная запись уже существует в белом списке";
+$lang['danger']['whitelist_from_invalid'] = "Указанная запись белого списка имеет недопустимый формат";
+$lang['danger']['alias_invalid'] = "Недопустимый псевдоним адрес";
+$lang['danger']['goto_invalid'] = "Неверный основной адрес";
+$lang['danger']['alias_domain_invalid'] = "Недопустимый псевдоним домена";
+$lang['danger']['target_domain_invalid'] = "Неверный основной домен";
+$lang['danger']['object_exists'] = "Объект %s уже существует";
+$lang['danger']['domain_exists'] = "Домен %s уже существует";
+$lang['danger']['alias_goto_identical'] = "Псевдоним адрес и основной адрес не могут быть одинаковыми";
+$lang['danger']['aliasd_targetd_identical'] = "Псевдоним домена и основной домен не могут быть одинаковыми";
+$lang['success']['alias_added'] = "Псевдоним адрес(а) был(и) добавлен(ы)";
+$lang['success']['alias_modified'] = "Изменения псевдоним адреса сохранены";
+$lang['success']['aliasd_modified'] = "Изменения псевдоним домена сохранены";
+$lang['success']['mailbox_modified'] = "Изменения почтового ящика %s сохранены";
+$lang['success']['resource_modified'] = "Изменения почтового ящика %s сохранены";
+$lang['success']['object_modified'] = "Изменения объекта %s сохранены";
+$lang['success']['msg_size_saved'] = "Установлен новый максимальный размер письма";
+$lang['danger']['aliasd_not_found'] = "Псевдоним домена не найден";
+$lang['danger']['targetd_not_found'] = "Основной домен не найден";
+$lang['danger']['aliasd_exists'] = "Псевдоним домена уже существует";
+$lang['success']['aliasd_added'] = "Добавлен псевдоним домена %s";
+$lang['success']['aliasd_modified'] = "Изменения псевдоним домена %s сохранены";
+$lang['success']['domain_modified'] = "Изменения домена %s сохранены";
+$lang['success']['domain_admin_modified'] = "Изменения администратора домена %s сохранены";
+$lang['success']['domain_admin_added'] = "Администратор домена %s добавлен";
+$lang['success']['changes_general'] = "Изменения сохранены";
+$lang['success']['admin_modified'] = "Изменения администратора сохранены";
+$lang['danger']['exit_code_not_null'] = "Ошибка: код ошибки %d";
+$lang['danger']['mailbox_not_available'] = "Почтовый ящик недоступен";
+$lang['danger']['username_invalid'] = "Нельзя использовать этот логин";
+$lang['danger']['password_mismatch'] = "Введенные пароли не совпадают";
+$lang['danger']['password_complexity'] = "Пароль не соответствует требованиям";
+$lang['danger']['password_empty'] = "Пароль не может быть пустым";
+$lang['danger']['login_failed'] = "Введен неверный логин или пароль";
+$lang['danger']['mailbox_invalid'] = "Недопустимое имя почтового ящика";
+$lang['danger']['description_invalid'] = "Недопустимое описание ресурса";
+$lang['danger']['resource_invalid'] = "Недопустимое имя ресурса";
+$lang['danger']['mailbox_invalid_suggest'] = "Имя почтового ящика недействительно, возможно вы имели в виду %s?";
+$lang['danger']['is_alias'] = "%s уже известен как псевдоним адреса";
+$lang['danger']['is_alias_or_mailbox'] = "%s уже известен как псевдоним адреса или почтовый ящик";
+$lang['danger']['is_spam_alias'] = "%s уже известен как спам псевдоним адрес";
+$lang['danger']['quota_not_0_not_numeric'] = "Размер квоты должен быть больше нуля";
+$lang['danger']['domain_not_found'] = "Домен не найден";
+$lang['danger']['max_mailbox_exceeded'] = "Превышено максимальное количество почтовых ящиков (%d из %d)";
+$lang['danger']['mailbox_quota_exceeded'] = "Квота превышает лимит домена (максимум %d MiB)";
+$lang['danger']['mailbox_quota_left_exceeded'] = "Недостаточно свободного места (места осталось: %d MiB)";
+$lang['success']['mailbox_added'] = "Почтовый ящик %s добавлен";
+$lang['success']['resource_added'] = "Ресурс %s добавлен";
+$lang['success']['domain_removed'] = "Домен %s удален";
+$lang['success']['alias_removed'] = "Псевдоним адрес %s удален";
+$lang['success']['alias_domain_removed'] = "Псевдоним домена %s удален";
+$lang['success']['domain_admin_removed'] = "Администратор домена %s удален";
+$lang['success']['mailbox_removed'] = "Почтовый ящик %s удален";
+$lang['success']['eas_reset'] = "Устройства ActiveSync для пользователя %s были сброшены";
+$lang['success']['resource_removed'] = "Ресурс %s удален";
+$lang['danger']['max_quota_in_use'] = "Квота почтового ящика должна быть больше или равна %d MiB";
+$lang['danger']['domain_quota_m_in_use'] = "Квота домена должна быть больше или равна %s MiB";
+$lang['danger']['mailboxes_in_use'] = "Максимальный лимит почтовых ящиков должен быть больше или равен %d";
+$lang['danger']['aliases_in_use'] = "Максимальный лимит псевдоним адресов должен быть больше или равен %d";
+$lang['danger']['sender_acl_invalid'] = "Недопустимое значение ACL отправителя";
+$lang['danger']['domain_not_empty'] = "Нельзя удалить непустой домен";
+$lang['warning']['spam_alias_temp_error'] = "Временная ошибка: Не удается добавить спам псевдоним, пожалуйста, попробуй снова позже";
+$lang['danger']['spam_alias_max_exceeded'] = "Превышение максимально разрешенных спам псевдонимов";
+$lang['danger']['validity_missing'] = "Пожалуйста, назначьте срок действия";
+$lang['user']['on'] = "Вкл.";
+$lang['user']['off'] = "Выкл.";
+$lang['user']['messages'] = "писем"; // "123 messages"
+$lang['user']['in_use'] = "Занято";
+$lang['user']['user_change_fn'] = "";
+$lang['user']['user_settings'] = "Настройки пользователя";
+$lang['user']['mailbox_settings'] = "Настройки почтового ящика";
+$lang['user']['mailbox_details'] = "Данные почтового ящика";
+$lang['user']['change_password'] = "Сменить пароль";
+$lang['user']['new_password'] = "Новый пароль";
+$lang['user']['save_changes'] = "Сохранить изменения";
+$lang['user']['password_now'] = "Текущий пароль";
+$lang['user']['new_password_repeat'] = "Повторить пароль";
+$lang['user']['new_password_description'] = "Требование: 6 символов, буквы и цифры.";
+$lang['user']['did_you_know'] = '<b>Вы знали?</b> You can use tags in your email address ("me+<b>privat</b>@example.com") to move messages to a folder automatically (example: "privat").';
+$lang['user']['spam_aliases'] = "Временные псевдонимы электронной почты";
+$lang['user']['alias'] = "Псевдоним";
+$lang['user']['aliases'] = "Псевдонимы";
+$lang['user']['domain_aliases'] = "Адреса псевдонимов домена";
+$lang['user']['is_catch_all'] = 'Catch-all for domain/s';
+$lang['user']['aliases_also_send_as'] = 'Also allowed to send as user';
+$lang['user']['aliases_send_as_all'] = 'Do not check sender access for the following domain(s) and its alias domains';
+$lang['user']['alias_create_random'] = "Генерировать случайный псевдоним адрес";
+$lang['user']['alias_extend_all'] = "Продлить псевдоним адреса на 1 час";
+$lang['user']['alias_valid_until'] = "Действителен до";
+$lang['user']['alias_remove_all'] = "Удалить все псевдоним адреса";
+$lang['user']['alias_time_left'] = "Осталось времени";
+$lang['user']['alias_full_date'] = "d.m.Y, H:i:s T";
+$lang['user']['syncjob_full_date'] = "d.m.Y, H:i:s T";
+$lang['user']['alias_select_validity'] = "Срок действия";
+$lang['user']['sync_jobs'] = "Синхронизировать задания";
+$lang['user']['hour'] = "час";
+$lang['user']['hours'] = "часов";
+$lang['user']['day'] = "день";
+$lang['user']['week'] = "неделя";
+$lang['user']['weeks'] = "недели";
+$lang['user']['spamfilter'] = "Спам-фильтр";
+$lang['user']['spamfilter_wl'] = "Белый список";
+$lang['user']['spamfilter_wl_desc'] = "Белый список адресов электронной почты, позволяет никогда не классифицировать все полученные письма с указанных адресов как спам. Можно добавлять маски адресов.";
+$lang['user']['spamfilter_bl'] = "Черный список";
+$lang['user']['spamfilter_bl_desc'] = "Черный список адресов электронной почты, позволяет классифицировать все полученные письма с указанных адресов как спам и отклонять их получение. Можно добавлять маски адресов.";
+$lang['user']['spamfilter_behavior'] = "Рейтинг";
+$lang['user']['spamfilter_table_rule'] = "Правила";
+$lang['user']['spamfilter_table_action'] = "Действие";
+$lang['user']['spamfilter_table_empty'] = "Нет данных для отображения";
+$lang['user']['spamfilter_table_remove'] = "Удалить";
+$lang['user']['spamfilter_table_add'] = "Добавить";
+$lang['user']['spamfilter_default_score'] = "Оценки спама";
+$lang['user']['spamfilter_green'] = "Зеленый: это сообщение не является спамом";
+$lang['user']['spamfilter_yellow'] = "Желтый: это сообщение может быть спамом, оно будет помечено как спам и перемещено в папку спам";
+$lang['user']['spamfilter_red'] = "Красный: это сообщение является спамом и не будет принято сервером";
+$lang['user']['spamfilter_default_score'] = "Значения по умолчанию";
+$lang['user']['spamfilter_hint'] = 'The first value describes the "low spam score", the second represents the "high spam score".';
+$lang['user']['spamfilter_table_domain_policy'] = "n/a (domain policy)";
+$lang['user']['tls_policy_warning'] = '<strong>Warning:</strong> If you decide to enforce encrypted mail transfer, you may lose emails.<br>Messages to not satisfy the policy will be bounced with a hard fail by the mail system.';
+$lang['user']['tls_policy'] = "Настройки TLS шифрования";
+$lang['user']['tls_enforce_in'] = "Принудительное TLS входящих";
+$lang['user']['tls_enforce_out'] = "Принудительное TLS исходящих";
+$lang['user']['no_record'] = "Нет записи";
+$lang['user']['misc_settings'] = "Другие настройки профиля";
+$lang['user']['misc_delete_profile'] = "Другие настройки профиля";
+$lang['user']['tag_handling'] = 'Set handling for tagged mail';
+$lang['user']['tag_in_subfolder'] = "В подпапку";
+$lang['user']['tag_in_subject'] = "В теме";
+$lang['user']['tag_help_explain'] = 'In subfolder: a new subfolder named after the tag will be created below INBOX ("INBOX/Facebook").<br>
+In subject: the tags name will be prepended to the mails subject, example: "[Facebook] Meine Neuigkeiten".';
+$lang['user']['tag_help_example'] = 'Example for a tagged email address: ich<b>+Facebook</b>@example.org';
+$lang['user']['eas_reset'] = "Сбросить кеш ActiveSync устройств";
+$lang['user']['eas_reset_now'] = "Сбросить сейчас";
+$lang['user']['eas_reset_help'] = 'In many cases a device cache reset will help to recover a broken ActiveSync profile.<br><b>Attention:</b> All elements will be redownloaded!';
+$lang['user']['encryption'] = "Шифрование";
+$lang['user']['username'] = "Логин";
+$lang['user']['password'] = "Пароль";
+$lang['user']['last_run'] = "Последний запуск";
+$lang['user']['excludes'] = "Исключает";
+$lang['user']['interval'] = "Интервал";
+$lang['user']['active'] = "Статус";
+$lang['user']['action'] = "Действия";
+$lang['user']['edit'] = "Изменить";
+$lang['user']['remove'] = "Удалить";
+$lang['user']['delete_now'] = "Удалить сейчас";
+$lang['user']['create_syncjob'] = "Создание новой задачи синхронизации";
+$lang['start']['dashboard'] = '%s - dashboard';
+$lang['start']['start_rc'] = 'Открыть Roundcube';
+$lang['start']['start_sogo'] = "Открыть SOGo";
+$lang['start']['mailcow_apps_detail'] = "Приложения для доступа к электронной почте, календарю, контактам и т.д.";
+$lang['start']['mailcow_panel'] = 'Start mailcow UI';
+$lang['start']['mailcow_panel_description'] = "Пользовательский интерфейс mailcow доступен для администраторов и пользователей почтовых ящиков.";
+$lang['start']['mailcow_panel_detail'] = "<b>Администраторы</b> могут создавать, изменять или удалять почтовые ящики, псевдонимы и другие административные настройки.<br>
+	<b>Пользователи</b> могут изменять пароль, создавать временные псевдонимы (спам псевдонимы), фильтры спама и другие доступные настройки своего профиля.";
+$lang['start']['recommended_config'] = "Рекомендуемые настройки (без ActiveSync)";
+$lang['start']['imap_smtp_server'] = 'IMAP- and SMTP server data';
+$lang['start']['imap_smtp_server_description'] = 'For the best experience we recommend to use <a href="%s" target="_blank"><b>Mozilla Thunderbird</b></a>.';
+$lang['start']['imap_smtp_server_badge'] = 'Read/Write emails';
+$lang['start']['imap_smtp_server_auth_info'] = 'Please use your full email address and the PLAIN authentication mechanism.<br>
+Your login data will be encrypted by the server-side mandatory encryption.';
+$lang['start']['managesieve'] = 'ManageSieve';
+$lang['start']['managesieve_badge'] = "Фильтр почты";
+$lang['start']['managesieve_description'] = 'Please use <b>Mozilla Thunderbird</b> with the <a style="text-decoration:none" target="_blank" href="%s"><b>nightly sieve extension</b></a>.<br>Start Thunderbird, open the add-on settings and drop the newly downloaded xpi file into the opened window.<br>The server name is <b>%s</b>, use port <b>4190</b> if you are asked for. The login data match your email login.';
+$lang['start']['service'] = "Сервисы";
+$lang['start']['encryption'] = "Метод шифрования";
+$lang['start']['help'] = "Справка";
+$lang['start']['hostname'] = "Имя хоста";
+$lang['start']['port'] = "Порт";
+$lang['start']['footer'] = '';
+$lang['header']['mailcow_settings'] = "Меню";
+$lang['header']['administration'] = "Административные настройки";
+$lang['header']['mailboxes'] = "Управление почтовым сервером";
+$lang['header']['user_settings'] = "Настройки пользователя";
+$lang['header']['login'] = "Логин";
+$lang['header']['logged_in_as_logout'] = "Вы вошли как <b>%s</b> (выйти)";
+$lang['header']['logged_in_as_logout_dual'] = 'Вы вошли как <b>%s <span class="text-info">[%s]</span></b>';
+$lang['header']['locale'] = "Язык";
+$lang['mailbox']['domain'] = "Домен";
+$lang['mailbox']['spam_aliases'] = "Временный псевдоним";
+$lang['mailbox']['multiple_bookings'] = 'Multiple bookings';
+$lang['mailbox']['kind'] = "Вид";
+$lang['mailbox']['description'] = "Описание";
+$lang['mailbox']['alias'] = "Псевдоним";
+$lang['mailbox']['resource_name'] = "Имя ресурса";
+$lang['mailbox']['aliases'] = "Псевдонимы";
+$lang['mailbox']['domains'] = "Домены";
+$lang['mailbox']['mailboxes'] = "Почтовые ящики";
+$lang['mailbox']['resources'] = "Ресурсы";
+$lang['mailbox']['mailbox_quota'] = "Макс. квота почтового ящика";
+$lang['mailbox']['domain_quota'] = "Квота";
+$lang['mailbox']['active'] = "Статус";
+$lang['mailbox']['action'] = "Действия";
+$lang['mailbox']['ratelimit'] = 'Outgoing rate limit/h';
+$lang['mailbox']['backup_mx'] = "Backup MX";
+$lang['mailbox']['domain_aliases'] = "Псевдонимы домена";
+$lang['mailbox']['target_domain'] = 'Target domain';
+$lang['mailbox']['target_address'] = "Goto address";
+$lang['mailbox']['username'] = "Почтовый ящик";
+$lang['mailbox']['fname'] = "Имя";
+$lang['mailbox']['filter_table'] = "Поиск";
+$lang['mailbox']['yes'] = '&#10004;';
+$lang['mailbox']['no'] = '&#10008;';
+$lang['mailbox']['quota'] = "Квота";
+$lang['mailbox']['in_use'] = "Занято";
+$lang['mailbox']['msg_num'] = "Письма";
+$lang['mailbox']['remove'] = "Удалить";
+$lang['mailbox']['edit'] = "Изменить";
+$lang['mailbox']['archive'] = "Архив";
+$lang['mailbox']['no_record'] = 'No record for object %s';
+$lang['mailbox']['no_record_single'] = "Нет записи";
+$lang['mailbox']['add_domain'] = "Добавить домен";
+$lang['mailbox']['add_domain_alias'] = "Добавить псевдоним домена";
+$lang['mailbox']['add_mailbox'] = "Добавить почтовый ящик";
+$lang['mailbox']['add_resource'] = "Добавить ресурс";
+$lang['mailbox']['add_alias'] = "Добавить псевдоним";
+$lang['mailbox']['add_domain_record_first'] = "Сначала добавьте домен";
+$lang['info']['no_action'] = "Действий не предусмотрено";
+$lang['delete']['title'] = "Удалить объект";
+$lang['delete']['remove_domain_warning'] = "<b>Внимание:</b> Вы собираетесь удалить домен <b>%s</b>!";
+$lang['delete']['remove_syncjob_warning'] = "<b>Внимание:</b> Вы собираетесь удалить задание синхронизации для пользователя <b>%s</b>!";
+$lang['delete']['remove_domainalias_warning'] = "<b>Внимание:</b> Вы собираетесь удалить псевдоним домена <b>%s</b>!";
+$lang['delete']['remove_domainadmin_warning'] = "<b>Внимание:</b> Вы собираетесь удалить администратора домена <b>%s</b>!";
+$lang['delete']['remove_alias_warning'] = "<b>Внимание:</b> Вы собираетесь удалить псевдоним адрес <b>%s</b>!";
+$lang['delete']['remove_mailbox_warning'] = "<b>Внимание:</b> Вы собираетесь удалить почтовый ящик <b>%s</b>!";
+$lang['delete']['remove_mailbox_details'] = "Почтовый ящик будет <b>очищен навсегда</b>!";
+$lang['delete']['remove_resource_warning'] = "<b>Внимание:</b> Вы собираетесь удалить ресурс <b>%s</b>!";
+$lang['delete']['remove_resource_details'] = "Ресурс будет <b>очищен навсегда</b>!";
+$lang['delete']['remove_domain_details'] = "Это также удаляет псевдонимы доменов.<br><br><b>Домен должен быть пустым для удаления.</b>";
+$lang['delete']['remove_syncjob_details'] = "Объекты из этого задания синхронизации больше не будут извлекаться с удаленного сервера.";
+$lang['delete']['remove_alias_details'] = "Пользователи больше не смогут получать почту или отправлять почту с этого адреса.</b>";
+$lang['delete']['remove_button'] = "Удалить";
+$lang['delete']['previous'] = "Предыдущая страница";
+$lang['edit']['syncjob'] = "Изменить задание синхронизации";
+$lang['edit']['save'] = "Сохранить";
+$lang['edit']['username'] = "Логин";
+$lang['edit']['hostname'] = "Имя хоста";
+$lang['edit']['encryption'] = "Шифрование";
+$lang['edit']['maxage'] = 'Maximum age of messages in days that will be polled from remote<br><small>(0 = ignore age)</small>';
+$lang['edit']['subfolder2'] = 'Sync into subfolder on destination<br><small>(empty = do not use subfolder)</small>';
+$lang['edit']['mins_interval'] = "Интервал (минуты)";
+$lang['edit']['exclude'] = 'Exclude objects (regex)';
+$lang['edit']['save'] = "Сохранить";
+$lang['edit']['archive'] = "Доступ к архиву";
+$lang['edit']['max_mailboxes'] = "Максимум почтовых ящиков";
+$lang['edit']['title'] = "Добавить объект";
+$lang['edit']['target_address'] = 'Goto address/es <small>(comma-separated)</small>';
+$lang['edit']['active'] = "Активность";
+$lang['edit']['target_domain'] = "Основной домен";
+$lang['edit']['password'] = "Пароль";
+$lang['edit']['ratelimit'] = 'Outgoing rate limit/h';
+$lang['danger']['ratelimt_less_one'] = 'Outgoing rate limit/h must not be less than 1';
+$lang['edit']['password_repeat'] = "Повторить пароль";
+$lang['edit']['domain_admin'] = "Редактирование администратора домена";
+$lang['edit']['domain'] = "Изменить домен";
+$lang['edit']['alias_domain'] = "Псевдоним домена";
+$lang['edit']['edit_alias_domain'] = "Изменить псевдоним домена";
+$lang['edit']['domains'] = "Домены";
+$lang['edit']['destroy'] = "Ручной ввод данных";
+$lang['edit']['alias'] = "Изменить псевдоним";
+$lang['edit']['mailbox'] = "Редактирование почтового ящика";
+$lang['edit']['description'] = "Описание";
+$lang['edit']['max_aliases'] = "Максимум псевдонимов";
+$lang['edit']['max_quota'] = "Максимальная квота на почтовый ящик (MiB)";
+$lang['edit']['domain_quota'] = "Квота домена";
+$lang['edit']['backup_mx_options'] = "Backup MX";
+$lang['edit']['relay_domain'] = 'Relay domain';
+$lang['edit']['relay_all'] = 'Relay all recipients';
+$lang['edit']['dkim_signature'] = "DKIM подпись";
+$lang['edit']['dkim_record_info'] = '<small>Please add a TXT record with the given value to your DNS settings.</small>';
+$lang['edit']['relay_all_info'] = '<small>If you choose <b>not</b> to relay all recipients, you will need to add a ("blind") mailbox for every single recipient that should be relayed.</small>';
+$lang['edit']['full_name'] = "Имя";
+$lang['edit']['quota_mb'] = "Квота (MiB)";
+$lang['edit']['sender_acl'] = "Отправлять письма от <small>(выбрать какой адрес(а) можно использовать в качестве отправителя)</small>";
+$lang['edit']['sender_acl_info'] = "Псевдонимы не могут быть отменены";
+$lang['edit']['dkim_txt_name'] = "Имя TXT записи";
+$lang['edit']['dkim_txt_value'] = "Значение TXT записи";
+$lang['edit']['previous'] = "Предыдущая страница";
+$lang['edit']['unchanged_if_empty'] = "Если без изменений, оставьте поле пустым";
+$lang['edit']['dont_check_sender_acl'] = "Отключить проверку отправителя для домена %s + псевдонимы домена";
+$lang['edit']['multiple_bookings'] = 'Multiple bookings';
+$lang['edit']['kind'] = "Вид";
+$lang['edit']['resource'] = "Ресурс";
+$lang['add']['syncjob'] = "Добавить задание синхронизации";
+$lang['add']['syncjob_hint'] = "Помните, что пароли должны быть сохранены как обычный текст!";
+$lang['add']['hostname'] = "Имя хоста";
+$lang['add']['port'] = "Порт";
+$lang['add']['username'] = "Логин";
+$lang['add']['enc_method'] = "Метод шифрования";
+$lang['add']['mins_interval'] = "Интервал опроса (в минутах)";
+$lang['add']['maxage'] = 'Maximum age of messages that will be polled from remote (0 = ignore age)';
+$lang['add']['subfolder2'] = "Синхронизировать в подпапку по назначению";
+$lang['add']['exclude'] = "Исключить объекты (regex)";
+$lang['add']['delete2duplicates'] = "Удалить дубликаты в получателях";
+$lang['edit']['delete2duplicates'] = "Удалить дубликаты в получателях";
+$lang['add']['title'] = "Добавить объект";
+$lang['add']['domain'] = "Домен";
+$lang['add']['active'] = "Активный";
+$lang['add']['multiple_bookings'] = 'Multiple bookings';
+$lang['add']['save'] = "Сохранить изменения";
+$lang['add']['description'] = "Описание";
+$lang['add']['max_aliases'] = "Максимум псевдонимов";
+$lang['add']['resource_name'] = "Имя ресурса";
+$lang['add']['max_mailboxes'] = "Максимум почтовых ящиков";
+$lang['add']['mailbox_quota_m'] = "Максимальная квота на почтовый ящик (MiB)";
+$lang['add']['domain_quota_m'] = "Общая квота домена (MiB)";
+$lang['add']['backup_mx_options'] = "Backup MX";
+$lang['add']['relay_all'] = "Relay all recipients";
+$lang['add']['relay_domain'] = "Relay this domain";
+$lang['add']['relay_all_info'] = '<small>If you choose <b>not</b> to relay all recipients, you will need to add a ("blind") mailbox for every single recipient that should be relayed.</small>';
+$lang['add']['alias'] = "Псевдоним(ы)";
+$lang['add']['alias_spf_fail'] = '<b>Заметка:</b> If your chosen destination address is an external mailbox, the <b>receiving mailserver</b> may reject your message due to an SPF failure.</a>';
+$lang['add']['alias_address'] = "Псевдоним адрес(а)";
+$lang['add']['alias_address_info'] = '<small>Full email address/es or @example.com, to catch all messages for a domain (comma-separated). <b>mailcow domains only</b>.</small>';
+$lang['add']['alias_domain_info'] = '<small>Только допустимые доменные имена (через запятую).</small>';
+$lang['add']['target_address'] = "Основной адрес";
+$lang['add']['target_address_info'] = "<small>Адрес(а) электронной почты (через запятую).</small>";
+$lang['add']['alias_domain'] = "Псевдоним домена";
+$lang['add']['select'] = "Пожалуйста, выберите...";
+$lang['add']['target_domain'] = "Основной домен";
+$lang['add']['mailbox'] = "Почтовый ящик";
+$lang['add']['resource'] = "Ресурс";
+$lang['add']['kind'] = "Вид";
+$lang['add']['mailbox_username'] = "Адрес электронной почты, без @example.com";
+$lang['add']['full_name'] = "Имя";
+$lang['add']['quota_mb'] = "Квота (MiB):";
+$lang['add']['select_domain'] = "Выберите основной домен";
+$lang['add']['password'] = "Пароль";
+$lang['add']['password_repeat'] = "Повторить пароль";
+$lang['add']['previous'] = "Предыдущая страница";
+$lang['add']['restart_sogo_hint'] = "После добавления нового домена потребуется перезагрузить SOGo!";
+$lang['login']['title'] = "Логин";
+$lang['login']['administration'] = "Администрирование";
+$lang['login']['administration_details'] = "Пожалуйста, используйте вашу учетную запись администратора для выполнения административных задач";
+$lang['login']['user_settings'] = "Настройки пользователя";
+$lang['login']['user_settings_details'] = "Пользователи почтовых ящиков могут использовать пользовательский интерфейс mailcow, чтобы изменять свой пароль, создавать временные псевдонимы (псевдонимы спама), настраивать поведение спам-фильтра или импортировать сообщения с удаленного сервера IMAP.";
+$lang['login']['username'] = "Логин";
+$lang['login']['password'] = "Пароль";
+$lang['login']['reset_password'] = "Сбросить пароль";
+$lang['login']['login'] = "Войти";
+$lang['login']['previous'] = "Предыдущая страница";
+$lang['login']['delayed'] = 'Login was delayed by %s seconds.';
+$lang['tfa']['tfa'] = "Двухфакторная проверка подлинности";
+$lang['tfa']['set_tfa'] = "Использовать двухфакторный метод проверки подлинности";
+$lang['tfa']['yubi_otp'] = "Yubico OTP аутентификация";
+$lang['tfa']['key_id'] = "Идентификатор для вашего YubiKey";
+$lang['tfa']['api_register'] = 'mailcow использует Yubico Cloud API. Пожалуйста, получите ключ API для вашего ключа <a href="https://upgrade.yubico.com/getapikey/" target="_blank">тут</a>.';
+$lang['tfa']['u2f'] = "U2F проверка подлинности";
+$lang['tfa']['hotp'] = "HOTP проверка подлинности";
+$lang['tfa']['totp'] = "TOTP проверка подлинности";
+$lang['tfa']['none'] = "Отключен";
+$lang['tfa']['delete_tfa'] = "Отключить TFA";
+$lang['tfa']['disable_tfa'] = "Отключить TFA до следующего удачного входа";
+$lang['tfa']['confirm_tfa'] = "Пожалуйста, подтвердите свой одноразовый пароль в поле ниже";
+$lang['tfa']['confirm'] = "Подтвердить";
+$lang['tfa']['otp'] = "Одноразовый пароль";
+$lang['tfa']['trash_login'] = "Некорректный логин";
+$lang['tfa']['select'] = "Пожалуйста выберите";
+$lang['tfa']['waiting_usb_auth'] = "<i>Ждем USB-устройства...</i><br><br>Пожалуйста, нажмите кнопку на USB-устройстве U2F.";
+$lang['tfa']['waiting_usb_register'] = "<i>Ждем USB-устройства...</i><br><br>Пожалуйста, введите свой пароль выше и подтвердите регистрацию U2F, нажав кнопку на USB-устройстве U2F.";
+$lang['admin']['search_domain_da'] = "Поиск домена";
+$lang['admin']['restrictions'] = "Настройки Postfix";
+$lang['admin']['rr'] = "Настройки получателя";
+$lang['admin']['sr'] = "Настройки отправителя";
+$lang['admin']['reset_defaults'] = "Сброс по умолчанию";
+$lang['admin']['sr'] = "Настройки отправителя";
+$lang['admin']['r_inactive'] = "Неактивные элементы";
+$lang['admin']['r_active'] = "Активные элементы";
+$lang['admin']['r_info'] = "Выделенные серым цветом элементы в списке активных элементов заблокированы от перемещения в список неактивных элементов, так как их отключение может непредсказуемо повлиять на работу mailcow. Unknown restrictions will be set in order of appearance anyway. <br>Вы можете добавить новые элементы в <code>inc/vars.local.inc.php</code>, что бы иметь возможно переключать их.";
+$lang['admin']['public_folders'] = "Общие папки";
+$lang['admin']['public_folders_text'] = 'A namespace "Public" is created. Below\'s public folder name indicates the name of the first auto-created mailbox within this namespace.';
+$lang['admin']['public_folder_name'] = "Имя папки";
+$lang['admin']['public_folder_enable'] = "Включение общих папок";
+$lang['admin']['public_folder_enable_text'] = "Отключение этой опции не приведет к удалению почты из общих папок";
+$lang['admin']['public_folder_pusf'] = 'Enable per-user seen flag';
+$lang['admin']['public_folder_pusf_text'] = 'A "per-user seen flag"-enabled system will not mark a mail as read for User B, when User A has seen it, but User B did not.';
+$lang['admin']['privacy'] = "Конфедоциальность";
+$lang['admin']['privacy_text'] = 'This option enables a PCRE table to remove "User-Agent", "X-Enigmail", "X-Mailer", "X-Originating-IP" and replaces "Received: from" headers with localhost/127.0.0.1.';
+$lang['admin']['privacy_anon_mail'] = "Анонимизировать исходящую почту";
+$lang['admin']['dkim_txt_name'] = "Имя TXT записи";
+$lang['admin']['dkim_txt_value'] = "Значение TXT записи";
+$lang['admin']['dkim_key_length'] = "Длина ключа";
+$lang['admin']['dkim_key_valid'] = "Ключ действителен";
+$lang['admin']['dkim_key_unused'] = "Неиспользованный ключ";
+$lang['admin']['dkim_key_missing'] = "Ключ отсутствует";
+$lang['admin']['dkim_key_hint'] = "Селектор для DKIM ключей <code>dkim</code>. Подсказка: При добавлении записи на DNS-сервере, укажите Имя TXT записи <code>dkim._domainkey</code>.";
+$lang['admin']['previous'] = "Предыдущая страница";
+$lang['admin']['quota_mb'] = "Квота (MiB)";
+$lang['admin']['sender_acl'] = "Разрешить отправлять письма от";
+$lang['admin']['msg_size'] = "Максимальный размер письма";
+$lang['admin']['msg_size_limit'] = "Сейчас максимальный размер письма";
+$lang['admin']['msg_size_limit_details'] = "Применение нового ограничения перезагрузит Postfix и веб-сервер";
+$lang['admin']['save'] = "Сохранить изменения";
+$lang['admin']['maintenance'] = "Техническое обслуживание и информация";
+$lang['admin']['sys_info'] = "Системная информация";
+$lang['admin']['dkim_add_key'] = "Добавить DKIM ключ";
+$lang['admin']['dkim_keys'] = "DKIM ключи";
+$lang['admin']['add'] = "Добавить";
+$lang['admin']['configuration'] = "Конфигурации";
+$lang['admin']['password'] = "Пароль";
+$lang['admin']['password_repeat'] = "Повторить пароль";
+$lang['admin']['active'] = "Активный";
+$lang['admin']['action'] = "Действия";
+$lang['admin']['add_domain_admin'] = "Добавить администратора домена";
+$lang['admin']['admin_domains'] = "Домен";
+$lang['admin']['domain_admins'] = "Администраторы домена";
+$lang['admin']['username'] = "Логин";
+$lang['admin']['edit'] = "Изменить";
+$lang['admin']['remove'] = "Удалить";
+$lang['admin']['save'] = "Сохранить изменения";
+$lang['admin']['admin'] = "Администратор";
+$lang['admin']['admin_details'] = "Изменить данные администратора";
+$lang['admin']['unchanged_if_empty'] = "Если без изменений, оставьте поле пустым";
+$lang['admin']['yes'] = '&#10004;';
+$lang['admin']['no'] = '&#10008;';
+$lang['admin']['access'] = "Права доступа";
+$lang['admin']['invalid_max_msg_size'] = "Неверно указан максимальный размер письма";
+$lang['admin']['site_not_found'] = "Не удается найти конфигурацию mailcow";
+$lang['admin']['public_folder_empty'] = "Имя общей папки не может быть пустым";
+$lang['admin']['set_rr_failed'] = "Не установить настройки Postfix";
+$lang['admin']['no_record'] = "Нет записей";

From 8fb6a4c34d687993f3f3490a8bd390be289bc379 Mon Sep 17 00:00:00 2001
From: Dennis Neufeld <info@dennis14e.de>
Date: Tue, 16 May 2017 18:11:58 +0200
Subject: [PATCH 16/25] Language selection

Better way to select language
---
 data/web/inc/prerequisites.inc.php | 80 +++++++-----------------------
 data/web/inc/vars.inc.php          |  5 +-
 2 files changed, 22 insertions(+), 63 deletions(-)

diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php
index 8a96e66eb..d22065cb3 100644
--- a/data/web/inc/prerequisites.inc.php
+++ b/data/web/inc/prerequisites.inc.php
@@ -2,8 +2,8 @@
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/sessions.inc.php';
 
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php';
-if (file_exists('./inc/vars.local.inc.php')) {
-	include_once 'inc/vars.local.inc.php';
+if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php')) {
+  include_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php';
 }
 
 // Yubi OTP API
@@ -32,13 +32,13 @@ $offset = sprintf('%+d:%02d', $hrs*$sgn, $mins);
 
 $dsn = $database_type . ":host=" . $database_host . ";dbname=" . $database_name;
 $opt = [
-    PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
-    PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-    PDO::ATTR_EMULATE_PREPARES   => false,
-    PDO::MYSQL_ATTR_INIT_COMMAND => "SET time_zone = '" . $offset . "'",
+  PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
+  PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+  PDO::ATTR_EMULATE_PREPARES   => false,
+  PDO::MYSQL_ATTR_INIT_COMMAND => "SET time_zone = '" . $offset . "'",
 ];
 try {
-	$pdo = new PDO($dsn, $database_user, $database_pass, $opt);
+  $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
 }
 catch (PDOException $e) {
 ?>
@@ -47,64 +47,20 @@ catch (PDOException $e) {
 exit;
 }
 
+// Set language
 $_SESSION['mailcow_locale'] = strtolower(trim($DEFAULT_LANG));
-setcookie('language', $DEFAULT_LANG);
-if (isset($_COOKIE['language'])) {
-	switch ($_COOKIE['language']) {
-		case "de":
-			$_SESSION['mailcow_locale'] = 'de';
-			setcookie('language', 'de');
-		break;
-		case "en":
-			$_SESSION['mailcow_locale'] = 'en';
-			setcookie('language', 'en');
-		break;
-		case "es":
-			$_SESSION['mailcow_locale'] = 'es';
-			setcookie('language', 'es');
-		break;
-		case "nl":
-			$_SESSION['mailcow_locale'] = 'nl';
-			setcookie('language', 'nl');
-		break;
-		case "pt":
-			$_SESSION['mailcow_locale'] = 'pt';
-			setcookie('language', 'pt');
-		break;
-    case "ru":
-			$_SESSION['mailcow_locale'] = 'ru';
-			setcookie('language', 'ru');
-		break;
-	}
+
+if (isset($_GET['lang']) && in_array($_GET['lang'], $AVAILABLE_LANGUAGES)) {
+  $_SESSION['mailcow_locale'] = $_GET['lang'];
 }
-if (isset($_GET['lang'])) {
-	switch ($_GET['lang']) {
-		case "de":
-			$_SESSION['mailcow_locale'] = 'de';
-			setcookie('language', 'de');
-		break;
-		case "en":
-			$_SESSION['mailcow_locale'] = 'en';
-			setcookie('language', 'en');
-		break;
-		case "es":
-			$_SESSION['mailcow_locale'] = 'es';
-			setcookie('language', 'es');
-		break;
-		case "nl":
-			$_SESSION['mailcow_locale'] = 'nl';
-			setcookie('language', 'nl');
-		break;
-		case "pt":
-			$_SESSION['mailcow_locale'] = 'pt';
-			setcookie('language', 'pt');
-		break;
-		case "ru":
-			$_SESSION['mailcow_locale'] = 'ru';
-			setcookie('language', 'ru');
-		break;
-	}
+elseif (isset($_COOKIE['language']) && in_array($_COOKIE['language'], $AVAILABLE_LANGUAGES)) {
+  $_SESSION['mailcow_locale'] = $_COOKIE['language'];
 }
+if (isset($_SESSION['mailcow_locale']) && file_exists($_SERVER['DOCUMENT_ROOT'] . '/lang/lang.'.$_SESSION['mailcow_locale'].'.php')) {
+  $_SESSION['mailcow_locale'] = strtolower(trim($DEFAULT_LANG));
+}
+setcookie('language', $_SESSION['mailcow_locale']);
+
 require_once $_SERVER['DOCUMENT_ROOT'] . '/lang/lang.en.php';
 include $_SERVER['DOCUMENT_ROOT'] . '/lang/lang.'.$_SESSION['mailcow_locale'].'.php';
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/functions.inc.php';
diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index 8bf49f092..62bdf18b2 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -27,9 +27,12 @@ $FORM_ACTION = "previous";
 $MC_DKIM_TXTS = "/data/dkim/txt";
 $MC_DKIM_KEYS = "/data/dkim/keys";
 
-// Change default language, "en", "es" "pt", "de", "ru" or "nl"
+// Change default language, "de", "en", "es", "nl", "pt", "ru"
 $DEFAULT_LANG = "en";
 
+// Available languages
+$AVAILABLE_LANGUAGES = array("de", "en", "es", "nl", "pt", "ru");
+
 // Change theme (default: lumen)
 // Needs to be one of those: cerulean, cosmo, cyborg, darkly, flatly, journal, lumen, paper, readable, sandstone,
 // simplex, slate, spacelab, superhero, united, yeti

From 9f4491b9be2d682a3bd95c610852720d36dfb0be Mon Sep 17 00:00:00 2001
From: Dennis Neufeld <info@dennis14e.de>
Date: Tue, 16 May 2017 18:17:31 +0200
Subject: [PATCH 17/25] Language selection: Fix missing negation

---
 data/web/inc/prerequisites.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php
index d22065cb3..57ff479a4 100644
--- a/data/web/inc/prerequisites.inc.php
+++ b/data/web/inc/prerequisites.inc.php
@@ -56,7 +56,7 @@ if (isset($_GET['lang']) && in_array($_GET['lang'], $AVAILABLE_LANGUAGES)) {
 elseif (isset($_COOKIE['language']) && in_array($_COOKIE['language'], $AVAILABLE_LANGUAGES)) {
   $_SESSION['mailcow_locale'] = $_COOKIE['language'];
 }
-if (isset($_SESSION['mailcow_locale']) && file_exists($_SERVER['DOCUMENT_ROOT'] . '/lang/lang.'.$_SESSION['mailcow_locale'].'.php')) {
+if (isset($_SESSION['mailcow_locale']) && !file_exists($_SERVER['DOCUMENT_ROOT'] . '/lang/lang.'.$_SESSION['mailcow_locale'].'.php')) {
   $_SESSION['mailcow_locale'] = strtolower(trim($DEFAULT_LANG));
 }
 setcookie('language', $_SESSION['mailcow_locale']);

From b2a5bf0453486867e9e99e772d822b7fbfb2b691 Mon Sep 17 00:00:00 2001
From: Dennis Neufeld <info@dennis14e.de>
Date: Tue, 16 May 2017 19:20:58 +0200
Subject: [PATCH 18/25] Formatting, Updated Bootstrap/Bootswatch

---
 data/web/autoconfig.php        |  30 ++-
 data/web/inc/footer.inc.php    | 474 +++++++++++++++++----------------
 data/web/inc/header.inc.php    | 237 +++++++++--------
 data/web/inc/languages.min.css |   2 +-
 data/web/inc/vars.inc.php      |  18 +-
 data/web/index.php             | 163 ++++++------
 6 files changed, 467 insertions(+), 457 deletions(-)

diff --git a/data/web/autoconfig.php b/data/web/autoconfig.php
index ad4857b8f..d01bc724e 100644
--- a/data/web/autoconfig.php
+++ b/data/web/autoconfig.php
@@ -1,24 +1,28 @@
 <?php
-require_once "inc/vars.inc.php";
-if (empty($mailcow_hostname)) { exit(); }
-header("Content-Type: application/xml");
+require_once 'inc/vars.inc.php';
+
+if (empty($mailcow_hostname)) {
+  exit();
+}
+
+header('Content-Type: application/xml');
 ?>
-<?='<?xml version="1.0"?>';?>
+<?= '<?xml version="1.0"?>'; ?>
 <clientConfig version="1.1">
-    <emailProvider id="<?=$mailcow_hostname;?>">
+    <emailProvider id="<?= $mailcow_hostname; ?>">
       <domain>%EMAILDOMAIN%</domain>
       <displayName>A mailcow mail server</displayName>
       <displayShortName>mail server</displayShortName>
 
       <incomingServer type="imap">
-         <hostname><?=$mailcow_hostname;?></hostname>
+         <hostname><?= $mailcow_hostname; ?></hostname>
          <port>993</port>
          <socketType>SSL</socketType>
          <username>%EMAILADDRESS%</username>
          <authentication>password-cleartext</authentication>
       </incomingServer>
       <incomingServer type="imap">
-         <hostname><?=$mailcow_hostname;?></hostname>
+         <hostname><?= $mailcow_hostname; ?></hostname>
          <port>143</port>
          <socketType>STARTTLS</socketType>
          <username>%EMAILADDRESS%</username>
@@ -26,14 +30,14 @@ header("Content-Type: application/xml");
       </incomingServer>
 
       <incomingServer type="pop3">
-         <hostname><?=$mailcow_hostname;?></hostname>
+         <hostname><?= $mailcow_hostname; ?></hostname>
          <port>995</port>
          <socketType>SSL</socketType>
          <username>%EMAILADDRESS%</username>
          <authentication>password-cleartext</authentication>
       </incomingServer>
       <incomingServer type="pop3">
-         <hostname><?=$mailcow_hostname;?></hostname>
+         <hostname><?= $mailcow_hostname; ?></hostname>
          <port>110</port>
          <socketType>STARTTLS</socketType>
          <username>%EMAILADDRESS%</username>
@@ -41,7 +45,7 @@ header("Content-Type: application/xml");
       </incomingServer>
 
       <outgoingServer type="smtp">
-         <hostname><?=$mailcow_hostname;?></hostname>
+         <hostname><?= $mailcow_hostname; ?></hostname>
          <port>465</port>
          <socketType>SSL</socketType>
          <username>%EMAILADDRESS%</username>
@@ -49,14 +53,14 @@ header("Content-Type: application/xml");
       </outgoingServer>
 
       <outgoingServer type="smtp">
-         <hostname><?=$mailcow_hostname;?></hostname>
+         <hostname><?= $mailcow_hostname; ?></hostname>
          <port>587</port>
          <socketType>STARTTLS</socketType>
          <username>%EMAILADDRESS%</username>
          <authentication>password-cleartext</authentication>
       </outgoingServer>
 
-      <enable visiturl="https://<?=$mailcow_hostname;?>/admin.php">
+      <enable visiturl="https://<?= $mailcow_hostname; ?>/admin.php">
          <instruction>If you didn't change the password given to you by the administrator or if you didn't change it in a long time, please consider doing that now.</instruction>
          <instruction lang="de">Sollten Sie das Ihnen durch den Administrator vergebene Passwort noch nicht geändert haben, empfehlen wir dies nun zu tun. Auch ein altes Passwort sollte aus Sicherheitsgründen geändert werden.</instruction>
       </enable>
@@ -64,6 +68,6 @@ header("Content-Type: application/xml");
     </emailProvider>
 
     <webMail>
-      <loginPage url="https://<?=$mailcow_hostname;?>/SOGo/" />
+      <loginPage url="https://<?= $mailcow_hostname; ?>/SOGo/" />
     </webMail>
 </clientConfig>
diff --git a/data/web/inc/footer.inc.php b/data/web/inc/footer.inc.php
index 605a4e7c8..eb2d9ce8b 100644
--- a/data/web/inc/footer.inc.php
+++ b/data/web/inc/footer.inc.php
@@ -1,234 +1,240 @@
-<?php
-include("inc/tfa_modals.php");
-if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admin"):
-?>
-<div id="RestartSOGo" class="modal fade" role="dialog">
-	<div class="modal-dialog">
-		<div class="modal-content">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal">&times;</button>
-			<h4 class="modal-title"><?=$lang['footer']['restart_sogo'];?></h4>
-		</div>
-		<div class="modal-body">
-			<p><?=$lang['footer']['restart_sogo_info'];?></p>
-			<hr />
-			<button class="btn btn-md btn-primary" id="triggerRestartSogo"><?=$lang['footer']['restart_now'];?></button>
-			<br /><br />
-			<div id="statusTriggerRestartSogo"></div>
-		</div>
-		</div>
-	</div>
-</div>
-<?php
-endif;
-?>
-<div id="ConfirmDeleteModal" class="modal fade" role="dialog">
-	<div class="modal-dialog">
-		<div class="modal-content">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal">&times;</button>
-			<h4 class="modal-title"><?=$lang['footer']['confirm_delete'];?></h4>
-		</div>
-		<div class="modal-body">
-			<p><?=$lang['footer']['delete_these_items'];?></p>
-      <ul id="ItemsToDelete"></ul>
-			<hr />
-			<button class="btn btn-sm btn-danger" id="IsConfirmed"><?=$lang['footer']['delete_now'];?></button>
-			<button class="btn btn-sm btn-default" id="isCanceled"><?=$lang['footer']['cancel'];?></button>
-		</div>
-		</div>
-	</div>
-</div>
-<div style="margin-bottom:100px"></div>
-<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"></script>
-<script src="/js/bootstrap-switch.min.js"></script>
-<script src="/js/bootstrap-slider.min.js"></script>
-<script src="/js/bootstrap-select.min.js"></script>
-<script src="/js/notifications.min.js"></script>
-<script src="/js/u2f-api.js"></script>
-<script>
-// Select language and reopen active URL without POST
-function setLang(sel) {
-	$.post( "<?=$_SERVER['REQUEST_URI'];?>", {lang: sel} );
-	window.location.href = window.location.pathname + window.location.search;
-}
-
-$(document).ready(function() {
-  function mailcow_alert_box(message, type) {
-    $.notify({message: message},{type: type,placement: {from: "bottom",align: "right"},animate: {enter: 'animated fadeInUp',exit: 'animated fadeOutDown'}});
-  }
-  <?php if (isset($_SESSION['return'])): ?>
-  mailcow_alert_box("<?=$_SESSION['return']['msg'];?>",  "<?=$_SESSION['return']['type'];?>");
-  <?php endif; unset($_SESSION['return']); ?>
-  // Confirm TFA modal
-  <?php if (isset($_SESSION['pending_tfa_method'])):?>
-  $('#ConfirmTFAModal').modal({
-    backdrop: 'static',
-    keyboard: false
-  }); 
-  $('#ConfirmTFAModal').on('shown.bs.modal', function(){
-      $(this).find('#token').focus();
-      // If U2F
-      if(document.getElementById("u2f_auth_data") !== null) {
-        $.ajax({
-          type: "GET",
-          cache: false,
-          dataType: 'script',
-          url: "/api/v1/get/u2f-authentication/<?=(isset($_SESSION['pending_mailcow_cc_username'])) ? $_SESSION['pending_mailcow_cc_username'] : null;?>",
-          success: function(data){
-            data;
-          }
-        });
-        setTimeout(function() {
-          console.log("sign: ", req);
-          u2f.sign(req, function(data) {
-            var form = document.getElementById('u2f_auth_form');
-            var auth = document.getElementById('u2f_auth_data');
-            console.log("Authenticate callback", data);
-            auth.value = JSON.stringify(data);
-            form.submit();
-          });
-        }, 1000);
-      }
-  });
-  <?php endif; ?>
-
-  // Set TFA modals
-
-  $('#selectTFA').change(function () {
-    if ($(this).val() == "yubi_otp") {
-      $('#YubiOTPModal').modal('show');
-      $("option:selected").prop("selected", false);
-    }
-    if ($(this).val() == "totp") {
-      $('#TOTPModal').modal('show');
-      $("option:selected").prop("selected", false);
-    }
-    if ($(this).val() == "u2f") {
-      $('#U2FModal').modal('show');
-      $("option:selected").prop("selected", false);
-      $.ajax({
-        type: "GET",
-        cache: false,
-        dataType: 'script',
-        url: "/api/v1/get/u2f-registration/<?=(isset($_SESSION['mailcow_cc_username'])) ? $_SESSION['mailcow_cc_username'] : null;?>",
-        success: function(data){
-          data;
-        }
-      });
-      setTimeout(function() {
-        console.log("Register: ", req);
-        u2f.register([req], sigs, function(data) {
-          var form  = document.getElementById('u2f_reg_form');
-          var reg   = document.getElementById('u2f_register_data');
-          console.log("Register callback", data);
-          if (data.errorCode && data.errorCode != 0) {
-            var u2f_return_code = document.getElementById('u2f_return_code');
-            u2f_return_code.style.display = u2f_return_code.style.display === 'none' ? '' : null;
-            if (data.errorCode == "4") { data.errorCode = "4 - The presented device is not eligible for this request. For a registration request this may mean that the token is already registered, and for a sign request it may mean that the token does not know the presented key handle"; }
-            u2f_return_code.innerHTML = 'Error code: ' + data.errorCode;
-            return;
-          }
-          reg.value = JSON.stringify(data);
-          form.submit();
-        });
-      }, 1000);
-    }
-    if ($(this).val() == "none") {
-      $('#DisableTFAModal').modal('show');
-      $("option:selected").prop("selected", false);
-    }
-  });
-
-  // Activate tooltips
-  $(function () {
-    $('[data-toggle="tooltip"]').tooltip()
-  })
-	// Hide alerts after n seconds
-	$("#alert-fade").fadeTo(7000, 500).slideUp(500, function(){
-		$("#alert-fade").alert('close');
-	});
-
-	// Remember last navigation pill
-	(function () {
-		'use strict';
-    if ($('a[data-toggle="tab"]').length) {
-      $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-        var id = $(this).parents('[role="tablist"]').attr('id');
-        var key = 'lastTag';
-        if (id) {
-          key += ':' + id;
-        }
-        localStorage.setItem(key, $(e.target).attr('href'));
-      });
-      $('[role="tablist"]').each(function (idx, elem) {
-        var id = $(elem).attr('id');
-        var key = 'lastTag';
-        if (id) {
-          key += ':' + id;
-        }
-        var lastTab = localStorage.getItem(key);
-        if (lastTab) {
-          $('[href="' + lastTab + '"]').tab('show');
-        }
-      });
-    }
-	})();
-
-	// Disable submit after submitting form
-	$('form').submit(function() {
-		if ($('form button[type="submit"]').data('submitted') == '1') {
-			return false;
-		} else {
-			$(this).find('button[type="submit"]').first().text('<?=$lang['footer']['loading'];?>');
-			$('form button[type="submit"]').attr('data-submitted', '1');
-			function disableF5(e) { if ((e.which || e.keyCode) == 116 || (e.which || e.keyCode) == 82) e.preventDefault(); };
-			$(document).on("keydown", disableF5);
-		}
-	});
-
-	// IE fix to hide scrollbars when table body is empty
-	$('tbody').filter(function (index) {
-		return $(this).children().length < 1;
-	}).remove();
-
-	// Init Bootstrap Selectpicker
-	$('select').selectpicker();
-
-	// Trigger SOGo restart
-	$('#triggerRestartSogo').click(function(){
-		$(this).prop("disabled",true);
-		$(this).html('<span class="glyphicon glyphicon-refresh glyphicon-spin"></span> ');
-		$('#statusTriggerRestartSogo').text('Stopping SOGo workers, this may take a while... ');
-		$.ajax({
-			method: 'get',
-			url: 'call_sogo_ctrl.php',
-			data: {
-				'ajax': true,
-				'ACTION': 'stop'
-			},
-			success: function(data) {
-				$('#statusTriggerRestartSogo').append(data);
-				$('#statusTriggerRestartSogo').append('<br />Starting SOGo... ');
-				$.ajax({
-					method: 'get',
-					url: 'call_sogo_ctrl.php',
-					data: {
-						'ajax': true,
-						'ACTION': 'start'
-					},
-					success: function(data) {
-						$('#statusTriggerRestartSogo').append(data);
-						$('#triggerRestartSogo').html('<span class="glyphicon glyphicon-ok"></span> ');
-					}
-				});
-			}
-		});
-	});
-  $("<input type='hidden' value='<?=$_SESSION['CSRF']['TOKEN'];?>' />").attr("id", "csrf_token").attr("name", "csrf_token").appendTo("form");
-});
-</script>
-
-</body>
-</html>
-<?php $stmt = null; $pdo = null; ?>
+<?php
+include 'inc/tfa_modals.php';
+
+if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'admin'):
+?>
+<div id="RestartSOGo" class="modal fade" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+    <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal">&times;</button>
+      <h4 class="modal-title"><?= $lang['footer']['restart_sogo']; ?></h4>
+    </div>
+    <div class="modal-body">
+      <p><?= $lang['footer']['restart_sogo_info']; ?></p>
+      <hr>
+      <button class="btn btn-md btn-primary" id="triggerRestartSogo"><?= $lang['footer']['restart_now']; ?></button>
+      <br><br>
+      <div id="statusTriggerRestartSogo"></div>
+    </div>
+    </div>
+  </div>
+</div>
+<?php
+endif;
+?>
+<div id="ConfirmDeleteModal" class="modal fade" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+    <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal">&times;</button>
+      <h4 class="modal-title"><?= $lang['footer']['confirm_delete']; ?></h4>
+    </div>
+    <div class="modal-body">
+      <p><?= $lang['footer']['delete_these_items']; ?></p>
+      <ul id="ItemsToDelete"></ul>
+      <hr>
+      <button class="btn btn-sm btn-danger" id="IsConfirmed"><?= $lang['footer']['delete_now']; ?></button>
+      <button class="btn btn-sm btn-default" id="isCanceled"><?= $lang['footer']['cancel']; ?></button>
+    </div>
+    </div>
+  </div>
+</div>
+<div style="margin-bottom: 100px;"></div>
+
+<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha256-U5ZEeKfGNOja007MMD3YBI0A3OSZOQbeG6z2f2Y0hu8=" crossorigin="anonymous"></script>
+<script src="/js/bootstrap-switch.min.js"></script>
+<script src="/js/bootstrap-slider.min.js"></script>
+<script src="/js/bootstrap-select.min.js"></script>
+<script src="/js/notifications.min.js"></script>
+<script src="/js/u2f-api.js"></script>
+<script>
+// Select language and reopen active URL without POST
+function setLang(sel) {
+  $.post( "<?= $_SERVER['REQUEST_URI']; ?>", {lang: sel} );
+  window.location.href = window.location.pathname + window.location.search;
+}
+
+$(document).ready(function() {
+  function mailcow_alert_box(message, type) {
+    $.notify({message: message},{type: type,placement: {from: "bottom",align: "right"},animate: {enter: 'animated fadeInUp',exit: 'animated fadeOutDown'}});
+  }
+  <?php if (isset($_SESSION['return'])): ?>
+  mailcow_alert_box("<?= $_SESSION['return']['msg']; ?>",  "<?= $_SESSION['return']['type']; ?>");
+  <?php endif; unset($_SESSION['return']); ?>
+  // Confirm TFA modal
+  <?php if (isset($_SESSION['pending_tfa_method'])):?>
+  $('#ConfirmTFAModal').modal({
+    backdrop: 'static',
+    keyboard: false
+  });
+  $('#ConfirmTFAModal').on('shown.bs.modal', function(){
+      $(this).find('#token').focus();
+      // If U2F
+      if(document.getElementById("u2f_auth_data") !== null) {
+        $.ajax({
+          type: "GET",
+          cache: false,
+          dataType: 'script',
+          url: "/api/v1/get/u2f-authentication/<?= (isset($_SESSION['pending_mailcow_cc_username'])) ? $_SESSION['pending_mailcow_cc_username'] : null; ?>",
+          success: function(data){
+            data;
+          }
+        });
+        setTimeout(function() {
+          console.log("sign: ", req);
+          u2f.sign(req, function(data) {
+            var form = document.getElementById('u2f_auth_form');
+            var auth = document.getElementById('u2f_auth_data');
+            console.log("Authenticate callback", data);
+            auth.value = JSON.stringify(data);
+            form.submit();
+          });
+        }, 1000);
+      }
+  });
+  <?php endif; ?>
+
+  // Set TFA modals
+
+  $('#selectTFA').change(function () {
+    if ($(this).val() == "yubi_otp") {
+      $('#YubiOTPModal').modal('show');
+      $("option:selected").prop("selected", false);
+    }
+    if ($(this).val() == "totp") {
+      $('#TOTPModal').modal('show');
+      $("option:selected").prop("selected", false);
+    }
+    if ($(this).val() == "u2f") {
+      $('#U2FModal').modal('show');
+      $("option:selected").prop("selected", false);
+      $.ajax({
+        type: "GET",
+        cache: false,
+        dataType: 'script',
+        url: "/api/v1/get/u2f-registration/<?= (isset($_SESSION['mailcow_cc_username'])) ? $_SESSION['mailcow_cc_username'] : null; ?>",
+        success: function(data){
+          data;
+        }
+      });
+      setTimeout(function() {
+        console.log("Register: ", req);
+        u2f.register([req], sigs, function(data) {
+          var form  = document.getElementById('u2f_reg_form');
+          var reg   = document.getElementById('u2f_register_data');
+          console.log("Register callback", data);
+          if (data.errorCode && data.errorCode != 0) {
+            var u2f_return_code = document.getElementById('u2f_return_code');
+            u2f_return_code.style.display = u2f_return_code.style.display === 'none' ? '' : null;
+            if (data.errorCode == "4") { data.errorCode = "4 - The presented device is not eligible for this request. For a registration request this may mean that the token is already registered, and for a sign request it may mean that the token does not know the presented key handle"; }
+            u2f_return_code.innerHTML = 'Error code: ' + data.errorCode;
+            return;
+          }
+          reg.value = JSON.stringify(data);
+          form.submit();
+        });
+      }, 1000);
+    }
+    if ($(this).val() == "none") {
+      $('#DisableTFAModal').modal('show');
+      $("option:selected").prop("selected", false);
+    }
+  });
+
+  // Activate tooltips
+  $(function () {
+    $('[data-toggle="tooltip"]').tooltip()
+  })
+  // Hide alerts after n seconds
+  $("#alert-fade").fadeTo(7000, 500).slideUp(500, function(){
+    $("#alert-fade").alert('close');
+  });
+
+  // Remember last navigation pill
+  (function () {
+    'use strict';
+    if ($('a[data-toggle="tab"]').length) {
+      $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+        var id = $(this).parents('[role="tablist"]').attr('id');
+        var key = 'lastTag';
+        if (id) {
+          key += ':' + id;
+        }
+        localStorage.setItem(key, $(e.target).attr('href'));
+      });
+      $('[role="tablist"]').each(function (idx, elem) {
+        var id = $(elem).attr('id');
+        var key = 'lastTag';
+        if (id) {
+          key += ':' + id;
+        }
+        var lastTab = localStorage.getItem(key);
+        if (lastTab) {
+          $('[href="' + lastTab + '"]').tab('show');
+        }
+      });
+    }
+  })();
+
+  // Disable submit after submitting form
+  $('form').submit(function() {
+    if ($('form button[type="submit"]').data('submitted') == '1') {
+      return false;
+    } else {
+      $(this).find('button[type="submit"]').first().text('<?= $lang['footer']['loading']; ?>');
+      $('form button[type="submit"]').attr('data-submitted', '1');
+      function disableF5(e) { if ((e.which || e.keyCode) == 116 || (e.which || e.keyCode) == 82) e.preventDefault(); };
+      $(document).on("keydown", disableF5);
+    }
+  });
+
+  // IE fix to hide scrollbars when table body is empty
+  $('tbody').filter(function (index) {
+    return $(this).children().length < 1;
+  }).remove();
+
+  // Init Bootstrap Selectpicker
+  $('select').selectpicker();
+
+  // Trigger SOGo restart
+  $('#triggerRestartSogo').click(function(){
+    $(this).prop("disabled",true);
+    $(this).html('<span class="glyphicon glyphicon-refresh glyphicon-spin"></span> ');
+    $('#statusTriggerRestartSogo').text('Stopping SOGo workers, this may take a while... ');
+    $.ajax({
+      method: 'get',
+      url: 'call_sogo_ctrl.php',
+      data: {
+        'ajax': true,
+        'ACTION': 'stop'
+      },
+      success: function(data) {
+        $('#statusTriggerRestartSogo').append(data);
+        $('#statusTriggerRestartSogo').append('<br>Starting SOGo...');
+        $.ajax({
+          method: 'get',
+          url: 'call_sogo_ctrl.php',
+          data: {
+            'ajax': true,
+            'ACTION': 'start'
+          },
+          success: function(data) {
+            $('#statusTriggerRestartSogo').append(data);
+            $('#triggerRestartSogo').html('<span class="glyphicon glyphicon-ok"></span> ');
+          }
+        });
+      }
+    });
+  });
+
+  // CSRF
+  $('<input type="hidden" value="<?= $_SESSION['CSRF']['TOKEN']; ?>">').attr('id', 'csrf_token').attr('name', 'csrf_token').appendTo('form');
+});
+</script>
+
+</body>
+</html>
+<?php
+$stmt = null;
+$pdo = null;
diff --git a/data/web/inc/header.inc.php b/data/web/inc/header.inc.php
index ca692e0de..e92403764 100644
--- a/data/web/inc/header.inc.php
+++ b/data/web/inc/header.inc.php
@@ -1,118 +1,119 @@
-<!DOCTYPE html>
-<html lang="<?= $_SESSION['mailcow_locale'] ?>">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>mailcow UI</title>
-<!--[if lt IE 9]>
-<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-<![endif]-->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.12.0/jquery.min.js" integrity="sha384-XxcvoeNF5V0ZfksTnV+bejnCsJjOOIzN6UVwF85WBsAnU3zeYh5bloN+L4WLgeNE" crossorigin="anonymous"></script>
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.6/<?=strtolower(trim($DEFAULT_THEME));?>/bootstrap.min.css">
-<link rel="stylesheet" href="/css/bootstrap-select.min.css">
-<link rel="stylesheet" href="/css/bootstrap-slider.min.css">
-<link rel="stylesheet" href="/css/bootstrap-switch.min.css">
-<link rel="stylesheet" href="/css/footable.bootstrap.min.css">
-<link rel="stylesheet" href="/inc/languages.min.css">
-<link rel="stylesheet" href="/css/mailcow.css">
-<link rel="stylesheet" href="/css/animate.min.css">
-<?=(preg_match("/mailbox.php/i", $_SERVER['REQUEST_URI'])) ? '<link rel="stylesheet" href="/css/mailbox.css">' : null;?>
-<?=(preg_match("/admin.php/i", $_SERVER['REQUEST_URI'])) ? '<link rel="stylesheet" href="/css/admin.css">' : null;?>
-<link rel="shortcut icon" href="/favicon.png" type="image/png">
-<link rel="icon" href="/favicon.png" type="image/png">
-</head>
-<body style="padding-top:70px">
-<nav class="navbar navbar-default navbar-fixed-top"  role="navigation">
-	<div class="container-fluid">
-		<div class="navbar-header">
-			<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-				<span class="sr-only">Toggle navigation</span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-				<span class="icon-bar"></span>
-			</button>
-			<a class="navbar-brand" href="/"><img height="32" alt="mailcow-logo" style="margin-top:-5px;" src="/img/cow_mailcow.svg" /></a>
-		</div>
-		<div id="navbar" class="navbar-collapse collapse">
-			<ul class="nav navbar-nav navbar-right">
-				<?php
-				if (isset($_SESSION['mailcow_locale'])) {
-				?>
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><span class="lang-sm lang-lbl" lang="<?=$_SESSION['mailcow_locale'];?>"></span><span class="caret"></span></a>
-					<ul class="dropdown-menu" role="menu">
-						<li <?=($_SESSION['mailcow_locale'] == 'de') ? 'class="active"' : ''?>> <a href="?<?= http_build_query(array_merge($_GET, array("lang" => "de"))) ?>"><span class="lang-xs lang-lbl-full" lang="de"></span></a></li>
-						<li <?=($_SESSION['mailcow_locale'] == 'en') ? 'class="active"' : ''?>> <a href="?<?= http_build_query(array_merge($_GET, array("lang" => "en"))) ?>"><span class="lang-xs lang-lbl-full" lang="en"></span></a></li>
-						<li <?=($_SESSION['mailcow_locale'] == 'es') ? 'class="active"' : ''?>> <a href="?<?= http_build_query(array_merge($_GET, array("lang" => "es"))) ?>"><span class="lang-xs lang-lbl-full" lang="es"></span></a></li>
-						<li <?=($_SESSION['mailcow_locale'] == 'nl') ? 'class="active"' : ''?>> <a href="?<?= http_build_query(array_merge($_GET, array("lang" => "nl"))) ?>"><span class="lang-xs lang-lbl-full" lang="nl"></span></a></li>
-						<li <?=($_SESSION['mailcow_locale'] == 'pt') ? 'class="active"' : ''?>> <a href="?<?= http_build_query(array_merge($_GET, array("lang" => "pt"))) ?>"><span class="lang-xs lang-lbl-full" lang="pt"></span></a></li>
-						<li <?=($_SESSION['mailcow_locale'] == 'ru') ? 'class="active"' : ''?>> <a href="?<?= http_build_query(array_merge($_GET, array("lang" => "ru"))) ?>"><span class="lang-xs lang-lbl-full" lang="ru"></span></a></li>
-					</ul>
-				</li>
-				<?php
-				}
-				if (isset($_SESSION['mailcow_cc_role'])) {
-				?>
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> <?=$lang['header']['mailcow_settings'];?> <span class="caret"></span></a>
-					<ul class="dropdown-menu" role="menu">
-					<?php
-						if (isset($_SESSION['mailcow_cc_role'])) {
-							if ($_SESSION['mailcow_cc_role'] == "admin") {
-							?>
-								<li <?=(preg_match("/admin/i", $_SERVER['REQUEST_URI'])) ? 'class="active"' : ''?>><a href="/admin.php"><?=$lang['header']['administration'];?></a></li>
-							<?php
-							}
-							if ($_SESSION['mailcow_cc_role'] == "admin" || $_SESSION['mailcow_cc_role'] == "domainadmin") {
-							?>
-								<li <?=(preg_match("/mailbox/i", $_SERVER['REQUEST_URI'])) ? 'class="active"' : ''?>><a href="/mailbox.php"><?=$lang['header']['mailboxes'];?></a></li>
-							<?php
-							}
-							if ($_SESSION['mailcow_cc_role'] != "admin") {
-							?>
-								<li <?=(preg_match("/user/i", $_SERVER['REQUEST_URI'])) ? 'class="active"' : ''?>><a href="/user.php"><?=$lang['header']['user_settings'];?></a></li>
-							<?php
-              }
-						}
-						?>
-					</ul>
-				</li>
-				<?php
-				if ($_SESSION['mailcow_cc_role'] == "admin"):
-				?>
-				<li><a href data-toggle="modal" data-target="#RestartSOGo"><span style="font-size:12px" class="glyphicon glyphicon-refresh" aria-hidden="true"></span> <?=$lang['header']['restart_sogo'];?></a></li>
-				<?php
-				endif;
-				?>
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><span class="glyphicon glyphicon-link" aria-hidden="true"></span> Apps <span class="caret"></span></a>
-					<ul class="dropdown-menu" role="menu">
-          <?php
-          foreach ($MAILCOW_APPS as $app):
-          ?>
-            <li><a href="<?=$app['link'];?>"><?=$app['name'];?></a></li>
-          <?php
-          endforeach;
-          ?>
-					</ul>
-				</li>
-        <?php
-				}
-				if (!isset($_SESSION["dual-login"]) && isset($_SESSION['mailcow_cc_username'])):
-				?>
-					<li><a style="border-left:1px solid #E7E7E7" href="#" onclick="logout.submit()"><?=sprintf($lang['header']['logged_in_as_logout'], $_SESSION['mailcow_cc_username']);?></a></li>
-				<?php
-				elseif (isset($_SESSION["dual-login"])):
-				?>
-					<li><a style="border-left:1px solid #E7E7E7" href="#" onclick="logout.submit()"><?=sprintf($lang['header']['logged_in_as_logout_dual'], $_SESSION['mailcow_cc_username'], $_SESSION["dual-login"]["username"]);?></a></li>
-				<?php
-				endif;
-				?>
-			</ul>
-		</div><!--/.nav-collapse -->
-	</div><!--/.container-fluid -->
-</nav>
-<form action="/" method="post" id="logout"><input type="hidden" name="logout"></form>
+<!DOCTYPE html>
+<html lang="<?= $_SESSION['mailcow_locale'] ?>">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>mailcow UI</title>
+<!--[if lt IE 9]>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js" integrity="sha256-3Jy/GbSLrg0o9y5Z5n1uw0qxZECH7C6OQpVBgNFYa0g=" crossorigin="anonymous"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js" integrity="sha256-g6iAfvZp+nDQ2TdTR/VVKJf3bGro4ub5fvWSWVRi2NE=" crossorigin="anonymous"></script>
+<![endif]-->
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.12.4/jquery.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous">
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.7/<?= strtolower(trim($DEFAULT_THEME)); ?>/bootstrap.min.css">
+<link rel="stylesheet" href="/css/bootstrap-select.min.css">
+<link rel="stylesheet" href="/css/bootstrap-slider.min.css">
+<link rel="stylesheet" href="/css/bootstrap-switch.min.css">
+<link rel="stylesheet" href="/css/footable.bootstrap.min.css">
+<link rel="stylesheet" href="/inc/languages.min.css">
+<link rel="stylesheet" href="/css/mailcow.css">
+<link rel="stylesheet" href="/css/animate.min.css">
+<?= (preg_match("/mailbox.php/i", $_SERVER['REQUEST_URI'])) ? '<link rel="stylesheet" href="/css/mailbox.css">' : null; ?>
+<?= (preg_match("/admin.php/i", $_SERVER['REQUEST_URI'])) ? '<link rel="stylesheet" href="/css/admin.css">' : null; ?>
+<link rel="shortcut icon" href="/favicon.png" type="image/png">
+<link rel="icon" href="/favicon.png" type="image/png">
+</head>
+<body style="padding-top: 70px;">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="/"><img height="32" alt="mailcow-logo" style="margin-top: -5px;" src="/img/cow_mailcow.svg"></a>
+    </div>
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav navbar-right">
+        <?php
+        if (isset($_SESSION['mailcow_locale'])) {
+        ?>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><span class="lang-sm lang-lbl" lang="<?= $_SESSION['mailcow_locale']; ?>"></span><span class="caret"></span></a>
+          <ul class="dropdown-menu" role="menu">
+            <?php
+            foreach ($AVAILABLE_LANGUAGES as $language) {
+            ?>
+            <li<?= ($_SESSION['mailcow_locale'] == $language) ? ' class="active"' : ''; ?>><a href="?<?= http_build_query(array_merge($_GET, array('lang' => $language))); ?>"><span class="lang-xs lang-lbl-full" lang="<?= $language; ?>"></span></a></li>
+            <?php
+            }
+            ?>
+          </ul>
+        </li>
+        <?php
+        }
+        if (isset($_SESSION['mailcow_cc_role'])) {
+        ?>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><?= $lang['header']['mailcow_settings']; ?> <span class="caret"></span></a>
+          <ul class="dropdown-menu" role="menu">
+            <?php
+            if (isset($_SESSION['mailcow_cc_role'])) {
+              if ($_SESSION['mailcow_cc_role'] == 'admin') {
+              ?>
+                <li<?= (preg_match("/admin/i", $_SERVER['REQUEST_URI'])) ? ' class="active"' : ''; ?>><a href="/admin.php"><?= $lang['header']['administration']; ?></a></li>
+              <?php
+              }
+              if ($_SESSION['mailcow_cc_role'] == 'admin' || $_SESSION['mailcow_cc_role'] == 'domainadmin') {
+              ?>
+                <li<?= (preg_match("/mailbox/i", $_SERVER['REQUEST_URI'])) ? ' class="active"' : ''; ?>><a href="/mailbox.php"><?= $lang['header']['mailboxes']; ?></a></li>
+              <?php
+              }
+              if ($_SESSION['mailcow_cc_role'] != 'admin') {
+              ?>
+                <li<?= (preg_match("/user/i", $_SERVER['REQUEST_URI'])) ? ' class="active"' : ''; ?>><a href="/user.php"><?= $lang['header']['user_settings']; ?></a></li>
+              <?php
+              }
+            }
+            ?>
+          </ul>
+        </li>
+        <?php
+        if ($_SESSION['mailcow_cc_role'] == 'admin') {
+        ?>
+        <li><a href data-toggle="modal" data-target="#RestartSOGo"><span style="font-size: 12px;" class="glyphicon glyphicon-refresh" aria-hidden="true"></span> <?= $lang['header']['restart_sogo']; ?></a></li>
+        <?php
+        }
+        ?>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><span class="glyphicon glyphicon-link" aria-hidden="true"></span> Apps <span class="caret"></span></a>
+          <ul class="dropdown-menu" role="menu">
+          <?php
+          foreach ($MAILCOW_APPS as $app):
+          ?>
+            <li><a href="<?= $app['link']; ?>"><?= $app['name']; ?></a></li>
+          <?php
+          endforeach;
+          ?>
+          </ul>
+        </li>
+        <?php
+        }
+        if (!isset($_SESSION['dual-login']) && isset($_SESSION['mailcow_cc_username'])):
+        ?>
+          <li><a href="#" style="border-left: 1px solid #E7E7E7;" onclick="logout.submit()"><?= sprintf($lang['header']['logged_in_as_logout'], $_SESSION['mailcow_cc_username']); ?></a></li>
+        <?php
+        elseif (isset($_SESSION['dual-login'])):
+        ?>
+          <li><a href="#" style="border-left: 1px solid #E7E7E7;" onclick="logout.submit()"><?= sprintf($lang['header']['logged_in_as_logout_dual'], $_SESSION['mailcow_cc_username'], $_SESSION['dual-login']['username']); ?></a></li>
+        <?php
+        endif;
+        ?>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div><!--/.container-fluid -->
+</nav>
+<form action="/" method="post" id="logout"><input type="hidden" name="logout"></form>
diff --git a/data/web/inc/languages.min.css b/data/web/inc/languages.min.css
index 79b740c38..d0e5162c0 100644
--- a/data/web/inc/languages.min.css
+++ b/data/web/inc/languages.min.css
@@ -1 +1 @@
-.lang-xs{background-position:0 -473px;min-width:14px;height:11px;min-height:11px;max-height:11px;background-repeat:no-repeat;display:inline-block;background-image:url(languages.png)}.lang-sm{background-position:0 -1172px;min-width:22px;height:16px;min-height:16px;max-height:16px;background-repeat:no-repeat;display:inline-block;background-image:url(languages.png)}.lang-lg{background-position:0 -2134px;min-width:30px;height:22px;min-height:22px;max-height:22px;background-repeat:no-repeat;display:inline-block;background-image:url(languages.png)}.lang-xs[lang=ar]{background-position:0 0}.lang-xs[lang=be]{background-position:0 -11px}.lang-xs[lang=bg]{background-position:0 -22px}.lang-xs[lang=cs]{background-position:0 -33px}.lang-xs[lang=da]{background-position:0 -44px}.lang-xs[lang=de]{background-position:0 -55px}.lang-xs[lang=el]{background-position:0 -66px}.lang-xs[lang=en]{background-position:0 -77px}.lang-xs[lang=es]{background-position:0 -88px}.lang-xs[lang=et]{background-position:0 -99px}.lang-xs[lang=fi]{background-position:0 -110px}.lang-xs[lang=fr]{background-position:0 -121px}.lang-xs[lang=ga]{background-position:0 -132px}.lang-xs[lang=hi]{background-position:0 -143px}.lang-xs[lang=hr]{background-position:0 -154px}.lang-xs[lang=hu]{background-position:0 -165px}.lang-xs[lang=in]{background-position:0 -176px}.lang-xs[lang=is]{background-position:0 -187px}.lang-xs[lang=it]{background-position:0 -198px}.lang-xs[lang=iw]{background-position:0 -209px}.lang-xs[lang=ja]{background-position:0 -220px}.lang-xs[lang=ko]{background-position:0 -231px}.lang-xs[lang=lt]{background-position:0 -242px}.lang-xs[lang=lv]{background-position:0 -253px}.lang-xs[lang=mk]{background-position:0 -264px}.lang-xs[lang=ms]{background-position:0 -275px}.lang-xs[lang=mt]{background-position:0 -286px}.lang-xs[lang=nl]{background-position:0 -297px}.lang-xs[lang=no]{background-position:0 -308px}.lang-xs[lang=pl]{background-position:0 -319px}.lang-xs[lang=pt]{background-position:0 -330px}.lang-xs[lang=ro]{background-position:0 -341px}.lang-xs[lang=ru]{background-position:0 -352px}.lang-xs[lang=sk]{background-position:0 -363px}.lang-xs[lang=sl]{background-position:0 -374px}.lang-xs[lang=sq]{background-position:0 -385px}.lang-xs[lang=sr]{background-position:0 -396px}.lang-xs[lang=sv]{background-position:0 -407px}.lang-xs[lang=th]{background-position:0 -418px}.lang-xs[lang=tr]{background-position:0 -429px}.lang-xs[lang=uk]{background-position:0 -440px}.lang-xs[lang=vi]{background-position:0 -451px}.lang-xs[lang=zh]{background-position:0 -462px}.lang-sm[lang=ar]{background-position:0 -484px}.lang-sm[lang=be]{background-position:0 -500px}.lang-sm[lang=bg]{background-position:0 -516px}.lang-sm[lang=cs]{background-position:0 -532px}.lang-sm[lang=da]{background-position:0 -548px}.lang-sm[lang=de]{background-position:0 -564px}.lang-sm[lang=el]{background-position:0 -580px}.lang-sm[lang=en]{background-position:0 -596px}.lang-sm[lang=es]{background-position:0 -612px}.lang-sm[lang=et]{background-position:0 -628px}.lang-sm[lang=fi]{background-position:0 -644px}.lang-sm[lang=fr]{background-position:0 -660px}.lang-sm[lang=ga]{background-position:0 -676px}.lang-sm[lang=hi]{background-position:0 -692px}.lang-sm[lang=hr]{background-position:0 -708px}.lang-sm[lang=hu]{background-position:0 -724px}.lang-sm[lang=in]{background-position:0 -740px}.lang-sm[lang=is]{background-position:0 -756px}.lang-sm[lang=it]{background-position:0 -772px}.lang-sm[lang=iw]{background-position:0 -788px}.lang-sm[lang=ja]{background-position:0 -804px}.lang-sm[lang=ko]{background-position:0 -820px}.lang-sm[lang=lt]{background-position:0 -836px}.lang-sm[lang=lv]{background-position:0 -852px}.lang-sm[lang=mk]{background-position:0 -868px}.lang-sm[lang=ms]{background-position:0 -884px}.lang-sm[lang=mt]{background-position:0 -900px}.lang-sm[lang=nl]{background-position:0 -916px}.lang-sm[lang=no]{background-position:0 -932px}.lang-sm[lang=pl]{background-position:0 -948px}.lang-sm[lang=pt]{background-position:0 -964px}.lang-sm[lang=ro]{background-position:0 -980px}.lang-sm[lang=ru]{background-position:0 -996px}.lang-sm[lang=sk]{background-position:0 -1012px}.lang-sm[lang=sl]{background-position:0 -1028px}.lang-sm[lang=sq]{background-position:0 -1044px}.lang-sm[lang=sr]{background-position:0 -1060px}.lang-sm[lang=sv]{background-position:0 -1076px}.lang-sm[lang=th]{background-position:0 -1092px}.lang-sm[lang=tr]{background-position:0 -1108px}.lang-sm[lang=uk]{background-position:0 -1124px}.lang-sm[lang=vi]{background-position:0 -1140px}.lang-sm[lang=zh]{background-position:0 -1156px}.lang-lg[lang=ar]{background-position:0 -1188px}.lang-lg[lang=be]{background-position:0 -1210px}.lang-lg[lang=bg]{background-position:0 -1232px}.lang-lg[lang=cs]{background-position:0 -1254px}.lang-lg[lang=da]{background-position:0 -1276px}.lang-lg[lang=de]{background-position:0 -1298px}.lang-lg[lang=el]{background-position:0 -1320px}.lang-lg[lang=en]{background-position:0 -1342px}.lang-lg[lang=es]{background-position:0 -1364px}.lang-lg[lang=et]{background-position:0 -1386px}.lang-lg[lang=fi]{background-position:0 -1408px}.lang-lg[lang=fr]{background-position:0 -1430px}.lang-lg[lang=ga]{background-position:0 -1452px}.lang-lg[lang=hi]{background-position:0 -1474px}.lang-lg[lang=hr]{background-position:0 -1496px}.lang-lg[lang=hu]{background-position:0 -1518px}.lang-lg[lang=in]{background-position:0 -1540px}.lang-lg[lang=is]{background-position:0 -1562px}.lang-lg[lang=it]{background-position:0 -1584px}.lang-lg[lang=iw]{background-position:0 -1606px}.lang-lg[lang=ja]{background-position:0 -1628px}.lang-lg[lang=ko]{background-position:0 -1650px}.lang-lg[lang=lt]{background-position:0 -1672px}.lang-lg[lang=lv]{background-position:0 -1694px}.lang-lg[lang=mk]{background-position:0 -1716px}.lang-lg[lang=ms]{background-position:0 -1738px}.lang-lg[lang=mt]{background-position:0 -1760px}.lang-lg[lang=nl]{background-position:0 -1782px}.lang-lg[lang=no]{background-position:0 -1804px}.lang-lg[lang=pl]{background-position:0 -1826px}.lang-lg[lang=pt]{background-position:0 -1848px}.lang-lg[lang=ro]{background-position:0 -1870px}.lang-lg[lang=ru]{background-position:0 -1892px}.lang-lg[lang=sk]{background-position:0 -1914px}.lang-lg[lang=sl]{background-position:0 -1936px}.lang-lg[lang=sq]{background-position:0 -1958px}.lang-lg[lang=sr]{background-position:0 -1980px}.lang-lg[lang=sv]{background-position:0 -2002px}.lang-lg[lang=th]{background-position:0 -2024px}.lang-lg[lang=tr]{background-position:0 -2046px}.lang-lg[lang=uk]{background-position:0 -2068px}.lang-lg[lang=vi]{background-position:0 -2090px}.lang-lg[lang=zh]{background-position:0 -2112px}.lang-lbl-en:after,.lang-lbl-full:after,.lang-lbl:after{content:"Unknown language"}.lang-lbl[lang=ar]:after{content:"\000627\000644\000639\000631\000628\00064A\000629"}.lang-lbl[lang=be]:after{content:"\000411\000435\00043B\000430\000440\000443\000441\00043A\000456"}.lang-lbl[lang=bg]:after{content:"\000411\00044A\00043B\000433\000430\000440\000441\00043A\000438"}.lang-lbl[lang=cs]:after{content:"\00010Ce\000161tina"}.lang-lbl[lang=da]:after{content:"Dansk"}.lang-lbl[lang=de]:after{content:"Deutsch"}.lang-lbl[lang=el]:after{content:"\000395\0003BB\0003BB\0003B7\0003BD\0003B9\0003BA\0003AC"}.lang-lbl[lang=en]:after{content:"English"}.lang-lbl[lang=es]:after{content:"Espa\0000F1ol"}.lang-lbl[lang=et]:after{content:"Eesti"}.lang-lbl[lang=fi]:after{content:"Suomi"}.lang-lbl[lang=fr]:after{content:"Fran\0000E7ais"}.lang-lbl[lang=ga]:after{content:"Gaeilge"}.lang-lbl[lang=hi]:after{content:"\000939\00093F\000902\000926\000940"}.lang-lbl[lang=hr]:after{content:"Hrvatski"}.lang-lbl[lang=hu]:after{content:"Magyar"}.lang-lbl[lang=in]:after{content:"Bahasa\000020indonesia"}.lang-lbl[lang=is]:after{content:"\0000CDslenska"}.lang-lbl[lang=it]:after{content:"Italiano"}.lang-lbl[lang=iw]:after{content:"\0005E2\0005D1\0005E8\0005D9\0005EA"}.lang-lbl[lang=ja]:after{content:"\0065E5\00672C\008A9E"}.lang-lbl[lang=ko]:after{content:"\00D55C\00AD6D\00C5B4"}.lang-lbl[lang=lt]:after{content:"Lietuvi\000173"}.lang-lbl[lang=lv]:after{content:"Latvie\000161u"}.lang-lbl[lang=mk]:after{content:"\00041C\000430\00043A\000435\000434\00043E\00043D\000441\00043A\000438"}.lang-lbl[lang=ms]:after{content:"Bahasa\000020melayu"}.lang-lbl[lang=mt]:after{content:"Malti"}.lang-lbl[lang=nl]:after{content:"Nederlands"}.lang-lbl[lang=no]:after{content:"Norsk"}.lang-lbl[lang=pl]:after{content:"Polski"}.lang-lbl[lang=pt]:after{content:"Portugu\0000EAs"}.lang-lbl[lang=ro]:after{content:"Rom\0000E2n\000103"}.lang-lbl[lang=ru]:after{content:"\000420\000443\000441\000441\00043A\000438\000439"}.lang-lbl[lang=sk]:after{content:"Sloven\00010Dina"}.lang-lbl[lang=sl]:after{content:"Sloven\000161\00010Dina"}.lang-lbl[lang=sq]:after{content:"Shqipe"}.lang-lbl[lang=sr]:after{content:"\000421\000440\00043F\000441\00043A\000438"}.lang-lbl[lang=sv]:after{content:"Svenska"}.lang-lbl[lang=th]:after{content:"\000E44\000E17\000E22"}.lang-lbl[lang=tr]:after{content:"T\0000FCrk\0000E7e"}.lang-lbl[lang=uk]:after{content:"\000423\00043A\000440\000430\000457\00043D\000441\00044C\00043A\000430"}.lang-lbl[lang=vi]:after{content:"Ti\001EBFng\000020vi\001EC7t"}.lang-lbl[lang=zh]:after{content:"\004E2D\006587"}.lang-lbl-en[lang=ar]:after{content:"Arabic"}.lang-lbl-en[lang=be]:after{content:"Belarusian"}.lang-lbl-en[lang=bg]:after{content:"Bulgarian"}.lang-lbl-en[lang=cs]:after{content:"Czech"}.lang-lbl-en[lang=da]:after{content:"Danish"}.lang-lbl-en[lang=de]:after{content:"German"}.lang-lbl-en[lang=el]:after{content:"Greek"}.lang-lbl-en[lang=en]:after{content:"English"}.lang-lbl-en[lang=es]:after{content:"Spanish"}.lang-lbl-en[lang=et]:after{content:"Estonian"}.lang-lbl-en[lang=fi]:after{content:"Finnish"}.lang-lbl-en[lang=fr]:after{content:"French"}.lang-lbl-en[lang=ga]:after{content:"Irish"}.lang-lbl-en[lang=hi]:after{content:"Hindi"}.lang-lbl-en[lang=hr]:after{content:"Croatian"}.lang-lbl-en[lang=hu]:after{content:"Hungarian"}.lang-lbl-en[lang=in]:after{content:"Indonesian"}.lang-lbl-en[lang=is]:after{content:"Icelandic"}.lang-lbl-en[lang=it]:after{content:"Italian"}.lang-lbl-en[lang=iw]:after{content:"Hebrew"}.lang-lbl-en[lang=ja]:after{content:"Japanese"}.lang-lbl-en[lang=ko]:after{content:"Korean"}.lang-lbl-en[lang=lt]:after{content:"Lithuanian"}.lang-lbl-en[lang=lv]:after{content:"Latvian"}.lang-lbl-en[lang=mk]:after{content:"Macedonian"}.lang-lbl-en[lang=ms]:after{content:"Malay"}.lang-lbl-en[lang=mt]:after{content:"Maltese"}.lang-lbl-en[lang=nl]:after{content:"Dutch"}.lang-lbl-en[lang=no]:after{content:"Norwegian"}.lang-lbl-en[lang=pl]:after{content:"Polish"}.lang-lbl-en[lang=pt]:after{content:"Portuguese"}.lang-lbl-en[lang=ro]:after{content:"Romanian"}.lang-lbl-en[lang=ru]:after{content:"Russian"}.lang-lbl-en[lang=sk]:after{content:"Slovak"}.lang-lbl-en[lang=sl]:after{content:"Slovenian"}.lang-lbl-en[lang=sq]:after{content:"Albanian"}.lang-lbl-en[lang=sr]:after{content:"Serbian"}.lang-lbl-en[lang=sv]:after{content:"Swedish"}.lang-lbl-en[lang=th]:after{content:"Thai"}.lang-lbl-en[lang=tr]:after{content:"Turkish"}.lang-lbl-en[lang=uk]:after{content:"Ukrainian"}.lang-lbl-en[lang=vi]:after{content:"Vietnamese"}.lang-lbl-en[lang=zh]:after{content:"Chinese"}.lang-lbl-full[lang=ar]:after{content:"\000627\000644\000639\000631\000628\00064A\000629\0000A0/\0000A0Arabic"}.lang-lbl-full[lang=be]:after{content:"\000411\000435\00043B\000430\000440\000443\000441\00043A\000456\0000A0/\0000A0Belarusian"}.lang-lbl-full[lang=bg]:after{content:"\000411\00044A\00043B\000433\000430\000440\000441\00043A\000438\0000A0/\0000A0Bulgarian"}.lang-lbl-full[lang=cs]:after{content:"\00010Ce\000161tina\0000A0/\0000A0Czech"}.lang-lbl-full[lang=da]:after{content:"Dansk\0000A0/\0000A0Danish"}.lang-lbl-full[lang=de]:after{content:"Deutsch\0000A0/\0000A0German"}.lang-lbl-full[lang=el]:after{content:"\000395\0003BB\0003BB\0003B7\0003BD\0003B9\0003BA\0003AC\0000A0/\0000A0Greek"}.lang-lbl-full[lang=en]:after{content:"English\0000A0/\0000A0English"}.lang-lbl-full[lang=es]:after{content:"Espa\0000F1ol\0000A0/\0000A0Spanish"}.lang-lbl-full[lang=et]:after{content:"Eesti\0000A0/\0000A0Estonian"}.lang-lbl-full[lang=fi]:after{content:"Suomi\0000A0/\0000A0Finnish"}.lang-lbl-full[lang=fr]:after{content:"Fran\0000E7ais\0000A0/\0000A0French"}.lang-lbl-full[lang=ga]:after{content:"Gaeilge\0000A0/\0000A0Irish"}.lang-lbl-full[lang=hi]:after{content:"\000939\00093F\000902\000926\000940\0000A0/\0000A0Hindi"}.lang-lbl-full[lang=hr]:after{content:"Hrvatski\0000A0/\0000A0Croatian"}.lang-lbl-full[lang=hu]:after{content:"Magyar\0000A0/\0000A0Hungarian"}.lang-lbl-full[lang=in]:after{content:"Bahasa\000020indonesia\0000A0/\0000A0Indonesian"}.lang-lbl-full[lang=is]:after{content:"\0000CDslenska\0000A0/\0000A0Icelandic"}.lang-lbl-full[lang=it]:after{content:"Italiano\0000A0/\0000A0Italian"}.lang-lbl-full[lang=iw]:after{content:"\0005E2\0005D1\0005E8\0005D9\0005EA\0000A0/\0000A0Hebrew"}.lang-lbl-full[lang=ja]:after{content:"\0065E5\00672C\008A9E\0000A0/\0000A0Japanese"}.lang-lbl-full[lang=ko]:after{content:"\00D55C\00AD6D\00C5B4\0000A0/\0000A0Korean"}.lang-lbl-full[lang=lt]:after{content:"Lietuvi\000173\0000A0/\0000A0Lithuanian"}.lang-lbl-full[lang=lv]:after{content:"Latvie\000161u\0000A0/\0000A0Latvian"}.lang-lbl-full[lang=mk]:after{content:"\00041C\000430\00043A\000435\000434\00043E\00043D\000441\00043A\000438\0000A0/\0000A0Macedonian"}.lang-lbl-full[lang=ms]:after{content:"Bahasa\000020melayu\0000A0/\0000A0Malay"}.lang-lbl-full[lang=mt]:after{content:"Malti\0000A0/\0000A0Maltese"}.lang-lbl-full[lang=nl]:after{content:"Nederlands\0000A0/\0000A0Dutch"}.lang-lbl-full[lang=no]:after{content:"Norsk\0000A0/\0000A0Norwegian"}.lang-lbl-full[lang=pl]:after{content:"Polski\0000A0/\0000A0Polish"}.lang-lbl-full[lang=pt]:after{content:"Portugu\0000EAs\0000A0/\0000A0Portuguese"}.lang-lbl-full[lang=ro]:after{content:"Rom\0000E2n\000103\0000A0/\0000A0Romanian"}.lang-lbl-full[lang=ru]:after{content:"\000420\000443\000441\000441\00043A\000438\000439\0000A0/\0000A0Russian"}.lang-lbl-full[lang=sk]:after{content:"Sloven\00010Dina\0000A0/\0000A0Slovak"}.lang-lbl-full[lang=sl]:after{content:"Sloven\000161\00010Dina\0000A0/\0000A0Slovenian"}.lang-lbl-full[lang=sq]:after{content:"Shqipe\0000A0/\0000A0Albanian"}.lang-lbl-full[lang=sr]:after{content:"\000421\000440\00043F\000441\00043A\000438\0000A0/\0000A0Serbian"}.lang-lbl-full[lang=sv]:after{content:"Svenska\0000A0/\0000A0Swedish"}.lang-lbl-full[lang=th]:after{content:"\000E44\000E17\000E22\0000A0/\0000A0Thai"}.lang-lbl-full[lang=tr]:after{content:"T\0000FCrk\0000E7e\0000A0/\0000A0Turkish"}.lang-lbl-full[lang=uk]:after{content:"\000423\00043A\000440\000430\000457\00043D\000441\00044C\00043A\000430\0000A0/\0000A0Ukrainian"}.lang-lbl-full[lang=vi]:after{content:"Ti\001EBFng\000020vi\001EC7t\0000A0/\0000A0Vietnamese"}.lang-lbl-full[lang=zh]:after{content:"\004E2D\006587\0000A0/\0000A0Chinese"}.lang-lg:before,.lang-sm:before,.lang-xs:before{content:'\0000A0'}.lang-xs.lang-lbl,.lang-xs.lang-lbl-en,.lang-xs.lang-lbl-full{padding-left:16px}.lang-sm.lang-lbl,.lang-sm.lang-lbl-en,.lang-sm.lang-lbl-full{padding-left:24px}.lang-lg.lang-lbl,.lang-lg.lang-lbl-en,.lang-lg.lang-lbl-full{padding-left:32px}.lang-lg.lang-lbl-en:before,.lang-lg.lang-lbl-full:before,.lang-lg.lang-lbl:before,.lang-sm.lang-lbl-en:before,.lang-sm.lang-lbl-full:before,.lang-sm.lang-lbl:before,.lang-xs.lang-lbl-en:before,.lang-xs.lang-lbl-full:before,.lang-xs.lang-lbl:before{content:''}.lang-lg,.lang-lg:after{top:0;position:relative}.lang-sm{top:1px;position:relative}.lang-sm:after{top:-1px;position:relative}.lang-xs{top:4px;position:relative}.lang-xs:after{top:-4px;position:relative}.lead>.lang-lg{top:2px}.lead>.lang-lg:after{top:-2px}.lead>.lang-sm{top:6px}.lead>.lang-sm:after{top:-6px}.lead>.lang-xs{top:8px}.lead>.lang-xs:after{top:-8px}small>.lang-sm{top:-1px}small>.lang-sm:after{top:1px}small>.lang-xs{top:2px}small>.lang-xs:after{top:-2px}h1>.lang-lg{top:9px}h1>.lang-lg:after{top:-9px}h1>.lang-sm{top:12px}h1>.lang-sm:after{top:-12px}h1>.lang-xs{top:14px}h1>.lang-xs:after{top:-14px}h2>.lang-lg{top:5px}h2>.lang-lg:after{top:-5px}h2>.lang-sm{top:8px}h2>.lang-sm:after{top:-8px}h2>.lang-xs{top:10px}h2>.lang-xs:after{top:-10px}h3>.lang-lg{top:1px}h3>.lang-lg:after{top:-1px}h3>.lang-sm{top:5px}h3>.lang-sm:after{top:-5px}h3>.lang-xs{top:8px}h3>.lang-xs:after{top:-8px}h4>.lang-lg{top:-1px}h4>.lang-lg:after,h4>.lang-sm{top:1px}h4>.lang-sm:after{top:-1px}h4>.lang-xs{top:4px}h4>.lang-xs:after{top:-4px}h5>.lang-sm,h5>.lang-sm:after{top:0}h5>.lang-xs{top:2px}h5>.lang-xs:after{top:-2px}h6>.lang-sm,h6>.lang-sm:after{top:0}h6>.lang-xs{top:1px}h6>.lang-xs:after{top:-1px}.btn>.lang-sm{top:2px}.btn>.lang-sm:after{top:-2px}.btn>.lang-xs{top:4px}.btn>.lang-xs:after{top:-4px}.btn.btn-xs>.lang-sm,.btn.btn-xs>.lang-sm:after{top:0}.btn.btn-xs>.lang-xs{top:3px}.btn.btn-xs>.lang-xs:after{top:-3px}.btn.btn-sm>.lang-sm,.btn.btn-sm>.lang-sm:after{top:0}.btn.btn-sm>.lang-xs{top:3px}.btn.btn-sm>.lang-xs:after{top:-3px}.btn.btn-lg>.lang-lg{top:1px}.btn.btn-lg>.lang-lg:after{top:-1px}.btn.btn-lg>.lang-sm{top:3px}.btn.btn-lg>.lang-sm:after{top:-3px}.btn.btn-lg>.lang-xs{top:6px}.btn.btn-lg>.lang-xs:after{top:-6px}
\ No newline at end of file
+.lang-xs{background-position:0 -473px;min-width:14px;height:11px;min-height:11px;max-height:11px;background-repeat:no-repeat;display:inline-block;background-image:url(languages.png)}.lang-sm{background-position:0 -1172px;min-width:22px;height:16px;min-height:16px;max-height:16px;background-repeat:no-repeat;display:inline-block;background-image:url(languages.png)}.lang-lg{background-position:0 -2134px;min-width:30px;height:22px;min-height:22px;max-height:22px;background-repeat:no-repeat;display:inline-block;background-image:url(languages.png)}.lang-xs[lang=ar]{background-position:0 0}.lang-xs[lang=be]{background-position:0 -11px}.lang-xs[lang=bg]{background-position:0 -22px}.lang-xs[lang=cs]{background-position:0 -33px}.lang-xs[lang=da]{background-position:0 -44px}.lang-xs[lang=de]{background-position:0 -55px}.lang-xs[lang=el]{background-position:0 -66px}.lang-xs[lang=en]{background-position:0 -77px}.lang-xs[lang=es]{background-position:0 -88px}.lang-xs[lang=et]{background-position:0 -99px}.lang-xs[lang=fi]{background-position:0 -110px}.lang-xs[lang=fr]{background-position:0 -121px}.lang-xs[lang=ga]{background-position:0 -132px}.lang-xs[lang=hi]{background-position:0 -143px}.lang-xs[lang=hr]{background-position:0 -154px}.lang-xs[lang=hu]{background-position:0 -165px}.lang-xs[lang=in]{background-position:0 -176px}.lang-xs[lang=is]{background-position:0 -187px}.lang-xs[lang=it]{background-position:0 -198px}.lang-xs[lang=iw]{background-position:0 -209px}.lang-xs[lang=ja]{background-position:0 -220px}.lang-xs[lang=ko]{background-position:0 -231px}.lang-xs[lang=lt]{background-position:0 -242px}.lang-xs[lang=lv]{background-position:0 -253px}.lang-xs[lang=mk]{background-position:0 -264px}.lang-xs[lang=ms]{background-position:0 -275px}.lang-xs[lang=mt]{background-position:0 -286px}.lang-xs[lang=nl]{background-position:0 -297px}.lang-xs[lang=no]{background-position:0 -308px}.lang-xs[lang=pl]{background-position:0 -319px}.lang-xs[lang=pt]{background-position:0 -330px}.lang-xs[lang=ro]{background-position:0 -341px}.lang-xs[lang=ru]{background-position:0 -352px}.lang-xs[lang=sk]{background-position:0 -363px}.lang-xs[lang=sl]{background-position:0 -374px}.lang-xs[lang=sq]{background-position:0 -385px}.lang-xs[lang=sr]{background-position:0 -396px}.lang-xs[lang=sv]{background-position:0 -407px}.lang-xs[lang=th]{background-position:0 -418px}.lang-xs[lang=tr]{background-position:0 -429px}.lang-xs[lang=uk]{background-position:0 -440px}.lang-xs[lang=vi]{background-position:0 -451px}.lang-xs[lang=zh]{background-position:0 -462px}.lang-sm[lang=ar]{background-position:0 -484px}.lang-sm[lang=be]{background-position:0 -500px}.lang-sm[lang=bg]{background-position:0 -516px}.lang-sm[lang=cs]{background-position:0 -532px}.lang-sm[lang=da]{background-position:0 -548px}.lang-sm[lang=de]{background-position:0 -564px}.lang-sm[lang=el]{background-position:0 -580px}.lang-sm[lang=en]{background-position:0 -596px}.lang-sm[lang=es]{background-position:0 -612px}.lang-sm[lang=et]{background-position:0 -628px}.lang-sm[lang=fi]{background-position:0 -644px}.lang-sm[lang=fr]{background-position:0 -660px}.lang-sm[lang=ga]{background-position:0 -676px}.lang-sm[lang=hi]{background-position:0 -692px}.lang-sm[lang=hr]{background-position:0 -708px}.lang-sm[lang=hu]{background-position:0 -724px}.lang-sm[lang=in]{background-position:0 -740px}.lang-sm[lang=is]{background-position:0 -756px}.lang-sm[lang=it]{background-position:0 -772px}.lang-sm[lang=iw]{background-position:0 -788px}.lang-sm[lang=ja]{background-position:0 -804px}.lang-sm[lang=ko]{background-position:0 -820px}.lang-sm[lang=lt]{background-position:0 -836px}.lang-sm[lang=lv]{background-position:0 -852px}.lang-sm[lang=mk]{background-position:0 -868px}.lang-sm[lang=ms]{background-position:0 -884px}.lang-sm[lang=mt]{background-position:0 -900px}.lang-sm[lang=nl]{background-position:0 -916px}.lang-sm[lang=no]{background-position:0 -932px}.lang-sm[lang=pl]{background-position:0 -948px}.lang-sm[lang=pt]{background-position:0 -964px}.lang-sm[lang=ro]{background-position:0 -980px}.lang-sm[lang=ru]{background-position:0 -996px}.lang-sm[lang=sk]{background-position:0 -1012px}.lang-sm[lang=sl]{background-position:0 -1028px}.lang-sm[lang=sq]{background-position:0 -1044px}.lang-sm[lang=sr]{background-position:0 -1060px}.lang-sm[lang=sv]{background-position:0 -1076px}.lang-sm[lang=th]{background-position:0 -1092px}.lang-sm[lang=tr]{background-position:0 -1108px}.lang-sm[lang=uk]{background-position:0 -1124px}.lang-sm[lang=vi]{background-position:0 -1140px}.lang-sm[lang=zh]{background-position:0 -1156px}.lang-lg[lang=ar]{background-position:0 -1188px}.lang-lg[lang=be]{background-position:0 -1210px}.lang-lg[lang=bg]{background-position:0 -1232px}.lang-lg[lang=cs]{background-position:0 -1254px}.lang-lg[lang=da]{background-position:0 -1276px}.lang-lg[lang=de]{background-position:0 -1298px}.lang-lg[lang=el]{background-position:0 -1320px}.lang-lg[lang=en]{background-position:0 -1342px}.lang-lg[lang=es]{background-position:0 -1364px}.lang-lg[lang=et]{background-position:0 -1386px}.lang-lg[lang=fi]{background-position:0 -1408px}.lang-lg[lang=fr]{background-position:0 -1430px}.lang-lg[lang=ga]{background-position:0 -1452px}.lang-lg[lang=hi]{background-position:0 -1474px}.lang-lg[lang=hr]{background-position:0 -1496px}.lang-lg[lang=hu]{background-position:0 -1518px}.lang-lg[lang=in]{background-position:0 -1540px}.lang-lg[lang=is]{background-position:0 -1562px}.lang-lg[lang=it]{background-position:0 -1584px}.lang-lg[lang=iw]{background-position:0 -1606px}.lang-lg[lang=ja]{background-position:0 -1628px}.lang-lg[lang=ko]{background-position:0 -1650px}.lang-lg[lang=lt]{background-position:0 -1672px}.lang-lg[lang=lv]{background-position:0 -1694px}.lang-lg[lang=mk]{background-position:0 -1716px}.lang-lg[lang=ms]{background-position:0 -1738px}.lang-lg[lang=mt]{background-position:0 -1760px}.lang-lg[lang=nl]{background-position:0 -1782px}.lang-lg[lang=no]{background-position:0 -1804px}.lang-lg[lang=pl]{background-position:0 -1826px}.lang-lg[lang=pt]{background-position:0 -1848px}.lang-lg[lang=ro]{background-position:0 -1870px}.lang-lg[lang=ru]{background-position:0 -1892px}.lang-lg[lang=sk]{background-position:0 -1914px}.lang-lg[lang=sl]{background-position:0 -1936px}.lang-lg[lang=sq]{background-position:0 -1958px}.lang-lg[lang=sr]{background-position:0 -1980px}.lang-lg[lang=sv]{background-position:0 -2002px}.lang-lg[lang=th]{background-position:0 -2024px}.lang-lg[lang=tr]{background-position:0 -2046px}.lang-lg[lang=uk]{background-position:0 -2068px}.lang-lg[lang=vi]{background-position:0 -2090px}.lang-lg[lang=zh]{background-position:0 -2112px}.lang-lbl-en:after,.lang-lbl-full:after,.lang-lbl:after{content:"Unknown language"}.lang-lbl[lang=ar]:after{content:"\000627\000644\000639\000631\000628\00064A\000629"}.lang-lbl[lang=be]:after{content:"\000411\000435\00043B\000430\000440\000443\000441\00043A\000456"}.lang-lbl[lang=bg]:after{content:"\000411\00044A\00043B\000433\000430\000440\000441\00043A\000438"}.lang-lbl[lang=cs]:after{content:"\00010Ce\000161tina"}.lang-lbl[lang=da]:after{content:"Dansk"}.lang-lbl[lang=de]:after{content:"Deutsch"}.lang-lbl[lang=el]:after{content:"\000395\0003BB\0003BB\0003B7\0003BD\0003B9\0003BA\0003AC"}.lang-lbl[lang=en]:after{content:"English"}.lang-lbl[lang=es]:after{content:"Espa\0000F1ol"}.lang-lbl[lang=et]:after{content:"Eesti"}.lang-lbl[lang=fi]:after{content:"Suomi"}.lang-lbl[lang=fr]:after{content:"Fran\0000E7ais"}.lang-lbl[lang=ga]:after{content:"Gaeilge"}.lang-lbl[lang=hi]:after{content:"\000939\00093F\000902\000926\000940"}.lang-lbl[lang=hr]:after{content:"Hrvatski"}.lang-lbl[lang=hu]:after{content:"Magyar"}.lang-lbl[lang=in]:after{content:"Bahasa\000020indonesia"}.lang-lbl[lang=is]:after{content:"\0000CDslenska"}.lang-lbl[lang=it]:after{content:"Italiano"}.lang-lbl[lang=iw]:after{content:"\0005E2\0005D1\0005E8\0005D9\0005EA"}.lang-lbl[lang=ja]:after{content:"\0065E5\00672C\008A9E"}.lang-lbl[lang=ko]:after{content:"\00D55C\00AD6D\00C5B4"}.lang-lbl[lang=lt]:after{content:"Lietuvi\000173"}.lang-lbl[lang=lv]:after{content:"Latvie\000161u"}.lang-lbl[lang=mk]:after{content:"\00041C\000430\00043A\000435\000434\00043E\00043D\000441\00043A\000438"}.lang-lbl[lang=ms]:after{content:"Bahasa\000020melayu"}.lang-lbl[lang=mt]:after{content:"Malti"}.lang-lbl[lang=nl]:after{content:"Nederlands"}.lang-lbl[lang=no]:after{content:"Norsk"}.lang-lbl[lang=pl]:after{content:"Polski"}.lang-lbl[lang=pt]:after{content:"Portugu\0000EAs"}.lang-lbl[lang=ro]:after{content:"Rom\0000E2n\000103"}.lang-lbl[lang=ru]:after{content:"\000420\000443\000441\000441\00043A\000438\000439"}.lang-lbl[lang=sk]:after{content:"Sloven\00010Dina"}.lang-lbl[lang=sl]:after{content:"Sloven\000161\00010Dina"}.lang-lbl[lang=sq]:after{content:"Shqipe"}.lang-lbl[lang=sr]:after{content:"\000421\000440\00043F\000441\00043A\000438"}.lang-lbl[lang=sv]:after{content:"Svenska"}.lang-lbl[lang=th]:after{content:"\000E44\000E17\000E22"}.lang-lbl[lang=tr]:after{content:"T\0000FCrk\0000E7e"}.lang-lbl[lang=uk]:after{content:"\000423\00043A\000440\000430\000457\00043D\000441\00044C\00043A\000430"}.lang-lbl[lang=vi]:after{content:"Ti\001EBFng\000020vi\001EC7t"}.lang-lbl[lang=zh]:after{content:"\004E2D\006587"}.lang-lbl-en[lang=ar]:after{content:"Arabic"}.lang-lbl-en[lang=be]:after{content:"Belarusian"}.lang-lbl-en[lang=bg]:after{content:"Bulgarian"}.lang-lbl-en[lang=cs]:after{content:"Czech"}.lang-lbl-en[lang=da]:after{content:"Danish"}.lang-lbl-en[lang=de]:after{content:"German"}.lang-lbl-en[lang=el]:after{content:"Greek"}.lang-lbl-en[lang=en]:after{content:"English"}.lang-lbl-en[lang=es]:after{content:"Spanish"}.lang-lbl-en[lang=et]:after{content:"Estonian"}.lang-lbl-en[lang=fi]:after{content:"Finnish"}.lang-lbl-en[lang=fr]:after{content:"French"}.lang-lbl-en[lang=ga]:after{content:"Irish"}.lang-lbl-en[lang=hi]:after{content:"Hindi"}.lang-lbl-en[lang=hr]:after{content:"Croatian"}.lang-lbl-en[lang=hu]:after{content:"Hungarian"}.lang-lbl-en[lang=in]:after{content:"Indonesian"}.lang-lbl-en[lang=is]:after{content:"Icelandic"}.lang-lbl-en[lang=it]:after{content:"Italian"}.lang-lbl-en[lang=iw]:after{content:"Hebrew"}.lang-lbl-en[lang=ja]:after{content:"Japanese"}.lang-lbl-en[lang=ko]:after{content:"Korean"}.lang-lbl-en[lang=lt]:after{content:"Lithuanian"}.lang-lbl-en[lang=lv]:after{content:"Latvian"}.lang-lbl-en[lang=mk]:after{content:"Macedonian"}.lang-lbl-en[lang=ms]:after{content:"Malay"}.lang-lbl-en[lang=mt]:after{content:"Maltese"}.lang-lbl-en[lang=nl]:after{content:"Dutch"}.lang-lbl-en[lang=no]:after{content:"Norwegian"}.lang-lbl-en[lang=pl]:after{content:"Polish"}.lang-lbl-en[lang=pt]:after{content:"Portuguese"}.lang-lbl-en[lang=ro]:after{content:"Romanian"}.lang-lbl-en[lang=ru]:after{content:"Russian"}.lang-lbl-en[lang=sk]:after{content:"Slovak"}.lang-lbl-en[lang=sl]:after{content:"Slovenian"}.lang-lbl-en[lang=sq]:after{content:"Albanian"}.lang-lbl-en[lang=sr]:after{content:"Serbian"}.lang-lbl-en[lang=sv]:after{content:"Swedish"}.lang-lbl-en[lang=th]:after{content:"Thai"}.lang-lbl-en[lang=tr]:after{content:"Turkish"}.lang-lbl-en[lang=uk]:after{content:"Ukrainian"}.lang-lbl-en[lang=vi]:after{content:"Vietnamese"}.lang-lbl-en[lang=zh]:after{content:"Chinese"}.lang-lbl-full[lang=ar]:after{content:"\000627\000644\000639\000631\000628\00064A\000629\0000A0/\0000A0Arabic"}.lang-lbl-full[lang=be]:after{content:"\000411\000435\00043B\000430\000440\000443\000441\00043A\000456\0000A0/\0000A0Belarusian"}.lang-lbl-full[lang=bg]:after{content:"\000411\00044A\00043B\000433\000430\000440\000441\00043A\000438\0000A0/\0000A0Bulgarian"}.lang-lbl-full[lang=cs]:after{content:"\00010Ce\000161tina\0000A0/\0000A0Czech"}.lang-lbl-full[lang=da]:after{content:"Dansk\0000A0/\0000A0Danish"}.lang-lbl-full[lang=de]:after{content:"Deutsch\0000A0/\0000A0German"}.lang-lbl-full[lang=el]:after{content:"\000395\0003BB\0003BB\0003B7\0003BD\0003B9\0003BA\0003AC\0000A0/\0000A0Greek"}.lang-lbl-full[lang=en]:after{content:"English\0000A0/\0000A0English"}.lang-lbl-full[lang=es]:after{content:"Espa\0000F1ol\0000A0/\0000A0Spanish"}.lang-lbl-full[lang=et]:after{content:"Eesti\0000A0/\0000A0Estonian"}.lang-lbl-full[lang=fi]:after{content:"Suomi\0000A0/\0000A0Finnish"}.lang-lbl-full[lang=fr]:after{content:"Fran\0000E7ais\0000A0/\0000A0French"}.lang-lbl-full[lang=ga]:after{content:"Gaeilge\0000A0/\0000A0Irish"}.lang-lbl-full[lang=hi]:after{content:"\000939\00093F\000902\000926\000940\0000A0/\0000A0Hindi"}.lang-lbl-full[lang=hr]:after{content:"Hrvatski\0000A0/\0000A0Croatian"}.lang-lbl-full[lang=hu]:after{content:"Magyar\0000A0/\0000A0Hungarian"}.lang-lbl-full[lang=in]:after{content:"Bahasa\000020indonesia\0000A0/\0000A0Indonesian"}.lang-lbl-full[lang=is]:after{content:"\0000CDslenska\0000A0/\0000A0Icelandic"}.lang-lbl-full[lang=it]:after{content:"Italiano\0000A0/\0000A0Italian"}.lang-lbl-full[lang=iw]:after{content:"\0005E2\0005D1\0005E8\0005D9\0005EA\0000A0/\0000A0Hebrew"}.lang-lbl-full[lang=ja]:after{content:"\0065E5\00672C\008A9E\0000A0/\0000A0Japanese"}.lang-lbl-full[lang=ko]:after{content:"\00D55C\00AD6D\00C5B4\0000A0/\0000A0Korean"}.lang-lbl-full[lang=lt]:after{content:"Lietuvi\000173\0000A0/\0000A0Lithuanian"}.lang-lbl-full[lang=lv]:after{content:"Latvie\000161u\0000A0/\0000A0Latvian"}.lang-lbl-full[lang=mk]:after{content:"\00041C\000430\00043A\000435\000434\00043E\00043D\000441\00043A\000438\0000A0/\0000A0Macedonian"}.lang-lbl-full[lang=ms]:after{content:"Bahasa\000020melayu\0000A0/\0000A0Malay"}.lang-lbl-full[lang=mt]:after{content:"Malti\0000A0/\0000A0Maltese"}.lang-lbl-full[lang=nl]:after{content:"Nederlands\0000A0/\0000A0Dutch"}.lang-lbl-full[lang=no]:after{content:"Norsk\0000A0/\0000A0Norwegian"}.lang-lbl-full[lang=pl]:after{content:"Polski\0000A0/\0000A0Polish"}.lang-lbl-full[lang=pt]:after{content:"Portugu\0000EAs\0000A0/\0000A0Portuguese"}.lang-lbl-full[lang=ro]:after{content:"Rom\0000E2n\000103\0000A0/\0000A0Romanian"}.lang-lbl-full[lang=ru]:after{content:"\000420\000443\000441\000441\00043A\000438\000439\0000A0/\0000A0Russian"}.lang-lbl-full[lang=sk]:after{content:"Sloven\00010Dina\0000A0/\0000A0Slovak"}.lang-lbl-full[lang=sl]:after{content:"Sloven\000161\00010Dina\0000A0/\0000A0Slovenian"}.lang-lbl-full[lang=sq]:after{content:"Shqipe\0000A0/\0000A0Albanian"}.lang-lbl-full[lang=sr]:after{content:"\000421\000440\00043F\000441\00043A\000438\0000A0/\0000A0Serbian"}.lang-lbl-full[lang=sv]:after{content:"Svenska\0000A0/\0000A0Swedish"}.lang-lbl-full[lang=th]:after{content:"\000E44\000E17\000E22\0000A0/\0000A0Thai"}.lang-lbl-full[lang=tr]:after{content:"T\0000FCrk\0000E7e\0000A0/\0000A0Turkish"}.lang-lbl-full[lang=uk]:after{content:"\000423\00043A\000440\000430\000457\00043D\000441\00044C\00043A\000430\0000A0/\0000A0Ukrainian"}.lang-lbl-full[lang=vi]:after{content:"Ti\001EBFng\000020vi\001EC7t\0000A0/\0000A0Vietnamese"}.lang-lbl-full[lang=zh]:after{content:"\004E2D\006587\0000A0/\0000A0Chinese"}.lang-lg:before,.lang-sm:before,.lang-xs:before{content:'\0000A0'}.lang-xs.lang-lbl,.lang-xs.lang-lbl-en,.lang-xs.lang-lbl-full{padding-left:16px}.lang-sm.lang-lbl,.lang-sm.lang-lbl-en,.lang-sm.lang-lbl-full{padding-left:24px}.lang-lg.lang-lbl,.lang-lg.lang-lbl-en,.lang-lg.lang-lbl-full{padding-left:32px}.lang-lg.lang-lbl-en:before,.lang-lg.lang-lbl-full:before,.lang-lg.lang-lbl:before,.lang-sm.lang-lbl-en:before,.lang-sm.lang-lbl-full:before,.lang-sm.lang-lbl:before,.lang-xs.lang-lbl-en:before,.lang-xs.lang-lbl-full:before,.lang-xs.lang-lbl:before{content:''}.lang-lg,.lang-lg:after{top:0;position:relative}.lang-sm{top:1px;position:relative}.lang-sm:after{top:-1px;position:relative}.lang-xs{top:4px;position:relative}.lang-xs:after{top:-4px;position:relative}.lead>.lang-lg{top:2px}.lead>.lang-lg:after{top:-2px}.lead>.lang-sm{top:6px}.lead>.lang-sm:after{top:-6px}.lead>.lang-xs{top:8px}.lead>.lang-xs:after{top:-8px}small>.lang-sm{top:-1px}small>.lang-sm:after{top:1px}small>.lang-xs{top:2px}small>.lang-xs:after{top:-2px}h1>.lang-lg{top:9px}h1>.lang-lg:after{top:-9px}h1>.lang-sm{top:12px}h1>.lang-sm:after{top:-12px}h1>.lang-xs{top:14px}h1>.lang-xs:after{top:-14px}h2>.lang-lg{top:5px}h2>.lang-lg:after{top:-5px}h2>.lang-sm{top:8px}h2>.lang-sm:after{top:-8px}h2>.lang-xs{top:10px}h2>.lang-xs:after{top:-10px}h3>.lang-lg{top:1px}h3>.lang-lg:after{top:-1px}h3>.lang-sm{top:5px}h3>.lang-sm:after{top:-5px}h3>.lang-xs{top:8px}h3>.lang-xs:after{top:-8px}h4>.lang-lg{top:-1px}h4>.lang-lg:after,h4>.lang-sm{top:1px}h4>.lang-sm:after{top:-1px}h4>.lang-xs{top:4px}h4>.lang-xs:after{top:-4px}h5>.lang-sm,h5>.lang-sm:after{top:0}h5>.lang-xs{top:2px}h5>.lang-xs:after{top:-2px}h6>.lang-sm,h6>.lang-sm:after{top:0}h6>.lang-xs{top:1px}h6>.lang-xs:after{top:-1px}.btn>.lang-sm{top:2px}.btn>.lang-sm:after{top:-2px}.btn>.lang-xs{top:4px}.btn>.lang-xs:after{top:-4px}.btn.btn-xs>.lang-sm,.btn.btn-xs>.lang-sm:after{top:0}.btn.btn-xs>.lang-xs{top:3px}.btn.btn-xs>.lang-xs:after{top:-3px}.btn.btn-sm>.lang-sm,.btn.btn-sm>.lang-sm:after{top:0}.btn.btn-sm>.lang-xs{top:3px}.btn.btn-sm>.lang-xs:after{top:-3px}.btn.btn-lg>.lang-lg{top:1px}.btn.btn-lg>.lang-lg:after{top:-1px}.btn.btn-lg>.lang-sm{top:3px}.btn.btn-lg>.lang-sm:after{top:-3px}.btn.btn-lg>.lang-xs{top:6px}.btn.btn-lg>.lang-xs:after{top:-6px}
diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index 62bdf18b2..f9d7bfa10 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -9,8 +9,8 @@ This file will be reset on upgrades.
 */
 
 // SQL database connection variables
-$database_type = "mysql";
-$database_host = "mysql";
+$database_type = 'mysql';
+$database_host = 'mysql';
 $database_user = getenv('DBUSER');
 $database_pass = getenv('DBPASS');
 $database_name = getenv('DBNAME');
@@ -21,23 +21,23 @@ $mailcow_hostname = getenv('MAILCOW_HOSTNAME');
 // Where to go after adding and editing objects
 // Can be "form" or "previous"
 // "form" will stay in the current form, "previous" will redirect to previous page
-$FORM_ACTION = "previous";
+$FORM_ACTION = 'previous';
 
 // File locations should not be changed
-$MC_DKIM_TXTS = "/data/dkim/txt";
-$MC_DKIM_KEYS = "/data/dkim/keys";
+$MC_DKIM_TXTS = '/data/dkim/txt';
+$MC_DKIM_KEYS = '/data/dkim/keys';
 
 // Change default language, "de", "en", "es", "nl", "pt", "ru"
-$DEFAULT_LANG = "en";
+$DEFAULT_LANG = 'en';
 
 // Available languages
-$AVAILABLE_LANGUAGES = array("de", "en", "es", "nl", "pt", "ru");
+$AVAILABLE_LANGUAGES = array('de', 'en', 'es', 'nl', 'pt', 'ru');
 
 // Change theme (default: lumen)
 // Needs to be one of those: cerulean, cosmo, cyborg, darkly, flatly, journal, lumen, paper, readable, sandstone,
 // simplex, slate, spacelab, superhero, united, yeti
 // See https://bootswatch.com/
-$DEFAULT_THEME = "lumen";
+$DEFAULT_THEME = 'lumen';
 
 // Password complexity as regular expression
 $PASSWD_REGEP = '.{4,}';
@@ -59,5 +59,3 @@ $PAGINATION_SIZE = 10;
 
 // Session lifetime in seconds
 $SESSION_LIFETIME = 3600;
-
-?>
diff --git a/data/web/index.php b/data/web/index.php
index 0c2868442..80462276b 100644
--- a/data/web/index.php
+++ b/data/web/index.php
@@ -1,97 +1,98 @@
 <?php
-require_once("inc/prerequisites.inc.php");
+require_once 'inc/prerequisites.inc.php';
 
-if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admin") {
-	header('Location: /admin.php');
-	exit();
+if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'admin') {
+  header('Location: /admin.php');
+  exit();
 }
-elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "domainadmin") {
-	header('Location: /mailbox.php');
-	exit();
+elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'domainadmin') {
+  header('Location: /mailbox.php');
+  exit();
 }
-elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "user") {
-	header('Location: /user.php');
-	exit();
+elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'user') {
+  header('Location: /user.php');
+  exit();
 }
-require_once("inc/header.inc.php");
+
+require_once 'inc/header.inc.php';
 $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
 ?>
 <div class="container">
-	<div class="row">
-		<div class="col-md-offset-3 col-md-6">
-			<div class="panel panel-default">
-				<div class="panel-heading"><span class="glyphicon glyphicon-user" aria-hidden="true"></span> <?=$lang['login']['login'];?></div>
-				<div class="panel-body">
-				  <center><img style="max-width:250px" src="/img/cow_mailcow.svg" alt="mailcow"></center>
-					<legend>mailcow UI</legend>
-						<form method="post" autofill="off">
-						<div class="form-group">
-							<label class="sr-only" for="login_user"><?=$lang['login']['username'];?></label>
-							<div class="input-group">
-								<div class="input-group-addon"><i class="glyphicon glyphicon-user"></i></div>
-								<input name="login_user" autocorrect="off" autocapitalize="none" type="text" id="login_user" class="form-control" placeholder="<?=$lang['login']['username'];?>" required="" autofocus="">
-							</div>
-						</div>
-						<div class="form-group">
-							<label class="sr-only" for="pass_user"><?=$lang['login']['password'];?></label>
-							<div class="input-group">
-								<div class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></div>
-								<input name="pass_user" type="password" id="pass_user" class="form-control" placeholder="<?=$lang['login']['password'];?>" required="">
-							</div>
-						</div>
-						<div class="form-group">
-							<button type="submit" class="btn btn-success" value="Login"><?=$lang['login']['login'];?></button>
-							<div class="btn-group pull-right">
-								<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-									<span class="lang-sm lang-lbl" lang="<?=$_SESSION['mailcow_locale'];?>"></span> <span class="caret"></span>
-								</button>
-								<ul class="dropdown-menu">
-									<li <?=($_SESSION['mailcow_locale'] == 'de') ? 'class="active"' : ''?>><a href="?<?= http_build_query(array_merge($_GET, array("lang" => "de"))) ?>"><span class="lang-xs lang-lbl-full" lang="de"></span></a></li>
-									<li <?=($_SESSION['mailcow_locale'] == 'en') ? 'class="active"' : ''?>><a href="?<?= http_build_query(array_merge($_GET, array("lang" => "en"))) ?>"><span class="lang-xs lang-lbl-full" lang="en"></span></a></li>
-									<li <?=($_SESSION['mailcow_locale'] == 'es') ? 'class="active"' : ''?>><a href="?<?= http_build_query(array_merge($_GET, array("lang" => "es"))) ?>"><span class="lang-xs lang-lbl-full" lang="es"></span></a></li>
-									<li <?=($_SESSION['mailcow_locale'] == 'nl') ? 'class="active"' : ''?>><a href="?<?= http_build_query(array_merge($_GET, array("lang" => "nl"))) ?>"><span class="lang-xs lang-lbl-full" lang="nl"></span></a></li>
-									<li <?=($_SESSION['mailcow_locale'] == 'pt') ? 'class="active"' : ''?>><a href="?<?= http_build_query(array_merge($_GET, array("lang" => "pt"))) ?>"><span class="lang-xs lang-lbl-full" lang="pt"></span></a></li>
-									<li <?=($_SESSION['mailcow_locale'] == 'ru') ? 'class="active"' : ''?>><a href="?<?= http_build_query(array_merge($_GET, array("lang" => "ru"))) ?>"><span class="lang-xs lang-lbl-full" lang="ru"></span></a></li>
-								</ul>
-							</div>
-						</div>
-						</form>
-						<?php
-						if (isset($_SESSION['ldelay']) && $_SESSION['ldelay'] != "0"):
-						?>
-						<p><div class="alert alert-info"><?=sprintf($lang['login']['delayed'], $_SESSION['ldelay']);?></b></div></p>
-						<?php
-						endif;
-						?>
-					<legend>mailcow Apps</legend>
+  <div class="row">
+    <div class="col-md-offset-3 col-md-6">
+      <div class="panel panel-default">
+        <div class="panel-heading"><span class="glyphicon glyphicon-user" aria-hidden="true"></span> <?= $lang['login']['login']; ?></div>
+        <div class="panel-body">
+          <div class="text-center"><img style="max-width: 250px;" src="/img/cow_mailcow.svg" alt="mailcow"></div>
+          <legend>mailcow UI</legend>
+            <form method="post" autofill="off">
+            <div class="form-group">
+              <label class="sr-only" for="login_user"><?= $lang['login']['username']; ?></label>
+              <div class="input-group">
+                <div class="input-group-addon"><i class="glyphicon glyphicon-user"></i></div>
+                <input name="login_user" autocorrect="off" autocapitalize="none" type="text" id="login_user" class="form-control" placeholder="<?= $lang['login']['username']; ?>" required="" autofocus="">
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="sr-only" for="pass_user"><?= $lang['login']['password']; ?></label>
+              <div class="input-group">
+                <div class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></div>
+                <input name="pass_user" type="password" id="pass_user" class="form-control" placeholder="<?= $lang['login']['password']; ?>" required="">
+              </div>
+            </div>
+            <div class="form-group">
+              <button type="submit" class="btn btn-success" value="Login"><?= $lang['login']['login']; ?></button>
+              <div class="btn-group pull-right">
+                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <span class="lang-sm lang-lbl" lang="<?= $_SESSION['mailcow_locale']; ?>"></span> <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu">
+                  <?php
+                  foreach ($AVAILABLE_LANGUAGES as $language):
+                  ?>
+                  <li<?= ($_SESSION['mailcow_locale'] == $language) ? ' class="active"' : ''; ?>><a href="<?= http_build_query(array_merge($_GET, array('lang' => $language))) ?>"><span class="lang-xs lang-lbl-full" lang="<?= $language; ?>"></span></a></li>
+                  <?php
+                  endforeach;
+                  ?>
+                </ul>
+              </div>
+            </div>
+            </form>
+            <?php
+            if (isset($_SESSION['ldelay']) && $_SESSION['ldelay'] != '0'):
+            ?>
+            <p><div class="alert alert-info"><?= sprintf($lang['login']['delayed'], $_SESSION['ldelay']); ?></b></div></p>
+            <?php
+            endif;
+            ?>
+          <legend>mailcow Apps</legend>
           <?php
           foreach ($MAILCOW_APPS as $app):
           ?>
-            <a href="<?=$app['link'];?>" role="button" class="btn btn-lg btn-default"><?=$app['name'];?></a>&nbsp;
+            <a href="<?= $app['link']; ?>" role="button" class="btn btn-lg btn-default"><?= $app['name']; ?></a>&nbsp;
           <?php
           endforeach;
           ?>
-				</div>
-			</div>
-		</div>
-		<div class="col-md-offset-3 col-md-6">
-			<div class="panel panel-default" style="">
-				<div class="panel-heading">
-					<a data-toggle="collapse" href="#collapse1"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> <?=$lang['start']['help'];?></a>
-				</div>
-				<div id="collapse1" class="panel-collapse collapse">
-					<div class="panel-body">
-						<p><span style="border-bottom: 1px dotted #999">mailcow UI</span></p>
-						<p><?=$lang['start']['mailcow_panel_detail'];?></p>
-						<p><span style="border-bottom: 1px dotted #999">mailcow Apps</span></p>
-						<p><?=$lang['start']['mailcow_apps_detail'];?></p>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div> <!-- /container -->
+        </div>
+      </div>
+    </div>
+    <div class="col-md-offset-3 col-md-6">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <a data-toggle="collapse" href="#collapse1"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> <?= $lang['start']['help']; ?></a>
+        </div>
+        <div id="collapse1" class="panel-collapse collapse">
+          <div class="panel-body">
+            <p><span style="border-bottom: 1px dotted #999;">mailcow UI</span></p>
+            <p><?= $lang['start']['mailcow_panel_detail']; ?></p>
+            <p><span style="border-bottom: 1px dotted #999;">mailcow Apps</span></p>
+            <p><?= $lang['start']['mailcow_apps_detail']; ?></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div><!-- /.container -->
 <script src="js/index.js"></script>
 <?php
-require_once("inc/footer.inc.php");
-?>
+require_once 'inc/footer.inc.php';

From 53d02ded2a0d62263db767c6bfdc3af5eb454f78 Mon Sep 17 00:00:00 2001
From: Dennis Neufeld <info@dennis14e.de>
Date: Tue, 16 May 2017 19:25:35 +0200
Subject: [PATCH 19/25] Add missing question mark (GET-URL)

---
 data/web/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/web/index.php b/data/web/index.php
index 80462276b..2bc6e570d 100644
--- a/data/web/index.php
+++ b/data/web/index.php
@@ -50,7 +50,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
                   <?php
                   foreach ($AVAILABLE_LANGUAGES as $language):
                   ?>
-                  <li<?= ($_SESSION['mailcow_locale'] == $language) ? ' class="active"' : ''; ?>><a href="<?= http_build_query(array_merge($_GET, array('lang' => $language))) ?>"><span class="lang-xs lang-lbl-full" lang="<?= $language; ?>"></span></a></li>
+                  <li<?= ($_SESSION['mailcow_locale'] == $language) ? ' class="active"' : ''; ?>><a href="?<?= http_build_query(array_merge($_GET, array('lang' => $language))) ?>"><span class="lang-xs lang-lbl-full" lang="<?= $language; ?>"></span></a></li>
                   <?php
                   endforeach;
                   ?>

From 0d3d9b8c15843a8d10008a4f461aec54733325b8 Mon Sep 17 00:00:00 2001
From: Dennis Neufeld <info@dennis14e.de>
Date: Tue, 16 May 2017 19:46:24 +0200
Subject: [PATCH 20/25] Fix bug: Session cookie domain

If the web domain is != mail domain, the session cookie is set to the wrong domain.
---
 data/web/inc/sessions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/web/inc/sessions.inc.php b/data/web/inc/sessions.inc.php
index 1b2c986c0..f78ce5320 100644
--- a/data/web/inc/sessions.inc.php
+++ b/data/web/inc/sessions.inc.php
@@ -13,7 +13,7 @@ elseif (isset($_SERVER['HTTPS'])) {
 else {
   $IS_HTTPS = false;
 }
-session_set_cookie_params($GLOBALS['SESSION_LIFETIME'], '/', $_SERVER['SERVER_NAME'], $IS_HTTPS, true);
+session_set_cookie_params($GLOBALS['SESSION_LIFETIME'], '/', '', $IS_HTTPS, true);
 session_start();
 if (!isset($_SESSION['CSRF']['TOKEN'])) {
   $_SESSION['CSRF']['TOKEN'] = bin2hex(random_bytes(32));

From f38d726ed22472d5eb33fc352441f94efaf07f1b Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 17 May 2017 07:46:27 +0200
Subject: [PATCH 21/25] Revert base of Rspamd

---
 data/Dockerfiles/rspamd/Dockerfile | 17 +++++++++--------
 docker-compose.yml                 |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile
index 0eb0b6b63..4a2ea589d 100644
--- a/data/Dockerfiles/rspamd/Dockerfile
+++ b/data/Dockerfiles/rspamd/Dockerfile
@@ -1,11 +1,15 @@
-FROM alpine:edge
+FROM debian:jessie-slim
 LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
 
+ARG DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL C
 
-RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
-	&& apk add --no-cache rspamd rspamd-controller rsyslog ca-certificates \
-	&& adduser -S _rspamd
+RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \
+	&& echo "deb http://rspamd.com/apt-stable/ jessie main" > /etc/apt/sources.list.d/rspamd.list \
+	&& apt-get update && apt-get install -y \
+		ca-certificates \
+		rspamd \
+	&& rm -rf /var/lib/apt/lists/*
 
 RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local
 
@@ -13,11 +17,8 @@ COPY settings.conf /etc/rspamd/modules.d/settings.conf
 COPY antivirus.conf /etc/rspamd/modules.d/antivirus.conf
 COPY dkim_signing.lua /usr/share/rspamd/lua/dkim_signing.lua
 
-CMD /usr/sbin/rspamd -f -u _rspamd -g _rspamd
+CMD /usr/bin/rspamd -f -u _rspamd -g _rspamd
 
 RUN rm -rf /tmp/* /var/tmp/*
-RUN mkdir /run/rspamd && chown -R _rspamd: /run/rspamd
 
 USER _rspamd
-
-EXPOSE 11333 11334
diff --git a/docker-compose.yml b/docker-compose.yml
index 55ce91e18..d5c4ead0d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,9 +71,9 @@ services:
       image: mailcow/rspamd
       build: ./data/Dockerfiles/rspamd
       command: > 
-        /bin/sh -c "
+        /bin/bash -c "
         sleep 5;
-        /usr/sbin/rspamd -f -u _rspamd -g _rspamd
+        /usr/bin/rspamd -f -u _rspamd -g _rspamd
         "
       depends_on:
         nginx-mailcow:

From dd5b46e9eea09925af3fbda3373ed66018acf71f Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 17 May 2017 07:48:29 +0200
Subject: [PATCH 22/25] Use Alpine PHP-FPM

---
 data/Dockerfiles/php-fpm/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/Dockerfiles/php-fpm/Dockerfile b/data/Dockerfiles/php-fpm/Dockerfile
index 224275fa0..514710c08 100644
--- a/data/Dockerfiles/php-fpm/Dockerfile
+++ b/data/Dockerfiles/php-fpm/Dockerfile
@@ -1,8 +1,6 @@
 FROM php:7.1-fpm-alpine
 LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
 
-ARG DEBIAN_FRONTEND=noninteractive
-
 RUN apk add -U --no-cache libxml2-dev icu-dev icu-libs redis mysql-client bash autoconf g++ make openssl
 RUN pecl install redis && pecl clear-cache
 RUN docker-php-ext-configure intl

From 61de3c354c25f0845a4e90b7bd44a4d5363c87e2 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 17 May 2017 07:48:48 +0200
Subject: [PATCH 23/25] Use Alpine ClamAV

---
 data/Dockerfiles/clamav/Dockerfile   | 34 +++++++---------------------
 data/Dockerfiles/clamav/bootstrap.sh |  5 +++-
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/data/Dockerfiles/clamav/Dockerfile b/data/Dockerfiles/clamav/Dockerfile
index a2551677d..3fd2a8524 100755
--- a/data/Dockerfiles/clamav/Dockerfile
+++ b/data/Dockerfiles/clamav/Dockerfile
@@ -1,39 +1,21 @@
-FROM debian:stretch-slim
+FROM alpine
 LABEL maintainer "https://m-ko.de Markus Kosmal <code@cnfg.io>"
 
-# Debian Base to use
-ENV DEBIAN_VERSION stretch
-ARG DEBIAN_FRONTEND=noninteractive
-
-# initial install of av daemon
-RUN echo "deb http://http.debian.net/debian/ $DEBIAN_VERSION main contrib non-free" > /etc/apt/sources.list && \
-	echo "deb http://http.debian.net/debian/ $DEBIAN_VERSION-updates main contrib non-free" >> /etc/apt/sources.list && \
-	echo "deb http://security.debian.org/ $DEBIAN_VERSION/updates main contrib non-free" >> /etc/apt/sources.list && \
-	apt-get update && apt-get install -y -qq --no-install-recommends \
-		clamav-daemon \
-		clamav-freshclam \
-		libclamunrar7 \
-	&& rm -rf /var/lib/apt/lists/*
+RUN apk add -U --no-cache clamav clamav-libunrar clamav-daemon bash curl
 
 # initial update of av databases
 COPY dl_files.sh /dl_files.sh
 RUN chmod +x /dl_files.sh
 
+# pre-download defintions
 RUN set -ex; \
-	\
-	fetchDeps=' \
-		curl \
-	'; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends $fetchDeps; \
-	rm -rf /var/lib/apt/lists/*; \
-	/dl_files.sh \
-	apt-get purge -y --auto-remove $fetchDeps
+	/dl_files.sh && \
+	apk del curl
 
 # permission juggling
-RUN mkdir /var/run/clamav && \
-	chown clamav:clamav /var/run/clamav && \
-	chmod 750 /var/run/clamav
+RUN mkdir -p /run/clamav && \
+	chown clamav:clamav /run/clamav && \
+	chmod 750 /run/clamav
 
 # av configuration update
 RUN sed -i 's/^Foreground .*$/Foreground true/g' /etc/clamav/clamd.conf && \
diff --git a/data/Dockerfiles/clamav/bootstrap.sh b/data/Dockerfiles/clamav/bootstrap.sh
index bc5d1b327..96c356672 100755
--- a/data/Dockerfiles/clamav/bootstrap.sh
+++ b/data/Dockerfiles/clamav/bootstrap.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 trap "kill 0" SIGINT
 
+touch /var/log/clamav/clamd.log /var/log/clamav/freshclam.log
+chown -R clamav:clamav /var/log/clamav/
+
 freshclam -d &
 clamd &
 
-sleep inf
+tail -f /var/log/clamav/clamd.log /var/log/clamav/freshclam.log

From a7b854f7ce01a150a43ab0de911b071c613c5372 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 17 May 2017 21:16:48 +0200
Subject: [PATCH 24/25] Fix Dockerfile, again

---
 data/Dockerfiles/php-fpm/docker-entrypoint.sh | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/data/Dockerfiles/php-fpm/docker-entrypoint.sh b/data/Dockerfiles/php-fpm/docker-entrypoint.sh
index 5e88a89d9..9df1dbebf 100755
--- a/data/Dockerfiles/php-fpm/docker-entrypoint.sh
+++ b/data/Dockerfiles/php-fpm/docker-entrypoint.sh
@@ -51,10 +51,35 @@ for file in $(ls /data/dkim/keys/); do
   domain=${file%.dkim}
   if [[ -f /data/dkim/txt/${file} ]]; then
     redis-cli -h redis-mailcow HSET DKIM_PUB_KEYS "${domain}" "$(cat /data/dkim/txt/${file})"
-    redis-cli -h redis-mailcow HSET DKIM_PRIV_KEYS "${domain}" "$(cat /data/dkim/keys/${file})"
+    redis-cli -h redis-mailcow HSET DKIM_PRIV_KEYS "dkim.${domain}" "$(cat /data/dkim/keys/${file})"
     redis-cli -h redis-mailcow HSET DKIM_SELECTORS "${domain}" "dkim"
   fi
   rm /data/dkim/{keys,txt}/${file}
 done
 
+# Fix DKIM keys
+
+# Fetch domains
+declare -a DOMAIN_ARRAY
+while read line
+do
+ DOMAIN_ARRAY+=("$line")
+done < <(mysql -h mysql-mailcow -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT domain FROM domain" -Bs)
+while read line
+do
+ DOMAIN_ARRAY+=("$line")
+done < <(mysql -h mysql-mailcow -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT alias_domain FROM alias_domain" -Bs)
+
+# Loop through array and fix keys
+if [[ ! -z ${DOMAIN_ARRAY} ]]; then
+ for domain in "${DOMAIN_ARRAY[@]}"; do
+   WRONG_KEY=$(redis-cli -h redis-mailcow HGET DKIM_PRIV_KEYS ${domain} | tr -d \")
+   if [[ ! -z ${WRONG_KEY} ]]; then
+     echo "Migrating defect key for domain ${domain}"
+     redis-cli -h redis-mailcow HSET DKIM_PRIV_KEYS "dkim.${domain}" ${WRONG_KEY}
+     redis-cli -h redis-mailcow HDEL DKIM_PRIV_KEYS "${domain}"
+   fi
+ done
+fi
+
 exec "$@"

From c9184a9badfb1d90b679c7118d3d8fc0a6504f94 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 17 May 2017 21:17:00 +0200
Subject: [PATCH 25/25] Various fixes and changes

---
 data/web/css/admin.css         |   6 +-
 data/web/css/mailbox.css       |  11 +-
 data/web/css/mailcow.css       |   8 --
 data/web/css/user.css          |  24 ++++
 data/web/inc/functions.inc.php | 212 +++++++++++++++------------------
 data/web/inc/header.inc.php    |   1 +
 data/web/js/admin.js           |   2 +-
 data/web/js/mailbox.js         |   1 -
 data/web/js/user.js            | 157 +++++++++++++++++++++++-
 data/web/json_api.php          |  62 +++++++++-
 data/web/mailbox.php           |   2 +-
 data/web/user.php              |  88 ++++----------
 12 files changed, 369 insertions(+), 205 deletions(-)
 create mode 100644 data/web/css/user.css

diff --git a/data/web/css/admin.css b/data/web/css/admin.css
index de6fbfa0a..a8365f6d5 100644
--- a/data/web/css/admin.css
+++ b/data/web/css/admin.css
@@ -18,4 +18,8 @@ body {
 body.modal-open {
   overflow-y:scroll;
   padding-right: inherit !important;
-}
\ No newline at end of file
+}
+.mass-actions-admin {
+  user-select: none;
+  padding:10px 0 10px 0;
+}
diff --git a/data/web/css/mailbox.css b/data/web/css/mailbox.css
index b76f3f297..79e882551 100644
--- a/data/web/css/mailbox.css
+++ b/data/web/css/mailbox.css
@@ -18,15 +18,12 @@ table.footable>tbody>tr.footable-empty>td {
   padding: 10px;
   background: #F5F5F5;
 }
-
-#alias_table {
-  cursor:pointer;
-}
-#alias_table .footable-paging {
-  cursor:	auto;
-}
 @media (min-width: 992px) {
   .container {
       width: 80%;
   }
 }
+.mass-actions-mailbox {
+  user-select: none;
+  padding:10px 0 10px 10px;
+}
diff --git a/data/web/css/mailcow.css b/data/web/css/mailcow.css
index 3978fcd98..adfc063b2 100644
--- a/data/web/css/mailcow.css
+++ b/data/web/css/mailcow.css
@@ -63,11 +63,3 @@ body.modal-open {
   max-width: 550px;
   z-index: 2000;
 }
-.mass-actions-mailbox {
-  user-select: none;
-  padding:10px 0 10px 10px;
-}
-.mass-actions-admin {
-  user-select: none;
-  padding:10px 0 10px 0;
-}
diff --git a/data/web/css/user.css b/data/web/css/user.css
new file mode 100644
index 000000000..605a10102
--- /dev/null
+++ b/data/web/css/user.css
@@ -0,0 +1,24 @@
+table.footable>tbody>tr.footable-empty>td {
+  font-size:15px !important;
+  font-style:italic;
+}
+.pagination a {
+  text-decoration: none !important;
+}
+.panel panel-default {
+  overflow: visible !important;
+}
+.table-responsive {
+  overflow: visible !important;
+}
+.footer-add-item {
+  display:block;
+  text-align: center;
+  font-style: italic;
+  padding: 10px;
+  background: #F5F5F5;
+}
+.mass-actions-user {
+  user-select: none;
+  padding:10px 0 10px 0;
+}
diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php
index a1a6d9350..40e6a86a6 100644
--- a/data/web/inc/functions.inc.php
+++ b/data/web/inc/functions.inc.php
@@ -867,7 +867,7 @@ function delete_policy_list_item($postarray) {
   return true;
 }
 function get_syncjobs($username = null) {
-  // 'username' can be be set, if not, default to mailcow_cc_username
+  // 'username' can be set, if not set, defaults to mailcow_cc_username
 	global $lang;
 	global $pdo;
   $data = array();
@@ -880,7 +880,10 @@ function get_syncjobs($username = null) {
     $username = $_SESSION['mailcow_cc_username'];
   }
   try {
-    $stmt = $pdo->prepare("SELECT *, CONCAT(LEFT(`password1`, 3), '…') as `password1_short`
+    $stmt = $pdo->prepare("SELECT *,
+      CONCAT(LEFT(`password1`, 3), '...') AS `password1_short`,
+      `active` AS `active_int`,
+      CASE `active` WHEN 1 THEN '".$lang['mailbox']['yes']."' ELSE '".$lang['mailbox']['no']."' END AS `active`
         FROM `imapsync`
           WHERE `user2` = :username");
     $stmt->execute(array(':username' => $username));
@@ -1096,126 +1099,107 @@ function add_syncjob($postarray) {
 }
 function edit_syncjob($postarray) {
   // Array items
-  // 'username' can be set, defaults to mailcow_cc_username
 	global $lang;
 	global $pdo;
-  if (isset($postarray['username']) && filter_var($postarray['username'], FILTER_VALIDATE_EMAIL)) {
-    if (!hasMailboxObjectAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], $postarray['username'])) {
+  if (!is_array($postarray['id'])) {
+    $ids = array();
+    $ids[] = $postarray['id'];
+  }
+  else {
+    $ids = $postarray['id'];
+  }
+
+  foreach ($ids as $id) {
+    $is_now = get_syncjob_details($id);
+    if (!empty($is_now)) {
+      $username = $is_now['user2'];
+      $user1 = (!empty($postarray['user1'])) ? $postarray['user1'] : $is_now['user1'];
+      $active = (isset($postarray['active'])) ? $postarray['active'] : $is_now['active_int'];
+      $delete2duplicates = (isset($postarray['delete2duplicates'])) ? $postarray['delete2duplicates'] : $is_now['delete2duplicates'];
+      $delete1 = (isset($postarray['delete1'])) ? $postarray['delete1'] : $is_now['delete1'];
+      $port1 = (!empty($postarray['port1'])) ? $postarray['port1'] : $is_now['port1'];
+      $password1 = (!empty($postarray['password1'])) ? $postarray['password1'] : $is_now['password1'];
+      $host1 = (!empty($postarray['host1'])) ? $postarray['host1'] : $is_now['host1'];
+      $subfolder2 = (!empty($postarray['subfolder2'])) ? $postarray['subfolder2'] : $is_now['subfolder2'];
+      $enc1 = (!empty($postarray['enc1'])) ? $postarray['enc1'] : $is_now['enc1'];
+      $mins_interval = (!empty($postarray['mins_interval'])) ? $postarray['mins_interval'] : $is_now['mins_interval'];
+      $exclude = (!empty($postarray['exclude'])) ? $postarray['exclude'] : $is_now['exclude'];
+      $maxage = (!empty($postarray['maxage'])) ? $postarray['maxage'] : $is_now['maxage'];
+    }
+    else {
       $_SESSION['return'] = array(
         'type' => 'danger',
         'msg' => sprintf($lang['danger']['access_denied'])
       );
       return false;
     }
-    else {
-      $username = $postarray['username'];
+    if (empty($subfolder2)) {
+      $subfolder2 = "";
+    }
+    if (!isset($maxage) || !filter_var($maxage, FILTER_VALIDATE_INT, array('options' => array('min_range' => 1, 'max_range' => 32767)))) {
+      $maxage = "0";
+    }
+    if (!filter_var($port1, FILTER_VALIDATE_INT, array('options' => array('min_range' => 1, 'max_range' => 65535)))) {
+      $_SESSION['return'] = array(
+        'type' => 'danger',
+        'msg' => sprintf($lang['danger']['access_denied'])
+      );
+      return false;
+    }
+    if (!filter_var($mins_interval, FILTER_VALIDATE_INT, array('options' => array('min_range' => 10, 'max_range' => 3600)))) {
+      $_SESSION['return'] = array(
+        'type' => 'danger',
+        'msg' => sprintf($lang['danger']['access_denied'])
+      );
+      return false;
+    }
+    if (!is_valid_domain_name($host1)) {
+      $_SESSION['return'] = array(
+        'type' => 'danger',
+        'msg' => sprintf($lang['danger']['access_denied'])
+      );
+      return false;
+    }
+    if ($enc1 != "TLS" && $enc1 != "SSL" && $enc1 != "PLAIN") {
+      $_SESSION['return'] = array(
+        'type' => 'danger',
+        'msg' => sprintf($lang['danger']['access_denied'])
+      );
+      return false;
+    }
+    if (@preg_match("/" . $exclude . "/", null) === false) {
+      $_SESSION['return'] = array(
+        'type' => 'danger',
+        'msg' => sprintf($lang['danger']['access_denied'])
+      );
+      return false;
+    }
+    try {
+      $stmt = $pdo->prepare("UPDATE `imapsync` SET `delete1` = :delete1, `maxage` = :maxage, `subfolder2` = :subfolder2, `exclude` = :exclude, `host1` = :host1, `user1` = :user1, `password1` = :password1, `mins_interval` = :mins_interval, `port1` = :port1, `enc1` = :enc1, `delete2duplicates` = :delete2duplicates, `active` = :active
+        WHERE `id` = :id");
+      $stmt->execute(array(
+        ':delete1' => $delete1,
+        ':id' => $id,
+        ':exclude' => $exclude,
+        ':maxage' => $maxage,
+        ':subfolder2' => $subfolder2,
+        ':host1' => $host1,
+        ':user1' => $user1,
+        ':password1' => $password1,
+        ':mins_interval' => $mins_interval,
+        ':port1' => $port1,
+        ':enc1' => $enc1,
+        ':delete2duplicates' => $delete2duplicates,
+        ':active' => $active,
+      ));
+    }
+    catch(PDOException $e) {
+      $_SESSION['return'] = array(
+        'type' => 'danger',
+        'msg' => 'MySQL: '.$e
+      );
+      return false;
     }
-  }
-  else {
-    $username = $_SESSION['mailcow_cc_username'];
-  }
-  
-	$active           = intval($postarray['active']);
-	$delete2duplicates = intval($postarray['delete2duplicates']);
-	$delete1          = intval($postarray['delete1']);
-  $id               = $postarray['id'];
-  $port1            = $postarray['port1'];
-  $host1            = $postarray['host1'];
-  $password1        = $postarray['password1'];
-  $exclude          = $postarray['exclude'];
-  $maxage           = $postarray['maxage'];
-  $subfolder2       = $postarray['subfolder2'];
-  $user1            = $postarray['user1'];
-  $mins_interval    = $postarray['mins_interval'];
-  $enc1             = $postarray['enc1'];
-
-  if (empty($subfolder2)) {
-    $subfolder2 = "";
-  }
-  if (!isset($maxage) || !filter_var($maxage, FILTER_VALIDATE_INT, array('options' => array('min_range' => 1, 'max_range' => 32767)))) {
-    $maxage = "0";
-  }
-  if (!filter_var($port1, FILTER_VALIDATE_INT, array('options' => array('min_range' => 1, 'max_range' => 65535)))) {
-    $_SESSION['return'] = array(
-      'type' => 'danger',
-      'msg' => sprintf($lang['danger']['access_denied'])
-    );
-    return false;
-  }
-  if (!filter_var($mins_interval, FILTER_VALIDATE_INT, array('options' => array('min_range' => 10, 'max_range' => 3600)))) {
-    $_SESSION['return'] = array(
-      'type' => 'danger',
-      'msg' => sprintf($lang['danger']['access_denied'])
-    );
-    return false;
-  }
-  if (!is_valid_domain_name($host1)) {
-    $_SESSION['return'] = array(
-      'type' => 'danger',
-      'msg' => sprintf($lang['danger']['access_denied'])
-    );
-    return false;
-  }
-  if ($enc1 != "TLS" && $enc1 != "SSL" && $enc1 != "PLAIN") {
-    $_SESSION['return'] = array(
-      'type' => 'danger',
-      'msg' => sprintf($lang['danger']['access_denied'])
-    );
-    return false;
-  }
-  if (@preg_match("/" . $exclude . "/", null) === false) {
-    $_SESSION['return'] = array(
-      'type' => 'danger',
-      'msg' => sprintf($lang['danger']['access_denied'])
-    );
-    return false;
-  }
-  try {
-    $stmt = $pdo->prepare("SELECT `user2` FROM `imapsync`
-      WHERE `user2` = :user2 AND `id` = :id");
-    $stmt->execute(array(':user2' => $username, ':id' => $id));
-    $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
-  }
-  catch(PDOException $e) {
-    $_SESSION['return'] = array(
-      'type' => 'danger',
-      'msg' => 'MySQL: '.$e
-    );
-    return false;
-  }
-  if (empty($num_results)) {
-    $_SESSION['return'] = array(
-      'type' => 'danger',
-      'msg' => sprintf($lang['danger']['access_denied'])
-    );
-    return false;
-  }
-  try {
-    $stmt = $pdo->prepare("UPDATE `imapsync` set `delete1` = :delete1, `maxage` = :maxage, `subfolder2` = :subfolder2, `exclude` = :exclude, `host1` = :host1, `user1` = :user1, `password1` = :password1, `mins_interval` = :mins_interval, `port1` = :port1, `enc1` = :enc1, `delete2duplicates` = :delete2duplicates, `active` = :active
-      WHERE `user2` = :user2 AND `id` = :id");
-    $stmt->execute(array(
-      ':user2' => $username,
-      ':delete1' => $delete1,
-      ':id' => $id,
-      ':exclude' => $exclude,
-      ':maxage' => $maxage,
-      ':subfolder2' => $subfolder2,
-      ':host1' => $host1,
-      ':user1' => $user1,
-      ':password1' => $password1,
-      ':mins_interval' => $mins_interval,
-      ':port1' => $port1,
-      ':enc1' => $enc1,
-      ':delete2duplicates' => $delete2duplicates,
-      ':active' => $active,
-    ));
-  }
-  catch(PDOException $e) {
-    $_SESSION['return'] = array(
-      'type' => 'danger',
-      'msg' => 'MySQL: '.$e
-    );
-    return false;
   }
   $_SESSION['return'] = array(
     'type' => 'success',
@@ -2479,7 +2463,7 @@ function dkim_delete_key($postarray) {
       $selector = $redis->hGet('DKIM_SELECTORS', $domain);
       $redis->hDel('DKIM_PUB_KEYS', $domain);
       $redis->hDel('DKIM_PRIV_KEYS', $selector . '.' . $domain);
-      $redis->hDel('DKIM_SELECTORS', $selector);
+      $redis->hDel('DKIM_SELECTORS', $domain);
     }
     catch (RedisException $e) {
       $_SESSION['return'] = array(
diff --git a/data/web/inc/header.inc.php b/data/web/inc/header.inc.php
index e92403764..170335e36 100644
--- a/data/web/inc/header.inc.php
+++ b/data/web/inc/header.inc.php
@@ -21,6 +21,7 @@
 <link rel="stylesheet" href="/css/animate.min.css">
 <?= (preg_match("/mailbox.php/i", $_SERVER['REQUEST_URI'])) ? '<link rel="stylesheet" href="/css/mailbox.css">' : null; ?>
 <?= (preg_match("/admin.php/i", $_SERVER['REQUEST_URI'])) ? '<link rel="stylesheet" href="/css/admin.css">' : null; ?>
+<?= (preg_match("/user.php/i", $_SERVER['REQUEST_URI'])) ? '<link rel="stylesheet" href="/css/user.css">' : null; ?>
 <link rel="shortcut icon" href="/favicon.png" type="image/png">
 <link rel="icon" href="/favicon.png" type="image/png">
 </head>
diff --git a/data/web/js/admin.js b/data/web/js/admin.js
index 711070ddc..9d6642b9f 100644
--- a/data/web/js/admin.js
+++ b/data/web/js/admin.js
@@ -56,7 +56,7 @@ $(document).ready(function() {
           url: '/api/v1/' + api_url,
           jsonp: false,
           complete: function (data) {
-            location.assign(window.location);
+            location.reload(true);
           }
         });
       })
diff --git a/data/web/js/mailbox.js b/data/web/js/mailbox.js
index 0ec0d5e2d..100c9235a 100644
--- a/data/web/js/mailbox.js
+++ b/data/web/js/mailbox.js
@@ -88,7 +88,6 @@ $(document).ready(function() {
         $('#ConfirmDeleteModal').modal('hide');
       });;
   });
-
 });
 
 jQuery(function($){
diff --git a/data/web/js/user.js b/data/web/js/user.js
index 8d9450be1..7959cc5aa 100644
--- a/data/web/js/user.js
+++ b/data/web/js/user.js
@@ -22,12 +22,165 @@ $(document).ready(function() {
 
 	// Init Bootstrap Switch
 	$.fn.bootstrapSwitch.defaults.onColor = 'success';
-	$("[name='tls_out']").bootstrapSwitch();
-	$("[name='tls_in']").bootstrapSwitch();
+	$("#tls_out").bootstrapSwitch();
+	$("#tls_in").bootstrapSwitch();
 
   // Log modal
   $('#logModal').on('show.bs.modal', function(e) {
   var logText = $(e.relatedTarget).data('log-text');
   $(e.currentTarget).find('#logText').html('<pre style="background:none;font-size:11px;line-height:1.1;border:0px">' + logText + '</pre>');
   });
+
+  // Collect values of input fields with name multi_select with same data-id to js array multi_data[data-id]
+  var multi_data = [];
+  $(document).on('change', 'input[name=multi_select]:checkbox', function() {
+    if ($(this).is(':checked') && $(this).data('id')) {
+      var id = $(this).data('id');
+      if (typeof multi_data[id] == "undefined") {
+        multi_data[id] = [];
+      }
+      multi_data[id].push($(this).val());
+    }
+    else {
+      var id = $(this).data('id');
+      multi_data[id].splice($.inArray($(this).val(), multi_data[id]),1);
+    }
+  });
+  // Select checkbox by click on parent tr
+  $(document).on('click', 'tbody>tr', function(e) {
+    if (e.target.type == "checkbox") {
+      e.stopPropagation();
+    } else {
+      var checkbox = $(this).find(':checkbox');
+      checkbox.trigger('click');
+    }
+  });
+  // Select or deselect all checkboxes with same data-id
+  $(document).on('click', '#toggle_multi_select_all', function(e) {
+    e.preventDefault();
+    id = $(this).data("id");
+    multi_data[id] = [];
+    var all_checkboxes = $("input[data-id=" + id + "]:enabled");
+    all_checkboxes.prop("checked", !all_checkboxes.prop("checked")).change();
+  });
+  // General API edit actions
+  $(document).on('click', '#edit_selected', function(e) {
+    e.preventDefault();
+    var id = $(this).data('id');
+    if (typeof multi_data[id] == "undefined") return;
+    data_array = multi_data[id];
+    api_url = $(this).data('api-url');
+    api_attr = $(this).data('api-attr');
+    if (Object.keys(data_array).length !== 0) {
+      $.ajax({
+        type: "POST",
+        dataType: "json",
+        data: { "items": JSON.stringify(data_array), "attr": JSON.stringify(api_attr), "csrf_token": csrf_token },
+        url: '/api/v1/' + api_url,
+        jsonp: false,
+        complete: function (data) {
+          // var reponse = (JSON.parse(data.responseText));
+          // console.log(reponse.type);
+          // console.log(reponse.msg);
+          location.assign(window.location);
+        }
+      });
+    }
+  });
+  // General API delete actions
+  $(document).on('click', '#delete_selected', function(e) {
+    e.preventDefault();
+    var id = $(this).data('id');
+    if (typeof multi_data[id] == "undefined" || multi_data[id] == "") return;
+    data_array = multi_data[id];
+    api_url = $(this).data('api-url');
+      $(document).on('show.bs.modal','#ConfirmDeleteModal', function () {
+        $("#ItemsToDelete").empty();
+        for (var i in data_array) {
+          $("#ItemsToDelete").append("<li>" + data_array[i] + "</li>");
+        }
+      })
+      $('#ConfirmDeleteModal').modal({
+        backdrop: 'static',
+        keyboard: false
+      })
+      .one('click', '#IsConfirmed', function(e) {
+        $.ajax({
+          type: "POST",
+          dataType: "json",
+          data: { "items": JSON.stringify(data_array), "csrf_token": csrf_token },
+          url: '/api/v1/' + api_url,
+          jsonp: false,
+          complete: function (data) {
+            location.reload(true);
+          }
+        });
+      })
+      .one('click', '#isCanceled', function(e) {
+        $('#ConfirmDeleteModal').modal('hide');
+      });;
+  });
+});
+jQuery(function($){
+  // http://stackoverflow.com/questions/24816/escaping-html-strings-with-jquery
+  var entityMap = {
+  '&': '&amp;',
+  '<': '&lt;',
+  '>': '&gt;',
+  '"': '&quot;',
+  "'": '&#39;',
+  '/': '&#x2F;',
+  '`': '&#x60;',
+  '=': '&#x3D;'
+  };
+  function escapeHtml(string) {
+    return String(string).replace(/[&<>"'`=\/]/g, function (s) {
+      return entityMap[s];
+    });
+  }
+  function draw_sync_job_table() {
+    ft_aliasdomain_table = FooTable.init('#sync_job_table', {
+      "columns": [
+        {"name":"chkbox","title":"","style":{"maxWidth":"40px","width":"40px"},"filterable": false,"sortable": false,"type":"html"},
+        {"sorted": true,"name":"server_w_port","title":"Server"},
+        {"name":"enc1","title":lang.encryption},
+        {"name":"user1","title":lang.username},
+        {"name":"exclude","title":lang.excludes},
+        {"name":"mins_interval","title":lang.interval + " (min)"},
+        {"name":"last_run","title":lang.last_run},
+        {"name":"log","title":"Log"},
+        {"name":"active","filterable": false,"style":{"maxWidth":"50px","width":"70px"},"title":lang.active},
+        {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","maxWidth":"180px","width":"180px"},"type":"html","title":lang.action,"breakpoints":"xs sm"}
+      ],
+      "empty": lang.empty,
+      "rows": $.ajax({
+        dataType: 'json',
+        url: '/api/v1/get/syncjob',
+        jsonp: false,
+        error: function () {
+          console.log('Cannot draw sync job table');
+        },
+        success: function (data) {
+          $.each(data, function (i, item) {
+            item.log = '<a href="#logModal" data-toggle="modal" data-log-text="' + escapeHtml(item.returned_text) + '">Open logs</a>'
+            item.exclude = '<code>' + item.exclude + '</code>'
+            item.server_w_port = item.host1 + ':' + item.port1;
+            item.action = '<div class="btn-group">' +
+              '<a href="/edit.php?syncjob=' + item.id + '" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-pencil"></span> ' + lang.edit + '</a>' +
+              '</div>';
+            item.chkbox = '<input type="checkbox" data-id="syncjob" name="multi_select" value="' + item.id + '" />';
+          });
+        }
+      }),
+      "paging": {
+        "enabled": true,
+        "limit": 5,
+        "size": pagination_size
+      },
+      "sorting": {
+        "enabled": true
+      }
+    });
+  }
+  draw_sync_job_table();
 });
\ No newline at end of file
diff --git a/data/web/json_api.php b/data/web/json_api.php
index 0301659a4..a2d08e393 100644
--- a/data/web/json_api.php
+++ b/data/web/json_api.php
@@ -151,7 +151,19 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
                   echo json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
                 }
               break;
-
+            }
+          break;
+          case "syncjob":
+            switch ($object) {
+              default:
+                $data = get_syncjobs($object);
+                if (!isset($data) || empty($data)) {
+                  echo '{}';
+                }
+                else {
+                  echo json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
+                }
+              break;
             }
           break;
           case "resource":
@@ -183,7 +195,6 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
                   echo '{}';
                 }
               break;
-
               default:
                 $data = mailbox_get_resource_details($object);
                 if (!isset($data) || empty($data)) {
@@ -193,7 +204,6 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
                   echo json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
                 }
               break;
-
             }
           break;
           case "fwdhost":
@@ -226,7 +236,6 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
                   echo json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
                 }
               break;
-
             }
           break;
           case "alias-domain":
@@ -258,7 +267,6 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
                   echo '{}';
                 }
               break;
-
               default:
                 $data = mailbox_get_alias_domains($object);
                 if (!isset($data) || empty($data)) {
@@ -756,6 +764,50 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
               ));
             }
           break;
+          case "syncjob":
+            if (isset($_POST['items']) && isset($_POST['attr'])) {
+              $items = (array)json_decode($_POST['items'], true);
+              $attr = (array)json_decode($_POST['attr'], true);
+              $postarray = array_merge(array('id' => $items), $attr);
+              if (is_array($postarray['id'])) {
+                if (edit_syncjob($postarray) === false) {
+                  if (isset($_SESSION['return'])) {
+                    echo json_encode($_SESSION['return']);
+                  }
+                  else {
+                    echo json_encode(array(
+                      'type' => 'error',
+                      'msg' => 'Edit failed'
+                    ));
+                  }
+                  exit();
+                }
+                else {
+                  if (isset($_SESSION['return'])) {
+                    echo json_encode($_SESSION['return']);
+                  }
+                  else {
+                    echo json_encode(array(
+                      'type' => 'success',
+                      'msg' => 'Task completed'
+                    ));
+                  }
+                }
+              }
+              else {
+                echo json_encode(array(
+                  'type' => 'error',
+                  'msg' => 'Incomplete post data'
+                ));
+              }
+            }
+            else {
+              echo json_encode(array(
+                'type' => 'error',
+                'msg' => 'Incomplete post data'
+              ));
+            }
+          break;
           case "resource":
             if (isset($_POST['items']) && isset($_POST['attr'])) {
               $items = (array)json_decode($_POST['items'], true);
diff --git a/data/web/mailbox.php b/data/web/mailbox.php
index b04ae9684..b10bb4147 100644
--- a/data/web/mailbox.php
+++ b/data/web/mailbox.php
@@ -152,7 +152,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
                 <a class="btn btn-sm btn-default" id="toggle_multi_select_all" data-id="alias" href="#"><span class="glyphicon glyphicon-check" aria-hidden="true"></span> <?=$lang['mailbox']['toggle_all'];?></a>
                 <a class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" href="#"><?=$lang['mailbox']['quick_actions'];?> <span class="caret"></span></a>
                 <ul class="dropdown-menu">
-                  <li><a id="edit_selected" data-id="alias" data-api-url='edit/alias' data-api-attr='{"active":"1","active1":"12"}' href="#"><?=$lang['mailbox']['activate'];?></a></li>
+                  <li><a id="edit_selected" data-id="alias" data-api-url='edit/alias' data-api-attr='{"active":"1"}' href="#"><?=$lang['mailbox']['activate'];?></a></li>
                   <li><a id="edit_selected" data-id="alias" data-api-url='edit/alias' data-api-attr='{"active":"0"}' href="#"><?=$lang['mailbox']['deactivate'];?></a></li>
                   <li role="separator" class="divider"></li>
                   <li><a id="delete_selected" data-id="alias" data-api-url='delete/alias' href="#"><?=$lang['mailbox']['remove'];?></a></li>
diff --git a/data/web/user.php b/data/web/user.php
index d5c75abcf..7a3d6f873 100644
--- a/data/web/user.php
+++ b/data/web/user.php
@@ -408,71 +408,21 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
 	</div>
 	<div role="tabpanel" class="tab-pane" id="Syncjobs">
 		<div class="table-responsive">
-		<table class="table table-striped" id="timelimitedaliases">
-			<thead>
-			<tr>
-				<th class="sort-table" style="min-width: 96px;">Server:Port</th>
-				<th class="sort-table" style="min-width: 96px;"><?=$lang['user']['encryption'];?></th>
-				<th class="sort-table" style="min-width: 96px;"><?=$lang['user']['username'];?></th>
-				<th class="sort-table" style="min-width: 96px;"><?=$lang['user']['excludes'];?></th>
-				<th class="sort-table" style="min-width: 35px;"><?=$lang['user']['interval'];?></th>
-				<th class="sort-table" style="min-width: 35px;"><?=$lang['user']['last_run'];?></th>
-				<th class="sort-table" style="min-width: 35px;">Log</th>
-				<th class="sort-table" style="max-width: 95px;"><?=$lang['user']['active'];?></th>
-				<th style="text-align: right; min-width: 200px;"><?=$lang['user']['action'];?></th>
-			</tr>
-			</thead>
-			<tbody>
-			<?php
-      $get_syncjobs = get_syncjobs($username);
-			if (!empty($get_syncjobs)):
-			foreach ($get_syncjobs as $row):
-			?>
-				<tr id="data">
-				<td><?=htmlspecialchars($row['host1'] . ':' . $row['port1']);?></td>
-				<td><?=htmlspecialchars($row['enc1']);?></td>
-				<td><?=htmlspecialchars($row['user1']);?></td>
-				<td><?=($row['exclude'] == '') ? '&#10008;' : '<code>' . $row['exclude'] . '</code>';?></td>
-				<td><?=htmlspecialchars($row['mins_interval']);?> min</td>
-				<td><?=(empty($row['last_run'])) ? '&#10008;' : htmlspecialchars(date($lang['user']['syncjob_full_date'], strtotime($row['last_run'])));?></td>
-				<td>
-        <?php
-        if (empty($row['returned_text'])) {
-          echo '&#10008;';
-        }
-        else {
-        ?>
-          <a href="#logModal" data-toggle="modal" data-log-text="<?=htmlspecialchars($row['returned_text']);?>">Open logs</a>
-        <?php
-        }
-        ?>
-        </td>
-				<td><?=($row['active'] == '1') ? '&#10004;' : '&#10008;';?></td>
-        <td style="text-align: right;">
-          <div class="btn-group">
-            <a href="/edit.php?syncjob=<?=urlencode($row['id']);?>" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-pencil"></span> <?=$lang['user']['edit'];?></a>
-            <a href="/delete.php?syncjob=<?=urlencode($row['id']);?>" class="btn btn-xs btn-danger"><span class="glyphicon glyphicon-trash"></span> <?=$lang['user']['remove'];?></a>
-          </div>
-        </td>
-				</tr>
-			<?php
-			endforeach;
-			else:
-			?>
-				<tr id="no-data"><td colspan="9" style="text-align: center; font-style: italic;"><?=$lang['user']['no_record'];?></td></tr>
-			<?php
-			endif;	
-			?>
-			</tbody>
-      <tfoot>
-        <tr id="no-data">
-          <td colspan="9" style="text-align: center; font-style: normal; border-top: 1px solid #e7e7e7;">
-            <a href="/add.php?syncjob"><?=$lang['user']['create_syncjob'];?></a>
-          </td>
-        </tr>
-      </tfoot>
-		</table>
+      <table class="table table-striped" id="sync_job_table"></table>
 		</div>
+    <div class="mass-actions-user">
+      <div class="btn-group">
+        <a class="btn btn-sm btn-default" id="toggle_multi_select_all" data-id="syncjob" href="#"><span class="glyphicon glyphicon-check" aria-hidden="true"></span> <?=$lang['mailbox']['toggle_all'];?></a>
+        <a class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" href="#"><?=$lang['mailbox']['quick_actions'];?> <span class="caret"></span></a>
+        <ul class="dropdown-menu">
+          <li><a id="edit_selected" data-id="syncjob" data-api-url='edit/syncjob' data-api-attr='{"active":"1"}' href="#"><?=$lang['mailbox']['activate'];?></a></li>
+          <li><a id="edit_selected" data-id="syncjob" data-api-url='edit/syncjob' data-api-attr='{"active":"0"}' href="#"><?=$lang['mailbox']['deactivate'];?></a></li>
+          <li role="separator" class="divider"></li>
+          <li><a id="delete_selected" data-id="syncjob" data-api-url='delete/syncjob' href="#"><?=$lang['mailbox']['remove'];?></a></li>
+        </ul>
+        <a class="btn btn-sm btn-success" href="/add.php?syncjob"><?=$lang['user']['create_syncjob'];?></a>
+      </div>
+    </div>
 		</div>
 	</div>
 </div>
@@ -533,7 +483,15 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "use
   </div>
 </div>
 </div> <!-- /container -->
-<script src="js/sorttable.js"></script>
+<script type='text/javascript'>
+<?php
+$lang_user = json_encode($lang['user']);
+echo "var lang = ". $lang_user . ";\n";
+echo "var csrf_token = '". $_SESSION['CSRF']['TOKEN'] . "';\n";
+echo "var pagination_size = '". $PAGINATION_SIZE . "';\n";
+?>
+</script>
+<script src="js/footable.min.js"></script>
 <script src="js/user.js"></script>
 <?php
 require_once("inc/footer.inc.php");