From 779b9cf521c421b19995eae57b3256ce4589a34a Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Thu, 27 Sep 2012 11:07:55 +0300
Subject: [PATCH] fixed bug in history loging func

---
 bin/v_add_user_package |  6 +++++-
 func/main.sh           | 24 +++++++++---------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/bin/v_add_user_package b/bin/v_add_user_package
index 86bf4cae0..8d3d8626e 100755
--- a/bin/v_add_user_package
+++ b/bin/v_add_user_package
@@ -69,7 +69,11 @@ chmod 644 $VESTA/data/packages/$package.pkg
 #----------------------------------------------------------#
 
 # Logging
-log_history "added user package $package" '' 'admin'
+if [ "$rewrite" != 'yes' ]; then
+    log_history "added user package $package" '' 'admin'
+else
+    log_history "updated user package $package" '' 'admin'
+fi
 log_event "$OK" "$EVENT"
 
 exit
diff --git a/func/main.sh b/func/main.sh
index bfed6abfd..50a1636b9 100755
--- a/func/main.sh
+++ b/func/main.sh
@@ -59,25 +59,19 @@ log_event() {
 log_history() {
     cmd=$1
     undo=${2-no}
-    log_user="$3"
+    log_user=${3-$user}
+    log=$VESTA/data/users/$log_user/history.log
 
-    if [ -z "$log_user" ]; then
-        log_user="$user"
+    touch $log
+    if [ '99' -lt "$(wc -l $log |cut -f 1 -d ' ')" ]; then
+        tail -n 99 $log > $log.moved
+        mv -f $log.moved $log
+        chmod 660 $log
     fi
 
-    touch $USER_DATA/history.log
-    if [ '99' -lt "$(wc -l $USER_DATA/history.log |cut -f 1 -d ' ')" ]; then
-        tail -n 99 $USER_DATA/history.log > $USER_DATA/history.log.mv
-        mv -f $USER_DATA/history.log.mv $USER_DATA/history.log
-        chmod 660 $USER_DATA/history.log
-    fi
-
-    curr_str=$(grep "ID=" $VESTA/data/users/$log_user/history.log |\
-        cut -f 2 -d \' | sort -n | tail -n1)
+    curr_str=$(grep "ID=" $log | cut -f 2 -d \' | sort -n | tail -n1)
     id="$((curr_str +1))"
-
-    HISTORY="ID='$id' DATE='$DATE' TIME='$TIME' CMD='$cmd' UNDO='$undo'"
-    echo "$HISTORY" >> $VESTA/data/users/$log_user/history.log
+    echo "ID='$id' DATE='$DATE' TIME='$TIME' CMD='$cmd' UNDO='$undo'" >> $log
 }
 
 # Argument list checker