Last references to fname/lname in code

Author: jaapmarcus

func/main.sh

@@ -929,7 +929,6 @@ is_format_valid() {
                 email_forward)  is_email_format_valid "$arg" ;;
                 exp)            is_date_format_valid "$arg" ;;
                 extentions)     is_common_format_valid "$arg" 'extentions' ;;
-                fname)          is_name_format_valid "$arg" "first name" ;;
                 ftp_password)   is_password_format_valid "$arg" ;;
                 ftp_user)       is_user_format_valid "$arg" "$arg_name" ;;
                 host)           is_object_format_valid "$arg" "$arg_name" ;;
@@ -940,11 +939,11 @@ is_format_valid() {
                 ip_status)      is_ip_status_format_valid "$arg" ;;
                 job)            is_int_format_valid "$arg" 'job' ;;
                 key)            is_user_format_valid "$arg" "$arg_name" ;;
-                lname)          is_name_format_valid "$arg" "last name" ;;
                 malias)         is_user_format_valid "$arg" "$arg_name" ;;
                 max_db)         is_int_format_valid "$arg" 'max db';;
                 min)            is_cron_format_valid "$arg" $arg_name ;;
                 month)          is_cron_format_valid "$arg" $arg_name ;;
+                name)           is_name_format_valid "$arg" "name" ;;
                 nat_ip)         is_ip_format_valid "$arg" ;;
                 netmask)        is_ip_format_valid "$arg" 'netmask' ;;
                 newid)          is_int_format_valid "$arg" 'id' ;;

install/deb/filemanager/filegator/backend/Services/Auth/Adapters/HestiaAuth.php

@@ -59,7 +59,7 @@ public function transformUser($hstuser): User
     {
         $user = new User();
         $user->setUsername($this->hestia_user);
-        $user->setName($this->hestia_user . " (" . $hstuser['FNAME'] . " " . $hstuser['LNAME'] . ")");
+        $user->setName($this->hestia_user . " (" . $hstuser['NAME']. ")");
         $user->setRole('user');
         $user->setPermissions($this->permissions);
         $user->setHomedir('/');

web/reset/index.php

@@ -25,15 +25,14 @@
             exec ($cmd." ".$v_user." json", $output, $return_var);
             $data = json_decode(implode('', $output), true);
             $rkey = $data[$user]['RKEY'];
-            $fname = $data[$user]['FNAME'];
-            $lname = $data[$user]['LNAME'];
+            $name = $data[$user]['NAME'];
             $contact = $data[$user]['CONTACT'];
             $to = $data[$user]['CONTACT'];
             $subject = __('MAIL_RESET_SUBJECT',date("Y-m-d H:i:s"));
             $hostname = exec('hostname');
             $from = __('MAIL_FROM',$hostname);
-            if (!empty($fname)) {
-                $mailtext = __('GREETINGS_GORDON_FREEMAN',$fname,$lname);
+            if (!empty($name)) {
+                $mailtext = __('GREETINGS_GORDON',$name);
             } else {
                 $mailtext = __('GREETINGS');
             }