Serghey Rodin 14 лет назад
Родитель
Сommit
4134cc38bc
5 измененных файлов с 14 добавлено и 10 удалено
  1. 1 0
      bin/v_add_user
  2. 8 7
      bin/v_change_user_package
  3. 2 1
      bin/v_list_user
  4. 1 1
      bin/v_list_users
  5. 2 1
      bin/v_update_user_counters

+ 1 - 0
bin/v_add_user

@@ -205,6 +205,7 @@ U_MAIL_DOMAINS='0'
 U_MAIL_ACCOUNTS='0'
 U_MAIL_ACCOUNTS='0'
 U_DATABASES='0'
 U_DATABASES='0'
 U_CRON_JOBS='0'
 U_CRON_JOBS='0'
+U_BACKUPS='0'
 DATE='$V_DATE'" > $V_USERS/$user/user.conf
 DATE='$V_DATE'" > $V_USERS/$user/user.conf
 chmod 660 $V_USERS/$user/user.conf
 chmod 660 $V_USERS/$user/user.conf
 
 

+ 8 - 7
bin/v_change_user_package

@@ -41,13 +41,13 @@ is_package_avalable() {
     done
     done
 
 
     # Comparing user data with package
     # 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"
         echo "Error: Upgrade package"
         log_event 'debug' "$E_LIMIT $v_log"
         log_event 'debug' "$E_LIMIT $v_log"
         exit $E_LIMIT
         exit $E_LIMIT
@@ -108,6 +108,7 @@ U_MAIL_DOMAINS='$U_MAIL_DOMAINS'
 U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS'
 U_MAIL_ACCOUNTS='$U_MAIL_ACCOUNTS'
 U_DATABASES='$U_DATABASES'
 U_DATABASES='$U_DATABASES'
 U_CRON_JOBS='$U_CRON_JOBS'
 U_CRON_JOBS='$U_CRON_JOBS'
+U_BACKUPS='$U_BACKUPS'
 DATE='$DATE'" > $V_USERS/$user/user.conf
 DATE='$DATE'" > $V_USERS/$user/user.conf
 }
 }
 
 

+ 2 - 1
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
     $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_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_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
 # Listing user
 case $format in 
 case $format in 

+ 1 - 1
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_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_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 \$U_MAIL_DOMAINS \$U_MAIL_ACCOUNTS \$U_DATABASES \$U_CRON_JOBS"
-fields="$fields \$DATE"
+fields="$fields \$U_BACKUPS \$DATE"
 
 
 # Listing domains
 # Listing domains
 case $format in 
 case $format in 

+ 2 - 1
bin/v_update_user_counters

@@ -78,6 +78,7 @@ for user in $user_list; do
     U_MAIL_ACCOUNTS=0
     U_MAIL_ACCOUNTS=0
     U_DATABASES=0
     U_DATABASES=0
     U_CRON_JOBS=0
     U_CRON_JOBS=0
+    U_BACKUPS=0
 
 
     # New IFS
     # New IFS
     IFS=$'\n'
     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_MAIL_ACCOUNTS' "$U_MAIL_ACCOUNTS"
     update_user_value "$user" '$U_DATABASES' "$U_DATABASES"
     update_user_value "$user" '$U_DATABASES' "$U_DATABASES"
     update_user_value "$user" '$U_CRON_JOBS' "$U_CRON_JOBS"
     update_user_value "$user" '$U_CRON_JOBS' "$U_CRON_JOBS"
-
+    update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS"
 done
 done