|
@@ -83,7 +83,7 @@ increase_ip_value() {
|
|
|
if [ -z "$current_usr" ]; then
|
|
if [ -z "$current_usr" ]; then
|
|
|
new_usr="$USER"
|
|
new_usr="$USER"
|
|
|
else
|
|
else
|
|
|
- check_usr=$(echo -e "${current_usr//,/\\n}" | grep -w ^${USER}$)
|
|
|
|
|
|
|
+ check_usr=$(echo -e "${current_usr//,/\\n}" | grep -x "$USER")
|
|
|
if [ -z "$check_usr" ]; then
|
|
if [ -z "$check_usr" ]; then
|
|
|
new_usr="$current_usr,$USER"
|
|
new_usr="$current_usr,$USER"
|
|
|
else
|
|
else
|
|
@@ -91,6 +91,12 @@ increase_ip_value() {
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
|
|
+ # Make sure users list does not contain duplicates
|
|
|
|
|
+ new_usr=$(echo "$new_usr" |\
|
|
|
|
|
+ sed "s/,/\n/g"|\
|
|
|
|
|
+ sort -u |\
|
|
|
|
|
+ sed ':a;N;$!ba;s/\n/,/g')
|
|
|
|
|
+
|
|
|
sed -i "s/$web_key='$current_web'/$web_key='$new_web'/g" \
|
|
sed -i "s/$web_key='$current_web'/$web_key='$new_web'/g" \
|
|
|
$HESTIA/data/ips/$sip
|
|
$HESTIA/data/ips/$sip
|
|
|
sed -i "s/$usr_key='$current_usr'/$usr_key='$new_usr'/g" \
|
|
sed -i "s/$usr_key='$current_usr'/$usr_key='$new_usr'/g" \
|
|
@@ -118,6 +124,7 @@ decrease_ip_value() {
|
|
|
sed "s/,/\n/g"|\
|
|
sed "s/,/\n/g"|\
|
|
|
sed "s/^$user$//g"|\
|
|
sed "s/^$user$//g"|\
|
|
|
sed "/^$/d"|\
|
|
sed "/^$/d"|\
|
|
|
|
|
+ sort -u |\
|
|
|
sed ':a;N;$!ba;s/\n/,/g')
|
|
sed ':a;N;$!ba;s/\n/,/g')
|
|
|
else
|
|
else
|
|
|
new_usr="$current_usr"
|
|
new_usr="$current_usr"
|