unfied is_system_enabled funcion

This commit is contained in:
Serghey Rodin 2012-02-21 22:40:07 +02:00
commit 965b2a4933
67 changed files with 104 additions and 236 deletions

View file

@ -38,11 +38,14 @@ check_args '7' "$#" 'user min hour day month wday command [job]'
format_validation 'user' 'min' 'hour' 'day' 'month' 'wday' 'command'
# Checking cron system
is_system_enabled 'cron'
is_system_enabled 'CRON_SYSTEM'
# Checking user
is_user_valid
# Checking package
is_package_full 'CRON_JOBS'
# Get str position
if [ -z "$job" ]; then
job=$(get_next_cron_string)

View file

@ -42,7 +42,7 @@ check_args '5' "$#" 'user db db_user db_password type [host] [encoding]'
format_validation 'user' 'database' 'db_user' 'db_password' 'encoding'
# Checking db system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking db type
is_type_valid 'db' "$type"
@ -63,7 +63,7 @@ fi
is_db_host_valid
# Checking package
is_package_full 'db_base'
is_package_full 'DATABASES'
#----------------------------------------------------------#

View file

@ -43,7 +43,7 @@ format_validation 'host' 'port' 'db_user' 'db_password' 'max_db'
format_validation 'template'
# Checking db system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking db type
is_type_valid 'db' "$type"

View file

@ -43,7 +43,7 @@ check_args '3' "$#" 'user domain ip [template] [exp] [soa] [ttl]'
format_validation 'user' 'domain' 'ip' 'template' 'exp' 'ttl'
# Checking dns system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid
@ -55,7 +55,7 @@ is_user_suspended
is_domain_new 'dns'
# Checking package
is_package_full 'dns'
is_package_full 'DNS_DOMAINS'
# Checking template
is_template_valid 'dns'

View file

@ -42,7 +42,7 @@ check_args '5' "$#" 'user domain record type value [id]'
format_validation 'user' 'domain' 'record' 'rtype' 'dvalue'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid
@ -56,6 +56,9 @@ is_domain_valid 'dns'
# Checking domain is active
is_domain_suspended 'dns'
# Checking package
is_package_full 'DNS_RECORDS'
# Defining if emtpy
if [ -z "$id"] ; then
id=$(get_next_dns_record)

View file

@ -29,13 +29,13 @@ source $V_FUNC/domain.func
#----------------------------------------------------------#
# Checking arg number
check_args '3' "$#" 'user domain [antispam] [antivirus]'
check_args '2' "$#" 'user domain [antispam] [antivirus]'
# Checking argument format
format_validation 'user' 'domain' 'antispam' 'antivirus'
# Checking dns system is enabled
is_system_enabled 'mail'
is_system_enabled 'MAIL_SYSTEM'
# Checking user
is_user_valid
@ -44,18 +44,11 @@ is_user_valid
is_user_suspended
# Checking domain
is_domain_new 'quiet'
if [ $? -ne 0 ]; then
# Checking domain owner
is_domain_owner
# Checking domain service
is_dns_domain_free
fi
is_domain_new 'mail'
# Checking package
is_package_full 'mail'
is_package_full 'MAIL_DOMAINS'
exit

View file

@ -29,7 +29,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking backup system is enabled
is_system_enabled 'backup'
is_system_enabled 'BACKUP_SYSTEM'
# Checking user
is_user_valid

View file

@ -41,7 +41,7 @@ check_args '3' "$#" 'user domain ip [template]'
format_validation 'user' 'domain' 'ip' 'template'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid
@ -56,7 +56,7 @@ is_domain_new 'dns'
is_ip_avalable
# Checking package
is_package_full 'web_domain'
is_package_full 'WEB_DOMAINS'
# Checking template
templates=$(get_user_value '$WEB_TPL')

View file

@ -37,7 +37,7 @@ check_args '3' "$#" 'user domain dom_alias'
format_validation 'user' 'domain' 'dom_alias'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid
@ -55,7 +55,7 @@ is_domain_suspended 'web'
is_domain_new 'web' "$dom_alias"
# Checking package
is_package_full 'web_alias'
is_package_full 'WEB_ALIASES'
#----------------------------------------------------------#

View file

@ -35,7 +35,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -33,7 +33,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -40,7 +40,7 @@ check_args '3' "$#" 'user domain ssl_dir [ssl_home]'
format_validation 'user' 'domain' 'ssl_dir'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid
@ -54,9 +54,6 @@ is_domain_valid 'web'
# Checking domain is not suspened
is_domain_suspended 'web'
# Checking package
is_package_full 'web_ssl'
# Check ssl is not added
is_domain_key_empty 'web' '$SSL'

View file

@ -37,7 +37,7 @@ check_args '3' "$#" 'user domain type'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid "$user"

View file

@ -33,7 +33,7 @@ check_args '4' "$#" 'user domain auth_user auth_password'
format_validation 'user' 'domain' 'auth_user' 'auth_pass'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -31,7 +31,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking backup system is enabled
is_system_enabled 'backup'
is_system_enabled 'BACKUP_SYSTEM'
# Checking user
is_user_valid

View file

@ -38,7 +38,7 @@ check_args '7' "$#" 'user job min hour day month wday command'
format_validation 'user' 'job' 'min' 'hour' 'day' 'month' 'wday' 'command'
# Checking cron system
is_system_enabled 'cron'
is_system_enabled 'CRON_SYSTEM'
# Checking user
is_user_valid

View file

@ -33,7 +33,7 @@ check_args '3' "$#" 'user db_name db_password'
format_validation 'user' 'database' 'db_password'
# Checking db system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking user
is_user_valid

View file

@ -34,7 +34,7 @@ check_args '3' "$#" 'user domain exp'
format_validation 'user' 'domain' 'exp'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '3' "$#" 'user domain ip'
format_validation 'user' 'domain' 'ip'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -36,7 +36,7 @@ check_args '5' "$#" 'user domain id record type value'
format_validation 'user' 'domain' 'id' 'record' 'rtype'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -33,7 +33,7 @@ check_args '3' "$#" 'user domain soa'
format_validation 'user' 'domain' 'soa'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -35,7 +35,7 @@ check_args '3' "$#" 'user domain template'
format_validation 'user' 'domain' 'template'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -33,7 +33,7 @@ check_args '3' "$#" 'user domain ttl'
format_validation 'user' 'domain' 'ttl'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -35,7 +35,7 @@ check_args '3' "$#" 'user domain ip'
format_validation 'user' 'domain' 'ip'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -34,7 +34,7 @@ check_args '3' "$#" 'user domain ssl_dir'
format_validation 'user' 'domain' 'ssl_dir'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -29,7 +29,7 @@ check_args '3' "$#" 'user domain ssl_home'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -34,7 +34,7 @@ check_args '3' "$#" 'user domain template'
format_validation 'user' 'domain' 'template'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user db_name'
format_validation 'user' 'database'
# Checking db system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'type host'
format_validation 'host'
# Checking db system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking db type
is_type_valid 'db' "$type"

View file

@ -33,7 +33,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -36,7 +36,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -35,7 +35,7 @@ check_args '3' "$#" 'user domain dom_alias'
format_validation 'user' 'domain' 'dom_alias'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -35,7 +35,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -34,7 +34,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid "$user"

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -35,7 +35,7 @@ check_args '2' "$#" 'user domain [auth_user]'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking cron system
is_system_enabled 'cron'
is_system_enabled 'CRON_SYSTEM'
# Checking user
is_user_valid

View file

@ -31,7 +31,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking dns system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '1' "$#" 'user [suspend_url]'
format_validation 'user' 'url'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -73,7 +73,7 @@ check_args '2' "$#" 'user backup'
format_validation 'user' 'backup'
# Checking backup system is enabled
is_system_enabled 'backup'
is_system_enabled 'BACKUP_SYSTEM'
# Checking load averages
la=$(cat /proc/loadavg |cut -f 1 -d ' '|cut -f 1 -d '.')

View file

@ -31,7 +31,7 @@ check_args '2' "$#" 'user db_name'
format_validation 'user' 'database'
# Checking db system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking db system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking dns system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -37,7 +37,7 @@ check_args '2' "$#" 'user domain [suspend_url]'
format_validation 'user' 'domain' 'url'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -33,7 +33,7 @@ check_args '1' "$#" 'user [suspend_url]'
format_validation 'user' 'url'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -31,7 +31,7 @@ check_args '2' "$#" 'user db_name'
format_validation 'user' 'database'
# Checking db system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking db system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking dns system is enabled
is_system_enabled 'dns'
is_system_enabled 'DNS_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -31,7 +31,7 @@ check_args '2' "$#" 'user db_name'
format_validation 'user' 'database'
# Checking web system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'db'
is_system_enabled 'DB_SYSTEM'
# Checking user
is_user_valid

View file

@ -190,7 +190,7 @@ check_ftp_connection(){
check_args '1' "$#" 'user'
# Checking backup system is enabled
is_system_enabled 'backup'
is_system_enabled 'BACKUP_SYSTEM'
# Checking argument format
format_validation 'user'

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -32,7 +32,7 @@ check_args '2' "$#" 'user domain'
format_validation 'user' 'domain'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid

View file

@ -30,7 +30,7 @@ check_args '1' "$#" 'user'
format_validation 'user'
# Checking web system is enabled
is_system_enabled 'web'
is_system_enabled 'WEB_SYSTEM'
# Checking user
is_user_valid "$user"