added user stats support

Author: serghey-rodin

bin/v_backup_users

@@ -22,7 +22,6 @@ source $VESTA/func/main.sh
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Updating user billing
 for user in $(ls $VESTA/data/users); do
     check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf)
     if [ ! -z "$check_suspend" ]; then

bin/v_list_user_log

@@ -69,7 +69,8 @@ is_object_valid 'user' 'USER' "$user"
 conf=$USER_DATA/history.log
 
 # Defining fileds to select
-fields="\$CMD \$A1 \$A2 \$A3 \$A4 \$A5 \$A6 \$A7 \$A8 \$A9 \$TIME \$DATE"
+fields="\$DATE\$TIME \$CMD \$A1 \$A2 \$A3 \$A4 \$A5 \$A6 \$A7 \$A8 \$A9"
+fields="$fields \$TIME \$DATE"
 
 # Listing domains
 case $format in 

bin/v_list_user_stats

@@ -0,0 +1,58 @@
+#!/bin/bash
+# info: list user stats
+# options: user [format]
+#
+# The function for listing user statistics
+
+
+#----------------------------------------------------------#
+#                    Variable&Function                     #
+#----------------------------------------------------------#
+
+# Argument defenition
+user=$1
+format=${2-shell}
+
+# Includes
+source $VESTA/func/main.sh
+
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+check_args '1' "$#" 'user [format]'
+validate_format 'user'
+is_object_valid 'user' 'USER' "$user"
+
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+# Defining config
+conf=$USER_DATA/stats.log
+
+# Defining fileds to select
+fields="\$DATE \$TIME \$PACKAGE \$IP_OWNED \$DISK_QUOTA \$U_DISK \$U_DISK_DIRS"
+fields="$fields \$U_DISK_WEB \$U_DISK_MAIL \$U_DISK_DB \$BANDWIDTH"
+fields="$fields \$U_BANDWIDTH \$U_WEB_DOMAINS \$U_WEB_SSL \$U_WEB_ALIASES"
+fields="$fields \$U_DNS_DOMAINS \$U_DNS_RECORDS \$U_MAIL_DOMAINS \$U_MAIL_DKIM"
+fields="$fields \$U_MAIL_ACCOUNTS \$U_DATABASES \$U_CRON_JOBS \$U_BACKUPS"
+
+# Listing domains
+case $format in 
+    json)   json_list ;;
+    plain)  nohead=1; shell_list ;;
+    shell)  fields='$DATE $PACKAGE $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS';
+            fields="$fields \$U_DATABASES"
+            shell_list | column -t ;;
+    *)      check_args '1' '0' 'user [format]'
+esac
+
+
+#----------------------------------------------------------#
+#                       Vesta                              #
+#----------------------------------------------------------#
+
+exit

bin/v_update_user_stats

@@ -52,15 +52,15 @@ for user in $user_list; do
 
     # Compiling report string
     s="DATE='$DATE' TIME='$TIME' PACKAGE='$PACKAGE' IP_OWNED='$IP_OWNED'" 
-    s="$s U_DISK='$U_DISK' U_DISK_DIRS='$U_DISK_DIRS' U_DISK_WEB='$U_DISK_WEB'"
-    s="$s U_DISK_MAIL='$U_DISK_MAIL' U_DISK_DB='$U_DISK_DB'" 
-    s="$s U_DISK_DATABASES='$U_DISK_DATABASES'" 
-    s="$s U_BANDWIDTH='$U_BANDWIDTH'  U_WEB_DOMAINS='$U_WEB_DOMAINS'"
-    s="$s U_WEB_SSL='$U_WEB_SSL'  U_WEB_ALIASES='$U_WEB_ALIASES'"
+    s="$s DISK_QUOTA='$DISK_QUOTA' U_DISK='$U_DISK' U_DISK_DIRS='$U_DISK_DIRS'"
+    s="$s U_DISK_WEB='$U_DISK_WEB' U_DISK_MAIL='$U_DISK_MAIL'" 
+    s="$s U_DISK_DB='$U_DISK_DB' BANDWIDTH='$BANDWIDTH'"
+    s="$s U_BANDWIDTH='$U_BANDWIDTH' U_WEB_DOMAINS='$U_WEB_DOMAINS'"
+    s="$s U_WEB_SSL='$U_WEB_SSL' U_WEB_ALIASES='$U_WEB_ALIASES'"
     s="$s U_DNS_DOMAINS='$U_DNS_DOMAINS' U_DNS_RECORDS='$U_DNS_RECORDS'"
-    s="$s U_MAIL_DOMAINS='$U_MAIL_DOMAINS' U_MAIL_DOMAINS='$U_MAIL_DOMAINS'"
+    s="$s U_MAIL_DOMAINS='$U_MAIL_DOMAINS' U_MAIL_DKIM='$U_MAIL_DKIM'"
     s="$s U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS' U_DATABASES='$U_DATABASES'"
-    s="$s U_CRON_JOBS='$U_CRON_JOBS'"
+    s="$s U_CRON_JOBS='$U_CRON_JOBS' U_BACKUPS='$U_BACKUPS'"
 
     # Updating user stats log
     stats="$USER_DATA/stats.log"