diff --git a/bin/v_add_user b/bin/v_add_user index dfb3d1af..360615c4 100755 --- a/bin/v_add_user +++ b/bin/v_add_user @@ -205,6 +205,7 @@ U_MAIL_DOMAINS='0' U_MAIL_ACCOUNTS='0' U_DATABASES='0' U_CRON_JOBS='0' +U_BACKUPS='0' DATE='$V_DATE'" > $V_USERS/$user/user.conf chmod 660 $V_USERS/$user/user.conf diff --git a/bin/v_change_user_package b/bin/v_change_user_package index 1d583368..6093ace0 100755 --- a/bin/v_change_user_package +++ b/bin/v_change_user_package @@ -41,13 +41,13 @@ is_package_avalable() { done # Comparing user data with package - if [ "$WEB_DOMAINS" -lt "$U_WEB_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 + if [[ "$WEB_DOMAINS" -lt "$U_WEB_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" log_event 'debug' "$E_LIMIT $v_log" exit $E_LIMIT @@ -108,6 +108,7 @@ U_MAIL_DOMAINS='$U_MAIL_DOMAINS' U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS' U_DATABASES='$U_DATABASES' U_CRON_JOBS='$U_CRON_JOBS' +U_BACKUPS='$U_BACKUPS' DATE='$DATE'" > $V_USERS/$user/user.conf } diff --git a/bin/v_list_user b/bin/v_list_user index 3455413b..bc4ad6e1 100755 --- a/bin/v_list_user +++ b/bin/v_list_user @@ -94,7 +94,8 @@ fields='$USER $FNAME $LNAME $PACKAGE $WEB_DOMAINS $WEB_ALIASES $WEB_TPL $SUSPENDED_MAIL $SUSPENDED_DB $SUSPENDED_CRON $IP_AVAIL $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' + $U_MAIL_DOMAINS $U_MAIL_ACCOUNTS $U_DATABASES $U_CRON_JOBS $U_BACKUPS + $DATE' # Listing user case $format in diff --git a/bin/v_list_users b/bin/v_list_users index 04cfe461..f46ffca5 100755 --- a/bin/v_list_users +++ b/bin/v_list_users @@ -92,7 +92,7 @@ fields="$fields \$IP_OWNED \$U_USERS \$U_DISK \$U_DISK_DIRS \$U_DISK_WEB" fields="$fields \$U_DISK_MAIL \$U_DISK_DB \$U_BANDWIDTH \$U_WEB_DOMAINS" fields="$fields \$U_WEB_SSL \$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" +fields="$fields \$U_BACKUPS \$DATE" # Listing domains case $format in diff --git a/bin/v_update_user_counters b/bin/v_update_user_counters index d436b4fe..b091fcf3 100755 --- a/bin/v_update_user_counters +++ b/bin/v_update_user_counters @@ -78,6 +78,7 @@ for user in $user_list; do U_MAIL_ACCOUNTS=0 U_DATABASES=0 U_CRON_JOBS=0 + U_BACKUPS=0 # New IFS IFS=$'\n' @@ -185,7 +186,7 @@ for user in $user_list; do update_user_value "$user" '$U_MAIL_ACCOUNTS' "$U_MAIL_ACCOUNTS" update_user_value "$user" '$U_DATABASES' "$U_DATABASES" update_user_value "$user" '$U_CRON_JOBS' "$U_CRON_JOBS" - + update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS" done