Merge branch 'main' into fix/domain-idn-handling

Author: Kristan Kenney

README.md

@@ -2,7 +2,7 @@
 
 [Hestia Control Panel](https://www.hestiacp.com/)
 ==================================================
-**Latest stable release:** Version 1.3.3 | [View Changelog](https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md)<br>
+**Latest stable release:** Version 1.3.4 | [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-sys-ip

@@ -42,7 +42,7 @@ source $HESTIA/conf/hestia.conf
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'IP NETMASK [INTERFACE] [USER] [STATUS] [NAME] [NATED_IP] [HELO]'
-is_format_valid 'ip' 'netmask' 'interface' 'user' 'ip_status'
+is_format_valid 'ip' 'netmask' 'iface' 'user' 'ip_status'
 is_ip_free
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"

func/main.sh

@@ -962,7 +962,6 @@ is_format_valid() {
                 host)           is_object_format_valid "$arg" "$arg_name" ;;
                 hour)           is_cron_format_valid "$arg" $arg_name ;;
                 id)             is_int_format_valid "$arg" 'id' ;;
-                interface)      is_interface_format_valid "$arg" ;;
                 iface)          is_interface_format_valid "$arg" ;;
                 ip)             is_ip_format_valid "$arg" ;;
                 ip_name)        is_domain_format_valid "$arg" 'IP name';;

install/deb/themes/dark.css

@@ -73,10 +73,6 @@ a {
   padding: 11px 11px;
 }
 
-.lang-ar .l-menu__item a {
-  line-height: 35px;
-}
-
 .lang-de .l-menu__item a {
   padding: 11px 12px;
 }

install/upgrade/versions/1.3.4.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.3.4
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################
+
+echo '[ * ] Updating System Administrator account permissions...'
+$HESTIA/bin/v-change-user-role admin admin
+
+# Send end-of-life notification to admin user on servers running Ubuntu 16.04
+if [ "$OS_TYPE" = "Ubuntu" ]; then
+    if [ "$OS_VERSION" = '16.04' ]; then
+        $HESTIA/bin/v-add-user-notification admin 'IMPORTANT: End of support for Ubuntu 16.04 LTS' '<b>Hestia Control Panel no longer supports Ubuntu 16.04 LTS</b>, as a result your server will no longer receive upgrades or security patches after <b>v1.3.4</b>.<br><br>Please upgrade to a supported operating system.'
+    fi
+fi

install/upgrade/versions/1.4.0.sh

@@ -107,6 +107,6 @@ fi
 
 # Fix PostgreSQL repo
 if [ -f /etc/apt/sources.list.d/postgresql.list ]; then
-    echo "[*] Updating PostgreSQL repository..."
+    echo "[ * ] Updating PostgreSQL repository..."
     sed -i 's|deb https://apt.postgresql.org/pub/repos/apt/|deb [arch=amd64] https://apt.postgresql.org/pub/repos/apt/|g' /etc/apt/sources.list.d/postgresql.list
 fi

src/deb/nginx/postinst

@@ -15,8 +15,15 @@ if [ ! -e "/usr/local/hestia/data/users/admin" ]; then
     exit
 fi
 
-# Load hestia.conf
+###############################################################
+#                Initialize functions/variables               #
+###############################################################
+
+# Load upgrade functions and variables
+source /usr/local/hestia/func/main.sh
+source /usr/local/hestia/func/upgrade.sh
 source /usr/local/hestia/conf/hestia.conf
+source /usr/local/hestia/install/upgrade/upgrade.conf
 
 # Reset backend port
 if [ ! -z "$BACKEND_PORT" ]; then

src/deb/php/postinst

@@ -11,6 +11,16 @@ if [ ! -e "/usr/local/hestia/data/users/admin" ]; then
     exit
 fi
 
+###############################################################
+#                Initialize functions/variables               #
+###############################################################
+
+# Load upgrade functions and variables
+source /usr/local/hestia/func/main.sh
+source /usr/local/hestia/func/upgrade.sh
+source /usr/local/hestia/conf/hestia.conf
+source /usr/local/hestia/install/upgrade/upgrade.conf
+
 # Restart hestia service
 if [ -f "/etc/init.d/hestia" ]; then
     systemctl restart hestia > /dev/null 2>&1

web/css/src/styles.css

@@ -1145,10 +1145,6 @@ form#vstobjects .alert {
   text-transform: lowercase;
 }
 
-.l-stat__col span {
-  padding-left: 15px;
-}
-
 .l-stat__col-title {
   text-transform: uppercase;
   font-weight: 600;
@@ -2147,13 +2143,11 @@ body.mobile .l-unit-toolbar__col--right {
 .lang-tw .actions-panel__col a {
   font-size: 0.9rem;
   font-weight: normal;
-  line-height: 29px;
 }
 
 .lang-ar .actions-panel__col a {
   font-size: 0.9rem;
   font-weight: normal;
-  line-height: 31px;
 }
 
 .l-unit__col .actions-panel .fas {