Skip to content

Commit 965b2a4

Browse files
committed
unfied is_system_enabled funcion
1 parent e6113ed commit 965b2a4

File tree

67 files changed

+104
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+104
-236
lines changed

bin/v_add_cron_job

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,14 @@ check_args '7' "$#" 'user min hour day month wday command [job]'
3838
format_validation 'user' 'min' 'hour' 'day' 'month' 'wday' 'command'
3939

4040
# Checking cron system
41-
is_system_enabled 'cron'
41+
is_system_enabled 'CRON_SYSTEM'
4242

4343
# Checking user
4444
is_user_valid
4545

46+
# Checking package
47+
is_package_full 'CRON_JOBS'
48+
4649
# Get str position
4750
if [ -z "$job" ]; then
4851
job=$(get_next_cron_string)

bin/v_add_db_base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ check_args '5' "$#" 'user db db_user db_password type [host] [encoding]'
4242
format_validation 'user' 'database' 'db_user' 'db_password' 'encoding'
4343

4444
# Checking db system is enabled
45-
is_system_enabled 'db'
45+
is_system_enabled 'DB_SYSTEM'
4646

4747
# Checking db type
4848
is_type_valid 'db' "$type"
@@ -63,7 +63,7 @@ fi
6363
is_db_host_valid
6464

6565
# Checking package
66-
is_package_full 'db_base'
66+
is_package_full 'DATABASES'
6767

6868

6969
#----------------------------------------------------------#

bin/v_add_db_host

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ format_validation 'host' 'port' 'db_user' 'db_password' 'max_db'
4343
format_validation 'template'
4444

4545
# Checking db system is enabled
46-
is_system_enabled 'db'
46+
is_system_enabled 'DB_SYSTEM'
4747

4848
# Checking db type
4949
is_type_valid 'db' "$type"

bin/v_add_dns_domain

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ check_args '3' "$#" 'user domain ip [template] [exp] [soa] [ttl]'
4343
format_validation 'user' 'domain' 'ip' 'template' 'exp' 'ttl'
4444

4545
# Checking dns system is enabled
46-
is_system_enabled 'dns'
46+
is_system_enabled 'DNS_SYSTEM'
4747

4848
# Checking user
4949
is_user_valid
@@ -55,7 +55,7 @@ is_user_suspended
5555
is_domain_new 'dns'
5656

5757
# Checking package
58-
is_package_full 'dns'
58+
is_package_full 'DNS_DOMAINS'
5959

6060
# Checking template
6161
is_template_valid 'dns'

bin/v_add_dns_domain_record

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ check_args '5' "$#" 'user domain record type value [id]'
4242
format_validation 'user' 'domain' 'record' 'rtype' 'dvalue'
4343

4444
# Checking web system is enabled
45-
is_system_enabled 'dns'
45+
is_system_enabled 'DNS_SYSTEM'
4646

4747
# Checking user
4848
is_user_valid
@@ -56,6 +56,9 @@ is_domain_valid 'dns'
5656
# Checking domain is active
5757
is_domain_suspended 'dns'
5858

59+
# Checking package
60+
is_package_full 'DNS_RECORDS'
61+
5962
# Defining if emtpy
6063
if [ -z "$id"] ; then
6164
id=$(get_next_dns_record)

bin/v_add_mail_domain

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ source $V_FUNC/domain.func
2929
#----------------------------------------------------------#
3030

3131
# Checking arg number
32-
check_args '3' "$#" 'user domain [antispam] [antivirus]'
32+
check_args '2' "$#" 'user domain [antispam] [antivirus]'
3333

3434
# Checking argument format
3535
format_validation 'user' 'domain' 'antispam' 'antivirus'
3636

3737
# Checking dns system is enabled
38-
is_system_enabled 'mail'
38+
is_system_enabled 'MAIL_SYSTEM'
3939

4040
# Checking user
4141
is_user_valid
@@ -44,18 +44,11 @@ is_user_valid
4444
is_user_suspended
4545

4646
# Checking domain
47-
is_domain_new 'quiet'
48-
if [ $? -ne 0 ]; then
49-
50-
# Checking domain owner
51-
is_domain_owner
52-
53-
# Checking domain service
54-
is_dns_domain_free
55-
fi
47+
is_domain_new 'mail'
5648

5749
# Checking package
58-
is_package_full 'mail'
50+
is_package_full 'MAIL_DOMAINS'
51+
5952

6053
exit
6154

bin/v_add_user_backup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ check_args '1' "$#" 'user'
2929
format_validation 'user'
3030

3131
# Checking backup system is enabled
32-
is_system_enabled 'backup'
32+
is_system_enabled 'BACKUP_SYSTEM'
3333

3434
# Checking user
3535
is_user_valid

bin/v_add_web_domain

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ check_args '3' "$#" 'user domain ip [template]'
4141
format_validation 'user' 'domain' 'ip' 'template'
4242

4343
# Checking web system is enabled
44-
is_system_enabled 'web'
44+
is_system_enabled 'WEB_SYSTEM'
4545

4646
# Checking user
4747
is_user_valid
@@ -56,7 +56,7 @@ is_domain_new 'dns'
5656
is_ip_avalable
5757

5858
# Checking package
59-
is_package_full 'web_domain'
59+
is_package_full 'WEB_DOMAINS'
6060

6161
# Checking template
6262
templates=$(get_user_value '$WEB_TPL')

bin/v_add_web_domain_alias

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ check_args '3' "$#" 'user domain dom_alias'
3737
format_validation 'user' 'domain' 'dom_alias'
3838

3939
# Checking web system is enabled
40-
is_system_enabled 'web'
40+
is_system_enabled 'WEB_SYSTEM'
4141

4242
# Checking user
4343
is_user_valid
@@ -55,7 +55,7 @@ is_domain_suspended 'web'
5555
is_domain_new 'web' "$dom_alias"
5656

5757
# Checking package
58-
is_package_full 'web_alias'
58+
is_package_full 'WEB_ALIASES'
5959

6060

6161
#----------------------------------------------------------#

bin/v_add_web_domain_cgi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ check_args '2' "$#" 'user domain'
3535
format_validation 'user' 'domain'
3636

3737
# Checking web system is enabled
38-
is_system_enabled 'web'
38+
is_system_enabled 'WEB_SYSTEM'
3939

4040
# Checking user
4141
is_user_valid

0 commit comments

Comments
 (0)