removed child user support

Author: serghey-rodin

bin/v_add_sys_ip

@@ -9,7 +9,7 @@
 ip="$1"
 mask="$2"
 interface="${3-eth0}"
-owner="${4-vesta}"
+user="${4-vesta}"
 ip_status="${5-shared}"
 ip_name="$6"
 
@@ -24,19 +24,16 @@ source $V_FUNC/domain_func.sh    # for namehosting
 #----------------------------------------------------------#
 
 # Checking arg number
-check_args '2' "$#" 'ip mask [interface] [owner] [ip_status] [ip_name]'
+check_args '2' "$#" 'ip mask [interface] [user] [ip_status] [ip_name]'
 
 # Checking argument format
-format_validation 'ip' 'mask' 'interface'
+format_validation 'ip' 'mask' 'interface' 'user'
 
 # Checking system ip
 is_sys_ip_free
 
-# Checking owner
-if [ ! -z "$owner" ]; then
-    format_validation 'user'
-    is_user_valid "$owner"
-fi
+# Checking user
+is_user_valid "$user"
 
 # Checking ip_status
 if [ ! -z "$ip_status" ]; then
@@ -84,10 +81,7 @@ namehost_ip_support
 #----------------------------------------------------------#
 
 # Updating user conf
-if [ ! -z "$owner" ]; then
-    user="$owner"
-    increase_user_value "$user" '$IP_OWNED'
-fi
+increase_user_value "$user" '$IP_OWNED'
 
 # Adding task to the vesta pipe
 if [ "$web_restart" = 'yes' ]; then

bin/v_add_sys_user

@@ -9,11 +9,9 @@
 user="$1"
 password="$2"
 email="$3"
-role="$4"
-owner="${5-vesta}"
-package="${6-default}"
-fname=$7
-lname=$8
+package="${4-default}"
+fname=$5
+lname=$6
 
 # Importing variables
 source $VESTA/conf/vars.conf
@@ -25,29 +23,16 @@ source $V_FUNC/shared_func.sh
 #----------------------------------------------------------#
 
 # Checking arg number
-check_args '5' "$#" 'user password email role owner [package] [fname] [lname]'
+check_args '3' "$#" 'user password email [package] [fname] [lname]'
 
 # Checking argument format
-format_validation 'user' 'password' 'email' 'role' 'owner' 'package' 
-format_validation 'fname' 'lname'
+format_validation 'user' 'password' 'email' 'package' 'fname' 'lname'
 
 # Checking user
 is_user_free "$user"
 
-# Checking 'vesta' user creation
-if [ "$user" != 'vesta' ]; then
-    # Checking owner
-    is_user_valid "$owner"
-
-    # Checking owner role
-    is_user_privileged "$owner"
-
-    # Checking owner permission
-    is_user_privileged "$owner" "$role"
-
-    # Checking package
-    is_package_valid "$package"
-fi
+# Checking package
+is_package_valid "$package"
 
 
 #----------------------------------------------------------#
@@ -149,12 +134,9 @@ LNAME='$lname'
 PACKAGE='$package'
 $package_data
 SUSPENDED='no'
-OWNER='$owner'
-ROLE='$role'
 CONTACT='$email'
 REPORTS='yes'
 IP_OWNED='0'
-U_CHILDS='0'
 U_DIR_DISK='0'
 U_DISK='0'
 U_BANDWIDTH='0'
@@ -165,15 +147,9 @@ U_DATABASES='0'
 U_MAIL_DOMAINS='0'
 DATE='$V_DATE'" > $V_USERS/$user/user.conf
 
-# Filling owner config
-if [ "$user" != 'vesta' ]; then
-    echo "USER='$user'" >> $V_USERS/$owner/child.conf
-    increase_user_value "$owner" 'U_CHILDS'
-fi
-
 # Hiding password
 dt="$(date +%m-%d-%y" "%H:%m:%S)"
-V_EVENT="$dt $V_SCRIPT $user ***** $email $role $owner $package $fname $lname"
+V_EVENT="$dt $V_SCRIPT $user ***** $email $package $fname $lname"
 
 # Logging
 log_event 'system' "$V_EVENT"

bin/v_add_sys_user_ip

@@ -368,14 +368,6 @@ if [ -e "$V_USERS/$user/billing.log" ]; then
     cp -r $V_USERS/$user/billing.log $tmpdir/vesta/
 fi
 
-if [ -e "$V_USERS/$user/child.conf" ]; then
-    if [ -z "$output" ]; then
-        echo -e "\t$(date +%H:%m:%S) child.conf"
-    fi
-
-    cp -r $V_USERS/$user/child.conf $tmpdir/vesta/
-fi
-
 if [ -e "$V_USERS/$user/history.log" ]; then
     if [ -z "$output" ]; then
         echo -e "\t$(date +%H:%m:%S) history.log"

bin/v_backup_sys_user

@@ -45,21 +45,14 @@ is_ip_key_empty '$U_SYS_USERS'
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Get ip and user owner
+# Changing ip owner
 ip_owner=$(get_sys_ip_value '$OWNER')
-user_owner=$(get_user_value '$OWNER')
-owner_role=$(get_user_value '$ROLE')
-
-# Checking permissions
-if [ "$owner_role" != 'admin' ] || [ "$ip_owner" != "$user_owner" ]; then
-        echo "Error: ip owner is not admin"
-        log_event 'debug' "$E_PERMS_REQUEIURED $V_EVENT"
-        exit $E_PERMS_REQUEIURED
+if [ "$ip_owner" != "$user" ]; then
+    update_sys_ip_value '$OWNER' "$user"
+    decrease_user_value "$ip_owner" '$IP_OWNED'
+    increase_user_value "$user" '$IP_OWNED'
 fi
 
-# Changing ip owner
-update_sys_ip_value '$OWNER' "$user"
-
 
 #----------------------------------------------------------#
 #                       Vesta                              #

bin/v_change_sys_ip_owner

@@ -33,9 +33,10 @@ is_user_valid
 # Checking user is active
 is_user_suspended
 
-# Checking user childs
-is_user_parent
-
+# Checking user vesta
+if [ "$user" = 'vesta' ]; then
+    exit
+fi
 
 #----------------------------------------------------------#
 #                       Action                             #
@@ -111,18 +112,6 @@ if [ ! -z "$statp" ]; then
     done
 fi
 
-# Deleteing user from parent
-owner=$(get_user_value '$OWNER')
-if [ -e "$V_USERS/$owner/child.conf" ]; then 
-    childc=$(grep -n "USER='$user'" $V_USERS/$owner/child.conf |\
-        cut -d : -f 1 | sort -n -r)
-fi
-if [ ! -z "$childc" ]; then
-    for str in $childc; do
-        sed -i "$str d" $V_USERS/$owner/child.conf
-    done
-fi
-
 # Removing system user
 userdel -f $user
 rm -rf $V_HOME/$user