improved template logic

This commit is contained in:
Serghey Rodin 2012-07-13 23:34:51 +03:00
commit ef33765d31
56 changed files with 710 additions and 282 deletions

View file

@ -73,7 +73,7 @@ top_panel($user,$TAB);
}
// Template
if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
if (( $_SESSION['user'] == 'admin') && ($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
$v_template = escapeshellarg($_POST['v_template']);
exec (VESTA_CMD."v_change_dns_domain_tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
if ($return_var != 0) {
@ -139,8 +139,13 @@ top_panel($user,$TAB);
}
}
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_dns.html');
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns.html');
if ($_SESSION['user'] == 'admin') {
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_dns.html');
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns.html');
} else {
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_dns.html');
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_dns.html');
}
unset($_SESSION['error_msg']);
unset($_SESSION['ok_msg']);
} else {

View file

@ -35,6 +35,7 @@ if ($_SESSION['user'] == 'admin') {
$v_username = $_GET['user'];
$v_password = "••••••••";
$v_email = $data[$v_username]['CONTACT'];
$v_template = $data[$v_username]['TEMPLATE'];
$v_package = $data[$v_username]['PACKAGE'];
$v_fname = $data[$v_username]['FNAME'];
$v_lname = $data[$v_username]['LNAME'];
@ -58,6 +59,10 @@ if ($_SESSION['user'] == 'admin') {
$packages = json_decode(implode('', $output), true);
unset($output);
exec (VESTA_CMD."v_list_web_templates json", $output, $return_var);
$templates = json_decode(implode('', $output), true);
unset($output);
exec (VESTA_CMD."v_list_sys_shells json", $output, $return_var);
$shells = json_decode(implode('', $output), true);
unset($output);
@ -92,6 +97,18 @@ if ($_SESSION['user'] == 'admin') {
unset($output);
}
// Change template
if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
$v_template = escapeshellarg($_POST['v_template']);
exec (VESTA_CMD."v_change_user_template ".$v_username." ".$v_template, $output, $return_var);
if ($return_var != 0) {
$error = implode('<br>', $output);
if (empty($error)) $error = 'Error: vesta did not return any output.';
$_SESSION['error_msg'] = $error;
}
unset($output);
}
// Change shell
if (($v_shell != $_POST['v_shell']) && (empty($_SESSION['error_msg']))) {
$v_shell = escapeshellarg($_POST['v_shell']);
@ -258,7 +275,7 @@ if ($_SESSION['user'] == 'admin') {
$_SESSION['ok_msg'] = "OK: changes has been saved.";
}
}
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/menu_edit_user.html');
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_user.html');
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_user.html');
unset($_SESSION['error_msg']);
unset($_SESSION['ok_msg']);

View file

@ -69,7 +69,7 @@ top_panel($user,$TAB);
$ips = json_decode(implode('', $output), true);
unset($output);
exec (VESTA_CMD."v_list_web_templates ".$user." json", $output, $return_var);
exec (VESTA_CMD."v_list_web_templates json", $output, $return_var);
$templates = json_decode(implode('', $output), true);
unset($output);
@ -120,7 +120,7 @@ top_panel($user,$TAB);
}
// Template
if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
if (( $_SESSION['user'] == 'admin') && ($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) {
$v_template = escapeshellarg($_POST['v_template']);
exec (VESTA_CMD."v_change_web_domain_tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
if ($return_var != 0) {
@ -509,8 +509,13 @@ top_panel($user,$TAB);
}
}
if ($_SESSION['user'] == 'admin') {
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_web.html');
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_web.html');
} else {
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_web.html');
include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_web.html');
}
unset($_SESSION['error_msg']);
unset($_SESSION['ok_msg']);
//}