From 50f7bcc66ec9e345c1ebaf4e76d89bd985044aa1 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Tue, 10 Jul 2012 15:18:19 +0300
Subject: [PATCH] fixing environment for cron

---
 bin/v_backup_users      | 2 +-
 bin/v_update_sys_queue  | 2 +-
 bin/v_update_sys_rrd    | 2 +-
 bin/v_update_sys_vesta  | 2 +-
 bin/v_update_user_stats | 2 +-
 func/main.sh            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/v_backup_users b/bin/v_backup_users
index bd4ff711d..b06469d1d 100755
--- a/bin/v_backup_users
+++ b/bin/v_backup_users
@@ -11,7 +11,7 @@
 
 # Importing system enviroment  as we run this script 
 # mostly by cron wich not read it by itself
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf
diff --git a/bin/v_update_sys_queue b/bin/v_update_sys_queue
index 3b4cd3c62..de9150f7b 100755
--- a/bin/v_update_sys_queue
+++ b/bin/v_update_sys_queue
@@ -17,7 +17,7 @@ queue=$1
 
 # Importing system enviroment  as we run this script
 # mostly by cron wich not read it by itself
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf
diff --git a/bin/v_update_sys_rrd b/bin/v_update_sys_rrd
index 7c8c85a60..d297aad9f 100755
--- a/bin/v_update_sys_rrd
+++ b/bin/v_update_sys_rrd
@@ -12,7 +12,7 @@
 
 # Importing system enviroment  as we run this script
 # mostly by cron wich do not read it by itself
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf
diff --git a/bin/v_update_sys_vesta b/bin/v_update_sys_vesta
index 336a1a120..6e31b0ed4 100755
--- a/bin/v_update_sys_vesta
+++ b/bin/v_update_sys_vesta
@@ -15,7 +15,7 @@ version=$1
 updates=''
 
 # Importing system enviroment
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf
diff --git a/bin/v_update_user_stats b/bin/v_update_user_stats
index ebb86eae0..52ba7358e 100755
--- a/bin/v_update_user_stats
+++ b/bin/v_update_user_stats
@@ -14,7 +14,7 @@ user=$1
 
 # Importing system enviroment  as we run this script 
 #       mostly by cron wich not read it by itself
-source /etc/profile.d/vesta.sh
+source /etc/profile
 
 # Includes
 source $VESTA/conf/vesta.conf
diff --git a/func/main.sh b/func/main.sh
index 6cdc25bc1..c99374901 100644
--- a/func/main.sh
+++ b/func/main.sh
@@ -742,7 +742,7 @@ validate_format(){
             stats_user)     validate_format_username "$arg" "$arg_name" ;;
             template)       validate_format_username "$arg" "$arg_name" ;;
             ttl)            validate_format_int "$arg" ;;
-            user)           validate_format_username "$arg" ;;
+            user)           validate_format_username "$arg" "$arg_name" ;;
             wday)           validate_format_mhdmw "$arg" $arg_name ;;
         esac
     done