Browse Source

Update log messages and quiet output on system actions

Kristan Kenney 5 years ago
parent
commit
45b05ce4d4
92 changed files with 144 additions and 113 deletions
  1. 1 1
      bin/v-add-cron-hestia-autoupdate
  2. 1 1
      bin/v-add-cron-reports
  3. 4 1
      bin/v-add-dns-record
  4. 1 1
      bin/v-add-mail-account-forward
  5. 1 1
      bin/v-add-mail-account-fwd-only
  6. 2 2
      bin/v-add-mail-domain
  7. 1 1
      bin/v-add-mail-domain-antispam
  8. 1 1
      bin/v-add-mail-domain-antivirus
  9. 1 1
      bin/v-add-mail-domain-catchall
  10. 3 3
      bin/v-add-mail-domain-dkim
  11. 1 1
      bin/v-add-mail-domain-smtp-relay
  12. 1 1
      bin/v-add-mail-domain-ssl
  13. 13 4
      bin/v-add-sys-webmail
  14. 1 1
      bin/v-add-user
  15. 1 1
      bin/v-add-user-composer
  16. 2 2
      bin/v-add-user-package
  17. 1 1
      bin/v-add-web-domain-allow-users
  18. 1 6
      bin/v-add-web-domain-backend
  19. 1 1
      bin/v-add-web-domain-httpauth
  20. 1 1
      bin/v-add-web-domain-proxy
  21. 1 1
      bin/v-add-web-domain-redirect
  22. 4 1
      bin/v-add-web-domain-ssl-force
  23. 4 1
      bin/v-add-web-domain-ssl-hsts
  24. 1 1
      bin/v-add-web-domain-stats
  25. 1 1
      bin/v-add-web-domain-stats-user
  26. 1 1
      bin/v-change-database-host-password
  27. 1 1
      bin/v-change-database-password
  28. 1 1
      bin/v-change-database-user
  29. 1 1
      bin/v-change-dns-domain-ip
  30. 1 1
      bin/v-change-dns-domain-soa
  31. 1 1
      bin/v-change-dns-domain-tpl
  32. 1 1
      bin/v-change-dns-domain-ttl
  33. 1 1
      bin/v-change-dns-record
  34. 1 1
      bin/v-change-fs-file-permission
  35. 1 1
      bin/v-change-mail-account-password
  36. 1 1
      bin/v-change-mail-account-quota
  37. 1 1
      bin/v-change-mail-domain-catchall
  38. 1 1
      bin/v-change-mail-domain-sslcert
  39. 1 1
      bin/v-change-sys-db-alias
  40. 1 1
      bin/v-change-sys-hostname
  41. 1 1
      bin/v-change-sys-ip-nat
  42. 1 1
      bin/v-change-sys-ip-owner
  43. 1 1
      bin/v-change-sys-webmail
  44. 1 1
      bin/v-change-user-contact
  45. 1 1
      bin/v-change-user-language
  46. 2 1
      bin/v-change-user-package
  47. 1 1
      bin/v-change-user-php-cli
  48. 1 1
      bin/v-change-user-role
  49. 1 1
      bin/v-change-user-shell
  50. 1 1
      bin/v-change-user-theme
  51. 1 1
      bin/v-change-web-domain-backend-tpl
  52. 2 2
      bin/v-change-web-domain-dirlist
  53. 1 1
      bin/v-change-web-domain-ftp-password
  54. 1 1
      bin/v-change-web-domain-ftp-path
  55. 1 1
      bin/v-change-web-domain-ip
  56. 1 1
      bin/v-change-web-domain-proxy-tpl
  57. 1 1
      bin/v-change-web-domain-sslcert
  58. 1 1
      bin/v-change-web-domain-tpl
  59. 1 1
      bin/v-delete-cron-reports
  60. 1 1
      bin/v-delete-dns-domain
  61. 4 1
      bin/v-delete-dns-record
  62. 1 1
      bin/v-delete-mail-domain
  63. 1 1
      bin/v-delete-mail-domain-antispam
  64. 1 1
      bin/v-delete-mail-domain-antivirus
  65. 2 2
      bin/v-delete-mail-domain-dkim
  66. 1 1
      bin/v-delete-mail-domain-smtp-relay
  67. 1 1
      bin/v-delete-mail-domain-ssl
  68. 1 1
      bin/v-delete-sys-smtp-relay
  69. 6 2
      bin/v-delete-sys-webmail
  70. 1 1
      bin/v-delete-user
  71. 1 1
      bin/v-delete-user-log
  72. 1 1
      bin/v-delete-web-domain
  73. 1 1
      bin/v-delete-web-domain-allow-users
  74. 1 1
      bin/v-delete-web-domain-backend
  75. 1 1
      bin/v-delete-web-domain-httpauth
  76. 1 1
      bin/v-delete-web-domain-proxy
  77. 1 1
      bin/v-delete-web-domain-redirect
  78. 1 1
      bin/v-delete-web-domain-ssl
  79. 4 1
      bin/v-delete-web-domain-ssl-force
  80. 4 1
      bin/v-delete-web-domain-ssl-hsts
  81. 1 1
      bin/v-delete-web-domain-stats
  82. 1 1
      bin/v-delete-web-domain-stats-user
  83. 1 1
      bin/v-rebuild-cron-jobs
  84. 1 1
      bin/v-rebuild-dns-domains
  85. 2 2
      bin/v-rebuild-mail-domain
  86. 3 3
      bin/v-rebuild-mail-domains
  87. 1 1
      bin/v-rename-user-package
  88. 1 1
      bin/v-update-dns-templates
  89. 1 1
      bin/v-update-mail-templates
  90. 1 1
      bin/v-update-web-templates
  91. 4 4
      func/rebuild.sh
  92. 5 1
      web/list/log/index.php

+ 1 - 1
bin/v-add-cron-hestia-autoupdate

@@ -94,7 +94,7 @@ $BIN/v-restart-cron
 check_result $? "Cron restart failed" >/dev/null
 check_result $? "Cron restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "Updates" "Enabled automatic updates for Hestia Control Panel packages."
+$BIN/v-log-action "system" "Info" "Updates" "Automatic updates enabled."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-cron-reports

@@ -56,7 +56,7 @@ $BIN/v-restart-cron
 check_result $? "Cron restart failed" >/dev/null
 check_result $? "Cron restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Cron Jobs" "Enabled cron job notifications and reporting."
+$BIN/v-log-action "$user" "Info" "Cron Jobs" "Cron job notifications and reporting enabled."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 4 - 1
bin/v-add-dns-record

@@ -27,6 +27,7 @@ priority=$6
 id=$7
 id=$7
 restart=$8
 restart=$8
 ttl=$9
 ttl=$9
+quiet=${10}
 
 
 if [ -z "$priority" ]; then
 if [ -z "$priority" ]; then
     priority=10
     priority=10
@@ -152,7 +153,9 @@ $BIN/v-restart-dns $restart
 check_result $? $E_RESTART 'dns failed to restart'
 check_result $? $E_RESTART 'dns failed to restart'
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "DNS" "Added DNS record (Type: $rtype, Value: $record, Domain: $domain)."
+if [ "$quiet" != "yes" ]; then
+    $BIN/v-log-action "$user" "Info" "DNS" "Added DNS record (Type: $rtype, Value: $record, Domain: $domain)."
+fi
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-mail-account-forward

@@ -85,7 +85,7 @@ fi
 update_object_value "mail/$domain" 'ACCOUNT' "$account"  '$FWD' "$fwd"
 update_object_value "mail/$domain" 'ACCOUNT' "$account"  '$FWD' "$fwd"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Warning" "Mail" "Enabled mail forwarding on mail account $account@$domain (send to: $email_forward)."
+$BIN/v-log-action "$user" "Warning" "Mail" "Mail forwarding on mail account $account@$domain enabled (send to: $email_forward)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-mail-account-fwd-only

@@ -83,7 +83,7 @@ add_object_key "mail/$domain" 'ACCOUNT' "$account" 'FWD_ONLY' 'MD5'
 update_object_value "mail/$domain" 'ACCOUNT' "$account"  '$FWD_ONLY' "yes"
 update_object_value "mail/$domain" 'ACCOUNT' "$account"  '$FWD_ONLY' "yes"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Warning" "Mail" "Enabled forward-only flag on mail account $account@$domain."
+$BIN/v-log-action "$user" "Warning" "Mail" "Forward-only flag enabled on mail account $account@$domain."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 2 - 2
bin/v-add-mail-domain

@@ -156,11 +156,11 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$dkim" = 'yes' ]; then
         p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n')
         p=$(cat $USER_DATA/mail/$domain.pub|grep -v ' KEY---'|tr -d '\n')
         record='_domainkey'
         record='_domainkey'
         policy="\"t=y; o=~;\""
         policy="\"t=y; o=~;\""
-        $BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
+        $BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no' '' 'yes'
 
 
         record='mail._domainkey'
         record='mail._domainkey'
         selector="\"v=DKIM1\; k=rsa\; p=$p\""
         selector="\"v=DKIM1\; k=rsa\; p=$p\""
-        $BIN/v-add-dns-record $user $domain $record TXT "$selector"
+        $BIN/v-add-dns-record $user $domain $record TXT "$selector" '' '' 'yes' '' 'yes'
     fi
     fi
 fi
 fi
 
 

+ 1 - 1
bin/v-add-mail-domain-antispam

@@ -66,7 +66,7 @@ fi
 update_object_value 'mail' 'DOMAIN' "$domain" '$ANTISPAM' 'yes'
 update_object_value 'mail' 'DOMAIN' "$domain" '$ANTISPAM' 'yes'
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Enabled anti-spam protection for $domain."
+$BIN/v-log-action "$user" "Info" "Mail" "Anti-spam protection enabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-mail-domain-antivirus

@@ -66,7 +66,7 @@ fi
 update_object_value 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS' 'yes'
 update_object_value 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS' 'yes'
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Enabled anti-virus scanning for $domain."
+$BIN/v-log-action "$user" "Info" "Mail" "Anti-virus scanning enabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-mail-domain-catchall

@@ -67,7 +67,7 @@ fi
 update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
 update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Warning" "Mail" "Enabled catch-all forwarding (Domain: $domain, Send to: $email)."
+$BIN/v-log-action "$user" "Warning" "Mail" "Catch-all forwarding enabled (Domain: $domain, Send to: $email)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 3 - 3
bin/v-add-mail-domain-dkim

@@ -78,11 +78,11 @@ if [ ! -z "$DNS_SYSTEM" ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
     p=$(cat $USER_DATA/mail/$domain.pub |grep -v ' KEY---' |tr -d '\n')
     p=$(cat $USER_DATA/mail/$domain.pub |grep -v ' KEY---' |tr -d '\n')
     record="_domainkey"
     record="_domainkey"
     policy="\"t=y\; o=~\;\""
     policy="\"t=y\; o=~\;\""
-    $BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no'
+    $BIN/v-add-dns-record $user $domain $record TXT "$policy" '' '' 'no' '' 'yes'
 
 
     record="mail._domainkey"
     record="mail._domainkey"
     selector="\"v=DKIM1\; k=rsa\; p=$p\""
     selector="\"v=DKIM1\; k=rsa\; p=$p\""
-    $BIN/v-add-dns-record $user $domain $record TXT "$selector"
+    $BIN/v-add-dns-record $user $domain $record TXT "$selector" '' '' 'yes' '' 'yes'
 fi
 fi
 
 
 
 
@@ -95,7 +95,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$DKIM' 'yes'
 increase_user_value "$user" '$U_MAIL_DKIM'
 increase_user_value "$user" '$U_MAIL_DKIM'
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Enabled DKIM message signing for $domain."
+$BIN/v-log-action "$user" "Info" "Mail" "DKIM message signing enabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-mail-domain-smtp-relay

@@ -71,7 +71,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$U_SMTP_RELAY_USERNAME' "$usernam
 update_object_value 'mail' 'DOMAIN' "$domain" '$U_SMTP_RELAY_PASSWORD' "$password"
 update_object_value 'mail' 'DOMAIN' "$domain" '$U_SMTP_RELAY_PASSWORD' "$password"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Enabled SMTP Relay for $domain (Host: $host, Port: $port)."
+$BIN/v-log-action "$user" "Info" "Mail" "SMTP Relay enabled (Domain: $domain, Host: $host, Port: $port)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-mail-domain-ssl

@@ -112,7 +112,7 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 check_result $? "Proxy restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Enabled SSL (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Mail" "SSL enabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 13 - 4
bin/v-add-sys-webmail

@@ -99,10 +99,19 @@ else
 
 
         if [ "$dns_domain" = "$domain" ]; then
         if [ "$dns_domain" = "$domain" ]; then
             if [ -z "$webmail_record" ]; then
             if [ -z "$webmail_record" ]; then
-                $BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip '' '' $restart
+                if [ "$quiet" = "yes" ]; then
+                    $BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip '' '' $restart '' 'yes'
+                else
+                    $BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip '' '' $restart '' 'yes'
+                fi
             else
             else
-                $BIN/v-delete-dns-record $user $domain $webmail_record $restart
-                $BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip '' '' $restart
+                if [ "$quiet" = "yes" ]; then
+                    $BIN/v-delete-dns-record $user $domain $webmail_record $restart 'yes'
+                    $BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip '' '' $restart '' 'yes'
+                else
+                    $BIN/v-delete-dns-record $user $domain $webmail_record $restart 'yes'
+                    $BIN/v-add-dns-record $user $domain $WEBMAIL_ALIAS A $ip '' '' $restart '' 'yes'
+                fi
             fi
             fi
         fi
         fi
     fi
     fi
@@ -162,7 +171,7 @@ fi
 
 
 # Logging
 # Logging
 if [ "$quiet" != 'yes' ]; then
 if [ "$quiet" != 'yes' ]; then
-    $BIN/v-log-action "$user" "Info" "Mail" "Webmail client access enabled (Domain: $domain)."
+    $BIN/v-log-action "$user" "Info" "Mail" "Webmail access enabled (Domain: $domain)."
 fi
 fi
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 

+ 1 - 1
bin/v-add-user

@@ -262,7 +262,7 @@ $BIN/v-add-user-sftp-jail $user
 
 
 # Logging
 # Logging
 $BIN/v-log-action "system" "Info" "Users" "User account added (Name: $user)."
 $BIN/v-log-action "system" "Info" "Users" "User account added (Name: $user)."
-$BIN/v-log-action "$user" "Info" "System" "User account added."
+$BIN/v-log-action "$user" "Info" "System" "Welcome!"
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-user-composer

@@ -85,7 +85,7 @@ check_result $? "Composer install failed"
 
 
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Plugins" "Enabled support for Composer."
+$BIN/v-log-action "$user" "Info" "Plugins" "Composer support enabled."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 2 - 2
bin/v-add-user-package

@@ -99,9 +99,9 @@ chmod 644 $HESTIA/data/packages/$package.pkg
 
 
 # Logging
 # Logging
 if [ "$rewrite" != 'yes' ]; then
 if [ "$rewrite" != 'yes' ]; then
-    $BIN/v-log-action "system" "Info" "Packages" "Added new package (Name: $package)."
+    $BIN/v-log-action "system" "Info" "Packages" "Package added (Name: $package)."
 else
 else
-    $BIN/v-log-action "system" "Info" "Packages" "Updated package (Name: $package)."
+    $BIN/v-log-action "system" "Info" "Packages" "Package limits updated (Name: $package)."
 fi
 fi
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 

+ 1 - 1
bin/v-add-web-domain-allow-users

@@ -65,7 +65,7 @@ fi
 # Adding new alias
 # Adding new alias
 update_object_value 'web' 'DOMAIN' "$domain" '$ALLOW_USERS' "yes"
 update_object_value 'web' 'DOMAIN' "$domain" '$ALLOW_USERS' "yes"
 
 
-$BIN/v-log-action "$user" "Warning" "Web" "Disabled subdomain ownership enforcement (Domain: $domain)."
+$BIN/v-log-action "$user" "Warning" "Web" "Subdomain ownership enforcement disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 6
bin/v-add-web-domain-backend

@@ -49,11 +49,6 @@ check_hestia_demo_mode
 prepare_web_backend
 prepare_web_backend
 get_domain_values 'web'
 get_domain_values 'web'
 
 
-# Checking backend configuration
-#if [ -e "$pool/$backend_type.conf" ]; then
-#    exit
-#fi
-
 # Allocating backend port
 # Allocating backend port
 backend_port=9000
 backend_port=9000
 ports=$(grep -v '^;' $pool/* 2>/dev/null |grep listen |grep -o :[0-9].*)
 ports=$(grep -v '^;' $pool/* 2>/dev/null |grep listen |grep -o :[0-9].*)
@@ -93,7 +88,7 @@ $BIN/v-restart-web-backend $restart
 check_result $? "Web backend restart failed" >/dev/null
 check_result $? "Web backend restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "Web" "Added $WEB_BACKEND backend configuration (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Web domain configuration applied (Domain: $domain, Backend: $WEB_BACKEND)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-web-domain-httpauth

@@ -116,7 +116,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$AUTH_USER' "$auth_user"
 update_object_value 'web' 'DOMAIN' "$domain" '$AUTH_HASH' "$auth_hash"
 update_object_value 'web' 'DOMAIN' "$domain" '$AUTH_HASH' "$auth_hash"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Enabled password protection (Domain: $domain, Username: $httpauth_user)."
+$BIN/v-log-action "$user" "Info" "Web" "Password protection enabled (Domain: $domain, Username: $httpauth_user)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-web-domain-proxy

@@ -85,7 +85,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 $BIN/v-restart-proxy $restart
 $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 check_result $? "Proxy restart failed" >/dev/null
 
 
-$BIN/v-log-action "$user" "Info" "Web" "Proxy Enabled (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Proxy enabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-web-domain-redirect

@@ -115,7 +115,7 @@ if [ "$restart" = "yes" ]; then
 fi
 fi
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Enabled domain redirection (Domain: $domain, Redirect to: $redirect)."
+$BIN/v-log-action "$user" "Info" "Web" "Domain redirection enabled (Domain: $domain, Redirect to: $redirect)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 4 - 1
bin/v-add-web-domain-ssl-force

@@ -15,6 +15,7 @@
 # Argument definition
 # Argument definition
 user=$1
 user=$1
 domain=$2
 domain=$2
+quiet=$3
 
 
 # Includes
 # Includes
 # shellcheck source=/usr/local/hestia/func/main.sh
 # shellcheck source=/usr/local/hestia/func/main.sh
@@ -95,7 +96,9 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" > /dev/null
 check_result $? "Proxy restart failed" > /dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Enabled automatic HTTPS redirection (Domain: $domain)."
+if [ "$quiet" != "yes" ]; then
+    $BIN/v-log-action "$user" "Info" "Web" "Automatic HTTPS redirection enabled (Domain: $domain)."
+fi
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 4 - 1
bin/v-add-web-domain-ssl-hsts

@@ -13,6 +13,7 @@
 # Argument definition
 # Argument definition
 user=$1
 user=$1
 domain=$2
 domain=$2
+quiet=$3
 
 
 # Includes
 # Includes
 # shellcheck source=/usr/local/hestia/func/main.sh
 # shellcheck source=/usr/local/hestia/func/main.sh
@@ -81,7 +82,9 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" > /dev/null
 check_result $? "Proxy restart failed" > /dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Enabled HTTP Strict Transport Security (HSTS) (Domain: $domain)."
+if [ "$quiet" != "yes" ]; then
+    $BIN/v-log-action "$user" "Info" "Web" "HTTP Strict Transport Security (HSTS) enabled (Domain: $domain)."
+fi
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-add-web-domain-stats

@@ -104,7 +104,7 @@ echo "$BIN/v-update-web-domain-stat $user $domain" >> \
 update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"
 update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Enabled web traffic analyzer (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Web traffic analyzer enabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 # Build stats
 # Build stats

+ 1 - 1
bin/v-add-web-domain-stats-user

@@ -85,7 +85,7 @@ if [ "$WEB_SYSTEM" = 'nginx' ]; then
 fi
 fi
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Enabled web traffic analyzer password (Username: $stats_user, Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Web traffic analyzer password enabled (Username: $stats_user, Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-database-host-password

@@ -72,7 +72,7 @@ update_object_value "../../conf/$type" 'HOST' "$host" '$PASSWORD' "$dbpass"
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Warning" "Database" "Changed password for remote database host (Host: $host)."
+$BIN/v-log-action "system" "Warning" "Database" "Password changed for remote database host (Host: $host)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-database-password

@@ -65,7 +65,7 @@ esac
 update_object_value 'db' 'DB' "$database" '$MD5' "$md5"
 update_object_value 'db' 'DB' "$database" '$MD5' "$md5"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Database" "Changed database password (Database: $database)."
+$BIN/v-log-action "$user" "Info" "Database" "Database password changed (Database: $database)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-database-user

@@ -100,7 +100,7 @@ fi
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Database" "Changed database user (Database: $database, User: $dbuser)"
+$BIN/v-log-action "$user" "Info" "Database" "Database user changed (Database: $database, User: $dbuser)"
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-dns-domain-ip

@@ -89,7 +89,7 @@ $BIN/v-restart-dns $restart
 check_result $? "DNS restart failed" >/dev/null
 check_result $? "DNS restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "DNS" "Changed IP address for DNS domain (IP: $ip, Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "DNS" "IP address for DNS domain changed (IP: $ip, Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-dns-domain-soa

@@ -83,7 +83,7 @@ $BIN/v-restart-dns $restart
 check_result $? "DNS restart failed" >/dev/null
 check_result $? "DNS restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "DNS" "Changed SOA record for DNS domain (SOA: $soa, Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "DNS" "SOA record for DNS domain changed (SOA: $soa, Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-dns-domain-tpl

@@ -166,7 +166,7 @@ $BIN/v-restart-dns $restart
 check_result $? "DNS restart failed" >/dev/null
 check_result $? "DNS restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "DNS" "Changed template for DNS domain (Template: $template, Domain: $domain)."
+$BIN/v-log-action "system" "Info" "DNS" "Template for DNS domain changed (Template: $template, Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-dns-domain-ttl

@@ -82,7 +82,7 @@ $BIN/v-restart-dns $restart
 check_result $? "DNS restart failed" >/dev/null
 check_result $? "DNS restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "DNS" "Changed TTL for DNS domain (TTL: $ttl, Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "DNS" "TTL for DNS domain changed (TTL: $ttl, Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-dns-record

@@ -128,7 +128,7 @@ $BIN/v-restart-dns $restart
 check_result $? "DNS restart failed" >/dev/null
 check_result $? "DNS restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "DNS" "Changed DNS record value (Type: $type, Record: $record, Value: $dvalue, Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "DNS" "DNS record value changed (Type: $type, Record: $record, Value: $dvalue, Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-fs-file-permission

@@ -53,7 +53,7 @@ if [ $? -ne 0 ]; then
     exit 3
     exit 3
 fi
 fi
 
 
-$BIN/v-log-action "system" "Info" "System" "Changed file system permissions (User: $user, File: $src_file, Permissions: $permissions)."
+$BIN/v-log-action "system" "Info" "System" "File system permissions changed (User: $user, File: $src_file, Permissions: $permissions)."
 
 
 # Exiting
 # Exiting
 exit
 exit

+ 1 - 1
bin/v-change-mail-account-password

@@ -79,7 +79,7 @@ fi
 update_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5' "$md5"
 update_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5' "$md5"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Changed mail account password (Account: $account@$domain)."
+$BIN/v-log-action "$user" "Info" "Mail" "Mail account password changed (Account: $account@$domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-mail-account-quota

@@ -81,7 +81,7 @@ fi
 update_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA' "$quota"
 update_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA' "$quota"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Changed mail account quota (Quota: $quota, Account: $account@$domain)."
+$BIN/v-log-action "$user" "Info" "Mail" "Mail account quota changed (Quota: $quota, Account: $account@$domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-mail-domain-catchall

@@ -66,7 +66,7 @@ fi
 update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
 update_object_value 'mail' 'DOMAIN' "$domain" '$CATCHALL' "$email"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Changed mail domain catch-all address (Domain: $domain, Send to: $email)."
+$BIN/v-log-action "$user" "Info" "Mail" "Mail domain catch-all address changed (Domain: $domain, Send to: $email)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-mail-domain-sslcert

@@ -69,7 +69,7 @@ $BIN/v-restart-mail $restart
 check_result $? "Mail restart failed" >/dev/null
 check_result $? "Mail restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Changed SSL certificate (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Mail" "SSL certificate changed (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-sys-db-alias

@@ -104,7 +104,7 @@ fi
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "System" "Changed system access alias (Tool: $db_editor, Alias: $alias)."
+$BIN/v-log-action "system" "Info" "System" "System access alias changed (Tool: $db_editor, Alias: $alias)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-sys-hostname

@@ -64,7 +64,7 @@ fi
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Warning" "System" "Changed system hostname (Host: $domain)."
+$BIN/v-log-action "system" "Warning" "System" "System hostname changed (Host: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-sys-ip-nat

@@ -110,7 +110,7 @@ fi
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "System" "Changed IP NAT address (IP: $ip, NAT IP: $nat_ip)."
+$BIN/v-log-action "system" "Info" "System" "IP NAT address changed (IP: $ip, NAT IP: $nat_ip)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-sys-ip-owner

@@ -91,7 +91,7 @@ fi
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "System" "Changed IP address owner (IP: $ip, Owner: $user)"
+$BIN/v-log-action "system" "Info" "System" "IP address owner changed (IP: $ip, Owner: $user)"
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-sys-webmail

@@ -59,7 +59,7 @@ $BIN/v-restart-web $restart
 $BIN/v-restart-proxy $restart
 $BIN/v-restart-proxy $restart
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "System" "Changed webmail access alias (Value: $NEW_ALIAS, Previous: $OLD_ALIAS)."
+$BIN/v-log-action "system" "Info" "System" "Webmail access alias changed (Value: $NEW_ALIAS, Previous: $OLD_ALIAS)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-user-contact

@@ -56,7 +56,7 @@ $BIN/v-rebuild-cron-jobs $user > /dev/null 2>&1
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "System" "Changed email address (Value: $email)."
+$BIN/v-log-action "$user" "Info" "System" "Email address changed (Value: $email)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-user-language

@@ -67,7 +67,7 @@ fi
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "System" "Changed display language (Value: $language)."
+$BIN/v-log-action "$user" "Info" "System" "Display language changed (Value: $language)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 2 - 1
bin/v-change-user-package

@@ -189,7 +189,8 @@ fi
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "System" "Changed user's package (User: $user, Package: $package)."
+$BIN/v-log-action "$user" "Info" "System" "You have been assigned a new package ($package)."
+$BIN/v-log-action "system" "Info" "System" "Package limits applied to user (Package: $package, User: $user)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-user-php-cli

@@ -80,6 +80,6 @@ update_user_value "$user" '$PHPCLI' "$version"
 #                       Hestia                             #
 #                       Hestia                             #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
-$BIN/v-log-action "system" "Info" "Users" "Changed default PHP CLI version (User: $user, Version: $version)."
+$BIN/v-log-action "system" "Info" "Users" "Default PHP CLI version changed (User: $user, Version: $version)."
 
 
 exit
 exit

+ 1 - 1
bin/v-change-user-role

@@ -42,7 +42,7 @@ check_hestia_demo_mode
 #                       Action                             #
 #                       Action                             #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
-$BIN/v-log-action "system" "Info" "System" "User role changed (User: $user, Role: $role)."
+$BIN/v-log-action "system" "Warning" "Security" "User privileges changed (User: $user, Role: $role, Previous: $ROLE)."
 update_user_value "$user" '$ROLE' "$role"
 update_user_value "$user" '$ROLE' "$role"
 
 
 #----------------------------------------------------------#
 #----------------------------------------------------------#

+ 1 - 1
bin/v-change-user-shell

@@ -63,7 +63,7 @@ fi
 update_user_value "$user" '$SHELL' "$shell"
 update_user_value "$user" '$SHELL' "$shell"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "System" "Changed user's SSH shell (Shell: $shell, User: $user)."
+$BIN/v-log-action "system" "Info" "System" "User SSH shell changed (Shell: $shell, User: $user)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-user-theme

@@ -56,6 +56,6 @@ update_user_value "$user" '$THEME' "$theme"
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 #                       Hestia                             #
 #                       Hestia                             #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
-$BIN/v-log-action "$user" "Info" "System" "User theme changed (User: $user, Theme: $theme)."
+$BIN/v-log-action "$user" "Info" "System" "Applied theme to user interface (Theme: $theme)."
 
 
 exit
 exit

+ 1 - 1
bin/v-change-web-domain-backend-tpl

@@ -173,7 +173,7 @@ $BIN/v-restart-web-backend $restart
 check_result $? "Web backend restart failed" >/dev/null
 check_result $? "Web backend restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Backend template changed (Domain: $domain, Template: $template)."
+$BIN/v-log-action "$user" "Info" "Web" "Backend template applied (Domain: $domain, Template: $template)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 2 - 2
bin/v-change-web-domain-dirlist

@@ -81,9 +81,9 @@ $BIN/v-restart-web
 
 
 # Logging
 # Logging
 if [ "$mode" = "on" ]; then
 if [ "$mode" = "on" ]; then
-    $BIN/v-log-action "$user" "Warning" "Web" "Enabled directory browsing (Domain: $domain)."
+    $BIN/v-log-action "$user" "Warning" "Web" "Directory browsing enabled (Domain: $domain)."
 else
 else
-    $BIN/v-log-action "$user" "Info" "Web" "Disabled directory browsing (Domain: $domain)."
+    $BIN/v-log-action "$user" "Info" "Web" "Directory browsing disabled (Domain: $domain)."
 fi
 fi
 log_event "$OK" "$EVENT"
 log_event "$OK" "$EVENT"
 
 

+ 1 - 1
bin/v-change-web-domain-ftp-password

@@ -86,7 +86,7 @@ ftp_md5=$(echo $FTP_MD5 |tr ':' '\n' |grep -n '' |\
 update_object_value 'web' 'DOMAIN' "$domain" '$FTP_MD5' "$ftp_md5"
 update_object_value 'web' 'DOMAIN' "$domain" '$FTP_MD5' "$ftp_md5"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Changed FTP account password (User: $ftp_user, Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "FTP account password changed (User: $ftp_user, Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-web-domain-ftp-path

@@ -97,7 +97,7 @@ ftp_path=$(echo $FTP_PATH |tr ':' '\n' |grep -n '' |\
 update_object_value 'web' 'DOMAIN' "$domain" '$FTP_PATH' "$ftp_path"
 update_object_value 'web' 'DOMAIN' "$domain" '$FTP_PATH' "$ftp_path"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Changed FTP account path (User: $ftp_user@domain, Path: $ftp_path_a)."
+$BIN/v-log-action "$user" "Info" "Web" "FTP account path changed (User: $ftp_user@domain, Path: $ftp_path_a)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-web-domain-ip

@@ -94,7 +94,7 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 check_result $? "Proxy restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Changed IP address for web domain (IP: $3, Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Web domain IP address changed (IP: $3, Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-web-domain-proxy-tpl

@@ -92,7 +92,7 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 check_result $? "Proxy restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Changed proxy template (Domain: $domain, Template: $template)."
+$BIN/v-log-action "$user" "Info" "Web" "Proxy template changed (Domain: $domain, Template: $template)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-web-domain-sslcert

@@ -92,7 +92,7 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 check_result $? "Proxy restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Changed SSL certificate (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "SSL certificate changed (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-change-web-domain-tpl

@@ -86,7 +86,7 @@ $BIN/v-restart-web $restart
 check_result $? "Web restart failed" >/dev/null
 check_result $? "Web restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "Web" "Changed web domain template (Domain: $domain, Template: $template)."
+$BIN/v-log-action "$user" "Info" "Web" "Web domain template applied (Domain: $domain, Template: $template)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-cron-reports

@@ -55,7 +55,7 @@ $BIN/v-restart-cron
 check_result $? "Cron restart failed" >/dev/null
 check_result $? "Cron restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Warn" "Disabled cron job notifications and reporting."
+$BIN/v-log-action "$user" "Info" "Warn" "Cron job notifications and reporting disabled."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-dns-domain

@@ -91,7 +91,7 @@ fi
 
 
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "DNS" "Deleted DNS domain (Name: $domain)."
+$BIN/v-log-action "$user" "Info" "DNS" "Deleted DNS zone (Name: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 4 - 1
bin/v-delete-dns-record

@@ -18,6 +18,7 @@ domain=$2
 domain_idn=$2
 domain_idn=$2
 id=$3
 id=$3
 restart=$4
 restart=$4
+quiet=$5
 
 
 # Includes
 # Includes
 # shellcheck source=/usr/local/hestia/func/main.sh
 # shellcheck source=/usr/local/hestia/func/main.sh
@@ -86,7 +87,9 @@ $BIN/v-restart-dns $restart
 check_result $? "Bind restart failed" >/dev/null
 check_result $? "Bind restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "DNS" "Deleted DNS record (ID: $id, Domain: $domain)."
+if [ "$quiet" != "yes" ]; then
+    $BIN/v-log-action "$user" "Info" "DNS" "Deleted DNS record (ID: $id, Domain: $domain)."
+fi
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-mail-domain

@@ -64,7 +64,7 @@ fi
 if [ "$DKIM" = 'yes' ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
 if [ "$DKIM" = 'yes' ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
     dkim_records=$($BIN/v-list-dns-records $user $domain plain | awk '{print $1,$2}' | grep -w '_domainkey' | cut -f 1 -d ' ')
     dkim_records=$($BIN/v-list-dns-records $user $domain plain | awk '{print $1,$2}' | grep -w '_domainkey' | cut -f 1 -d ' ')
     for id in $dkim_records; do
     for id in $dkim_records; do
-        $BIN/v-delete-dns-record $user $domain $id
+        $BIN/v-delete-dns-record $user $domain $id '' 'yes'
     done
     done
 fi
 fi
 
 

+ 1 - 1
bin/v-delete-mail-domain-antispam

@@ -66,7 +66,7 @@ fi
 update_object_value 'mail' 'DOMAIN' "$domain" '$ANTISPAM' 'no'
 update_object_value 'mail' 'DOMAIN' "$domain" '$ANTISPAM' 'no'
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Disabled anti-spam protection (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Mail" "Anti-spam protection disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-mail-domain-antivirus

@@ -66,7 +66,7 @@ fi
 update_object_value 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS' 'no'
 update_object_value 'mail' 'DOMAIN' "$domain" '$ANTIVIRUS' 'no'
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Disabled anti-virus scanning (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Mail" "Anti-virus scanning disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 2 - 2
bin/v-delete-mail-domain-dkim

@@ -57,7 +57,7 @@ if [ ! -z "$DNS_SYSTEM" ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
     records=$($BIN/v-list-dns-records $user $domain plain)
     records=$($BIN/v-list-dns-records $user $domain plain)
     dkim_records=$(echo "$records" |grep -w '_domainkey' | cut -f 1 -d ' ')
     dkim_records=$(echo "$records" |grep -w '_domainkey' | cut -f 1 -d ' ')
     for id in $dkim_records; do
     for id in $dkim_records; do
-        $BIN/v-delete-dns-record $user $domain $id
+        $BIN/v-delete-dns-record $user $domain $id 'yes'
     done
     done
 fi
 fi
 
 
@@ -71,7 +71,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$DKIM' 'no'
 decrease_user_value "$user" '$U_MAIL_DKIM'
 decrease_user_value "$user" '$U_MAIL_DKIM'
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Disabled DKIM message signing (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Mail" "DKIM message signing disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-mail-domain-smtp-relay

@@ -58,7 +58,7 @@ update_object_value 'mail' 'DOMAIN' "$domain" '$U_SMTP_RELAY_USERNAME' ''
 update_object_value 'mail' 'DOMAIN' "$domain" '$U_SMTP_RELAY_PASSWORD' ''
 update_object_value 'mail' 'DOMAIN' "$domain" '$U_SMTP_RELAY_PASSWORD' ''
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Mail" "Disabled SMTP Relay (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Mail" "SMTP Relay disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-mail-domain-ssl

@@ -65,7 +65,7 @@ $BIN/v-restart-mail $restart
 check_result $? "Mail restart failed" >/dev/null
 check_result $? "Mail restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Warn" "Mail" "Disabled SSL (Domain: $domain)."
+$BIN/v-log-action "$user" "Warn" "Mail" "SSL disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-sys-smtp-relay

@@ -41,7 +41,7 @@ rm -f /etc/exim4/smtp_relay.conf
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "Mail" "Disabled System SMTP Relay."
+$BIN/v-log-action "system" "Info" "Mail" "Global SMTP Relay disabled."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 6 - 2
bin/v-delete-sys-webmail

@@ -61,7 +61,11 @@ if [ ! -z "$WEBMAIL_ALIAS" ]; then
 
 
         if [ "$dns_domain" = "$domain" ]; then
         if [ "$dns_domain" = "$domain" ]; then
             if [ ! -z "$webmail_record" ]; then
             if [ ! -z "$webmail_record" ]; then
-                $BIN/v-delete-dns-record $user $domain $webmail_record $restart
+                if [ "$quiet" = "yes" ]; then
+                    $BIN/v-delete-dns-record $user $domain $webmail_record $restart 'yes'
+                else
+                    $BIN/v-delete-dns-record $user $domain $webmail_record $restart
+                fi
             fi
             fi
         fi
         fi
     fi
     fi
@@ -86,7 +90,7 @@ fi
 
 
 # Logging
 # Logging
 if [ "$quiet" != 'yes' ]; then
 if [ "$quiet" != 'yes' ]; then
-    $BIN/v-log-action "$user" "Info" "Mail" "Webmail client access disabled (Domain: $domain)."
+    $BIN/v-log-action "$user" "Info" "Mail" "Webmail access disabled (Domain: $domain)."
 fi
 fi
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 

+ 1 - 1
bin/v-delete-user

@@ -119,7 +119,7 @@ fi
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "System" "User deleted (User: $user)."
+$BIN/v-log-action "system" "Info" "Users" "User deleted (User: $user)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-user-log

@@ -49,7 +49,7 @@ if [ -f "$log_file" ]; then
     rm -f "$log_file"
     rm -f "$log_file"
     # Add event to user and system logs specifying that the log history was cleared
     # Add event to user and system logs specifying that the log history was cleared
     if [ "$user" = "system" ]; then
     if [ "$user" = "system" ]; then
-        $BIN/v-log-action "system" "Info" "Security" "System log history deleted."
+        $BIN/v-log-action "system" "Warning" "Security" "System log history deleted."
     else
     else
         $BIN/v-log-action "system" "Warning" "Security" "User action log deleted (User: $user)."
         $BIN/v-log-action "system" "Warning" "Security" "User action log deleted (User: $user)."
         $BIN/v-log-action "$user" "Info" "Security" "Log entries deleted."
         $BIN/v-log-action "$user" "Info" "Security" "Log entries deleted."

+ 1 - 1
bin/v-delete-web-domain

@@ -76,7 +76,7 @@ del_web_config "$WEB_SYSTEM" "$TPL.tpl"
 # Deleting SSL configuration and certificates
 # Deleting SSL configuration and certificates
 if [ "$SSL" = 'yes' ]; then
 if [ "$SSL" = 'yes' ]; then
     del_web_config "$WEB_SYSTEM" "$TPL.stpl"
     del_web_config "$WEB_SYSTEM" "$TPL.stpl"
-    $BIN/v-delete-web-domain-ssl-force $user $domain
+    $BIN/v-delete-web-domain-ssl-force $user $domain 'no' 'yes'
     rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
     rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
     rm -f $USER_DATA/ssl/$domain.*
     rm -f $USER_DATA/ssl/$domain.*
 fi
 fi

+ 1 - 1
bin/v-delete-web-domain-allow-users

@@ -65,7 +65,7 @@ fi
 # Adding new alias
 # Adding new alias
 update_object_value 'web' 'DOMAIN' "$domain" '$ALLOW_USERS' "no"
 update_object_value 'web' 'DOMAIN' "$domain" '$ALLOW_USERS' "no"
 
 
-$BIN/v-log-action "system" "Info" "Web" "Enabled subdomain ownership enforcement (Domain: $domain)."
+$BIN/v-log-action "system" "Info" "Web" "Subdomain ownership enforcement enabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-web-domain-backend

@@ -83,7 +83,7 @@ $BIN/v-restart-web-backend $restart
 check_result $? "Backend restart failed" >/dev/null
 check_result $? "Backend restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Deleted web domain backend configuration (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Web domain configuration deleted (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-web-domain-httpauth

@@ -87,7 +87,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$AUTH_USER' "$auth_user"
 update_object_value 'web' 'DOMAIN' "$domain" '$AUTH_HASH' "$auth_hash"
 update_object_value 'web' 'DOMAIN' "$domain" '$AUTH_HASH' "$auth_hash"
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Disabled web domain password (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Web domain password disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-web-domain-proxy

@@ -74,7 +74,7 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 check_result $? "Proxy restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Disabled proxy support (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Proxy disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-web-domain-redirect

@@ -72,7 +72,7 @@ if [ "$restart" = "yes" ]; then
 fi
 fi
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Disabled domain redirection (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Domain redirection disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-web-domain-ssl

@@ -69,7 +69,7 @@ mv $USER_DATA/ssl/$domain.* $tmpdir
 chown -R $user:$user $tmpdir
 chown -R $user:$user $tmpdir
 
 
 # Deleting force ssl
 # Deleting force ssl
-$BIN/v-delete-web-domain-ssl-force $user $domain
+$BIN/v-delete-web-domain-ssl-force $user $domain 'no' 'yes'
 
 
 
 
 #----------------------------------------------------------#
 #----------------------------------------------------------#

+ 4 - 1
bin/v-delete-web-domain-ssl-force

@@ -16,6 +16,7 @@
 user=$1
 user=$1
 domain=$2
 domain=$2
 restart=$3
 restart=$3
+quiet=$4
 
 
 # Includes
 # Includes
 # shellcheck source=/usr/local/hestia/func/main.sh
 # shellcheck source=/usr/local/hestia/func/main.sh
@@ -70,7 +71,9 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 check_result $? "Proxy restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Disabled automatic HTTPS redirection (Domain: $domain)."
+if [ "$quiet" != "yes" ]; then
+    $BIN/v-log-action "$user" "Info" "Web" "Automatic HTTPS redirection disabled (Domain: $domain)."
+fi
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 4 - 1
bin/v-delete-web-domain-ssl-hsts

@@ -16,6 +16,7 @@
 user=$1
 user=$1
 domain=$2
 domain=$2
 restart=$3
 restart=$3
+quiet=$4
 
 
 # Includes
 # Includes
 # shellcheck source=/usr/local/hestia/func/main.sh
 # shellcheck source=/usr/local/hestia/func/main.sh
@@ -69,7 +70,9 @@ $BIN/v-restart-proxy $restart
 check_result $? "Proxy restart failed" >/dev/null
 check_result $? "Proxy restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Disabled HTTP Strict Transport Security (Domain: $domain)."
+if [ "$quiet" != "yes" ]; then
+    $BIN/v-log-action "$user" "Info" "Web" "HTTP Strict Transport Security disabled (Domain: $domain)."
+fi
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-web-domain-stats

@@ -75,7 +75,7 @@ sed -i "/ $domain$/d" $HESTIA/data/queue/webstats.pipe
 update_object_value 'web' 'DOMAIN' "$domain" '$STATS' ''
 update_object_value 'web' 'DOMAIN' "$domain" '$STATS' ''
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Disabled web traffic analyzer (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Web traffic analyzer disabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-delete-web-domain-stats-user

@@ -71,7 +71,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$STATS_CRYPT' ''
 
 
 
 
 # Logging
 # Logging
-$BIN/v-log-action "$user" "Info" "Web" "Enabled web traffic analyzer password (Domain: $domain)."
+$BIN/v-log-action "$user" "Info" "Web" "Web traffic analyzer password enabled (Domain: $domain)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-rebuild-cron-jobs

@@ -48,8 +48,8 @@ sync_cron_jobs
 
 
 # Restarting crond
 # Restarting crond
 $BIN/v-restart-cron $restart
 $BIN/v-restart-cron $restart
-$BIN/v-log-action "system" "Info" "System" "Rebuilt cron jobs (User: $user)."
 check_result $? "Cron restart failed" >/dev/null
 check_result $? "Cron restart failed" >/dev/null
+$BIN/v-log-action "system" "Info" "System" "Rebuilt cron jobs (User: $user)."
 
 
 # Logging
 # Logging
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"

+ 1 - 1
bin/v-rebuild-dns-domains

@@ -97,7 +97,7 @@ $BIN/v-restart-dns $restart
 check_result $? "Bind restart failed" >/dev/null
 check_result $? "Bind restart failed" >/dev/null
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "System" "Rebuilt DNS domains (User: $user)."
+$BIN/v-log-action "system" "Info" "System" "Rebuilt DNS zones (User: $user)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 2 - 2
bin/v-rebuild-mail-domain

@@ -65,8 +65,8 @@ rebuild_mail_domain_conf
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
     if [ ! -z "$IMAP_SYSTEM" ]; then
     if [ ! -z "$IMAP_SYSTEM" ]; then
         WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
         WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
-        $BIN/v-delete-sys-webmail $user $domain '' $restart
-        $BIN/v-add-sys-webmail $user $domain $WEBMAIL '' $restart
+        $BIN/v-delete-sys-webmail $user $domain '' $restart 'yes'
+        $BIN/v-add-sys-webmail $user $domain $WEBMAIL '' $restart 'yes'
     fi
     fi
 fi
 fi
 
 

+ 3 - 3
bin/v-rebuild-mail-domains

@@ -69,10 +69,10 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
     if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
     if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
         if [ ! -z "$IMAP_SYSTEM" ]; then
         if [ ! -z "$IMAP_SYSTEM" ]; then
             WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
             WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
-            $BIN/v-delete-sys-webmail $user $domain $restart
-            $BIN/v-add-sys-webmail $user $domain $WEBMAIL $restart
+            $BIN/v-delete-sys-webmail $user $domain $restart 'yes'
+            $BIN/v-add-sys-webmail $user $domain $WEBMAIL $restart 'yes'
             if [ $? -ne 0 ]; then
             if [ $? -ne 0 ]; then
-                $BIN/v-add-sys-webmail $user $domain '' $restart
+                $BIN/v-add-sys-webmail $user $domain '' $restart 'yes'
             fi
             fi
         fi
         fi
     fi
     fi

+ 1 - 1
bin/v-rename-user-package

@@ -70,7 +70,7 @@ fi
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 # Logging
 # Logging
-$BIN/v-log-action "system" "Info" "System" "Renamed package (Value: $new_name, Previous: $old_name)."
+$BIN/v-log-action "system" "Info" "System" "Package renamed (Value: $new_name, Previous: $old_name)."
 log_event "$OK" "$ARGUMENTS"
 log_event "$OK" "$ARGUMENTS"
 
 
 exit
 exit

+ 1 - 1
bin/v-update-dns-templates

@@ -38,5 +38,5 @@ cp -rf $HESTIA_INSTALL_DIR/templates/dns $HESTIA/data/templates/
 # Clean tmpdir
 # Clean tmpdir
 rm -rf $tmpdir
 rm -rf $tmpdir
 
 
-$BIN/v-log-action "system" "Info" "System" "Updated DNS templates."
+$BIN/v-log-action "system" "Info" "Updates" "Default DNS zone templates updated."
 exit
 exit

+ 1 - 1
bin/v-update-mail-templates

@@ -49,5 +49,5 @@ if [ ! -z "$restart" ] || [ "$restart" == "yes" ]; then
     $BIN/v-restart-proxy $restart
     $BIN/v-restart-proxy $restart
     check_result $? "restart" >/dev/null 2>&1
     check_result $? "restart" >/dev/null 2>&1
 fi
 fi
-$BIN/v-log-action "system" "Info" "System" "Updated mail domain templates."
+$BIN/v-log-action "system" "Info" "Updates" "Default mail domain templates updated."
 exit
 exit

+ 1 - 1
bin/v-update-web-templates

@@ -68,6 +68,6 @@ if [ ! -z "$restart" ] || [ "$restart" == "yes" ]; then
     check_result $? "restart" >/dev/null 2>&1
     check_result $? "restart" >/dev/null 2>&1
 fi 
 fi 
 
 
-$BIN/v-log-action "system" "Info" "System" "Updated web domain templates."
+$BIN/v-log-action "system" "Info" "Updates" "Default web domain templates updated."
 
 
 exit
 exit

+ 4 - 4
func/rebuild.sh

@@ -289,13 +289,13 @@ rebuild_web_domain_conf() {
 
 
     # Refresh HTTPS redirection if previously enabled
     # Refresh HTTPS redirection if previously enabled
     if [ "$SSL_FORCE" = 'yes' ]; then
     if [ "$SSL_FORCE" = 'yes' ]; then
-        $BIN/v-delete-web-domain-ssl-force $user $domain no
-        $BIN/v-add-web-domain-ssl-force $user $domain yes
+        $BIN/v-delete-web-domain-ssl-force $user $domain no yes
+        $BIN/v-add-web-domain-ssl-force $user $domain yes yes
     fi
     fi
 
 
     if [ "$SSL_HSTS" = 'yes' ]; then
     if [ "$SSL_HSTS" = 'yes' ]; then
-        $BIN/v-delete-web-domain-ssl-hsts $user $domain no
-        $BIN/v-add-web-domain-ssl-hsts $user $domain yes
+        $BIN/v-delete-web-domain-ssl-hsts $user $domain no yes
+        $BIN/v-add-web-domain-ssl-hsts $user $domain yes yes
     fi
     fi
 
 
     # Adding proxy configuration
     # Adding proxy configuration

+ 5 - 1
web/list/log/index.php

@@ -1,6 +1,10 @@
 <?php
 <?php
 error_reporting(NULL);
 error_reporting(NULL);
-$TAB = 'LOG';
+if ($_GET['user'] === 'system') {
+    $TAB = 'SERVER';
+} else {
+    $TAB = 'LOG';
+}
 
 
 // Main include
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");