Skip to content

Commit f8178b1

Browse files
committed
same template for users and admin
1 parent 8d650b9 commit f8178b1

File tree

4 files changed

+11
-521
lines changed

4 files changed

+11
-521
lines changed

web/add/dns/index.php

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@
4040
$_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
4141
} else {
4242
// Add DNS
43-
exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4, $output, $return_var);
43+
exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4." no", $output, $return_var);
4444
check_return_code($return_var,$output);
4545
unset($output);
4646

4747
// Change Expiriation date
4848
if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) {
4949
$v_exp = escapeshellarg($_POST['v_exp']);
50-
exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp, $output, $return_var);
50+
exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp." no", $output, $return_var);
5151
check_return_code($return_var,$output);
5252
unset($output);
5353
}
5454

5555
// Change TTL
5656
if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400') && (empty($_SESSION['error_msg']))) {
5757
$v_ttl = escapeshellarg($_POST['v_ttl']);
58-
exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl, $output, $return_var);
58+
exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl." no", $output, $return_var);
5959
check_return_code($return_var,$output);
6060
unset($output);
6161
}
@@ -64,6 +64,13 @@
6464
$_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
6565
unset($v_domain);
6666
}
67+
68+
if (empty($_SESSION['error_msg'])) {
69+
exec (VESTA_CMD."v-restart-dns", $output, $return_var);
70+
check_return_code($return_var,$output);
71+
unset($output);
72+
}
73+
6774
}
6875
}
6976

@@ -120,11 +127,7 @@
120127
}
121128
if (empty($v_ttl)) $v_ttl = 14400;
122129
if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year'));
123-
if ($_SESSION['user'] == 'admin') {
124-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
125-
} else {
126-
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_dns.html');
127-
}
130+
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
128131
unset($_SESSION['error_msg']);
129132
unset($_SESSION['ok_msg']);
130133
} else {

web/add/web/index.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,7 @@
272272
$stats = json_decode(implode('', $output), true);
273273
unset($output);
274274

275-
// Are you admin?
276-
if ($_SESSION['user'] == 'admin') {
277275
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_web.html');
278-
} else {
279-
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_web.html');
280-
}
281276
unset($_SESSION['error_msg']);
282277
unset($_SESSION['ok_msg']);
283278
//}

web/templates/user/add_dns.html

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)