Merge branch 'fix/2020-07_v-edit-user' into staging/fixes

Author: Kristan Kenney

bin/v-change-user-name

@@ -12,6 +12,7 @@
 # Argument definition
 user=$1
 name=$2
+lname=$3
 
 # Includes
 source $HESTIA/func/main.sh
@@ -38,16 +39,19 @@ check_hestia_demo_mode
 # Get old values
 old_name=$(get_user_value '$NAME')
 
-
 # Changing ns values
-update_user_value "$user" '$NAME' "$name"
+if [ ! -z "$lname" ]; then
+    update_user_value "$user" '$NAME' "$name $lname"
+else
+    update_user_value "$user" '$NAME' "$name"
+fi
 
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
 
 # Logging
-log_history "Changed user name to $name"
+log_history "changed user display name to $name"
 log_event "$OK" "$ARGUMENTS"
 
 exit

web/edit/user/index.php

@@ -179,9 +179,9 @@
     }
 
     // Change full name
-    if ($v_fname != $_POST['v_name']){
-        $v_fname = escapeshellarg($_POST['v_name']);
-        exec (HESTIA_CMD."v-change-user-name ".escapeshellarg($v_username)." ".$v_name, $output, $return_var);
+    if ($v_name != $_POST['v_name']){
+        $v_name = escapeshellarg($_POST['v_name']);
+        exec (HESTIA_CMD."v-change-user-name ".escapeshellarg($v_username). " ". "$v_name", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         $v_name = $_POST['v_name'];