New database key structure

Author: serghey-rodin

bin/v_add_user

@@ -124,8 +124,8 @@ touch $V_USERS/$user/backup.conf
 chmod 660 $V_USERS/$user/backup.conf
 touch $V_USERS/$user/history.log
 chmod 660 $V_USERS/$user/history.log
-touch $V_USERS/$user/billing.log
-chmod 660 $V_USERS/$user/billing.log
+touch $V_USERS/$user/stats.log
+chmod 660 $V_USERS/$user/stats.log
 
 echo "v_update_user_disk $user" >> $V_QUEUE/disk.pipe
 
@@ -180,8 +180,12 @@ SUSPENDED_MAIL='0'
 SUSPENDED_DB='0'
 SUSPENDED_CRON='0'
 IP_OWNED='0'
-U_DIR_DISK='0'
+U_USERS='0'
 U_DISK='0'
+U_DISK_DIRS='0'
+U_DISK_WEB='0'
+U_DISK_MAIL='0'
+U_DISK_DB='0'
 U_BANDWIDTH='0'
 U_WEB_DOMAINS='0'
 U_WEB_SSL='0'

bin/v_change_user_package

@@ -57,16 +57,11 @@ 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
+    eval $usr_data
 
     # Parsing package
     pkg_data=$(cat $V_PKG/$package.pkg)
-    for key in $pkg_data; do
-        eval ${key%%=*}=${key#*=}
-    done
+    eval $pkg_data
 
     echo "FNAME='$FNAME'
 LNAME='$LNAME'
@@ -96,8 +91,12 @@ SUSPENDED_MAIL='$SUSPENDED_MAIL'
 SUSPENDED_DB='$SUSPENDED_DB'
 SUSPENDED_CRON='$SUSPENDED_CRON'
 IP_OWNED='$IP_OWNED'
-U_DIR_DISK='$U_DIR_DISK'
+U_USERS='$U_USERS'
 U_DISK='$U_DISK'
+U_DISK_DIRS='$U_DISK_DIRS'
+U_DISK_WEB='$U_DISK_WEB'
+U_DISK_MAIL='$U_DISK_MAIL'
+U_DISK_DB='$U_DISK_DB'
 U_BANDWIDTH='$U_BANDWIDTH'
 U_WEB_DOMAINS='$U_WEB_DOMAINS'
 U_WEB_SSL='$U_WEB_SSL'

bin/v_list_user

@@ -22,14 +22,11 @@ source $V_FUNC/shared.func
 json_list_user() {
     i=1
     fileds_count=$(echo "$fields" | wc -w)
-    line=$(cat $V_USERS/$USER/user.conf)
+    source $V_USERS/$USER/user.conf
 
     # Print top bracket
     echo '{'
 
-    # Assing key=value
-    eval $line
-
     # Starting output loop
     for field in $fields; do
         # Parsing key=value
@@ -59,12 +56,8 @@ json_list_user() {
 
 # Shell function
 shell_list_user() {
-    line=$(cat $V_USERS/$USER/user.conf)
-
-    # Parsing key=value
-    eval $line
+    source $V_USERS/$USER/user.conf
 
-    # Print result line
     for field in $fields; do
         eval key="$field"
         echo "${field//$/}: $key "
@@ -98,10 +91,10 @@ fields='$USER $FNAME $LNAME $PACKAGE $WEB_DOMAINS $WEB_ALIASES $WEB_TPL
     $DNS_DOMAINS $DNS_RECORDS $MAIL_DOMAINS $MAIL_ACCOUNTS $DATABASES
     $CRON_JOBS $DISK_QUOTA $BANDWIDTH $NS $SHELL $BACKUPS $CONTACT $REPORTS
     $RKEY $SUSPENDED $SUSPENDED_USERS $SUSPENDED_WEB $SUSPENDED_DNS
-    $SUSPENDED_MAIL $SUSPENDED_DB $SUSPENDED_CRON $IP_OWNED $U_DIR_DISK $U_DISK
-    $U_BANDWIDTH $U_WEB_DOMAINS $U_WEB_SSL $U_WEB_ALIASES $U_DNS_DOMAINS
-    $U_DNS_RECORDS $U_MAIL_DOMAINS $U_MAIL_ACCOUNTS $U_DATABASES $U_CRON_JOBS
-    $DATE'
+    $SUSPENDED_MAIL $SUSPENDED_DB $SUSPENDED_CRON $IP_OWNED $U_USERS
+    $U_DISK $U_DISK_DIRS $U_DISK_WEB $U_DISK_MAIL $U_DISK_DB $U_BANDWIDTH
+    $U_WEB_DOMAINS $U_WEB_SSL $U_WEB_ALIASES $U_DNS_DOMAINS $U_DNS_RECORDS
+    $U_MAIL_DOMAINS $U_MAIL_ACCOUNTS $U_DATABASES $U_CRON_JOBS $DATE'
 
 # Listing user
 case $format in 

bin/v_list_users

@@ -23,10 +23,7 @@ json_list_users() {
     # Starting main loop
     for USER in $(ls $V_USERS/); do
         # Reading user data
-        user_data=$(cat $V_USERS/$USER/user.conf)
-
-        # Assign key/value config
-        eval $user_data
+        source $V_USERS/$USER/user.conf
 
         # Closing bracket if there already was output
         if [ -n "$data" ]; then
@@ -74,11 +71,7 @@ shell_list_users() {
 
     # Starting main loop
     for USER in $(ls $V_USERS/); do
-        user_data=$(cat $V_USERS/$USER/user.conf)
-
-        # Assign key/value config
-        eval $user_data
-
+        source $V_USERS/$USER/user.conf
         eval echo "$fields"
     done
 }
@@ -95,8 +88,9 @@ fields="$fields \$DATABASES \$CRON_JOBS \$DISK_QUOTA \$BANDWIDTH \$NS \$SHELL"
 fields="$fields \$BACKUPS \$CONTACT \$REPORTS \$RKEY \$SUSPENDED"
 fields="$fields \$SUSPENDED_USERS \$SUSPENDED_WEB \$SUSPENDED_DNS"
 fields="$fields \$SUSPENDED_MAIL \$SUSPENDED_DB \$SUSPENDED_CRON \$IP_OWNED"
-fields="$fields \$U_DIR_DISK \$U_DISK \$U_BANDWIDTH \$U_WEB_DOMAINS"
-fields="$fields \$U_WEB_SSL \$U_WEB_ALIASES \$U_DNS_DOMAINS \$U_DNS_RECORDS"
+fields="$fields \$U_USERS \$U_DISK \$U_DISK_DIRS \$U_DISK_WEB \$U_DISK_MAIL"
+fields="$fields \$U_DISK_DB \$U_BANDWIDTH \$U_WEB_DOMAINS \$U_WEB_SSL"
+fields="$fields \$U_WEB_ALIASES \$U_DNS_DOMAINS \$U_DNS_RECORDS "
 fields="$fields \$U_MAIL_DOMAINS \$U_MAIL_ACCOUNTS \$U_DATABASES \$U_CRON_JOBS"
 fields="$fields \$DATE"