Skip to content

Commit 22a3319

Browse files
author
Kristan Kenney
committed
Ensure First and Last Name are always set for user
Last name was dropped when editing user. Corrected error in web front-end to account for recent code changes. v-change-user-name will accept the following as valid inputs on the backend: v-change-user-name $user "First Last" v-change-user-name $user First Last
1 parent a2655ee commit 22a3319

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

bin/v-change-user-name

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# Argument definition
1313
user=$1
1414
name=$2
15+
lname=$3
1516

1617
# Includes
1718
source $HESTIA/func/main.sh
@@ -38,16 +39,19 @@ check_hestia_demo_mode
3839
# Get old values
3940
old_name=$(get_user_value '$NAME')
4041

41-
4242
# Changing ns values
43-
update_user_value "$user" '$NAME' "$name"
43+
if [ ! -z "$lname" ]; then
44+
update_user_value "$user" '$NAME' "$name $lname"
45+
else
46+
update_user_value "$user" '$NAME' "$name"
47+
fi
4448

4549
#----------------------------------------------------------#
4650
# Hestia #
4751
#----------------------------------------------------------#
4852

4953
# Logging
50-
log_history "Changed user name to $name"
54+
log_history "changed user display name to $name"
5155
log_event "$OK" "$ARGUMENTS"
5256

5357
exit

web/edit/user/index.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@
179179
}
180180

181181
// Change full name
182-
if ($v_fname != $_POST['v_name']){
183-
$v_fname = escapeshellarg($_POST['v_name']);
184-
exec (HESTIA_CMD."v-change-user-name ".escapeshellarg($v_username)." ".$v_name, $output, $return_var);
182+
if ($v_name != $_POST['v_name']){
183+
$v_name = escapeshellarg($_POST['v_name']);
184+
exec (HESTIA_CMD."v-change-user-name ".escapeshellarg($v_username). " ". "$v_name", $output, $return_var);
185185
check_return_code($return_var,$output);
186186
unset($output);
187187
$v_name = $_POST['v_name'];

0 commit comments

Comments
 (0)