Skip to content

Commit 57bb40e

Browse files
committed
Unable to activate non set vars in user.conf
v-delete-user-2fa just deleted vars out of user.conf And when doesn't exists you can "create" them ... Updated v-rebuild-user to check when not exists. Also fixed a issue when file does not became edditable when FNAME/LNAME was missing durring upgrade
1 parent 9e6eea8 commit 57bb40e

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

bin/v-delete-user-2fa

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ if [ -z "$TWOFA" ]; then
4343
fi
4444

4545
# Remove 2FA from user config
46-
sed -i '/TWOFA=/d' $USER_DATA/user.conf
47-
sed -i '/QRCODE=/d' $USER_DATA/user.conf
46+
update_user_value "$user" '$TWOFA' ""
47+
update_user_value "$user" '$QRCODE' ""
4848

4949
#----------------------------------------------------------#
5050
# Hestia #

func/rebuild.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,20 @@ rebuild_user_conf() {
1717
# Update FNAME LNAME to NAME
1818
if [ -z "$NAME" ]; then
1919
NAME="$FNAME $LNAME"
20+
if [ -z $FNAME ]; then NAME=""; fi
21+
2022
sed -i "s/FNAME='$FNAME'/NAME='$NAME'/g" $USER_DATA/user.conf
2123
sed -i "/LNAME='$LNAME'/d" $USER_DATA/user.conf
2224
fi
23-
25+
if [ -z "${TWOFA+x}" ]; then
26+
sed -i "/RKEY/a TWOFA=''" $USER_DATA/user.conf
27+
fi
28+
if [ -z "${QRCODE+x}" ]; then
29+
sed -i "/TWOFA/a QRCODE=''" $USER_DATA/user.conf
30+
fi
31+
if [ -z "${PHPCLI+x}" ]; then
32+
sed -i "/QRCODE/a PHPCLI=''" $USER_DATA/user.conf
33+
fi
2434
# Run template trigger
2535
if [ -x "$HESTIA/data/packages/$PACKAGE.sh" ]; then
2636
$HESTIA/data/packages/$PACKAGE.sh "$user" "$CONTACT" "$NAME"

0 commit comments

Comments
 (0)