Adjusted templates + edit/index.php

web/edit/user/index.php

@@ -33,8 +33,7 @@ $v_password = "";
 $v_email = $data[$v_username]['CONTACT'];
 $v_package = $data[$v_username]['PACKAGE'];
 $v_language = $data[$v_username]['LANGUAGE'];
-$v_fname = $data[$v_username]['FNAME'];
-$v_lname = $data[$v_username]['LNAME'];
+$v_name = $data[$v_username]['NAME'];
 $v_shell = $data[$v_username]['SHELL'];
 $v_twofa = $data[$v_username]['TWOFA'];
 $v_qrcode = $data[$v_username]['QRCODE'];
@@ -180,23 +179,12 @@ if (!empty($_POST['save'])) {
     }
 
     // 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);
+    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);
         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']);
-        $v_lname = escapeshellarg($_POST['v_lname']);
-        exec (HESTIA_CMD."v-change-user-name ".escapeshellarg($v_username)." ".$v_fname." ".$v_lname, $output, $return_var);
-        check_return_code($return_var,$output);
-        unset($output);
-        $v_fname = $_POST['v_fname'];
-        $v_lname = $_POST['v_lname'];
+        $v_name = $_POST['v_name'];
     }
 
     // Change NameServers

web/templates/admin/add_user.html

@@ -78,7 +78,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_fname, "'"))?>" tabindex="3" >
+                                    <input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" tabindex="3" >
                                 </td>
                             </tr>
                             <tr>

web/templates/admin/edit_user.html

@@ -86,31 +86,6 @@
                                     <?php } ?>
                                 </td>
                             </tr>
-                            <?php if(!empty($v_lname)){
-                            ?>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('First Name');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
-                                </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, "'"))?>">
-                                </td>
-                            </tr>
-                            <?php    
-                            }else{
-                            ?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Contact');?>
@@ -118,11 +93,9 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
+                                    <input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
                                 </td>
                             </tr>
-                            <?php                                
-                            }?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Email');?>

web/templates/admin/list_user.html

@@ -101,7 +101,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           <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;">(<?php if(empty($data[$key]['LNAME'])){ echo $data[$key]['FNAME']; }else{ echo $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 echo __($data[$key]['NAME']);?>)</span></b></a>
                 <br />
                 <div class="userlist-email"><b><?=__('Email')?>:</b> <?=$data[$key]['CONTACT']?></div>
               </div>

web/templates/user/edit_user.html

@@ -85,32 +85,7 @@
                                     <div><img class="qr-code" src="<?php echo $v_qrcode; ?>"></div>
                                     <?php } ?>
                                 </td>
-                            </tr>
-                                                        <?php if(!empty($v_lname)){
-                            ?>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('First Name');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
-                                </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, "'"))?>">
-                                </td>
-                            </tr>
-                            <?php    
-                            }else{
-                            ?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Contact');?>
@@ -118,14 +93,7 @@
                             </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, "'"))?>">
+                                    <input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
                                 </td>
                             </tr>
                             <tr>

web/templates/user/list_user.html

@@ -103,7 +103,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           <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')?>"><?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>
+              <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 echo $data[$key]['FNAME'];?> <span style="font-weight: normal !important;">(<?=$key?>)</span></b></a>
                 <br />
                 <span class="userlist-email"><b><?=__('Email')?>:</b> <?=$data[$key]['CONTACT']?></span>
               </div>