From d30f9d10006608ae1b133fd0613c44c555938b92 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Sat, 25 Jun 2016 11:08:19 +0300
Subject: [PATCH] get user ip fix

---
 bin/v-add-domain | 2 +-
 func/ip.sh       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/v-add-domain b/bin/v-add-domain
index 0880442f..3816c811 100755
--- a/bin/v-add-domain
+++ b/bin/v-add-domain
@@ -39,7 +39,7 @@ is_object_unsuspended 'user' 'USER' "$user"
 
 # Get ip if it wasn't defined
 if [ -z "$ip" ]; then
-    get_user_ip $user
+    get_user_ip
     if [ -z "$ip" ]; then
         check_result $E_NOTEXIST "no avaiable IP address"
     fi
diff --git a/func/ip.sh b/func/ip.sh
index eb52a990..97890682 100644
--- a/func/ip.sh
+++ b/func/ip.sh
@@ -197,12 +197,12 @@ get_broadcast() {
 get_user_ips() {
     dedicated=$(grep -H "OWNER='$user'" $VESTA/data/ips/*)
     dedicated=$(echo "$dedicated" |cut -f 1 -d : |sed 's=.*/==')
-    shared=$(grep -H -A1 "OWNER='$owner'" $VESTA/data/ips/* |grep shared)
+    shared=$(grep -H -A1 "OWNER='admin'" $VESTA/data/ips/* |grep shared)
     shared=$(echo "$shared" |cut -f 1 -d : |sed 's=.*/==' |cut -f 1 -d \-)
     for dedicated_ip in $dedicated; do
         shared=$(echo "$shared" |grep -v $dedicated_ip)
     done
-    echo -e "$dedicated\n$shared"
+    echo -e "$dedicated\n$shared" |sed "/^$/d"
 }
 
 # Get user ip