database Keys redesing

Author: serghey-rodin

bin/v_add_cron_job

@@ -62,7 +62,7 @@ is_cron_job_free
 # Concatenating cron string
 command=$(echo $command|sed -e "s/'/%quote%/g" -e "s/:/%dots%/g")
 v_str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month"
-v_str="$v_str' WDAY='$wday' CMD='$command' SUSPEND='no' DATE='$V_DATE'"
+v_str="$v_str' WDAY='$wday' CMD='$command' SUSPENDED='no' DATE='$V_DATE'"
 
 # Adding to crontab
 echo "$v_str">>$V_USERS/$user/cron.conf

bin/v_add_db_base

@@ -89,7 +89,7 @@ increase_user_value "$user" '$U_DATABASES'
 
 # Adding db to db conf
 v_str="DB='$database' USER='$db_user' HOST='$host' TYPE='$type'"
-v_str="$v_str CHARSET='$encoding' U_DISK='0' SUSPEND='no' DATE='$V_DATE'"
+v_str="$v_str CHARSET='$encoding' U_DISK='0' SUSPENDED='no' DATE='$V_DATE'"
 echo "$v_str" >> $V_USERS/$user/db.conf
 chmod 660 $V_USERS/$user/db.conf
 

bin/v_add_dns_domain

@@ -102,7 +102,7 @@ cat $V_DNSTPL/$template.tpl |\
 
 # Adding dns.conf record
 dns_rec="DOMAIN='$domain' IP='$ip' TPL='$template' TTL='$ttl' EXP='$exp'"
-dns_rec="$dns_rec SOA='$soa' SUSPEND='no' DATE='$V_DATE'"
+dns_rec="$dns_rec SOA='$soa' SUSPENDED='no' DATE='$V_DATE'"
 echo "$dns_rec" >> $V_USERS/$user/dns.conf
 chmod 660 $V_USERS/$user/dns.conf
 

bin/v_add_dns_domain_record

@@ -77,7 +77,7 @@ zone="$V_USERS/$user/dns/$domain"
 
 # Adding record
 dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' VALUE='$dvalue'"
-dns_rec="$dns_rec SUSPEND='no' DATE='$V_DATE'"
+dns_rec="$dns_rec SUSPENDED='no' DATE='$V_DATE'"
 echo "$dns_rec" >> $zone 
 
 # Sorting records

bin/v_add_mail_domain

@@ -92,7 +92,7 @@ cat $V_DNSTPL/$template.tpl |\
 
 # Adding dns.conf record
 dns_rec="DOMAIN='$domain' IP='$ip' TPL='$template' TTL='$ttl' EXP='$exp'"
-dns_rec="$dns_rec SOA='$soa' SUSPEND='no' DATE='$V_DATE'"
+dns_rec="$dns_rec SOA='$soa' SUSPENDED='no' DATE='$V_DATE'"
 echo "$dns_rec" >> $V_USERS/$user/dns.conf
 chmod 660 $V_USERS/$user/dns.conf
 

bin/v_add_user

@@ -169,19 +169,28 @@ echo "FNAME='$fname'
 LNAME='$lname'
 PACKAGE='$package'
 $package_data
-SUSPENDED='no'
 CONTACT='$email'
 REPORTS='yes'
 RKEY='$(gen_password)'
+SUSPENDED='no'
+SUSPENDED_USERS='0'
+SUSPENDED_WEB='0'
+SUSPENDED_DNS='0'
+SUSPENDED_MAIL='0'
+SUSPENDED_DB='0'
+SUSPENDED_CRON='0'
 IP_OWNED='0'
 U_DIR_DISK='0'
 U_DISK='0'
 U_BANDWIDTH='0'
 U_WEB_DOMAINS='0'
 U_WEB_SSL='0'
+U_WEB_ALIASES='0'
 U_DNS_DOMAINS='0'
-U_DATABASES='0'
+U_DNS_RECORDS='0'
 U_MAIL_DOMAINS='0'
+U_MAIL_ACCOUNTS='0'
+U_DATABASES='0'
 U_CRON_JOBS='0'
 DATE='$V_DATE'" > $V_USERS/$user/user.conf
 chmod 660 $V_USERS/$user/user.conf

bin/v_add_web_domain

@@ -218,7 +218,7 @@ v_str="$v_str ALIAS='$aliases'"
 v_str="$v_str $template_data"    # Inserting PHP, CGI and ELOG keys
 v_str="$v_str STATS='' STATS_AUTH=''"
 v_str="$v_str SSL='no' SSL_HOME='single'"
-v_str="$v_str NGINX='' NGINX_EXT='' SUSPEND='no' DATE='$V_DATE'"
+v_str="$v_str NGINX='' NGINX_EXT='' SUSPENDED='no' DATE='$V_DATE'"
 
 # Registering domain
 echo "$v_str" >> $V_USERS/$user/web.conf

bin/v_change_cron_job

@@ -59,7 +59,7 @@ is_job_valid
 # Concatenating cron string
 command=$(echo $command|sed -e "s/'/%quote%/g" -e "s/:/%dots%/g")
 v_str="JOB='$job' MIN='$min' HOUR='$hour' WDAY='$wday'"
-v_str="$v_str MONTH='$month' DAY='$day' CMD='$command' SUSPEND='no'"
+v_str="$v_str MONTH='$month' DAY='$day' CMD='$command' SUSPENDED='no'"
 
 # Deleting job
 del_cron_job

bin/v_change_dns_domain_record

@@ -68,7 +68,7 @@ fi
 
 # Adding record
 dns_rec="ID='$id' RECORD='$record' TYPE='$rtype' VALUE='$value'"
-dns_rec="$dns_rec SUSPEND='no' DATE='$V_DATE'"
+dns_rec="$dns_rec SUSPENDED='no' DATE='$V_DATE'"
 echo "$dns_rec" >> $zone 
 
 # Sorting records

bin/v_change_user_package

@@ -21,17 +21,15 @@ source $V_FUNC/shared.func
 is_package_avalable() {
     # Parsing user data
     usr_data=$(cat $V_USERS/$user/user.conf)
+    IFS=$'\n'
     for key in $usr_data; do
         eval ${key%%=*}=${key#*=}
     done
 
     # Clearing vars
     WEB_DOMAINS='0'
-    WEB_SSL='0'
     DATABASES='0'
     MAIL_DOMAINS='0'
-    MAIL_BOXES='0'
-    MAIL_FORWARDERS='0'
     DNS_DOMAINS='0'
     DISK_QUOTA='0'
     BANDWIDTH='0'
@@ -44,10 +42,10 @@ is_package_avalable() {
 
     # Comparing user data with package
     if [ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ] ||\
-       [ "$WEB_SSL" -lt "$U_WEB_SSL" ] ||\
-       [ "$DATABASES" -lt "$U_DATABASES" ] ||\
-       [ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ] ||\
        [ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ] ||\
+       [ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ] ||\
+       [ "$DATABASES" -lt "$U_DATABASES" ] ||\
+       [ "$CRON_JOBS" -lt "$U_CRON_JOBS" ] ||\
        [ "$DISK_QUOTA" -lt "$U_DISK" ] ||\
        [ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]; then
         echo "Error: Upgrade package"
@@ -59,6 +57,7 @@ is_package_avalable() {
 change_user_package() {
     # Parsing user data
     usr_data=$(cat $V_USERS/$user/user.conf)
+    IFS=$'\n'
     for key in $usr_data; do
         eval ${key%%=*}=${key#*=}
     done
@@ -73,32 +72,41 @@ change_user_package() {
 LNAME='$LNAME'
 PACKAGE='$package'
 WEB_DOMAINS='$WEB_DOMAINS'
-WEB_SSL='$WEB_SSL'
 WEB_ALIASES='$WEB_ALIASES'
-DATABASES='$DATABASES'
-MAIL_DOMAINS='$MAIL_DOMAINS'
-MAIL_BOXES='$MAIL_BOXES'
-MAIL_FORWARDERS='$MAIL_FORWARDERS'
+WEB_TPL='$WEB_TPL'
 DNS_DOMAINS='$DNS_DOMAINS'
+DNS_RECORDS='$DNS_RECORDS'
+MAIL_DOMAINS='$MAIL_DOMAINS'
+MAIL_ACCOUNTS='$MAIL_ACCOUNTS'
+DATABASES='$DATABASES'
+CRON_JOBS='$CRON_JOBS'
 DISK_QUOTA='$DISK_QUOTA'
 BANDWIDTH='$BANDWIDTH'
 NS='$NS'
 SHELL='$SHELL'
 BACKUPS='$BACKUPS'
-WEB_TPL='$WEB_TPL'
-SUSPENDED='$SUSPENDED'
 CONTACT='$CONTACT'
-RKEY='$RKEY'
 REPORTS='$REPORTS'
+RKEY='$RKEY'
+SUSPENDED='$SUSPENDED'
+SUSPENDED_USERS='$SUSPENDED_USERS'
+SUSPENDED_WEB='$SUSPENDED_WEB'
+SUSPENDED_DNS='$SUSPENDED_DNS'
+SUSPENDED_MAIL='$SUSPENDED_MAIL'
+SUSPENDED_DB='$SUSPENDED_DB'
+SUSPENDED_CRON='$SUSPENDED_CRON'
 IP_OWNED='$IP_OWNED'
 U_DIR_DISK='$U_DIR_DISK'
 U_DISK='$U_DISK'
 U_BANDWIDTH='$U_BANDWIDTH'
 U_WEB_DOMAINS='$U_WEB_DOMAINS'
 U_WEB_SSL='$U_WEB_SSL'
+U_WEB_ALIASES='$U_WEB_ALIASES'
 U_DNS_DOMAINS='$U_DNS_DOMAINS'
-U_DATABASES='$U_DATABASES'
+U_DNS_RECORDS='$U_DNS_RECORDS'
 U_MAIL_DOMAINS='$U_MAIL_DOMAINS'
+U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS'
+U_DATABASES='$U_DATABASES'
 U_CRON_JOBS='$U_CRON_JOBS'
 DATE='$DATE'" > $V_USERS/$user/user.conf
 }
@@ -117,9 +125,6 @@ format_validation 'user' 'package'
 # Checking user
 is_user_valid
 
-# Checking user is active
-is_user_suspended
-
 # Checking package
 is_package_valid
 
@@ -131,9 +136,6 @@ is_package_avalable
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Get old package value
-old_package=$(get_user_value '$PACKAGE')
-
 # Changing user package
 change_user_package