Merge branch 'staging/release/1.4.3' into main

Author: jaapmarcus

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [Development]
+## [1.4.2] - Service release
 
 ### Features
 
@@ -12,7 +12,7 @@ All notable changes to this project will be documented in this file.
 ### Bugfixes
 
 - Improve the calculated disk size of a new backup estimated by excluding the exclude folders, mail accounts and database in backups (#1616) @Myself5
-- Improve v-update-firewall / v-stop-firewarewall to make it self healing (#1892) @myrevery 
+- Improve v-update-firewall / v-stop-firewall to make it self healing (#1892) @myrevery 
 - Update phpMyAdmin version to 1.5.1 (See https://www.phpmyadmin.net/news/2021/6/4/phpmyadmin-511-released/)
 - Fixed a bug after rebuilding mail with Exim4 and suspended domains (#1886)
 - Fixed "Allowed IP addresses for API" field with strange behaviour #1866

README.md

@@ -2,7 +2,7 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.4.2 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
+**Latest stable release:** Version 1.4.3 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
 
 **Web:** [www.hestiacp.com](https://www.hestiacp.com/)<br>
 **Documentation:** [docs.hestiacp.com](https://docs.hestiacp.com/)<br>

bin/v-add-user-composer

@@ -3,7 +3,7 @@
 # options: USER
 # labels: hestia
 #
-# example: v-add-user-composer user
+# example: v-add-user-composer user [version]
 #
 # The function adds support for composer (php dependency manager)
 # Homepage: https://getcomposer.org/
@@ -34,7 +34,7 @@ source $HESTIA/conf/hestia.conf
 
 check_args '1' "$#" 'USER [VERSION]'
 is_format_valid 'user'
-is_number_format_valid 'version' "$version"
+is_number_format_valid "$version" "version"
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 

func/domain.sh

@@ -927,14 +927,14 @@ is_base_domain_owner(){
                         test=$(is_domain_new "" $basedomain)
                         if [ $? -ne 0 ]; then
                             echo "Error: $basedomain belongs to a different user";
-                            exit 1;
+                            exit 4;
                         fi
                     fi
                 else
                     test=$(is_domain_new "" $basedomain);
                     if [ $? -ne 0 ]; then
                         echo "Error: $basedomain belongs to a different user";
-                        exit 1;
+                        exit 4;
                     fi
                 fi
             fi

install/hst-install-debian.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.3~alpha'
+HESTIA_INSTALL_VER='1.4.3'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

install/hst-install-ubuntu.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.3~alpha'
+HESTIA_INSTALL_VER='1.4.3'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.4.3~alpha
+Version: 1.4.3
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

web/edit/package/index.php

@@ -105,7 +105,6 @@
 
     // Check empty fields
     if (empty($_POST['v_package'])) $errors[] = _('package');
-    if (empty($_POST['v_package_new'])) $errors[] = _('package_new');
     if (empty($_POST['v_web_template'])) $errors[] = _('web template');
     if (!empty($_SESSION['WEB_BACKEND'])) {
         if (empty($_POST['v_backend_template'])) $errors[] = _('backend template');