From 862012be3febadddd8e74323edd0841ed30a9b26 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Sun, 31 Mar 2013 18:29:37 +0300
Subject: [PATCH] improved integer validator

---
 bin/v-add-user-package | 20 ++++++++++----------
 func/main.sh           | 16 ++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/bin/v-add-user-package b/bin/v-add-user-package
index a2bd2467..e2ddd7fc 100755
--- a/bin/v-add-user-package
+++ b/bin/v-add-user-package
@@ -29,16 +29,16 @@ is_package_new() {
 
 is_package_consistent() {
     source $pkg_dir/$package.pkg
-    validate_format_int $WEB_DOMAINS
-    validate_format_int $WEB_ALIASES
-    validate_format_int	$DNS_DOMAINS
-    validate_format_int $DNS_RECORDS
-    validate_format_int $MAIL_DOMAINS
-    validate_format_int $MAIL_ACCOUNTS
-    validate_format_int $DATABASES
-    validate_format_int $CRON_JOBS
-    validate_format_int $DISK_QUOTA
-    validate_format_int $BACKUPS
+    validate_format_int $WEB_DOMAINS 'WEB_DOMAINS'
+    validate_format_int $WEB_ALIASES 'WEB_ALIASES'
+    validate_format_int $DNS_DOMAINS 'DNS_DOMAINS'
+    validate_format_int $DNS_RECORDS 'DNS_RECORDS'
+    validate_format_int $MAIL_DOMAINS 'MAIL_DOMAINS'
+    validate_format_int $MAIL_ACCOUNTS 'MAIL_ACCOUNTS'
+    validate_format_int $DATABASES 'DATABASES'
+    validate_format_int $CRON_JOBS 'CRON_JOBS'
+    validate_format_int $DISK_QUOTA 'DISK_QUOTA'
+    validate_format_int $BACKUPS 'BACKUPS'
     validate_format_shell $SHELL
 }
 
diff --git a/func/main.sh b/func/main.sh
index b44b52d8..9b983df6 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -510,7 +510,7 @@ validate_format_password() {
 # Integer
 validate_format_int() {
     if ! [[ "$1" =~ ^[0-9]+$ ]] ; then 
-        echo "Error: int $1 is not valid"
+        echo "Error: $2 $1 is not valid"
         log_event "$E_INVALID" "$EVENT"
         exit $E_INVALID
     fi
@@ -700,7 +700,7 @@ validate_format_dvalue() {
     fi
     if [ "$rtype" = 'MX' ]; then
         validate_format_domain "$1" 'mx_record'
-        validate_format_int "$priority"
+        validate_format_int "$priority" 'priority_record'
     fi
 
 }
@@ -760,17 +760,17 @@ validate_format(){
             ftp_user)       validate_format_username "$arg" "$arg_name" ;;
             host)           validate_format_domain "$arg" "$arg_name" 'host';;
             hour)           validate_format_mhdmw "$arg" $arg_name ;;
-            id)             validate_format_int "$arg" ;;
+            id)             validate_format_int "$arg" 'id' ;;
             interface)      validate_format_interface "$arg" ;;
             ip)             validate_format_ip "$arg" ;;
             ip_name)        validate_format_domain "$arg" 'domain';;
             ip_status)      validate_format_ip_status "$arg" ;;
-            job)            validate_format_int "$arg" ;;
+            job)            validate_format_int "$arg" 'job' ;;
             key)            validate_format_username "$arg" "$arg_name" ;;
             lname)          validate_format_name "$arg" "$arg_name" ;;
             malias)         validate_format_username "$arg" "$arg_name" ;;
             mask)           validate_format_ip "$arg" ;;
-            max_db)         validate_format_int "$arg" ;;
+            max_db)         validate_format_int "$arg" 'max db';;
             min)            validate_format_mhdmw "$arg" $arg_name ;;
             month)          validate_format_mhdmw "$arg" $arg_name ;;
             nat_ip)         validate_format_ip "$arg" ;;
@@ -780,8 +780,8 @@ validate_format(){
             ns4)            validate_format_domain "$arg" 'name_server';;
             package)        validate_format_name "$arg" "$arg_name" ;;
             password)       validate_format_password "$arg" ;;
-            port)           validate_format_int "$arg" ;;
-            quota)          validate_format_int "$arg" ;;
+            port)           validate_format_int "$arg" 'port' ;;
+            quota)          validate_format_int "$arg" 'quota' ;;
             restart)        validate_format_boolean "$arg" 'restart' ;;
             record)         validate_format_common "$arg" 'record';;
             rtype)          validate_format_dns_type "$arg" ;;
@@ -790,7 +790,7 @@ validate_format(){
             stats_pass)     validate_format_password "$arg" ;;
             stats_user)     validate_format_username "$arg" "$arg_name" ;;
             template)       validate_format_name "$arg" "$arg_name" ;;
-            ttl)            validate_format_int "$arg" ;;
+            ttl)            validate_format_int "$arg" 'ttl';;
             user)           validate_format_username "$arg" "$arg_name" ;;
             wday)           validate_format_mhdmw "$arg" $arg_name ;;
         esac