Update Composer dependencies (hestiacp#3343)

* Update Composer dependencies

-phpmyadmin to 6.8.0

* Add check for restart flag

* Use v-update-sys-dependencies instead

* Update 2fa authentication plugin

* Use composer to update things

* Use main composer file

* Replace hardcode path wiht $HESTIA_PHP

* Update changelog

Author: jaapmarcus

.gitignore

@@ -28,9 +28,10 @@
 # Composer
 composer.phar
 test/vendor/
-web/src/vendor/filp
-web/src/vendor/psr
-web/src/vendor/composer/installed.json
+# PHPMailer
+web/inc/vendor/
+# Quick install
+web/src/vendor/
 .phpunit.result.cache
 
 # vitepress build output

CHANGELOG.md

@@ -23,6 +23,9 @@ All notable changes to this project will be documented in this file.
 - Added alias for composer (#3070)
 - Updated PhpPgAdmin and with support for PostgreSQL 15 (<https://github.com/hestiacp/phppgadmin>)
 - Upgrade MariaDB to 10.11 (#3305)
+- Add Quick installer for Flarum (#3342 and #3298 @Steveorevo)
+- Enable UTF8MB4 on default for Mysql (#3337 #1882)
+- Update Cloudflare ip adresses on each update (#3338 #2575)
 
 ### Bugfixes
 
@@ -60,6 +63,7 @@ All notable changes to this project will be documented in this file.
 - Fixed an issue with erroneous deleting $domain.\* instead of $domain.pem (#3221)
 - Fixed an issue with domain redirect and idn2 domains (#3323 #3325)
 - Fixed an issue in Dokuwiki due to changing repository owner (#3327)
+- Fixed an issue with B2 and changing access keys
 
 ### Dependencies
 
@@ -71,6 +75,7 @@ All notable changes to this project will be documented in this file.
 - Updated phpPgAdmin to 7.3.14-hestiacp
 - Update MediaWiki to 1.39.2
 - Update Prestashop to 8.0.1
+- Update TwoFactorAuth to 2.0.0
 
 ## [1.6.14] - Service release
 

bin/v-add-sys-dependencies

@@ -22,6 +22,7 @@ MODE=$1
 user="admin"
 
 PM_INSTALL_DIR="$HESTIA/web/inc"
+QUICK_INSTALL_DIR="$HESTIA/web/src"
 COMPOSER_BIN="$HOMEDIR/$user/.composer/composer"
 
 #----------------------------------------------------------#
@@ -69,7 +70,7 @@ openssl_installed=$(/usr/local/hestia/php/bin/php -m | grep openssl)
 if [ -z "$openssl_installed" ]; then
 	COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php $COMPOSER_BIN --quiet --no-dev install
 else
-	COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/local/hestia/php/bin/php $COMPOSER_BIN --quiet --no-dev install
+	COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec $HESTIA_PHP $COMPOSER_BIN --quiet --no-dev install
 fi
 
 # Check if installation was successful, if not abort script and throw error message notification and clean-up
@@ -85,8 +86,20 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
+cd "$QUICK_INSTALL_DIR"
+rm --recursive --force ${QUICK_INSTALL_DIR}/vendor
+mkdir -p ${QUICK_INSTALL_DIR}/vendor
+chown $user: -R ${QUICK_INSTALL_DIR}/vendor
+
+if [ -z "$openssl_installed" ]; then
+	COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php $COMPOSER_BIN --quiet --no-dev install
+else
+	COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec $HESTIA_PHP $COMPOSER_BIN --quiet --no-dev install
+fi
+
 # Set permissions
 chown root: -R "${PM_INSTALL_DIR}/vendor"
+chown root: -R "${QUICK_INSTALL_DIR}/vendor"
 
 #----------------------------------------------------------#
 #                       Logging                            #

bin/v-add-user-2fa

@@ -46,7 +46,7 @@ if [ -n "$TWOFA" ]; then
 fi
 
 # Get secret and qr code from 2fa libary
-data=$($HESTIA/php/bin/php $HESTIA/web/inc/2fa/secret.php)
+data=$($HESTIA_PHP $HESTIA/web/inc/2fa/secret.php)
 
 # Split to secret and qrcode using delimiter
 IFS='-' read -r -a array <<< "$data"

bin/v-check-user-2fa

@@ -44,7 +44,7 @@ if [ -z "$TWOFA" ]; then
 fi
 
 # Check if token is valid
-result=$($HESTIA/php/bin/php $HESTIA/web/inc/2fa/check.php "$TWOFA" "$token")
+result=$($HESIA_PHP $HESTIA/web/inc/2fa/check.php "$TWOFA" "$token")
 if [ "$result" != "ok" ]; then
 	echo "Error: Authentication token mismatch."
 	exit 9

bin/v-rebuild-dns-domain

@@ -35,7 +35,7 @@ source_conf "$HESTIA/conf/hestia.conf"
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER DOMAIN [RESTART] [UPDATE_SERIAL]'
-is_format_valid 'user' 'domain'
+is_format_valid 'user' 'domain' 'restart'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 check_user=$(is_object_unsuspended 'user' 'USER' "$user")

bin/v-rebuild-dns-domains

@@ -34,7 +34,7 @@ source_conf "$HESTIA/conf/hestia.conf"
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'USER [RESTART] [UPDATE_SERIAL]'
-is_format_valid 'user'
+is_format_valid 'user' 'restart'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 check_user=$(is_object_unsuspended 'user' 'USER' "$user")

bin/v-rebuild-mail-domain

@@ -43,7 +43,7 @@ fi
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER DOMAIN'
-is_format_valid 'user' 'domain'
+is_format_valid 'user' 'domain' 'restart'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 check_user=$(is_object_unsuspended 'user' 'USER' "$user")

bin/v-rebuild-user

@@ -35,7 +35,7 @@ source_conf "$HESTIA/conf/hestia.conf"
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'USER [RESTART]'
-is_format_valid 'user'
+is_format_valid 'user' 'restart'
 is_object_valid 'user' 'USER' "$user"
 check_user=$(is_object_unsuspended 'user' 'USER' "$user")
 if [ -n "$check_user" ]; then

bin/v-rebuild-web-domain

@@ -36,7 +36,7 @@ source_conf "$HESTIA/conf/hestia.conf"
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER DOMAIN [RESTART]'
-is_format_valid 'user' 'domain'
+is_format_valid 'user' 'domain' 'restart'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 check_user=$(is_object_unsuspended 'user' 'USER' "$user")