Skip to content

Commit 4d8a99d

Browse files
jaapmarcusjaapmarcus
authored
Multiple small fixes UI (hestiacp#2464)
* Suspend user not working (Discord) * Unable to remove DNS records (Forum) * User unable to change cronjob * Unable to disable notification (Cron) hestiacp#2460 * Small bugs
1 parent 046a8f9 commit 4d8a99d

File tree

16 files changed

+41
-41
lines changed

16 files changed

+41
-41
lines changed

‎web/delete/dns/index.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929

3030
// DNS record
3131
if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) {
32-
$v_username = escapeshellarg($user);
3332
$v_domain = escapeshellarg($_GET['domain']);
3433
$v_record_id = escapeshellarg($_GET['record_id']);
35-
exec(HESTIA_CMD."v-delete-dns-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
34+
exec(HESTIA_CMD."v-delete-dns-record ".$user." ".$v_domain." ".$v_record_id, $output, $return_var);
3635
check_return_code($return_var, $output);
3736
unset($output);
3837
$back = $_SESSION['back'];

‎web/edit/cron/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
$v_cmd = escapeshellarg($_POST['v_cmd']);
5959

6060
// Save changes
61-
exec(HESTIA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
61+
exec(HESTIA_CMD."v-change-cron-job ".$user." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
6262
check_return_code($return_var, $output);
6363
unset($output);
6464

‎web/edit/dns/index.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
// Change domain IP
9191
if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) {
9292
$v_ip = escapeshellarg($_POST['v_ip']);
93-
exec(HESTIA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
93+
exec(HESTIA_CMD."v-change-dns-domain-ip ".$user." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
9494
check_return_code($return_var, $output);
9595
$restart_dns = 'yes';
9696
unset($output);
@@ -99,7 +99,7 @@
9999
// Change domain template
100100
if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
101101
$v_template = escapeshellarg($_POST['v_template']);
102-
exec(HESTIA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
102+
exec(HESTIA_CMD."v-change-dns-domain-tpl ".$user." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
103103
check_return_code($return_var, $output);
104104
unset($output);
105105
$restart_dns = 'yes';
@@ -108,7 +108,7 @@
108108
// Change SOA record
109109
if (($v_soa != $_POST['v_soa']) && (empty($_SESSION['error_msg']))) {
110110
$v_soa = escapeshellarg($_POST['v_soa']);
111-
exec(HESTIA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var);
111+
exec(HESTIA_CMD."v-change-dns-domain-soa ".$user." ".$v_domain." ".$v_soa." 'no'", $output, $return_var);
112112
check_return_code($return_var, $output);
113113
unset($output);
114114
$restart_dns = 'yes';
@@ -117,15 +117,15 @@
117117
// Change expiriation date
118118
if (($v_exp != $_POST['v_exp']) && (empty($_SESSION['error_msg']))) {
119119
$v_exp = escapeshellarg($_POST['v_exp']);
120-
exec(HESTIA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var);
120+
exec(HESTIA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp." 'no'", $output, $return_var);
121121
check_return_code($return_var, $output);
122122
unset($output);
123123
}
124124

125125
// Change domain ttl
126126
if (($v_ttl != $_POST['v_ttl']) && (empty($_SESSION['error_msg']))) {
127127
$v_ttl = escapeshellarg($_POST['v_ttl']);
128-
exec(HESTIA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var);
128+
exec(HESTIA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var);
129129
check_return_code($return_var, $output);
130130
unset($output);
131131
$restart_dns = 'yes';
@@ -161,7 +161,7 @@
161161
$v_val = escapeshellarg($_POST['v_val']);
162162
$v_priority = escapeshellarg($_POST['v_priority']);
163163
$v_ttl = escapeshellarg($_POST['v_ttl']);
164-
exec(HESTIA_CMD."v-change-dns-record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." false ".$v_ttl, $output, $return_var);
164+
exec(HESTIA_CMD."v-change-dns-record ".$user." ".$v_domain." ".$v_record_id." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority." false ".$v_ttl, $output, $return_var);
165165
check_return_code($return_var, $output);
166166
$v_rec = $_POST['v_rec'];
167167
$v_type = $_POST['v_type'];
@@ -174,7 +174,7 @@
174174
// Change dns record id
175175
if (($_GET['record_id'] != $_POST['v_record_id']) && (empty($_SESSION['error_msg']))) {
176176
$v_old_record_id = escapeshellarg($_GET['record_id']);
177-
exec(HESTIA_CMD."v-change-dns-record-id ".$v_username." ".$v_domain." ".$v_old_record_id." ".$v_record_id, $output, $return_var);
177+
exec(HESTIA_CMD."v-change-dns-record-id ".$user." ".$v_domain." ".$v_old_record_id." ".$v_record_id, $output, $return_var);
178178
check_return_code($return_var, $output);
179179
unset($output);
180180
$restart_dns = 'yes';

‎web/suspend/user/index.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
}
1717

1818
if (!empty($_GET['user'])) {
19-
exec(HESTIA_CMD."v-suspend-user ".$user, $output, $return_var);
19+
$v_username = escapeshellarg($_GET['user']);
20+
exec(HESTIA_CMD."v-suspend-user ".$v_username, $output, $return_var);
2021
}
2122
check_return_code($return_var, $output);
2223
unset($output);

‎web/templates/pages/add_db.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<?php show_error_panel($_SESSION);?>
4141
</td>
4242
</tr>
43-
<?php if (($user == 'admin') && (($_GET['accept'] !== "true"))) {?>
43+
<?php if (($user_plain == 'admin') && (($_GET['accept'] !== "true"))) {?>
4444
<tr>
4545
<td class="step-top">
4646
<span class="alert alert-danger alert-with-icon">
@@ -50,15 +50,15 @@
5050
</td>
5151
</tr>
5252
<?php } ?>
53-
<?php if (($user == 'admin') && (empty($_GET['accept']))) {?>
53+
<?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
5454
<tr>
5555
<td class="step-top">
5656
<span><a href="/add/user/" class="vst-advanced admin-warning-button"><?=_('Add User');?></a></span>
5757
<span><a href="/add/db/?accept=true" class="vst-advanced button danger admin-warning-button"><?=_('Continue');?></a> </span>
5858
</td>
5959
</tr>
6060
<?php } ?>
61-
<?php if (($user == 'admin') && (($_GET['accept'] === "true")) || ($user !== "admin")) {?>
61+
<?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
6262
<tr>
6363
<td class="hint">
6464
<?=sprintf(_('Prefix %s will be automatically added to database name and database user'),'<b>'.$user_plain.'_</b>'); ?>

‎web/templates/pages/add_dns.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<?php show_error_panel($_SESSION);?>
4141
</td>
4242
</tr>
43-
<?php if (($user == 'admin') && (($_GET['accept'] !== "true"))) {?>
43+
<?php if (($user_plain == 'admin') && (($_GET['accept'] !== "true"))) {?>
4444
<tr>
4545
<td class="step-top">
4646
<span class="alert alert-danger alert-with-icon">
@@ -50,15 +50,15 @@
5050
</td>
5151
</tr>
5252
<?php } ?>
53-
<?php if (($user == 'admin') && (empty($_GET['accept']))) {?>
53+
<?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
5454
<tr>
5555
<td class="step-top">
5656
<span><a href="/add/user/" class="vst-advanced admin-warning-button"><?=_('Add User');?></a></span>
5757
<span><a href="/add/dns/?accept=true" class="vst-advanced button danger admin-warning-button"><?=_('Continue');?></a> </span>
5858
</td>
5959
</tr>
6060
<?php } ?>
61-
<?php if (($user == 'admin') && (($_GET['accept'] === "true")) || ($user !== "admin")) {?>
61+
<?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
6262
<tr>
6363
<td class="vst-text step-top">
6464
<?=_('Domain');?>

‎web/templates/pages/add_mail.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<?php show_error_panel($_SESSION);?>
4141
</td>
4242
</tr>
43-
<?php if (($user == 'admin') && (($_GET['accept'] !== "true"))) {?>
43+
<?php if (($user_plain == 'admin') && (($_GET['accept'] !== "true"))) {?>
4444
<tr>
4545
<td class="step-top">
4646
<span class="alert alert-danger alert-with-icon">
@@ -50,15 +50,15 @@
5050
</td>
5151
</tr>
5252
<?php } ?>
53-
<?php if (($user == 'admin') && (empty($_GET['accept']))) {?>
53+
<?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
5454
<tr>
5555
<td class="step-top">
5656
<span><a href="/add/user/" class="vst-advanced admin-warning-button"><?=_('Add User');?></a></span>
5757
<span><a href="/add/mail/?accept=true" class="vst-advanced button danger admin-warning-button"><?=_('Continue');?></a> </span>
5858
</td>
5959
</tr>
6060
<?php } ?>
61-
<?php if (($user == 'admin') && (($_GET['accept'] === "true")) || ($user !== "admin")) {?>
61+
<?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
6262
<tr>
6363
<td class="vst-text step-top">
6464
<?=_('Domain');?>

‎web/templates/pages/add_user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</tr>
9494
<tr>
9595
<td>
96-
<label><input type="checkbox" size="20" class="vst-checkbox" onclick="javascript:elementHideShow('send-welcome');" name="v_login_disabled" <?php if ($data[$user]['LOGIN_DISABLED'] == "yes") echo "checked=yes" ?>><?=_('Do not allow user to log in to Control Panel');?></label>
96+
<label><input type="checkbox" size="20" class="vst-checkbox" onclick="javascript:elementHideShow('send-welcome');" name="v_login_disabled" <?php if ($data[$user_plain]['LOGIN_DISABLED'] == "yes") echo "checked=yes" ?>><?=_('Do not allow user to log in to Control Panel');?></label>
9797
</td>
9898
</tr>
9999
<tr id="send-welcome">

‎web/templates/pages/add_web.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
66
</div>
77
<div class="l-unit-toolbar__buttonstrip float-right">
8-
<?php if (($user == 'admin') && (($_GET['accept'] === "true")) || ($user !== "admin")) {?>
8+
<?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
99
<a href="#" class="ui-button" title="<?=_('Save');?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
1010
<?php } ?>
1111
</div>
@@ -42,7 +42,7 @@
4242
<?php show_error_panel($_SESSION);?>
4343
</td>
4444
</tr>
45-
<?php if (($user == 'admin') && (($_GET['accept'] !== "true"))) {?>
45+
<?php if (($user_plain == 'admin') && (($_GET['accept'] !== "true"))) {?>
4646
<tr>
4747
<td class="step-top">
4848
<span class="alert alert-danger alert-with-icon">
@@ -52,15 +52,15 @@
5252
</td>
5353
</tr>
5454
<?php } ?>
55-
<?php if (($user == 'admin') && (empty($_GET['accept']))) {?>
55+
<?php if (($user_plain == 'admin') && (empty($_GET['accept']))) {?>
5656
<tr>
5757
<td class="step-top">
5858
<span><a href="/add/user/" class="vst-advanced admin-warning-button"><?=_('Add User');?></a></span>
5959
<span><a href="/add/web/?accept=true" class="vst-advanced button danger admin-warning-button"><?=_('Continue');?></a> </span>
6060
</td>
6161
</tr>
6262
<?php } ?>
63-
<?php if (($user == 'admin') && (($_GET['accept'] === "true")) || ($user !== "admin")) {?>
63+
<?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
6464
<tr>
6565
<td class="vst-text step-top">
6666
<?=_('Domain');?>

‎web/templates/pages/edit_db.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</table>
125125
</form>
126126
</div>
127-
<?php if ($v_type == 'pgsql'){ $user=strtolower($user); } ?>
127+
<?php if ($v_type == 'pgsql'){ $user_plain=strtolower($user_plain); } ?>
128128
<script>
129129
GLOBAL.DB_USER_PREFIX = "<?=$user_plain;?>_";
130130
GLOBAL.DB_DBNAME_PREFIX = "<?=$user_plain;?>_";

0 commit comments

Comments
 (0)