From 7ebd96d92d7616e82ffc89288910b70f4bace581 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 29 May 2013 13:16:09 +0300 Subject: [PATCH] updated syntax for is_system_enabled() --- bin/v-add-cron-job | 2 +- bin/v-add-cron-report | 2 +- bin/v-add-database | 2 +- bin/v-add-database-host | 2 +- bin/v-add-dns-domain | 2 +- bin/v-add-dns-on-web-alias | 4 ++-- bin/v-add-dns-record | 2 +- bin/v-add-mail-account | 2 +- bin/v-add-mail-account-alias | 2 +- bin/v-add-mail-account-autoreply | 2 +- bin/v-add-mail-account-forward | 2 +- bin/v-add-mail-domain | 2 +- bin/v-add-mail-domain-antispam | 2 +- bin/v-add-mail-domain-antivirus | 2 +- bin/v-add-mail-domain-catchall | 2 +- bin/v-add-mail-domain-dkim | 2 +- bin/v-add-remote-dns-domain | 2 +- bin/v-add-remote-dns-host | 2 +- bin/v-add-remote-dns-record | 2 +- bin/v-add-web-domain | 2 +- bin/v-add-web-domain-alias | 2 +- bin/v-add-web-domain-ftp | 2 +- bin/v-add-web-domain-proxy | 2 +- bin/v-add-web-domain-ssl | 2 +- bin/v-add-web-domain-stats | 2 +- bin/v-add-web-domain-stats-user | 2 +- bin/v-backup-user | 2 +- bin/v-change-cron-job | 2 +- bin/v-change-database-password | 2 +- bin/v-change-dns-domain-exp | 2 +- bin/v-change-dns-domain-ip | 2 +- bin/v-change-dns-domain-soa | 2 +- bin/v-change-dns-domain-tpl | 2 +- bin/v-change-dns-domain-ttl | 2 +- bin/v-change-dns-record | 2 +- bin/v-change-dns-record-id | 2 +- bin/v-change-mail-account-password | 2 +- bin/v-change-mail-account-quota | 2 +- bin/v-change-mail-domain-catchall | 2 +- bin/v-change-remote-dns-domain-exp | 2 +- bin/v-change-remote-dns-domain-soa | 2 +- bin/v-change-remote-dns-domain-ttl | 2 +- bin/v-change-web-domain-ftp | 2 +- bin/v-change-web-domain-ip | 2 +- bin/v-change-web-domain-proxy-tpl | 2 +- bin/v-change-web-domain-sslcert | 2 +- bin/v-change-web-domain-sslhome | 2 +- bin/v-change-web-domain-stats | 2 +- bin/v-change-web-domain-tpl | 2 +- bin/v-delete-cron-job | 2 +- bin/v-delete-cron-reports | 2 +- bin/v-delete-database | 2 +- bin/v-delete-database-host | 2 +- bin/v-delete-databases | 2 +- bin/v-delete-dns-domain | 2 +- bin/v-delete-dns-domains | 2 +- bin/v-delete-dns-domains-src | 2 +- bin/v-delete-dns-on-web-alias | 4 ++-- bin/v-delete-mail-account | 2 +- bin/v-delete-mail-account-alias | 2 +- bin/v-delete-mail-account-autoreply | 2 +- bin/v-delete-mail-account-forward | 2 +- bin/v-delete-mail-domain | 2 +- bin/v-delete-mail-domain-antispam | 2 +- bin/v-delete-mail-domain-antivirus | 2 +- bin/v-delete-mail-domain-catchall | 2 +- bin/v-delete-mail-domain-dkim | 2 +- bin/v-delete-mail-domains | 2 +- bin/v-delete-remote-dns-domain | 2 +- bin/v-delete-remote-dns-record | 2 +- bin/v-delete-user-backup | 2 +- bin/v-delete-web-domain | 2 +- bin/v-delete-web-domain-alias | 2 +- bin/v-delete-web-domain-ftp | 2 +- bin/v-delete-web-domain-proxy | 2 +- bin/v-delete-web-domain-ssl | 2 +- bin/v-delete-web-domain-stats | 2 +- bin/v-delete-web-domain-stats-user | 2 +- bin/v-delete-web-domains | 2 +- bin/v-insert-dns-domain | 2 +- bin/v-insert-dns-record | 2 +- bin/v-insert-dns-records | 2 +- bin/v-rebuild-cron-jobs | 2 +- bin/v-rebuild-databases | 2 +- bin/v-rebuild-dns-domain | 2 +- bin/v-rebuild-dns-domains | 2 +- bin/v-rebuild-mail-domains | 2 +- bin/v-rebuild-web-domains | 2 +- bin/v-schedule-user-backup | 2 +- bin/v-schedule-user-restore | 2 +- bin/v-suspend-database | 2 +- bin/v-suspend-database-host | 2 +- bin/v-suspend-databases | 2 +- bin/v-suspend-dns-domain | 2 +- bin/v-suspend-dns-domains | 2 +- bin/v-suspend-dns-record | 2 +- bin/v-suspend-mail-account | 2 +- bin/v-suspend-mail-accounts | 2 +- bin/v-suspend-mail-domain | 2 +- bin/v-suspend-mail-domains | 2 +- bin/v-suspend-web-domain | 2 +- bin/v-suspend-web-domains | 2 +- bin/v-unsuspend-database | 2 +- bin/v-unsuspend-database-host | 2 +- bin/v-unsuspend-databases | 2 +- bin/v-unsuspend-dns-domain | 2 +- bin/v-unsuspend-dns-domains | 2 +- bin/v-unsuspend-dns-record | 2 +- bin/v-unsuspend-mail-account | 2 +- bin/v-unsuspend-mail-accounts | 2 +- bin/v-unsuspend-mail-domain | 2 +- bin/v-unsuspend-mail-domains | 2 +- bin/v-unsuspend-web-domain | 2 +- bin/v-unsuspend-web-domains | 2 +- bin/v-update-database-disk | 2 +- bin/v-update-databases-disk | 2 +- bin/v-update-mail-domain-disk | 2 +- bin/v-update-mail-domains-disk | 2 +- bin/v-update-user-backups | 2 +- bin/v-update-web-domain-disk | 2 +- bin/v-update-web-domain-stat | 2 +- bin/v-update-web-domain-traff | 2 +- bin/v-update-web-domains-disk | 2 +- bin/v-update-web-domains-stat | 2 +- bin/v-update-web-domains-traff | 2 +- 125 files changed, 127 insertions(+), 127 deletions(-) diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job index 7569fb286..703201a50 100755 --- 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' diff --git a/bin/v-add-cron-report b/bin/v-add-cron-report index fd969bd6a..c0376c18c 100755 --- 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" diff --git a/bin/v-add-database b/bin/v-add-database index 371a2f54e..a2bec1f6f 100755 --- 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" diff --git a/bin/v-add-database-host b/bin/v-add-database-host index ae4e95233..e5045b410 100755 --- 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 diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain index 55b5d5ce7..4a32939af 100755 --- 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' diff --git a/bin/v-add-dns-on-web-alias b/bin/v-add-dns-on-web-alias index 6c6b55e0c..aa6e6b7c2 100755 --- 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" diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index 580e9fd1d..266a7c3a7 100755 --- 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" diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account index 67020b5ed..f83ba961b 100755 --- 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" diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias index cff53695e..b3074c14b 100755 --- 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" diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply index 13f1e9f59..20f5d7ad4 100755 --- 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" diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward index 8e6e81366..186878b39 100755 --- 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" diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index 6ab33de72..3f03d252b 100755 --- 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' diff --git a/bin/v-add-mail-domain-antispam b/bin/v-add-mail-domain-antispam index c6035c411..1cf1002b0 100755 --- 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" diff --git a/bin/v-add-mail-domain-antivirus b/bin/v-add-mail-domain-antivirus index 7da3ea0f6..6e9e7d884 100755 --- 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" diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall index fde47507e..4c6472cf9 100755 --- 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" diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim index 161bb0855..bce723653 100755 --- 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" diff --git a/bin/v-add-remote-dns-domain b/bin/v-add-remote-dns-domain index b0e6ab492..ff8e5a491 100755 --- 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" diff --git a/bin/v-add-remote-dns-host b/bin/v-add-remote-dns-host index 1e1ecc3dd..59ac5c991 100755 --- 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 diff --git a/bin/v-add-remote-dns-record b/bin/v-add-remote-dns-record index c87bf3d04..97b8ef8a2 100755 --- 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" diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index e56f307cb..dbaadd6b3 100755 --- 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' diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index 10cc15b7c..060994711 100755 --- 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" diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index 6e55947c0..36d4e0308 100755 --- 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" diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy index eb94f4c6d..ff6325f38 100755 --- 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" diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl index b8f2a292f..5973cec4f 100755 --- 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" diff --git a/bin/v-add-web-domain-stats b/bin/v-add-web-domain-stats index 3ebef22de..bdc8f930d 100755 --- 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" diff --git a/bin/v-add-web-domain-stats-user b/bin/v-add-web-domain-stats-user index fb6706456..4404e6418 100755 --- 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" diff --git a/bin/v-backup-user b/bin/v-backup-user index afd1a32b1..38ed10167 100755 --- 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 diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job index 1a930e508..959e28e1b 100755 --- 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" diff --git a/bin/v-change-database-password b/bin/v-change-database-password index ee283675d..870a2683d 100755 --- 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" diff --git a/bin/v-change-dns-domain-exp b/bin/v-change-dns-domain-exp index c9eb6ec7a..24f8a3e67 100755 --- 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" diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index ee5b14a9a..942e95a65 100755 --- 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" diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index fb722376a..4ba3a5ebf 100755 --- 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" diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index 47785178b..05808a6f0 100755 --- 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" diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index 7d9729e64..9a777ff22 100755 --- 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" diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 3739bda38..42f06766d 100755 --- 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" diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index 69b6fdb93..8fd85f9f8 100755 --- 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" diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password index 0c476374f..57e2331e3 100755 --- 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" diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota index 73135a36f..3e2949584 100755 --- 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" diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall index 359f40b7a..4525f4b27 100755 --- 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" diff --git a/bin/v-change-remote-dns-domain-exp b/bin/v-change-remote-dns-domain-exp index ea3d01ad1..81c744246 100755 --- 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" diff --git a/bin/v-change-remote-dns-domain-soa b/bin/v-change-remote-dns-domain-soa index e08f2d40d..d2ba41197 100755 --- 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" diff --git a/bin/v-change-remote-dns-domain-ttl b/bin/v-change-remote-dns-domain-ttl index 0b0d11296..fa7c978fc 100755 --- 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" diff --git a/bin/v-change-web-domain-ftp b/bin/v-change-web-domain-ftp index 1b94e85f6..49ac9d0b6 100755 --- 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" diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index 9e1f0fe88..177e3696e 100755 --- 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" diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl index 14642aaff..d4108f944 100755 --- 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" diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index cbfa4c271..ec17f4f2c 100755 --- 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" diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome index 533b1073e..dbc7a4764 100755 --- 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" diff --git a/bin/v-change-web-domain-stats b/bin/v-change-web-domain-stats index 7f007c0dc..5ed571c00 100755 --- 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" diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index 581ad60d8..a434e2f99 100755 --- 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" diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job index 13527d0a0..d835528fb 100755 --- 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" diff --git a/bin/v-delete-cron-reports b/bin/v-delete-cron-reports index 10fd121fb..54f54c70c 100755 --- 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" diff --git a/bin/v-delete-database b/bin/v-delete-database index 47860c9f9..f42cc26f5 100755 --- 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" diff --git a/bin/v-delete-database-host b/bin/v-delete-database-host index 3fd5f43d4..c3a90930c 100755 --- 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 diff --git a/bin/v-delete-databases b/bin/v-delete-databases index fa3772a71..e2679cbe4 100755 --- 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" diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain index d9a8bf645..d67d9ce12 100755 --- 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" diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains index 1d65dccde..d17169389 100755 --- 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" diff --git a/bin/v-delete-dns-domains-src b/bin/v-delete-dns-domains-src index 2e69d3c17..2c1353825 100755 --- 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" diff --git a/bin/v-delete-dns-on-web-alias b/bin/v-delete-dns-on-web-alias index 0d6d05677..22e9c6298 100755 --- 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" diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account index 8fb456849..5f318058f 100755 --- 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" diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias index 0fdce45e0..5f5a572ac 100755 --- 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" diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply index 37996e2c8..ecc7cd6d4 100755 --- 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" diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward index 912fe73fe..8fa773959 100755 --- 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" diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain index f29c5f517..e6a399658 100755 --- 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" diff --git a/bin/v-delete-mail-domain-antispam b/bin/v-delete-mail-domain-antispam index 7eb317014..162791f14 100755 --- 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" diff --git a/bin/v-delete-mail-domain-antivirus b/bin/v-delete-mail-domain-antivirus index 6ddeae4d6..e3ed77402 100755 --- 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" diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall index a984b4000..c09fa7ea1 100755 --- 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" diff --git a/bin/v-delete-mail-domain-dkim b/bin/v-delete-mail-domain-dkim index 2e7634334..e15c17c0e 100755 --- 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" diff --git a/bin/v-delete-mail-domains b/bin/v-delete-mail-domains index d3f5cc2a0..ef7feed6b 100755 --- 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" diff --git a/bin/v-delete-remote-dns-domain b/bin/v-delete-remote-dns-domain index a11d803e6..35f11a8c0 100755 --- 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" diff --git a/bin/v-delete-remote-dns-record b/bin/v-delete-remote-dns-record index d7355b095..be9e3111b 100755 --- 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" diff --git a/bin/v-delete-user-backup b/bin/v-delete-user-backup index 863b39b50..9e02ec76e 100755 --- 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" diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index 93b92a1b0..cc9aeeb17 100755 --- 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" diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias index 5d60c0f7a..0ed2f5844 100755 --- 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" diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp index cfe9061d6..9c9e6b669 100755 --- 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" diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy index fb54c9c1c..b9ac21d32 100755 --- 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" diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index 16bd6ca57..019ee71fa 100755 --- 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" diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats index c3398aab3..9da021e0f 100755 --- 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" diff --git a/bin/v-delete-web-domain-stats-user b/bin/v-delete-web-domain-stats-user index dc63a3eb7..526d682a9 100755 --- 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" diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains index b12822556..6c4f860dc 100755 --- 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" diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index b06a78f7b..ca7fa97ed 100755 --- 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" diff --git a/bin/v-insert-dns-record b/bin/v-insert-dns-record index 37d5a4b9e..01ee7e8f2 100755 --- 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" diff --git a/bin/v-insert-dns-records b/bin/v-insert-dns-records index 83b561e34..c86eeea0f 100755 --- 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" diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs index f27b6ccf4..cff11ef35 100755 --- 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" diff --git a/bin/v-rebuild-databases b/bin/v-rebuild-databases index 456a4065d..2a33b060f 100755 --- 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" diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain index 5f5790271..7bb342ddc 100755 --- 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" diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains index 2623d5c3f..2f727c001 100755 --- 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" diff --git a/bin/v-rebuild-mail-domains b/bin/v-rebuild-mail-domains index eb50acd4b..ef41c3bf0 100755 --- 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" diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index d1eaf5b0f..76705e5ab 100755 --- 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" diff --git a/bin/v-schedule-user-backup b/bin/v-schedule-user-backup index 3d5a8eff4..9c8bab476 100755 --- 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' diff --git a/bin/v-schedule-user-restore b/bin/v-schedule-user-restore index 9b1ba17f5..476b9bdf7 100755 --- 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' diff --git a/bin/v-suspend-database b/bin/v-suspend-database index 7153182cc..a39c352fb 100755 --- 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" diff --git a/bin/v-suspend-database-host b/bin/v-suspend-database-host index 51d3e4282..24fb81198 100755 --- 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" diff --git a/bin/v-suspend-databases b/bin/v-suspend-databases index e3ed49bbd..9da8eed57 100755 --- 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" diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index 612d2309f..83cd6c1d9 100755 --- 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" diff --git a/bin/v-suspend-dns-domains b/bin/v-suspend-dns-domains index fa64aaed9..d0e440dbf 100755 --- 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" diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index bad2e6cf8..83b39312a 100755 --- 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" diff --git a/bin/v-suspend-mail-account b/bin/v-suspend-mail-account index 6d1f90479..652cd28a4 100755 --- 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" diff --git a/bin/v-suspend-mail-accounts b/bin/v-suspend-mail-accounts index e0b439cc2..45a9e37d4 100755 --- 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" diff --git a/bin/v-suspend-mail-domain b/bin/v-suspend-mail-domain index 7fdc60f22..4ffa93602 100755 --- 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" diff --git a/bin/v-suspend-mail-domains b/bin/v-suspend-mail-domains index 60fba66b0..ac81e3c7f 100755 --- 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" diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index c3f6052b1..7e7933bf0 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -30,7 +30,7 @@ source $VESTA/func/ip.sh check_args '2' "$#" 'USER DOMAIN [RESTART]' validate_format 'user' 'domain' -is_system_enabled "$WEB_SYSTEM" +is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" is_object_unsuspended 'web' 'DOMAIN' "$domain" diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains index 7fa0d83b2..e2ed5919a 100755 --- a/bin/v-suspend-web-domains +++ b/bin/v-suspend-web-domains @@ -25,7 +25,7 @@ source $VESTA/func/domain.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" diff --git a/bin/v-unsuspend-database b/bin/v-unsuspend-database index b62297583..228f0fe12 100755 --- a/bin/v-unsuspend-database +++ b/bin/v-unsuspend-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_valid 'db' 'DB' "$database" is_object_suspended 'db' 'DB' "$database" diff --git a/bin/v-unsuspend-database-host b/bin/v-unsuspend-database-host index 8c98945b3..a9318cb5f 100755 --- a/bin/v-unsuspend-database-host +++ b/bin/v-unsuspend-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_suspended "../../conf/$type" 'HOST' "$host" diff --git a/bin/v-unsuspend-databases b/bin/v-unsuspend-databases index d036cadbc..719e87785 100755 --- a/bin/v-unsuspend-databases +++ b/bin/v-unsuspend-databases @@ -24,7 +24,7 @@ source $VESTA/func/db.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" diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index 372d2d99a..e3e5627a4 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -26,7 +26,7 @@ source $VESTA/func/main.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_valid 'dns' 'DOMAIN' "$domain" is_object_suspended 'dns' 'DOMAIN' "$domain" diff --git a/bin/v-unsuspend-dns-domains b/bin/v-unsuspend-dns-domains index 54173de42..bf98cace0 100755 --- a/bin/v-unsuspend-dns-domains +++ b/bin/v-unsuspend-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" diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index 66e1b93c3..02d06e335 100755 --- a/bin/v-unsuspend-dns-record +++ b/bin/v-unsuspend-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" diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account index 8c2179d91..f3d991fc0 100755 --- a/bin/v-unsuspend-mail-account +++ b/bin/v-unsuspend-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" diff --git a/bin/v-unsuspend-mail-accounts b/bin/v-unsuspend-mail-accounts index f3deb1757..d82a0e8be 100755 --- a/bin/v-unsuspend-mail-accounts +++ b/bin/v-unsuspend-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" diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain index c6374a0df..a15529b68 100755 --- a/bin/v-unsuspend-mail-domain +++ b/bin/v-unsuspend-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_valid 'mail' 'DOMAIN' "$domain" is_object_suspended 'mail' 'DOMAIN' "$domain" diff --git a/bin/v-unsuspend-mail-domains b/bin/v-unsuspend-mail-domains index 08161d4f2..7730d3e9b 100755 --- a/bin/v-unsuspend-mail-domains +++ b/bin/v-unsuspend-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" diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain index 09b1c3ad7..59fba0327 100755 --- a/bin/v-unsuspend-web-domain +++ b/bin/v-unsuspend-web-domain @@ -28,7 +28,7 @@ source $VESTA/func/ip.sh check_args '2' "$#" 'USER DOMAIN [RESTART]' validate_format 'user' 'domain' -is_system_enabled "$WEB_SYSTEM" +is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" is_object_suspended 'web' 'DOMAIN' "$domain" diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains index dda4a09c2..ca729bf45 100755 --- a/bin/v-unsuspend-web-domains +++ b/bin/v-unsuspend-web-domains @@ -25,7 +25,7 @@ source $VESTA/func/domain.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" diff --git a/bin/v-update-database-disk b/bin/v-update-database-disk index 695fb8c2b..22f225e69 100755 --- a/bin/v-update-database-disk +++ b/bin/v-update-database-disk @@ -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" diff --git a/bin/v-update-databases-disk b/bin/v-update-databases-disk index c434be053..e5059ea43 100755 --- a/bin/v-update-databases-disk +++ b/bin/v-update-databases-disk @@ -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" diff --git a/bin/v-update-mail-domain-disk b/bin/v-update-mail-domain-disk index 6d82aed0a..186ea027c 100755 --- a/bin/v-update-mail-domain-disk +++ b/bin/v-update-mail-domain-disk @@ -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" diff --git a/bin/v-update-mail-domains-disk b/bin/v-update-mail-domains-disk index 53a9d1e20..f1f7a8285 100755 --- a/bin/v-update-mail-domains-disk +++ b/bin/v-update-mail-domains-disk @@ -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" diff --git a/bin/v-update-user-backups b/bin/v-update-user-backups index 3604ae5b6..c09f44605 100755 --- a/bin/v-update-user-backups +++ b/bin/v-update-user-backups @@ -175,7 +175,7 @@ check_ftp_connection(){ #----------------------------------------------------------# check_args '1' "$#" 'USER' -is_system_enabled "$BACKUP_SYSTEM" +is_system_enabled "$BACKUP_SYSTEM" 'BACKUP_SYSTEM' validate_format 'user' is_object_valid 'user' 'USER' "$user" la=$(cat /proc/loadavg |cut -f 1 -d ' '|cut -f 1 -d '.') diff --git a/bin/v-update-web-domain-disk b/bin/v-update-web-domain-disk index b820748f7..7f447d37f 100755 --- a/bin/v-update-web-domain-disk +++ b/bin/v-update-web-domain-disk @@ -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" diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat index 1c2513e7b..64c2107d0 100755 --- a/bin/v-update-web-domain-stat +++ b/bin/v-update-web-domain-stat @@ -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" diff --git a/bin/v-update-web-domain-traff b/bin/v-update-web-domain-traff index 38c0506ee..53069f5ee 100755 --- a/bin/v-update-web-domain-traff +++ b/bin/v-update-web-domain-traff @@ -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" diff --git a/bin/v-update-web-domains-disk b/bin/v-update-web-domains-disk index 839dff498..2c94a0514 100755 --- a/bin/v-update-web-domains-disk +++ b/bin/v-update-web-domains-disk @@ -23,7 +23,7 @@ source $VESTA/func/main.sh check_args '1' "$#" 'USER' validate_format 'user' -is_system_enabled "$WEB_SYSTEM" +is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-web-domains-stat b/bin/v-update-web-domains-stat index ae9485184..31bf0782d 100755 --- a/bin/v-update-web-domains-stat +++ b/bin/v-update-web-domains-stat @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh check_args '1' "$#" 'USER' 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" diff --git a/bin/v-update-web-domains-traff b/bin/v-update-web-domains-traff index cc19ed4e5..2a93e3a7e 100755 --- a/bin/v-update-web-domains-traff +++ b/bin/v-update-web-domains-traff @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh check_args '1' "$#" 'USER' validate_format 'user' -is_system_enabled "$WEB_SYSTEM" +is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" "$user"