Merge branch 'main' into feature/logging

bin/v-rebuild-web-domains

@@ -117,12 +117,14 @@ done
 # Updating user counters
 $BIN/v-update-user-counters $user
 
-# Restarting web server
-$BIN/v-restart-web $restart
-check_result $? "Web restart failed" >/dev/null
+if [ "$restart" = "yes" ]; then
+    # Restarting web server
+    $BIN/v-restart-web $restart
+    check_result $? "Web restart failed" >/dev/null
 
-$BIN/v-restart-proxy $restart
-check_result $? "Proxy restart failed" >/dev/null
+    $BIN/v-restart-proxy $restart
+    check_result $? "Proxy restart failed" >/dev/null
+fi
 
 # Logging
 $BIN/v-log-action "system" "Info" "System" "Rebuilt web domains (User: $user)."

install/upgrade/versions/1.4.0.sh

@@ -15,14 +15,11 @@ if [ -e "/etc/nginx/nginx.conf" ]; then
     fi
 fi
 
-echo '[ * ] Updating System Administrator account permissions...'
-$HESTIA/bin/v-change-user-role admin admin
-
 # Populating HELO/SMTP Banner for existing ip's
 if [ "$MAIL_SYSTEM" == "exim4" ]; then
     source $HESTIA/func/ip.sh
 
-    echo "[ * ] Populating HELO/SMTP Banner param for existing IP's..."
+    echo "[ * ] Populating HELO/SMTP Banner value for existing IP addresses..."
     > /etc/exim4/mailhelo.conf
 
     for ip in $($BIN/v-list-sys-ips plain | cut -f1); do
@@ -101,8 +98,6 @@ if [ "$MAIL_SYSTEM" == "exim4" ]; then
         line=$(expr $(sed -n '/begin transports/=' /etc/exim4/exim4.conf.template) + 2)
         sed -i "${line}i $insert" /etc/exim4/exim4.conf.template
     fi
-    
-    $HESTIA/bin/v-restart-mail
 fi
 
 # Fix PostgreSQL repo

web/delete/key/index.php

@@ -6,7 +6,9 @@ session_start();
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
-    $user=$_GET['user'];
+    $v_user=$_GET['user'];
+}else{
+    $v_user = $user;
 }
 
 // Check token
@@ -18,7 +20,6 @@ if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) {
 if (!empty($_GET['key'])) {
     $v_key = escapeshellarg(trim($_GET['key']));
     $v_user = escapeshellarg(trim($v_user));
-    $v_key = str_replace('/','\\/', $v_key);
     exec (HESTIA_CMD."v-delete-user-ssh-key ".$v_user." ".$v_key);
     check_return_code($return_var,$output);
 }