updated syntax for is_system_enabled()

2025-08-19 13:01:52 -07:00 · 2013-05-29 13:16:09 +03:00 · 2013-05-29 13:16:09 +03:00 · 7ebd96d92d
commit 7ebd96d92d
parent bab24899ea
125 changed files with 127 additions and 127 deletions
--- a/bin/v-add-cron-job
+++ b/bin/v-add-cron-job
@ -34,7 +34,7 @@ A7="$command"

 check_args '7' "$#" 'USER MIN HOUR DAY MONTH WDAY COMMAND [JOB]'
 validate_format 'user' 'min' 'hour' 'day' 'month' 'wday' 'command'
-is_system_enabled $CRON_SYSTEM
+is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_package_full 'CRON_JOBS'
--- a/bin/v-add-cron-report
+++ b/bin/v-add-cron-report
@ -24,7 +24,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$CRON_SYSTEM"
+is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"

--- a/bin/v-add-database
+++ b/bin/v-add-database
@ -42,7 +42,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"

 check_args '5' "$#" 'USER DATABASE DBUSER DBPASS TYPE [HOST] [CHARSET]'
 validate_format 'user' 'database' 'dbuser' 'dbpass' 'charset'
-is_system_enabled "$DB_SYSTEM"
+is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_type_valid "$DB_SYSTEM" "$type"
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
--- a/bin/v-add-database-host
+++ b/bin/v-add-database-host
@ -38,7 +38,7 @@ A4='******'
 args_usage='TYPE HOST DBUSER DBPASS [MAX_DB] [CHARSETS] [TPL]'
 check_args '4' "$#" "$args_usage"
 validate_format 'host' 'dbuser' 'dbpass' 'max_db' 'charsets' 'template'
-is_system_enabled "$DB_SYSTEM"
+is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_type_valid "$DB_SYSTEM" "$type"
 is_dbhost_new
 case $type in
--- a/bin/v-add-dns-domain
+++ b/bin/v-add-dns-domain
@ -38,7 +38,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN IP [NS1] [NS2] [NS3] [NS4]'
 validate_format 'user' 'domain' 'ip'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_domain_new 'dns'
--- a/bin/v-add-dns-on-web-alias
+++ b/bin/v-add-dns-on-web-alias
@ -31,8 +31,8 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN ALIAS'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
--- a/bin/v-add-dns-record
+++ b/bin/v-add-dns-record
@ -41,7 +41,7 @@ source $VESTA/func/domain.sh

 check_args '5' "$#" 'USER DOMAIN RECORD TYPE VALUE [PRIORITY] [ID] [RESTART]'
 validate_format 'user' 'domain' 'record' 'rtype' 'dvalue'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-add-mail-account
+++ b/bin/v-add-mail-account
@ -35,7 +35,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"

 check_args '4' "$#" 'USER DOMAIN ACCOUNT PASSWORD [QUOTA]'
 validate_format 'user' 'domain' 'account' 'password' 'quota'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-add-mail-account-alias
+++ b/bin/v-add-mail-account-alias
@ -29,7 +29,7 @@ source $VESTA/func/domain.sh

 check_args '4' "$#" 'USER DOMAIN ACCOUNT ALIAS'
 validate_format 'user' 'domain' 'account' 'malias'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-add-mail-account-autoreply
+++ b/bin/v-add-mail-account-autoreply
@ -29,7 +29,7 @@ source $VESTA/func/domain.sh

 check_args '4' "$#" 'USER DOMAIN ACCOUNT MESSAGE'
 validate_format 'user' 'domain' 'account' 'autoreply'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-add-mail-account-forward
+++ b/bin/v-add-mail-account-forward
@ -29,7 +29,7 @@ source $VESTA/func/domain.sh

 check_args '4' "$#" 'USER DOMAIN ACCOUNT FORWARD'
 validate_format 'user' 'domain' 'account' 'forward'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-add-mail-domain
+++ b/bin/v-add-mail-domain
@ -32,7 +32,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN [ANTISPAM] [ANTIVIRUS] [DKIM] [DKIM_SIZE]'
 validate_format 'user' 'domain' 'antispam' 'antivirus' 'dkim' 'dkim_size'
-is_system_enabled "$MAIL_SYSTEM"
+is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_domain_new 'mail'
--- a/bin/v-add-mail-domain-antispam
+++ b/bin/v-add-mail-domain-antispam
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-add-mail-domain-antivirus
+++ b/bin/v-add-mail-domain-antivirus
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-add-mail-domain-catchall
+++ b/bin/v-add-mail-domain-catchall
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN EMAIL'
 validate_format 'user' 'domain' 'email'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-add-mail-domain-dkim
+++ b/bin/v-add-mail-domain-dkim
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN [DKIM_SIZE]'
 validate_format 'user' 'domain' 'dkim_size'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-add-remote-dns-domain
+++ b/bin/v-add-remote-dns-domain
@ -25,7 +25,7 @@ source $VESTA/func/remote.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$DNS_CLUSTER"
+is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"

--- a/bin/v-add-remote-dns-host
+++ b/bin/v-add-remote-dns-host
@ -33,7 +33,7 @@ A4='******'
 args_usage='HOST PORT USER PASSWORD [TYPE] [DNS_USER]'
 check_args '4' "$#" "$args_usage"
 validate_format 'host' 'port' 'user' 'password' 'type' 'dns_user'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_dnshost_new
 is_dnshost_alive

--- a/bin/v-add-remote-dns-record
+++ b/bin/v-add-remote-dns-record
@ -26,7 +26,7 @@ source $VESTA/func/remote.sh

 check_args '3' "$#" 'USER DOMAIN ID'
 validate_format 'user' 'domain' 'id'
-is_system_enabled "$DNS_CLUSTER"
+is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
 is_object_valid "dns/$domain" 'ID' "$id"
--- a/bin/v-add-web-domain
+++ b/bin/v-add-web-domain
@ -36,7 +36,7 @@ source $VESTA/func/ip.sh

 check_args '3' "$#" 'USER DOMAIN IP [RESTART]'
 validate_format 'user' 'domain' 'ip'
-is_system_enabled "$WEB_SYSTEM"
+is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_domain_new 'web'
--- a/bin/v-add-web-domain-alias
+++ b/bin/v-add-web-domain-alias
@ -34,7 +34,7 @@ source $VESTA/func/ip.sh

 check_args '3' "$#" 'USER DOMAIN DOM_ALIAS [RESTART]'
 validate_format 'user' 'domain' 'dom_alias'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-add-web-domain-ftp
+++ b/bin/v-add-web-domain-ftp
@ -32,7 +32,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"

 check_args '4' "$#" 'USER DOMAIN FTP_USER FTP_PASSWORD'
 validate_format 'user' 'domain' 'ftp_user' 'ftp_password'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-add-web-domain-proxy
+++ b/bin/v-add-web-domain-proxy
@ -33,7 +33,7 @@ source $VESTA/func/ip.sh

 check_args '2' "$#" 'USER DOMAIN [TEMPLATE] [EXTENTIONS] [RESTART]'
 validate_format 'user' 'domain' 'extentions'
-is_system_enabled "$PROXY_SYSTEM"
+is_system_enabled "$PROXY_SYSTEM" 'PROXY_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
--- a/bin/v-add-web-domain-ssl
+++ b/bin/v-add-web-domain-ssl
@ -35,7 +35,7 @@ source $VESTA/func/ip.sh

 check_args '3' "$#" 'USER DOMAIN SSL_DIR [SSL_HOME] [RESTART]'
 validate_format 'user' 'domain' 'ssl_dir'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-add-web-domain-stats
+++ b/bin/v-add-web-domain-stats
@ -31,7 +31,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN TYPE'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
+is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_type_valid "$STATS_SYSTEM" "$type"
 is_object_valid 'user' 'USER' "$user" "$user"
 is_object_unsuspended 'user' 'USER' "$user"
--- a/bin/v-add-web-domain-stats-user
+++ b/bin/v-add-web-domain-stats-user
@ -32,7 +32,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"

 check_args '4' "$#" 'USER DOMAIN STATS_USER STATS_PASS'
 validate_format 'user' 'domain' 'stats_user' 'stats_pass'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-backup-user
+++ b/bin/v-backup-user
@ -26,7 +26,7 @@ source $VESTA/func/db.sh

 check_args '1' "$#" 'USER [NOTIFY]'
 validate_format 'user'
-is_system_enabled "$BACKUP_SYSTEM"
+is_system_enabled "$BACKUP_SYSTEM" 'BACKUP_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_backup_enabled
--- a/bin/v-change-cron-job
+++ b/bin/v-change-cron-job
@ -31,7 +31,7 @@ source $VESTA/func/main.sh

 check_args '7' "$#" 'USER JOB MIN HOUR DAY MONTH WDAY COMMAND'
 validate_format 'user' 'job' 'min' 'hour' 'day' 'month' 'wday' 'command' 
-is_system_enabled $CRON_SYSTEM
+is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'cron' 'JOB' "$job"
--- a/bin/v-change-database-password
+++ b/bin/v-change-database-password
@ -32,7 +32,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"

 check_args '3' "$#" 'USER DATABASE DBPASS'
 validate_format 'user' 'database' 'dbpass'
-is_system_enabled "$DB_SYSTEM"
+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"
--- a/bin/v-change-dns-domain-exp
+++ b/bin/v-change-dns-domain-exp
@ -27,7 +27,7 @@ source $VESTA/func/main.sh

 check_args '3' "$#" 'USER DOMAIN EXP'
 validate_format 'user' 'domain' 'exp'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-change-dns-domain-ip
+++ b/bin/v-change-dns-domain-ip
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN IP'
 validate_format 'user' 'domain' 'ip'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-change-dns-domain-soa
+++ b/bin/v-change-dns-domain-soa
@ -29,7 +29,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN SOA'
 validate_format 'user' 'domain' 'soa'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-change-dns-domain-tpl
+++ b/bin/v-change-dns-domain-tpl
@ -30,7 +30,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN TEMPLATE [RESTART]'
 validate_format 'user' 'domain' 'template'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-change-dns-domain-ttl
+++ b/bin/v-change-dns-domain-ttl
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN TTL'
 validate_format 'user' 'domain' 'ttl'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-change-dns-record
+++ b/bin/v-change-dns-record
@ -32,7 +32,7 @@ source $VESTA/func/domain.sh

 check_args '4' "$#" 'USER DOMAIN ID VALUE [PRIORITY] [RESTART]'
 validate_format 'user' 'domain' 'id' 'dvalue'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-change-dns-record-id
+++ b/bin/v-change-dns-record-id
@ -30,7 +30,7 @@ source $VESTA/func/domain.sh

 check_args '4' "$#" 'USER DOMAIN ID NEWID [RESTART]'
 validate_format 'user' 'domain' 'id' 'newid'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-change-mail-account-password
+++ b/bin/v-change-mail-account-password
@ -34,7 +34,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'"

 check_args '4' "$#" 'USER DOMAIN ACCOUNT PASSWORD'
 validate_format 'user' 'domain' 'account' 'password'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-change-mail-account-quota
+++ b/bin/v-change-mail-account-quota
@ -29,7 +29,7 @@ source $VESTA/func/domain.sh

 check_args '4' "$#" 'USER DOMAIN ACCOUNT QUOTA'
 validate_format 'user' 'domain' 'account' 'quota'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-change-mail-domain-catchall
+++ b/bin/v-change-mail-domain-catchall
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN EMAIL'
 validate_format 'user' 'domain' 'email'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-change-remote-dns-domain-exp
+++ b/bin/v-change-remote-dns-domain-exp
@ -25,7 +25,7 @@ source $VESTA/func/remote.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$DNS_CLUSTER"
+is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"

--- a/bin/v-change-remote-dns-domain-soa
+++ b/bin/v-change-remote-dns-domain-soa
@ -25,7 +25,7 @@ source $VESTA/func/remote.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$DNS_CLUSTER"
+is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"

--- a/bin/v-change-remote-dns-domain-ttl
+++ b/bin/v-change-remote-dns-domain-ttl
@ -25,7 +25,7 @@ source $VESTA/func/remote.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$DNS_CLUSTER"
+is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"

--- a/bin/v-change-web-domain-ftp
+++ b/bin/v-change-web-domain-ftp
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '4' "$#" 'USER DOMAIN FTP_USER FTP_PASSWORD'
 validate_format 'user' 'domain' 'ftp_user' 'ftp_password'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-change-web-domain-ip
+++ b/bin/v-change-web-domain-ip
@ -29,7 +29,7 @@ source $VESTA/func/ip.sh

 check_args '3' "$#" 'USER DOMAIN IP [RESTART]'
 validate_format 'user' 'domain' 'ip'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-change-web-domain-proxy-tpl
+++ b/bin/v-change-web-domain-proxy-tpl
@ -33,7 +33,7 @@ source $VESTA/func/ip.sh

 check_args '3' "$#" 'USER DOMAIN TEMPLATE [EXTENTIONS] [RESTART]'
 validate_format 'user' 'domain' 'template'
-is_system_enabled "$PROXY_SYSTEM"
+is_system_enabled "$PROXY_SYSTEM" 'PROXY_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
--- a/bin/v-change-web-domain-sslcert
+++ b/bin/v-change-web-domain-sslcert
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN SSL_DIR'
 validate_format 'user' 'domain' 'ssl_dir'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-change-web-domain-sslhome
+++ b/bin/v-change-web-domain-sslhome
@ -23,7 +23,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN SSL_HOME'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-change-web-domain-stats
+++ b/bin/v-change-web-domain-stats
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN TYPE'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
+is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_type_valid "$STATS_SYSTEM" "$type"
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
--- a/bin/v-change-web-domain-tpl
+++ b/bin/v-change-web-domain-tpl
@ -30,7 +30,7 @@ source $VESTA/func/ip.sh

 check_args '3' "$#" 'USER DOMAIN TEMPLATE [RESTART]'
 validate_format 'user' 'domain' 'template'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-delete-cron-job
+++ b/bin/v-delete-cron-job
@ -24,7 +24,7 @@ source $VESTA/func/main.sh

 check_args '2' "$#" 'USER JOB'
 validate_format 'user' 'job'
-is_system_enabled "$CRON_SYSTEM"
+is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'cron' 'JOB' "$job"
--- a/bin/v-delete-cron-reports
+++ b/bin/v-delete-cron-reports
@ -24,7 +24,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$CRON_SYSTEM"
+is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"

--- a/bin/v-delete-database
+++ b/bin/v-delete-database
@ -26,7 +26,7 @@ source $VESTA/func/db.sh

 check_args '2' "$#" 'USER DATABASE'
 validate_format 'user' 'database'
-is_system_enabled "$DB_SYSTEM"
+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"
--- a/bin/v-delete-database-host
+++ b/bin/v-delete-database-host
@ -26,7 +26,7 @@ source $VESTA/func/db.sh

 check_args '2' "$#" 'TYPE HOST'
 validate_format 'type' 'host'
-is_system_enabled "$DB_SYSTEM"
+is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_type_valid "$DB_SYSTEM" "$type"
 is_object_valid "../../conf/$type" 'HOST' "$host"
 is_dbhost_free
--- a/bin/v-delete-databases
+++ b/bin/v-delete-databases
@ -23,7 +23,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$DB_SYSTEM"
+is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"

--- a/bin/v-delete-dns-domain
+++ b/bin/v-delete-dns-domain
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-delete-dns-domains
+++ b/bin/v-delete-dns-domains
@ -23,7 +23,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"


--- a/bin/v-delete-dns-domains-src
+++ b/bin/v-delete-dns-domains-src
@ -25,7 +25,7 @@ source $VESTA/func/main.sh

 check_args '2' "$#" 'USER SRC [RESTART]'
 validate_format 'user' 'src'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"


--- a/bin/v-delete-dns-on-web-alias
+++ b/bin/v-delete-dns-on-web-alias
@ -31,8 +31,8 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN ALIAS'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
--- a/bin/v-delete-mail-account
+++ b/bin/v-delete-mail-account
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN ACCOUNT'
 validate_format 'user' 'domain' 'account'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-delete-mail-account-alias
+++ b/bin/v-delete-mail-account-alias
@ -29,7 +29,7 @@ source $VESTA/func/domain.sh

 check_args '4' "$#" 'USER DOMAIN ACCOUNT ALIAS'
 validate_format 'user' 'domain' 'account' 'malias'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-delete-mail-account-autoreply
+++ b/bin/v-delete-mail-account-autoreply
@ -29,7 +29,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN ACCOUNT'
 validate_format 'user' 'domain' 'account'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-delete-mail-account-forward
+++ b/bin/v-delete-mail-account-forward
@ -29,7 +29,7 @@ source $VESTA/func/domain.sh

 check_args '4' "$#" 'USER DOMAIN ACCOUNT FORWARD'
 validate_format 'user' 'domain' 'account' 'forward'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-delete-mail-domain
+++ b/bin/v-delete-mail-domain
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-delete-mail-domain-antispam
+++ b/bin/v-delete-mail-domain-antispam
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-delete-mail-domain-antivirus
+++ b/bin/v-delete-mail-domain-antivirus
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-delete-mail-domain-catchall
+++ b/bin/v-delete-mail-domain-catchall
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-delete-mail-domain-dkim
+++ b/bin/v-delete-mail-domain-dkim
@ -26,7 +26,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-delete-mail-domains
+++ b/bin/v-delete-mail-domains
@ -23,7 +23,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$MAIL_SYSTEM"
+is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"


--- a/bin/v-delete-remote-dns-domain
+++ b/bin/v-delete-remote-dns-domain
@ -25,7 +25,7 @@ source $VESTA/func/remote.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$DNS_CLUSTER"
+is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'

 if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
    echo "Error: dns-cluster.conf doesn't exist"
--- a/bin/v-delete-remote-dns-record
+++ b/bin/v-delete-remote-dns-record
@ -26,7 +26,7 @@ source $VESTA/func/remote.sh

 check_args '3' "$#" 'USER DOMAIN ID'
 validate_format 'user' 'domain' 'id'
-is_system_enabled "$DNS_CLUSTER"
+is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'

 if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
    echo "Error: dns-cluster.conf doesn't exist"
--- a/bin/v-delete-user-backup
+++ b/bin/v-delete-user-backup
@ -24,7 +24,7 @@ source $VESTA/func/main.sh

 check_args '2' "$#" 'USER BACKUP'
 validate_format 'user' 'backup'
-is_system_enabled "$BACKUP_SYSTEM"
+is_system_enabled "$BACKUP_SYSTEM" 'BACKUP_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'backup' 'BACKUP' "$2"
--- a/bin/v-delete-web-domain
+++ b/bin/v-delete-web-domain
@ -31,7 +31,7 @@ source $VESTA/func/ip.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-delete-web-domain-alias
+++ b/bin/v-delete-web-domain-alias
@ -31,7 +31,7 @@ source $VESTA/func/ip.sh

 check_args '3' "$#" 'USER DOMAIN DOM_ALIAS [RESTART]'
 validate_format 'user' 'domain' 'dom_alias'
-is_system_enabled 'WEB_SYSTEM'
+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"
--- a/bin/v-delete-web-domain-ftp
+++ b/bin/v-delete-web-domain-ftp
@ -26,7 +26,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-delete-web-domain-proxy
+++ b/bin/v-delete-web-domain-proxy
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-delete-web-domain-ssl
+++ b/bin/v-delete-web-domain-ssl
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-delete-web-domain-stats
+++ b/bin/v-delete-web-domain-stats
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-delete-web-domain-stats-user
+++ b/bin/v-delete-web-domain-stats-user
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$WEB_SYSTEM"
+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"
--- a/bin/v-delete-web-domains
+++ b/bin/v-delete-web-domains
@ -24,7 +24,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER [RESTART]'
 validate_format 'user'
-is_system_enabled "$WEB_SYSTEM"
+is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"


--- a/bin/v-insert-dns-domain
+++ b/bin/v-insert-dns-domain
@ -26,7 +26,7 @@ source $VESTA/func/main.sh

 check_args '2' "$#" 'USER DATA [SRC]'
 validate_format 'user' 'data'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"

--- a/bin/v-insert-dns-record
+++ b/bin/v-insert-dns-record
@ -25,7 +25,7 @@ source $VESTA/func/main.sh

 check_args '3' "$#" 'USER DOMAIN DATA'
 validate_format 'user' 'domain' 'data'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-insert-dns-records
+++ b/bin/v-insert-dns-records
@ -25,7 +25,7 @@ source $VESTA/func/main.sh

 check_args '3' "$#" 'USER DOMAIN DATAFILE'
 validate_format 'user' 'domain' 'data_file'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-rebuild-cron-jobs
+++ b/bin/v-rebuild-cron-jobs
@ -24,7 +24,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER [RESTART]'
 validate_format 'user'
-is_system_enabled "$CRON_SYSTEM"
+is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_object_valid 'user' 'USER' "$user"


--- a/bin/v-rebuild-databases
+++ b/bin/v-rebuild-databases
@ -25,7 +25,7 @@ source $VESTA/func/rebuild.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$DB_SYSTEM"
+is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"


--- a/bin/v-rebuild-dns-domain
+++ b/bin/v-rebuild-dns-domain
@ -27,7 +27,7 @@ source $VESTA/func/rebuild.sh

 check_args '2' "$#" 'USER DOMAIN [RESTART]'
 validate_format 'user' 'domain'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
--- a/bin/v-rebuild-dns-domains
+++ b/bin/v-rebuild-dns-domains
@ -26,7 +26,7 @@ source $VESTA/func/rebuild.sh

 check_args '1' "$#" 'USER [RESTART]'
 validate_format 'user'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"

--- a/bin/v-rebuild-mail-domains
+++ b/bin/v-rebuild-mail-domains
@ -25,7 +25,7 @@ source $VESTA/func/rebuild.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$MAIL_SYSTEM"
+is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"

--- a/bin/v-rebuild-web-domains
+++ b/bin/v-rebuild-web-domains
@ -27,7 +27,7 @@ source $VESTA/func/rebuild.sh

 check_args '1' "$#" 'USER [RESTART]'
 validate_format 'user'
-is_system_enabled "$WEB_SYSTEM"
+is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"

--- a/bin/v-schedule-user-backup
+++ b/bin/v-schedule-user-backup
@ -23,7 +23,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$BACKUP_SYSTEM"
+is_system_enabled "$BACKUP_SYSTEM" 'BACKUP_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_backup_enabled
 is_backup_scheduled 'backup'
--- a/bin/v-schedule-user-restore
+++ b/bin/v-schedule-user-restore
@ -30,7 +30,7 @@ source $VESTA/func/main.sh

 check_args '2' "$#" 'USER BACKUP [WEB] [DNS] [MAIL] [DB] [CRON] [UDIR]'
 validate_format 'user'
-is_system_enabled "$BACKUP_SYSTEM"
+is_system_enabled "$BACKUP_SYSTEM" 'BACKUP_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_backup_enabled
 is_backup_scheduled 'restore'
--- a/bin/v-suspend-database
+++ b/bin/v-suspend-database
@ -25,7 +25,7 @@ source $VESTA/func/db.sh

 check_args '2' "$#" 'USER DATABASE'
 validate_format 'user' 'database'
-is_system_enabled "$DB_SYSTEM"
+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"
--- a/bin/v-suspend-database-host
+++ b/bin/v-suspend-database-host
@ -24,7 +24,7 @@ source $VESTA/func/main.sh

 check_args '2' "$#" 'TYPE HOST'
 validate_format 'type' 'host'
-is_system_enabled "$DB_SYSTEM"
+is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_object_valid "../../conf/$type" 'HOST' "$host"
 is_object_unsuspended "../../conf/$type" 'HOST' "$host"

--- a/bin/v-suspend-databases
+++ b/bin/v-suspend-databases
@ -23,7 +23,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$DB_SYSTEM"
+is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"


--- a/bin/v-suspend-dns-domain
+++ b/bin/v-suspend-dns-domain
@ -26,7 +26,7 @@ source $VESTA/func/main.sh

 check_args '2' "$#" 'USER DOMAIN [RESTART]'
 validate_format 'user' 'domain'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
 is_object_unsuspended 'dns' 'DOMAIN' "$domain"
--- a/bin/v-suspend-dns-domains
+++ b/bin/v-suspend-dns-domains
@ -24,7 +24,7 @@ source $VESTA/func/main.sh

 check_args '1' "$#" 'USER [RESTART]'
 validate_format 'user'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"


--- a/bin/v-suspend-dns-record
+++ b/bin/v-suspend-dns-record
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN ID [RESTART]'
 validate_format 'user' 'domain' 'id'
-is_system_enabled "$DNS_SYSTEM"
+is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
 is_object_unsuspended 'dns' 'DOMAIN' "$domain"
--- a/bin/v-suspend-mail-account
+++ b/bin/v-suspend-mail-account
@ -28,7 +28,7 @@ source $VESTA/func/domain.sh

 check_args '3' "$#" 'USER DOMAIN ACCOUNT'
 validate_format 'user' 'domain' 'account'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-suspend-mail-accounts
+++ b/bin/v-suspend-mail-accounts
@ -26,7 +26,7 @@ source $VESTA/func/main.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-suspend-mail-domain
+++ b/bin/v-suspend-mail-domain
@ -27,7 +27,7 @@ source $VESTA/func/domain.sh

 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
-is_system_enabled "$MAIL_SYSTEM"
+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"
--- a/bin/v-suspend-mail-domains
+++ b/bin/v-suspend-mail-domains
@ -24,7 +24,7 @@ source $VESTA/func/domain.sh

 check_args '1' "$#" 'USER'
 validate_format 'user'
-is_system_enabled "$MAIL_SYSTEM"
+is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"


--- a/Show more
+++ b/Show more