fix: prevent empty user variable from affecting multiple scripts (Fixes hestiacp#4926) (hestiacp#4928)

Author: sahsanu

bin/v-list-access-keys

@@ -1,17 +1,13 @@
 #!/bin/bash
 # info: list all API access keys
-# options: [FORMAT]
+# options: [USER] [FORMAT]
 #
 # example: v-list-access-keys json
 
 #----------------------------------------------------------#
 #                Variables & Functions                     #
 #----------------------------------------------------------#
 
-# Argument definition
-user="$1"
-format="${2:-shell}"
-
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf
 source /etc/hestiacp/hestia.conf
@@ -20,6 +16,10 @@ source $HESTIA/func/main.sh
 # load config file
 source_conf "$HESTIA/conf/hestia.conf"
 
+# Argument definition
+user="$1"
+format="${2:-shell}"
+
 # JSON list function
 json_list() {
 	echo -n '{'

bin/v-update-user-counters

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: update user usage counters
-# options: USER
+# options: [USER]
 #
 # example: v-update-user-counters admin
 #
@@ -10,9 +10,6 @@
 #                Variables & Functions                     #
 #----------------------------------------------------------#
 
-# Argument definition
-user=$1
-
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf
 source /etc/hestiacp/hestia.conf
@@ -21,11 +18,14 @@ source $HESTIA/func/main.sh
 # load config file
 source_conf "$HESTIA/conf/hestia.conf"
 
+# Argument definition
+user=$1
+
 #----------------------------------------------------------#
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '0' "$#" 'USER'
+check_args '0' "$#" '[USER]'
 if [ -n "$user" ]; then
 	is_format_valid 'user'
 	is_object_valid 'user' 'USER' "$user"

bin/v-update-user-stats

@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: update user statistics
-# options: USER
+# options: [USER]
 #
 # example: v-update-user-stats admin
 #
@@ -10,9 +10,6 @@
 #                Variables & Functions                     #
 #----------------------------------------------------------#
 
-# Argument definition
-user=$1
-
 # Importing system environment  as we run this script
 #       mostly by cron wich not read it by itself
 source /etc/profile.d/hestia.sh
@@ -27,11 +24,14 @@ source $HESTIA/func/domain.sh
 # load config file
 source_conf "$HESTIA/conf/hestia.conf"
 
+# Argument definition
+user=$1
+
 #----------------------------------------------------------#
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '0' "$#" 'USER'
+check_args '0' "$#" '[USER]'
 if [ ! -z "$user" ]; then
 	is_format_valid 'user'
 	is_object_valid 'user' 'USER' "$user"