Fixed last 3 commands with hardcode admin user (hestiacp#3928)

* Fixed last 3 commands with hardcode admin user

* Some more

Author: jaapmarcus

bin/v-acknowledge-user-notification

@@ -43,7 +43,7 @@ check_hestia_demo_mode
 
 # Updating notification
 if [ "$id" = 'all' ]; then
-	for id in $(v-list-user-notifications admin plain | cut -f1); do
+	for id in $(v-list-user-notifications "$user" plain | cut -f1); do
 		update_object_value 'notifications' 'NID' "$id" '$ACK' 'yes' 2> /dev/null
 	done
 else

bin/v-add-remote-dns-host

@@ -119,10 +119,15 @@ check_result $? "$HOST sync failed" "$E_CONNECT"
 #----------------------------------------------------------#
 
 # Adding local  dns-cluster cron job
-cmd="sudo $BIN/v-update-sys-queue dns-cluster"
-check_cron=$(grep "$cmd" $HESTIA/data/users/admin/cron.conf 2> /dev/null)
+cmd="v-update-sys-queue dns-cluster"
+check_cron=$(grep "$cmd" "/var/spool/cron/crontabs/hestiaweb" 2> /dev/null)
 if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then
-	$BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd"
+	min='*/5'
+	hour='0'
+	day='*'
+	month='*'
+	wday='*'
+	echo "$min $hour * * * sudo /usr/local/hestia/bin/$cmd" > "/var/spool/cron/crontabs/hestiaweb"
 fi
 
 # Logging

bin/v-add-user-sftp-key

@@ -70,7 +70,7 @@ fi
 
 #
 chown ${user}: "${AUTHKEY_FILE}"
-chown admin: "${PRVKEY_FILE}"
+chown ${ROOT_USER} : "${PRVKEY_FILE}"
 
 #----------------------------------------------------------#
 #                       Hestia                             #

bin/v-delete-user

@@ -36,7 +36,7 @@ source_conf "$HESTIA/conf/hestia.conf"
 check_args '1' "$#" 'USER [RESTART]'
 is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
-if [ "$user" = 'admin' ]; then
+if [ "$user" = "$ROOT_USER" ]; then
 	exit
 fi
 
@@ -110,8 +110,8 @@ rm -f /var/spool/cron/crontabs/$user
 rm -rf $USER_DATA
 
 # Updating admin counter
-if [ "$user" != 'admin' ]; then
-	decrease_user_value 'admin' '$U_USERS'
+if [ "$user" != "$ROOT_USER" ]; then
+	decrease_user_value "$ROOT_USER" '$U_USERS'
 fi
 
 #----------------------------------------------------------#

bin/v-delete-user-ips

@@ -30,7 +30,7 @@ source_conf "$HESTIA/conf/hestia.conf"
 check_args '1' "$#" 'USER'
 is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
-if [ "$user" = 'admin' ]; then
+if [ "$user" = "$ROOT_USER" ]; then
 	exit
 fi
 

bin/v-list-users-stats

@@ -127,7 +127,7 @@ check_args '0' "$#" '[FORMAT]'
 $BIN/v-update-user-stats
 
 # Defining config
-conf="$HESTIA/data/users/admin/overall_stats.log"
+conf="$HESTIA/data/users/$ROOT_USER/overall_stats.log"
 if [ ! -e "$conf" ]; then
 	touch $conf
 fi