hestiacp#533 Consilidate Last/First name

In to Name (For dupplication reason in translations "contact")

Removed the "check" last name in *.php files and made the last name not forced in bash script

Author: jaapmarcus

bin/v-add-user

@@ -35,8 +35,12 @@ is_user_free() {
 check_args '3' "$#" 'USER PASSWORD EMAIL [PACKAGE] [FNAME] [LNAME]'
 is_format_valid 'user' 'email' 'package'
 if [ ! -z "$fname" ]; then
-    is_format_valid 'fname' 'lname'
+    is_format_valid 'fname' 
 fi
+if [ ! -z "$lname" ]; then
+    is_format_valid 'lname' 
+fi
+
 is_user_free "$user"
 is_password_valid
 is_package_valid

bin/v-change-user-name

@@ -12,7 +12,7 @@
 # Argument definition
 user=$1
 fname=$2
-lname=$3
+lname=${3}
 
 # Includes
 source $HESTIA/func/main.sh
@@ -23,8 +23,11 @@ source $HESTIA/conf/hestia.conf
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '3' "$#" 'USER FNAME LNAME'
-is_format_valid 'user' 'fname' 'lname'
+check_args '2' "$#" 'USER FNAME'
+is_format_valid 'user' 'fname'
+if [ ! -z "$lname" ]; then
+    is_format_valid 'lname' 
+fi
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 

web/add/user/index.php

@@ -26,8 +26,7 @@
     if (empty($_POST['v_password'])) $errors[] = __('password');
     if (empty($_POST['v_package'])) $errrors[] = __('package');
     if (empty($_POST['v_email'])) $errors[] = __('email');
-    if (empty($_POST['v_fname'])) $errors[] = __('first name');
-    if (empty($_POST['v_lname'])) $errors[] = __('last name');
+    if (empty($_POST['v_name'])) $errors[] = __('name');
     if (!empty($errors[0])) {
         foreach ($errors as $i => $error) {
             if ( $i == 0 ) {
@@ -55,8 +54,7 @@
     $v_email = escapeshellarg($_POST['v_email']);
     $v_package = escapeshellarg($_POST['v_package']);
     $v_language = escapeshellarg($_POST['v_language']);
-    $v_fname = escapeshellarg($_POST['v_fname']);
-    $v_lname = escapeshellarg($_POST['v_lname']);
+    $v_name = escapeshellarg($_POST['v_name']);
     $v_notify = $_POST['v_notify'];
 
 
@@ -66,7 +64,7 @@
         $fp = fopen($v_password, "w");
         fwrite($fp, $_POST['v_password']."\n");
         fclose($fp);
-        exec (HESTIA_CMD."v-add-user ".$v_username." ".$v_password." ".$v_email." ".$v_package." ".$v_fname." ".$v_lname, $output, $return_var);
+        exec (HESTIA_CMD."v-add-user ".$v_username." ".$v_password." ".$v_email." ".$v_package." ".$v_name, $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         unlink($v_password);
@@ -87,8 +85,9 @@
         $hostname = exec('hostname');
         unset($output);
         $from = _translate($_POST['v_language'],'MAIL_FROM',$hostname);
-        if (!empty($_POST['v_fname'])) {
-            $mailtext = _translate($_POST['v_language'],'GREETINGS_GORDON_FREEMAN',$_POST['v_fname'],$_POST['v_lname']);
+        
+        if (!empty($_POST['v_name'])) {
+            $mailtext = _translate($_POST['v_language'],'GREETINGS_GORDON',$_POST['fname']);
         } else {
             $mailtext = _translate($_POST['v_language'],'GREETINGS');
         }
@@ -103,8 +102,7 @@
         unset($v_username);
         unset($v_password);
         unset($v_email);
-        unset($v_fname);
-        unset($v_lname);
+        unset($v_name);
         unset($v_notify);
     }
 }

web/edit/user/index.php

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

web/inc/i18n/en.php

@@ -519,6 +519,8 @@
     'Welcome to Hestia Control Panel'  => 'Welcome to Hestia Control Panel',
     'MAIL_FROM'  => 'Hestia Control Panel <noreply@%s>',
     'GREETINGS_GORDON_FREEMAN' => "Hello, %s %s,\n",
+    'GREETINGS_GORDON' => "Hello, %s,\n",
+    
     'GREETINGS' => "Hello,\n",
     'ACCOUNT_READY' => "Your account has been created and is ready for use.\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nHestia Control Panel\n",
 
@@ -848,4 +850,10 @@
     'Reset 2FA' => 'Unlock Account',
     '2FA Reset Code' => 'Account Recovery Code',
     'Invalid or missing token' => 'Invalid or missing token',
+    
+    //list user 
+    'Name' => 'Name',
+    //Add / Edit user
+    'Contact' => 'Name',
+    'GREETINGS_GORDON' => "Hello, %s,\n",
 );

web/templates/admin/add_user.html

@@ -73,22 +73,12 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('First Name');?>
+                                    <?php print __('Contact');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>" tabindex="3" >
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('Last Name');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" size="20" class="vst-input" name="v_lname" value="<?=htmlentities(trim($v_lname, "'"))?>" tabindex="4" >
+                                    <input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_fname, "'"))?>" tabindex="3" >
                                 </td>
                             </tr>
                             <tr>

web/templates/admin/edit_user.html

@@ -86,6 +86,8 @@
                                     <?php } ?>
                                 </td>
                             </tr>
+                            <?php if(!empty($v_lname)){
+                            ?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('First Name');?>
@@ -106,6 +108,21 @@
                                     <input type="text" size="20" class="vst-input" name="v_lname" value="<?=htmlentities(trim($v_lname, "'"))?>">
                                 </td>
                             </tr>
+                            <?php    
+                            }else{
+                            ?>
+                            <tr>
+                                <td class="vst-text input-label">
+                                    <?php print __('Contact');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
+                                </td>
+                            </tr>
+                            <?php                                
+                            }?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Email');?>

web/templates/admin/list_user.html

@@ -101,7 +101,7 @@
           <div class="clearfix l-unit__stat-col--left super-compact">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
           </div>
-              <div class="clearfix l-unit__stat-col--left wide-3 userlist-username"><b><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('login as')?> <?=$key?>"><?=$key?> <span style="font-weight: normal !important;">(<?=$data[$key]['FNAME']?> <?=$data[$key]['LNAME']?>)</span></b></a>
+              <div class="clearfix l-unit__stat-col--left wide-3 userlist-username"><b><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('login as')?> <?=$key?>"><?=$key?> <span style="font-weight: normal !important;">(<?php if(empty($data[$key]['LNAME'])){ echo $data[$key]['FNAME']; }else{ echo $data[$key]['FNAME'].' '.$data[$key]['LNAME'];}?>)</span></b></a>
                 <br />
                 <div class="userlist-email"><b><?=__('Email')?>:</b> <?=$data[$key]['CONTACT']?></div>
               </div>

web/templates/user/edit_user.html

@@ -86,6 +86,8 @@
                                     <?php } ?>
                                 </td>
                             </tr>
+                                                        <?php if(!empty($v_lname)){
+                            ?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('First Name');?>
@@ -106,6 +108,26 @@
                                     <input type="text" size="20" class="vst-input" name="v_lname" value="<?=htmlentities(trim($v_lname, "'"))?>">
                                 </td>
                             </tr>
+                            <?php    
+                            }else{
+                            ?>
+                            <tr>
+                                <td class="vst-text input-label">
+                                    <?php print __('Contact');?>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
+                                </td>
+                            </tr>
+                            <?php                                
+                            }?>
+                            <tr>
+                                <td>
+                                    <input type="text" size="20" class="vst-input" name="v_lname" value="<?=htmlentities(trim($v_lname, "'"))?>">
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Email');?>

web/templates/user/list_user.html

@@ -103,7 +103,7 @@
           <div class="clearfix l-unit__stat-col--left super-compact">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
           </div>
-              <div class="clearfix l-unit__stat-col--left wide-3 userlist-username"><b><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('login as')?>"><?=$data[$key]['FNAME']?> <?=$data[$key]['LNAME']?> <span style="font-weight: normal !important;">(<?=$key?>)</span></b></a>
+              <div class="clearfix l-unit__stat-col--left wide-3 userlist-username"><b><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=__('login as')?>"><?php if(empty($data[$key]['LNAME'])){ echo $data[$key]['FNAME']; }else{ echo $data[$key]['FNAME'].' '.$data[$key]['LNAME'];}?> <span style="font-weight: normal !important;">(<?=$key?>)</span></b></a>
                 <br />
                 <span class="userlist-email"><b><?=__('Email')?>:</b> <?=$data[$key]['CONTACT']?></span>
               </div>