diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77dd0f1a..c4a39d97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [1.5.3] - 2021-07-01
+### Added
+- installcheck: Check for Sodium when using PHP 7.4+
+### Changed
+- Changed packaging script to avoid duplicate files and reduce archive size
+
## [1.5.2] - 2021-06-28
### Changed
- Fixed packaging script, #367
diff --git a/index.php b/index.php
index baf2adba..48d4e7b9 100644
--- a/index.php
+++ b/index.php
@@ -29,19 +29,19 @@
# Allowed languages, i.e. languages with translations
$allowedLangs = array('de', 'en', 'es', 'fr', 'gl' , 'hu', 'it', 'nl', 'pl');
-# Fallback language if the browser prefers otherau than the allowed languages
+# Fallback language if the browser prefers another than the allowed languages
$fallbackLang = 'en';
# Application Name
$appname = 'BicBucStriim';
# App version
-$appversion = '1.5.2';
+$appversion = '1.5.3';
# Init app and routes
$app = new \Slim\Slim(array(
'view' => new \Slim\Views\Twig(),
- 'mode' => 'production',
+ #'mode' => 'production',
#'mode' => 'debug',
- #'mode' => 'development',
+ 'mode' => 'development',
));
$app->configureMode('production', 'confprod');
diff --git a/installcheck.php b/installcheck.php
index eaa672a9..c3194b9b 100644
--- a/installcheck.php
+++ b/installcheck.php
@@ -121,7 +121,7 @@ function check_php() {
echo $template->render(array(
'page' => array(
'rot' => '',
- 'version' => '1.5.22'
+ 'version' => '1.5.3'
),
'is_a' => $is_a,
'srv' => $srv,
@@ -135,6 +135,7 @@ function check_php() {
'dwrit' => fw('./data'),
'intl' => extension_loaded('intl'),
'mcrypt' => extension_loaded('mcrypt'),
+ 'sodium' => extension_loaded('sodium'),
'mwrit' => fw('./data/data.db'),
'opd' => ini_get('open_basedir'),
'php' => check_php(),
diff --git a/scripts/package.js b/scripts/package.js
index 920b6c92..da0f156a 100644
--- a/scripts/package.js
+++ b/scripts/package.js
@@ -9,19 +9,16 @@ zip.addLocalFile("js/script.js", "js/script.js");
zip.addLocalFolder("style/jquery", "style/jquery");
zip.addLocalFile("style/style.css", "style/");
zip.addLocalFolder("lib/BicBucStriim", "lib/BicBucStriim");
-zip.addLocalFolder("vendor", "vendor", "*.php");
+zip.addLocalFile("vendor/autoload.php", "vendor");
+zip.addLocalFile("vendor/DateTimeFileWriter.php", "vendor");
+zip.addLocalFile("vendor/epub.php", "vendor");
+zip.addLocalFile("vendor/rb.php", "vendor");
zip.addLocalFolder("vendor/aura", "vendor/aura");
zip.addLocalFolder("vendor/composer", "vendor/composer");
-zip.addLocalFolder("vendor/slim/slim", "vendor/slim/slim");
-zip.addLocalFolder("vendor/slim/views/", "vendor/slim/views/");
-zip.addLocalFolder("vendor/slim/slim/Slim", "vendor/slim/slim/Slim");
-zip.addLocalFolder("vendor/twig/twig", "vendor/twig/twig");
-zip.addLocalFolder("vendor/twig/twig/ext", "vendor/twig/twig/ext");
-zip.addLocalFolder("vendor/twig/twig/lib", "vendor/twig/twig/lib");
-zip.addLocalFolder("vendor/swiftmailer/swiftmailer/lib", "vendor/swiftmailer/swiftmailer/lib");
-zip.addLocalFolder("vendor/swiftmailer/swiftmailer", "vendor/swiftmailer/swiftmailer");
-zip.addLocalFolder("vendor/ircmaxell/password-compat/lib", "vendor/ircmaxell/password-compat/lib");
-zip.addLocalFolder("vendor/dflydev/markdown/src", "vendor/dflydev/markdown/src");
+zip.addLocalFolder("vendor/slim", "vendor/slim");
+zip.addLocalFolder("vendor/twig", "vendor/twig");
+zip.addLocalFolder("vendor/swiftmailer", "vendor/swiftmailer");
+zip.addLocalFolder("vendor/ircmaxell", "vendor/ircmaxell");
zip.addLocalFolder("vendor/dflydev/markdown", "vendor/dflydev/markdown");
zip.addLocalFolder("templates", "templates");
zip.addLocalFolder("data", "data");
diff --git a/templates/installcheck.html b/templates/installcheck.html
index 3d9e4bb5..a86605fb 100644
--- a/templates/installcheck.html
+++ b/templates/installcheck.html
@@ -259,7 +259,7 @@
{% endif %}
- Is Mcrypt enabled?
+ Is Mcrypt enabled? (PHP <7.4)
{% if mcrypt == true %}
@@ -273,6 +273,28 @@
info
+
+
+ {% if sodium == true %}
+ 
+ {% else %}
+
+ {% endif %}
+
+ Is Sodium enabled? (PHP 7.4+)
+
+
+ {% if sodium == true %}
+ Yes.
+ {% else %}
+ No.
+ {% endif %}
+
+
+
+ info
+
+
{% if intl == true %}
@@ -413,14 +435,26 @@
+