Skip to content

Commit e63d865

Browse files
jaapmarcusKristan Kenney
jaapmarcus
authored and
Kristan Kenney
committed
Adjusted templates + edit/index.php
1 parent 192abb9 commit e63d865

File tree

6 files changed

+10
-81
lines changed

6 files changed

+10
-81
lines changed

‎web/edit/user/index.php‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
$v_email = $data[$v_username]['CONTACT'];
3434
$v_package = $data[$v_username]['PACKAGE'];
3535
$v_language = $data[$v_username]['LANGUAGE'];
36-
$v_fname = $data[$v_username]['FNAME'];
37-
$v_lname = $data[$v_username]['LNAME'];
36+
$v_name = $data[$v_username]['NAME'];
3837
$v_shell = $data[$v_username]['SHELL'];
3938
$v_twofa = $data[$v_username]['TWOFA'];
4039
$v_qrcode = $data[$v_username]['QRCODE'];
@@ -180,23 +179,12 @@
180179
}
181180

182181
// Change full name
183-
if ($v_fname != $_POST['v_fname']){
184-
$v_fname = escapeshellarg($_POST['v_fname']);
185-
exec (HESTIA_CMD."v-change-user-name ".escapeshellarg($v_username)." ".$v_fname, $output, $return_var);
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);
186185
check_return_code($return_var,$output);
187186
unset($output);
188-
$v_name = $_POST['v_fname'];
189-
}
190-
191-
// Change full name
192-
if (($v_fname != $_POST['v_fname']) || ($v_lname != $_POST['v_lname']) && (empty($_SESSION['error_msg']))) {
193-
$v_fname = escapeshellarg($_POST['v_fname']);
194-
$v_lname = escapeshellarg($_POST['v_lname']);
195-
exec (HESTIA_CMD."v-change-user-name ".escapeshellarg($v_username)." ".$v_fname." ".$v_lname, $output, $return_var);
196-
check_return_code($return_var,$output);
197-
unset($output);
198-
$v_fname = $_POST['v_fname'];
199-
$v_lname = $_POST['v_lname'];
187+
$v_name = $_POST['v_name'];
200188
}
201189

202190
// Change NameServers

‎web/templates/admin/add_user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</tr>
7979
<tr>
8080
<td>
81-
<input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_fname, "'"))?>" tabindex="3" >
81+
<input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>" tabindex="3" >
8282
</td>
8383
</tr>
8484
<tr>

‎web/templates/admin/edit_user.html‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -86,43 +86,16 @@
8686
<?php } ?>
8787
</td>
8888
</tr>
89-
<?php if(!empty($v_lname)){
90-
?>
91-
<tr>
92-
<td class="vst-text input-label">
93-
<?php print __('First Name');?>
94-
</td>
95-
</tr>
96-
<tr>
97-
<td>
98-
<input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
99-
</td>
100-
</tr>
101-
<tr>
102-
<td class="vst-text input-label">
103-
<?php print __('Last Name');?>
104-
</td>
105-
</tr>
106-
<tr>
107-
<td>
108-
<input type="text" size="20" class="vst-input" name="v_lname" value="<?=htmlentities(trim($v_lname, "'"))?>">
109-
</td>
110-
</tr>
111-
<?php
112-
}else{
113-
?>
11489
<tr>
11590
<td class="vst-text input-label">
11691
<?php print __('Contact');?>
11792
</td>
11893
</tr>
11994
<tr>
12095
<td>
121-
<input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
96+
<input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
12297
</td>
12398
</tr>
124-
<?php
125-
}?>
12699
<tr>
127100
<td class="vst-text input-label">
128101
<?php print __('Email');?>

‎web/templates/admin/list_user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<div class="clearfix l-unit__stat-col--left super-compact">
102102
<input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
103103
</div>
104-
<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>
104+
<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>
105105
<br />
106106
<div class="userlist-email"><b><?=__('Email')?>:</b> <?=$data[$key]['CONTACT']?></div>
107107
</div>

‎web/templates/user/edit_user.html‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -85,47 +85,15 @@
8585
<div><img class="qr-code" src="<?php echo $v_qrcode; ?>"></div>
8686
<?php } ?>
8787
</td>
88-
</tr>
89-
<?php if(!empty($v_lname)){
90-
?>
91-
<tr>
92-
<td class="vst-text input-label">
93-
<?php print __('First Name');?>
94-
</td>
95-
</tr>
96-
<tr>
97-
<td>
98-
<input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
99-
</td>
100-
</tr>
101-
<tr>
102-
<td class="vst-text input-label">
103-
<?php print __('Last Name');?>
104-
</td>
10588
</tr>
106-
<tr>
107-
<td>
108-
<input type="text" size="20" class="vst-input" name="v_lname" value="<?=htmlentities(trim($v_lname, "'"))?>">
109-
</td>
110-
</tr>
111-
<?php
112-
}else{
113-
?>
11489
<tr>
11590
<td class="vst-text input-label">
11691
<?php print __('Contact');?>
11792
</td>
11893
</tr>
11994
<tr>
12095
<td>
121-
<input type="text" size="20" class="vst-input" name="v_fname" value="<?=htmlentities(trim($v_fname, "'"))?>">
122-
</td>
123-
</tr>
124-
<?php
125-
}?>
126-
<tr>
127-
<td>
128-
<input type="text" size="20" class="vst-input" name="v_lname" value="<?=htmlentities(trim($v_lname, "'"))?>">
96+
<input type="text" size="20" class="vst-input" name="v_name" value="<?=htmlentities(trim($v_name, "'"))?>">
12997
</td>
13098
</tr>
13199
<tr>

‎web/templates/user/list_user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<div class="clearfix l-unit__stat-col--left super-compact">
104104
<input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
105105
</div>
106-
<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>
106+
<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>
107107
<br />
108108
<span class="userlist-email"><b><?=__('Email')?>:</b> <?=$data[$key]['CONTACT']?></span>
109109
</div>

0 commit comments

Comments
 (0)