diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index 5b48189522..a8646418f1 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -290,5 +290,5 @@ dev_email = "" dev_password = "" [version] -current = "2.19.2" +current = "2.19.3" saved = "Fri, 30 Sep 2022 12:34:56 +0000" diff --git a/README.md b/README.md index 4c849d6bd7..7d35ce9d8b 100644 --- a/README.md +++ b/README.md @@ -140,26 +140,26 @@ RainLoop 1.17 vs SnappyMail |js/* |RainLoop |Snappy | |--------------- |--------: |--------: | -|admin.js |2.170.153 | 80.893 | -|app.js |4.207.787 | 405.596 | +|admin.js |2.170.153 | 81.500 | +|app.js |4.207.787 | 405.584 | |boot.js | 868.735 | 2.050 | -|libs.js | 658.812 | 195.214 | -|sieve.js | 0 | 86.183 | +|libs.js | 658.812 | 194.347 | +|sieve.js | 0 | 86.172 | |polyfills.js | 334.608 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.240.095 | 770.221 | +|TOTAL |8.240.095 | 769.938 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | -|admin.min.js | 256.831 | 40.083 | 73.606 | 13.387 | 60.877 | 11.991 | -|app.min.js | 515.367 | 187.928 |139.456 | 62.162 |110.485 | 53.380 | +|admin.min.js | 256.831 | 40.402 | 73.606 | 13.446 | 60.877 | 12.062 | +|app.min.js | 515.367 | 188.357 |139.456 | 62.409 |110.485 | 53.609 | |boot.min.js | 84.659 | 1.252 | 26.998 | 778 | 23.643 | 628 | -|libs.min.js | 584.772 | 93.430 |180.901 | 34.504 |155.182 | 30.954 | -|sieve.min.js | 0 | 41.961 | 0 | 10.493 | 0 | 9.462 | +|libs.min.js | 584.772 | 92.683 |180.901 | 34.283 |155.182 | 30.755 | +|sieve.min.js | 0 | 41.952 | 0 | 10.493 | 0 | 9.465 | |polyfills.min.js | 32.837 | 0 | 11.406 | 0 | 10.175 | 0 | -|TOTAL user |1.217.635 | 282.610 |358.761 | 97.444 |299.485 | 84.962 | -|TOTAL user+sieve |1.217.635 | 324.571 |358.761 |107.937 |299.485 | 94.424 | -|TOTAL admin | 959.099 | 134.765 |292.911 | 48.669 |249.877 | 43.573 | +|TOTAL user |1.217.635 | 282.292 |358.761 | 97.470 |299.485 | 84.992 | +|TOTAL user+sieve |1.217.635 | 324.244 |358.761 |107.963 |299.485 | 94.457 | +|TOTAL admin | 959.099 | 134.337 |292.911 | 48.507 |249.877 | 43.445 | For a user its around 70% smaller and faster than traditional RainLoop. @@ -187,12 +187,12 @@ For a user its around 70% smaller and faster than traditional RainLoop. |css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli | |------------ |-------: |------: |------: |------: |--------: | -|app.css | 340.331 | 81.669 | 46.946 | 16.923 | 14.538 | -|app.min.css | 274.947 | 65.520 | 39.647 | 15.098 | 13.140 | +|app.css | 340.331 | 82.275 | 46.946 | 17.069 | 14.651 | +|app.min.css | 274.947 | 65.946 | 39.647 | 15.046 | 13.224 | |boot.css | | 1.326 | | 664 | 545 | |boot.min.css | | 1.071 | | 590 | 474 | -|admin.css | | 29.949 | | 6.793 | 5.898 | -|admin.min.css | | 24.073 | | 6.158 | 5.414 | +|admin.css | | 29.955 | | 6.798 | 5.906 | +|admin.min.css | | 24.093 | | 6.170 | 5.424 | ### PGP RainLoop uses the old OpenPGP.js v2 @@ -206,7 +206,7 @@ See https://github.com/the-djmaze/openpgpjs for development |OpenPGP |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |-------: |--------: |--------: | -|openpgp.min.js | 330.742 | 539.244 |102.388 | 166.997 | 84.241 | 137.184 | +|openpgp.min.js | 330.742 | 539.257 |102.388 | 166.998 | 84.241 | 137.186 | |openpgp.worker | 1.499 | | 824 | | 695 | | diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md index 3f22a4ff4f..9ef5340af5 100644 --- a/integrations/cloudron/DESCRIPTION.md +++ b/integrations/cloudron/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages SnappyMail 2.19.2. +This app packages SnappyMail 2.19.3. SnappyMail is a simple, modern, lightweight & fast web-based email client. diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile index 04afbf0bf1..df68076215 100644 --- a/integrations/cloudron/Dockerfile +++ b/integrations/cloudron/Dockerfile @@ -4,7 +4,7 @@ RUN mkdir -p /app/code WORKDIR /app/code # If you change the extraction below, be sure to test on scaleway -VERSION=2.19.2 +VERSION=2.19.3 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \ unzip /tmp/snappymail.zip -d /app/code && \ rm /tmp/snappymail.zip && \ diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index e648458a67..fc527900af 100644 --- a/integrations/nextcloud/snappymail/appinfo/info.xml +++ b/integrations/nextcloud/snappymail/appinfo/info.xml @@ -3,7 +3,7 @@ snappymail SnappyMail SnappyMail Webmail - 2.19.2 + 2.19.3 agpl SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli = $mResult) { - $mResult = false; + $mValue = (int) $mValue; + if (0 < $mValue) { + return $mValue; } } else if (\is_array($mValue)) { if (1 === \count($mValue) && \is_numeric($mValue[0])) { - $mResult = (int) $mValue[0]; - if (0 >= $mResult) { - $mResult = false; + $mValue = (int) $mValue[0]; + if (0 < $mValue) { + return $mValue; } } else { - $mResult = array(); + $aResult = array(); foreach ($mValue as $mValueItem) { - $mTemp = $this->validateThreadItem($mValueItem); - if (false !== $mTemp) { - $mResult[] = $mTemp; + $mValueItem = $this->validateThreadItem($mValueItem); + if ($mValueItem) { + $aResult[] = $mValueItem; } } + return $aResult; } } - return $mResult; + return false; } }