Skip to content

Commit 4134cc3

Browse files
committed
added U_BACKUPS counter
1 parent b05944f commit 4134cc3

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

bin/v_add_user

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ U_MAIL_DOMAINS='0'
205205
U_MAIL_ACCOUNTS='0'
206206
U_DATABASES='0'
207207
U_CRON_JOBS='0'
208+
U_BACKUPS='0'
208209
DATE='$V_DATE'" > $V_USERS/$user/user.conf
209210
chmod 660 $V_USERS/$user/user.conf
210211

bin/v_change_user_package

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ is_package_avalable() {
4141
done
4242

4343
# Comparing user data with package
44-
if [ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ] ||\
45-
[ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ] ||\
46-
[ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ] ||\
47-
[ "$DATABASES" -lt "$U_DATABASES" ] ||\
48-
[ "$CRON_JOBS" -lt "$U_CRON_JOBS" ] ||\
49-
[ "$DISK_QUOTA" -lt "$U_DISK" ] ||\
50-
[ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]; then
44+
if [[ "$WEB_DOMAINS" -lt "$U_WEB_DOMAINS" ]] ||\
45+
[[ "$DNS_DOMAINS" -lt "$U_DNS_DOMAINS" ]] ||\
46+
[[ "$MAIL_DOMAINS" -lt "$U_MAIL_DOMAINS" ]] ||\
47+
[[ "$DATABASES" -lt "$U_DATABASES" ]] ||\
48+
[[ "$CRON_JOBS" -lt "$U_CRON_JOBS" ]] ||\
49+
[[ "$DISK_QUOTA" -lt "$U_DISK" ]] ||\
50+
[[ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]]; then
5151
echo "Error: Upgrade package"
5252
log_event 'debug' "$E_LIMIT $v_log"
5353
exit $E_LIMIT
@@ -108,6 +108,7 @@ U_MAIL_DOMAINS='$U_MAIL_DOMAINS'
108108
U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS'
109109
U_DATABASES='$U_DATABASES'
110110
U_CRON_JOBS='$U_CRON_JOBS'
111+
U_BACKUPS='$U_BACKUPS'
111112
DATE='$DATE'" > $V_USERS/$user/user.conf
112113
}
113114

bin/v_list_user

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ fields='$USER $FNAME $LNAME $PACKAGE $WEB_DOMAINS $WEB_ALIASES $WEB_TPL
9494
$SUSPENDED_MAIL $SUSPENDED_DB $SUSPENDED_CRON $IP_AVAIL $IP_OWNED $U_USERS
9595
$U_DISK $U_DISK_DIRS $U_DISK_WEB $U_DISK_MAIL $U_DISK_DB $U_BANDWIDTH
9696
$U_WEB_DOMAINS $U_WEB_SSL $U_WEB_ALIASES $U_DNS_DOMAINS $U_DNS_RECORDS
97-
$U_MAIL_DOMAINS $U_MAIL_ACCOUNTS $U_DATABASES $U_CRON_JOBS $DATE'
97+
$U_MAIL_DOMAINS $U_MAIL_ACCOUNTS $U_DATABASES $U_CRON_JOBS $U_BACKUPS
98+
$DATE'
9899

99100
# Listing user
100101
case $format in

bin/v_list_users

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fields="$fields \$IP_OWNED \$U_USERS \$U_DISK \$U_DISK_DIRS \$U_DISK_WEB"
9292
fields="$fields \$U_DISK_MAIL \$U_DISK_DB \$U_BANDWIDTH \$U_WEB_DOMAINS"
9393
fields="$fields \$U_WEB_SSL \$U_WEB_ALIASES \$U_DNS_DOMAINS \$U_DNS_RECORDS"
9494
fields="$fields \$U_MAIL_DOMAINS \$U_MAIL_ACCOUNTS \$U_DATABASES \$U_CRON_JOBS"
95-
fields="$fields \$DATE"
95+
fields="$fields \$U_BACKUPS \$DATE"
9696

9797
# Listing domains
9898
case $format in

bin/v_update_user_counters

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ for user in $user_list; do
7878
U_MAIL_ACCOUNTS=0
7979
U_DATABASES=0
8080
U_CRON_JOBS=0
81+
U_BACKUPS=0
8182

8283
# New IFS
8384
IFS=$'\n'
@@ -185,7 +186,7 @@ for user in $user_list; do
185186
update_user_value "$user" '$U_MAIL_ACCOUNTS' "$U_MAIL_ACCOUNTS"
186187
update_user_value "$user" '$U_DATABASES' "$U_DATABASES"
187188
update_user_value "$user" '$U_CRON_JOBS' "$U_CRON_JOBS"
188-
189+
update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS"
189190
done
190191

191192

0 commit comments

Comments
 (0)