Merge pull request #2313 from jaapmarcus/fix/2312-include-suspended-object-disk-calculation

Include suspended domains in disk calculation

bin/v-update-database-disk

@@ -32,9 +32,8 @@ check_args '2' "$#" 'USER DATABASE'
 is_format_valid 'user' 'database'
 is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'db' 'DB' "$database"
-is_object_unsuspended 'db' 'DB' "$database"
+
 
 #----------------------------------------------------------#
 #                       Action                             #

bin/v-update-databases-disk

@@ -35,7 +35,7 @@ is_object_valid 'user' 'USER' "$user"
 #----------------------------------------------------------#
 
 # Starting update loop
-for database in $(search_objects 'db' 'SUSPENDED' "no" 'DB'); do
+for database in $($BIN/v-list-databases $user plain | cut -f 1); do
     $BIN/v-update-database-disk "$user" "$database"
 done
 

bin/v-update-mail-domain-disk

@@ -36,9 +36,7 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 if [ -z "$MAIL_SYSTEM" ] || [ "$MAIL_SYSTEM" = 'remote' ]; then
     exit
 fi
@@ -49,7 +47,7 @@ fi
 
 # Starting loop
 dom_disk=0
-for account in $(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT'); do
+for account in $($BIN/v-list-mail-accounts $user $domain plain | cut -f 1); do
     home_dir=$HOMEDIR/$user/mail/$domain/$account
     if [ -e "$home_dir" ]; then
         udisk=$(nice -n 19 du -shm $home_dir | cut -f 1 )

bin/v-update-mail-domains-disk

@@ -38,10 +38,9 @@ fi
 #----------------------------------------------------------#
 
 # Starting loop
-for domain in $(search_objects 'mail' 'SUSPENDED' "no" 'DOMAIN'); do
+for domain in $($BIN/v-list-mail-domains $user plain | cut -f 1); do
     dom_disk=0
-    accounts=$(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT')
-    for account in $accounts; do
+    for account in $($BIN/v-list-mail-accounts $user $domain plain | cut -f 1); do
         home_dir=$HOMEDIR/$user/mail/$domain/$account
         if [ -e "$home_dir" ]; then
             udisk=$(nice -n 19 du -shm $home_dir | cut -f 1 )

bin/v-update-web-domain-disk

@@ -38,9 +38,7 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 
 #----------------------------------------------------------#
 #                       Action                             #

bin/v-update-web-domains-disk

@@ -35,7 +35,7 @@ is_object_valid 'user' 'USER' "$user"
 #----------------------------------------------------------#
 
 # Loop through all domains that are not suspended
-for domain in $(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'); do
+for domain in $($BIN/v-list-web-domains $user plan | cut -f 1); do 
     home_dir="$HOMEDIR/$user/web/$domain/"
     if [ -e "$home_dir" ]; then
         disk_usage=$(nice -n 19 du -shm $home_dir | cut -f 1 )