Fix detection in v-change-user-theme

Author: Kristan Kenney

bin/v-change-user-theme

@@ -21,16 +21,18 @@ theme=$2
 source $HESTIA/func/main.sh
 # shellcheck source=/usr/local/hestia/conf/hestia.conf
 source $HESTIA/conf/hestia.conf
-# Unset theme variable from $HESTIA/conf/hestia.conf
+# Unset THEME variable from $HESTIA/conf/hestia.conf
 unset THEME
 
+
 #----------------------------------------------------------#
 #                    Verifications                         #
 #----------------------------------------------------------#
 
 # Reading user values
 source $USER_DATA/user.conf
 
+
 is_format_valid 'user' 'theme'
 is_object_valid 'user' 'USER' "$user"
 
@@ -43,17 +45,12 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
-
-
-if [ -z $THEME ]; then
-    add_object_key "user" 'USER' "$user" 'THEME' 'LANGUAGE'
-fi
+# Set theme value
 update_user_value "$user" '$THEME' "$theme"
 
-$BIN/v-log-action "$user" "Info" "System" "User theme changed (User: $user, Theme: $theme)."
-
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
+$BIN/v-log-action "$user" "Info" "System" "User theme changed (User: $user, Theme: $theme)."
 
 exit

bin/v-list-user

@@ -93,6 +93,7 @@ shell_list() {
     echo "FULL NAME:      $NAME"
     echo "EMAIL:          $CONTACT"
     echo "LANGUAGE:       $LANGUAGE"
+    echo "THEME:          $THEME"
     echo "SUSPENDED:      $SUSPENDED"
     echo "PACKAGE:        $PACKAGE"
     echo "SHELL:          $SHELL"
@@ -127,7 +128,7 @@ plain_list() {
     echo -ne "$U_WEB_DOMAINS\t$U_WEB_SSL\t$U_WEB_ALIASES\t"
     echo -ne "$U_DNS_DOMAINS\t$U_DNS_RECORDS\t$U_MAIL_DOMAINS\t"
     echo -ne "$U_MAIL_DKIM\t$U_MAIL_ACCOUNTS\t$U_DATABASES\t"
-    echo -e "$U_CRON_JOBS\t$U_BACKUPS\t$LANGUAGE\t$TIME\t$DATE"
+    echo -e "$U_CRON_JOBS\t$U_BACKUPS\t$LANGUAGE\t$THEME\t$TIME\t$DATE"
 }
 
 # CSV list function
@@ -142,7 +143,7 @@ csv_list() {
     echo -n "U_DISK_WEB,U_DISK_MAIL,U_DISK_DB,U_BANDWIDTH,U_WEB_DOMAINS,"
     echo -n "U_WEB_SSL,U_WEB_ALIASES,U_DNS_DOMAINS,U_DNS_RECORDS,"
     echo -n "U_MAIL_DOMAINS,U_MAIL_DKIM,U_MAIL_ACCOUNTS,U_DATABASES"
-    echo "U_CRON_JOBS,U_BACKUPS,LANGUAGE,NOTIFICATIONS,TIME,DATE"
+    echo "U_CRON_JOBS,U_BACKUPS,LANGUAGE,THEME,NOTIFICATIONS,TIME,DATE"
     echo -n "$USER,\"$NAME\",$PACKAGE,$WEB_TEMPLATE,"
     echo -n "$BACKEND_TEMPLATE,$PROXY_TEMPLATE,$DNS_TEMPLATE,$WEB_DOMAINS,"
     echo -n "$WEB_ALIASES,$DNS_DOMAINS,$DNS_RECORDS,$MAIL_DOMAINS,"
@@ -154,7 +155,7 @@ csv_list() {
     echo -n "$U_DISK_MAIL,$U_DISK_DB,$U_BANDWIDTH,$U_WEB_DOMAINS,$U_WEB_SSL,"
     echo -n "$U_WEB_ALIASES,$U_DNS_DOMAINS,$U_DNS_RECORDS,$U_MAIL_DOMAINS,"
     echo -n "$U_MAIL_DKIM,$U_MAIL_ACCOUNTS,$U_DATABASES,$U_CRON_JOBS,"
-    echo "$U_BACKUPS,$LANGUAGE,$NOTIFICATIONS,$TIME,$DATE"
+    echo "$U_BACKUPS,$LANGUAGE,$THEME,$NOTIFICATIONS,$TIME,$DATE"
 }
 
 

func/rebuild.sh

@@ -34,6 +34,9 @@ rebuild_user_conf() {
     if [ -z "${ROLE+x}" ]; then 
         sed -i "/PHPCLI/a ROLE='user'" $USER_DATA/user.conf 
     fi
+    if [ -z "${THEME+x}" ]; then 
+        sed -i "/LANGUAGE/a THEME=''" $USER_DATA/user.conf 
+    fi
     # Run template trigger
     if [ -x "$HESTIA/data/packages/$PACKAGE.sh" ]; then
         $HESTIA/data/packages/$PACKAGE.sh "$user" "$CONTACT" "$NAME"