Browse Source

Fix typo in mail domain functions

"Disk" was misspelled.
Kristan Kenney 7 years ago
parent
commit
f3aee5e845
3 changed files with 10 additions and 10 deletions
  1. 3 3
      bin/v-update-mail-domain-disk
  2. 3 3
      bin/v-update-mail-domains-disk
  3. 4 4
      func/rebuild.sh

+ 3 - 3
bin/v-update-mail-domain-disk

@@ -45,7 +45,7 @@ fi
 #----------------------------------------------------------#
 
 # Starting loop
-dom_diks=0
+dom_disk=0
 for account in $(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT'); do
     home_dir=$HOMEDIR/$user/mail/$domain/$account
     if [ -e "$home_dir" ]; then
@@ -54,7 +54,7 @@ for account in $(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT'); do
         udisk=0
     fi
     update_object_value "mail/$domain" 'ACCOUNT' "$account"  '$U_DISK' "$udisk"
-    dom_diks=$((dom_diks + udisk))
+    dom_disk=$((dom_disk + udisk))
 done
 
 
@@ -62,7 +62,7 @@ done
 #                       Hestia                             #
 #----------------------------------------------------------#
 
-update_object_value 'mail' 'DOMAIN' "$domain" '$U_DISK' "$dom_diks"
+update_object_value 'mail' 'DOMAIN' "$domain" '$U_DISK' "$dom_disk"
 recalc_user_disk_usage
 
 # Logging

+ 3 - 3
bin/v-update-mail-domains-disk

@@ -36,7 +36,7 @@ fi
 
 # Starting loop
 for domain in $(search_objects 'mail' 'SUSPENDED' "no" 'DOMAIN'); do
-    dom_diks=0
+    dom_disk=0
     accounts=$(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT')
     for account in $accounts; do
         home_dir=$HOMEDIR/$user/mail/$domain/$account
@@ -46,9 +46,9 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "no" 'DOMAIN'); do
             udisk=0
         fi
         update_object_value "mail/$domain" 'ACCOUNT' "$account"  '$U_DISK' "$udisk"
-        dom_diks=$((dom_diks + udisk))
+        dom_disk=$((dom_disk + udisk))
     done
-    update_object_value 'mail' 'DOMAIN' "$domain" '$U_DISK' "$dom_diks"
+    update_object_value 'mail' 'DOMAIN' "$domain" '$U_DISK' "$dom_disk"
 done
 
 

+ 4 - 4
func/rebuild.sh

@@ -483,7 +483,7 @@ rebuild_mail_domain_conf() {
 
     # Rebuild domain accounts
     accs=0
-    dom_diks=0
+    dom_disk=0
     if [ -e "$USER_DATA/mail/$domain.conf" ]; then
         accounts=$(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT')
     else
@@ -491,7 +491,7 @@ rebuild_mail_domain_conf() {
     fi
     for account in $accounts; do
         (( ++accs))
-        dom_diks=$((dom_diks + U_DISK))
+        dom_disk=$((dom_disk + U_DISK))
         object=$(grep "ACCOUNT='$account'" $USER_DATA/mail/$domain.conf)
         FWD_ONLY='no'
         eval "$object"
@@ -531,9 +531,9 @@ rebuild_mail_domain_conf() {
 
     # Update counters
     update_object_value 'mail' 'DOMAIN' "$domain" '$ACCOUNTS' "$accs"
-    update_object_value 'mail' 'DOMAIN' "$domain" '$U_DISK' "$dom_diks"
+    update_object_value 'mail' 'DOMAIN' "$domain" '$U_DISK' "$dom_disk"
     U_MAIL_ACCOUNTS=$((U_MAIL_ACCOUNTS + accs))
-    U_DISK_MAIL=$((U_DISK_MAIL + dom_diks))
+    U_DISK_MAIL=$((U_DISK_MAIL + dom_disk))
     U_MAIL_DOMAINS=$((U_MAIL_DOMAINS + 1))
 }