get user ip fix

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

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