Fix issue where the restart flag is not set propper and skipped (hestiacp#1811)

* Fix restart mail domains

Make sure restart is set

* Prevent counters to be reset and don't calculate it again 

Disk space was counted at v-rebuild-mail-domains and v-rebuild-main-domain on domains level it is use less
Same applies to counters

Author: jaapmarcus

bin/v-rebuild-mail-domain

@@ -15,6 +15,7 @@
 # Argument definition
 user=$1
 domain=$2
+restart=${3-yes}
 
 # Includes
 # shellcheck source=/usr/local/hestia/func/main.sh
@@ -69,8 +70,8 @@ if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
     if [ ! -z "$IMAP_SYSTEM" ]; then
         WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
         if [ ! -z "$WEBMAIL" ]; then
-            $BIN/v-delete-mail-domain-webmail $user $domain '' $restart 'yes'
-            $BIN/v-add-mail-domain-webmail $user $domain $WEBMAIL '' $restart 'yes'
+            $BIN/v-delete-mail-domain-webmail $user $domain "$restart" 'yes'
+            $BIN/v-add-mail-domain-webmail $user $domain $WEBMAIL "$restart" 'yes'
         fi
     fi
 fi
@@ -81,6 +82,7 @@ fi
 
 # Update disk usage statistics
 $BIN/v-update-user-disk $user
+$BIN/v-update-user-counters $user
 
 # Logging
 $BIN/v-log-action "system" "Info" "System" "Rebuilt mail domain (User: $user, Domain: $domain)."

bin/v-rebuild-mail-domains

@@ -58,35 +58,16 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Reset counters
-U_MAIL_DOMAINS=0
-U_MAIL_DKIM=0
-U_MAIL_ACCOUNTS=0
-U_MAIL_SSL=0
-SUSPENDED_MAIL=0
-U_DISK_MAIL=0
-
 # Starting loop
 for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
-    $BIN/v-rebuild-mail-domain $user $domain
+    $BIN/v-rebuild-mail-domain $user $domain "no"
 done
 
 
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
 
-# Updating counters
-update_user_value "$user" '$U_MAIL_DOMAINS' "$U_MAIL_DOMAINS"
-update_user_value "$user" '$U_MAIL_DKIM' "$U_MAIL_DKIM"
-update_user_value "$user" '$U_MAIL_ACCOUNTS' "$U_MAIL_ACCOUNTS"
-update_user_value "$user" '$U_MAIL_SSL' "$U_MAIL_SSL"
-update_user_value "$user" '$SUSPENDED_MAIL' "$SUSPENDED_MAIL"
-update_user_value "$user" '$U_DISK_MAIL' "$U_DISK_MAIL"
-
-# Update disk usage statistics
-$BIN/v-update-user-disk $user
-
 # Logging
 $BIN/v-log-action "system" "Info" "System" "Rebuilt mail domains (User: $user)."
 log_event "$OK" "$ARGUMENTS"