From 941342035c9e0627aa6784493d8417066e60ed77 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Mon, 26 Sep 2011 11:15:06 +0300
Subject: [PATCH] improved password hide function

---
 bin/v_add_db_base              | 3 ++-
 bin/v_add_sys_user             | 3 ++-
 bin/v_add_web_domain_stat_auth | 2 +-
 bin/v_change_db_password       | 2 +-
 bin/v_change_sys_user_password | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/v_add_db_base b/bin/v_add_db_base
index ca24eefa..50b1da60 100755
--- a/bin/v_add_db_base
+++ b/bin/v_add_db_base
@@ -81,7 +81,8 @@ v_str="$v_str U_DISK='0' SUSPEND='no' DATE='$V_DATE'"
 echo "$v_str">>$V_USERS/$user/db.conf
 
 # Hiding password
-V_EVENT=$(echo $V_EVENT | sed -e "s/$db_password/xxxxxx/g")
+dt="$(date +%m-%d-%y" "%H:%m:%S)"
+V_EVENT="$dt $V_SCRIPT $user $database $db_user ***** $type $host"
 
 # Logging
 log_history "$V_EVENT" "v_del_db_base $user $database"
diff --git a/bin/v_add_sys_user b/bin/v_add_sys_user
index 6658ae51..ecbc0dbf 100755
--- a/bin/v_add_sys_user
+++ b/bin/v_add_sys_user
@@ -172,7 +172,8 @@ if [ "$user" != 'vesta' ]; then
 fi
 
 # Hiding password
-V_EVENT=$(echo $V_EVENT | sed -e "s/$password/xxxxxx/g")
+dt="$(date +%m-%d-%y" "%H:%m:%S)"
+V_EVENT="$dt $V_SCRIPT $user ***** $email $role $owner $package $fname $lname"
 
 # Logging
 log_event 'system' "$V_EVENT"
diff --git a/bin/v_add_web_domain_stat_auth b/bin/v_add_web_domain_stat_auth
index 64ddd3f3..498f92c3 100755
--- a/bin/v_add_web_domain_stat_auth
+++ b/bin/v_add_web_domain_stat_auth
@@ -90,7 +90,7 @@ fi
 update_web_domain_value '$STATS_AUTH' "$a_users"
 
 # Hiding password
-V_EVENT=$(echo $V_EVENT | sed -e "s/$auth_pass/xxxxxx/g")
+V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $user $domain $auth_user *****"
 
 # Logging
 log_history "$V_EVENT" "v_del_web_domain_stat_auth $user $domain $auth_user"
diff --git a/bin/v_change_db_password b/bin/v_change_db_password
index 554f9d26..9268ba80 100755
--- a/bin/v_change_db_password
+++ b/bin/v_change_db_password
@@ -63,7 +63,7 @@ esac
 #----------------------------------------------------------#
 
 # Hiding password
-V_EVENT=$(echo $V_EVENT | sed -e "s/$db_password/xxxxxx/g")
+V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $user $database *****"
 
 # Logging
 log_event 'system' "$V_EVENT"
diff --git a/bin/v_change_sys_user_password b/bin/v_change_sys_user_password
index 2e46ec00..bb86142c 100755
--- a/bin/v_change_sys_user_password
+++ b/bin/v_change_sys_user_password
@@ -44,7 +44,7 @@ echo "$password" | /usr/bin/passwd "$user" --stdin >/dev/null 2>&1
 #----------------------------------------------------------#
 
 # Hiding password
-V_EVENT=$(echo $V_EVENT | sed -e "s/$password/xxxxxx/g")
+V_EVENT="$(date +%m-%d-%y" "%H:%m:%S) $V_SCRIPT $user *****"
 
 # Logging
 log_event 'system' "$V_EVENT"