diff --git a/web/add/cron/index.php b/web/add/cron/index.php index 9280f25e3..c9302ae65 100644 --- a/web/add/cron/index.php +++ b/web/add/cron/index.php @@ -62,7 +62,7 @@ if (!empty($_POST['ok'])) { } // Render -render_page($user, $TAB, 'admin/add_cron'); +render_page($user, $TAB, 'add_cron'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/add/db/index.php b/web/add/db/index.php index 99e532d48..ef3257044 100644 --- a/web/add/db/index.php +++ b/web/add/db/index.php @@ -121,7 +121,7 @@ $db_hosts = array_merge($db_hosts, $db_hosts_tmp); unset($db_hosts_tmp); unset($output); -render_page($user, $TAB, 'admin/add_db'); +render_page($user, $TAB, 'add_db'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/add/dns/index.php b/web/add/dns/index.php index ec9dcbfcf..7c18faab3 100644 --- a/web/add/dns/index.php +++ b/web/add/dns/index.php @@ -166,12 +166,12 @@ if (empty($_GET['domain'])) { unset($output); } - render_page($user, $TAB, 'admin/add_dns'); + render_page($user, $TAB, 'add_dns'); } else { // Display body for dns record $v_domain = $_GET['domain']; - render_page($user, $TAB, 'admin/add_dns_rec'); + render_page($user, $TAB, 'add_dns_rec'); } diff --git a/web/add/firewall/banlist/index.php b/web/add/firewall/banlist/index.php index 25605e1c6..774421e64 100644 --- a/web/add/firewall/banlist/index.php +++ b/web/add/firewall/banlist/index.php @@ -48,7 +48,7 @@ if (!empty($_POST['ok'])) { } // Render -render_page($user, $TAB, 'admin/add_firewall_banlist'); +render_page($user, $TAB, 'add_firewall_banlist'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/add/firewall/index.php b/web/add/firewall/index.php index 305fee513..9aab3ff5a 100644 --- a/web/add/firewall/index.php +++ b/web/add/firewall/index.php @@ -64,7 +64,7 @@ if (!empty($_POST['ok'])) { } // Render -render_page($user, $TAB, 'admin/add_firewall'); +render_page($user, $TAB, 'add_firewall'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/add/ip/index.php b/web/add/ip/index.php index d97f0cde4..8746ed087 100644 --- a/web/add/ip/index.php +++ b/web/add/ip/index.php @@ -85,7 +85,7 @@ $users = json_decode(implode('', $output), true); unset($output); // Render -render_page($user, $TAB, 'admin/add_ip'); +render_page($user, $TAB, 'add_ip'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/add/mail/index.php b/web/add/mail/index.php index fcdbbaeba..02f765de1 100644 --- a/web/add/mail/index.php +++ b/web/add/mail/index.php @@ -182,12 +182,12 @@ if (!empty($_POST['ok_acc'])) { if (empty($_GET['domain'])) { // Display body for mail domain - render_page($user, $TAB, 'admin/add_mail'); + render_page($user, $TAB, 'add_mail'); } else { // Display body for mail account $v_domain = $_GET['domain']; - render_page($user, $TAB, 'admin/add_mail_acc'); + render_page($user, $TAB, 'add_mail_acc'); } // Flush session messages diff --git a/web/add/package/index.php b/web/add/package/index.php index 849e839cb..b0d8be71a 100644 --- a/web/add/package/index.php +++ b/web/add/package/index.php @@ -202,7 +202,7 @@ if (empty($v_ns1)) $v_ns1 = 'ns1.example.ltd'; if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd'; // Render page -render_page($user, $TAB, 'admin/add_package'); +render_page($user, $TAB, 'add_package'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/add/user/index.php b/web/add/user/index.php index 5b8840793..2cc79287f 100644 --- a/web/add/user/index.php +++ b/web/add/user/index.php @@ -122,7 +122,7 @@ $languages = json_decode(implode('', $output), true); unset($output); // Render page -render_page($user, $TAB, 'admin/add_user'); +render_page($user, $TAB, 'add_user'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/add/web/index.php b/web/add/web/index.php index 96ea822c8..59f4b5db2 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -347,7 +347,7 @@ $stats = json_decode(implode('', $output), true); unset($output); // Render page -render_page($user, $TAB, 'admin/add_web'); +render_page($user, $TAB, 'add_web'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/edit/backup/exclusions/index.php b/web/edit/backup/exclusions/index.php index 7ab9ba911..bbbb4b3e0 100644 --- a/web/edit/backup/exclusions/index.php +++ b/web/edit/backup/exclusions/index.php @@ -123,7 +123,7 @@ if (!empty($_POST['save'])) { // Render page -render_page($user, $TAB, 'admin/edit_backup_exclusions'); +render_page($user, $TAB, 'edit_backup_exclusions'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php index 72a3afc17..c66ca85cf 100644 --- a/web/edit/cron/index.php +++ b/web/edit/cron/index.php @@ -76,7 +76,7 @@ if (!empty($_POST['save'])) { } // Render page -render_page($user, $TAB, 'admin/edit_cron'); +render_page($user, $TAB, 'edit_cron'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/edit/db/index.php b/web/edit/db/index.php index 9730eb702..21d394f02 100644 --- a/web/edit/db/index.php +++ b/web/edit/db/index.php @@ -82,7 +82,7 @@ if (!empty($_POST['save'])) { } // Render page -render_page($user, $TAB, 'admin/edit_db'); +render_page($user, $TAB, 'edit_db'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/edit/dns/index.php b/web/edit/dns/index.php index 39fd00a2e..3c2e1e5c0 100644 --- a/web/edit/dns/index.php +++ b/web/edit/dns/index.php @@ -198,10 +198,10 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['reco // Render page if (empty($_GET['record_id'])) { // Display body for dns domain - render_page($user, $TAB, '*/edit_dns'); + render_page($user, $TAB, 'edit_dns'); } else { // Display body for dns record - render_page($user, $TAB, 'admin/edit_dns_rec'); + render_page($user, $TAB, 'edit_dns_rec'); } // Flush session messages diff --git a/web/edit/firewall/index.php b/web/edit/firewall/index.php index d45232dd1..18b4be4ca 100644 --- a/web/edit/firewall/index.php +++ b/web/edit/firewall/index.php @@ -81,7 +81,7 @@ if (!empty($_POST['save'])) { } // Render page -render_page($user, $TAB, 'admin/edit_firewall'); +render_page($user, $TAB, 'edit_firewall'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php index 81c429197..b9eaa5819 100644 --- a/web/edit/ip/index.php +++ b/web/edit/ip/index.php @@ -99,7 +99,7 @@ if (!empty($_POST['save'])) { } // Render page -render_page($user, $TAB, 'admin/edit_ip'); +render_page($user, $TAB, 'edit_ip'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php index fc2004f0b..f5e1bd079 100644 --- a/web/edit/mail/index.php +++ b/web/edit/mail/index.php @@ -307,10 +307,10 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco // Render page if (empty($_GET['account'])) { // Display body for mail domain - render_page($user, $TAB, 'admin/edit_mail'); + render_page($user, $TAB, 'edit_mail'); } else { // Display body for mail account - render_page($user, $TAB, 'admin/edit_mail_acc'); + render_page($user, $TAB, 'edit_mail_acc'); } // Flush session messages diff --git a/web/edit/package/index.php b/web/edit/package/index.php index f8ea92726..763bfdf47 100644 --- a/web/edit/package/index.php +++ b/web/edit/package/index.php @@ -224,7 +224,7 @@ if (!empty($_POST['save'])) { // Render page -render_page($user, $TAB, 'admin/edit_package'); +render_page($user, $TAB, 'edit_package'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/edit/server/index.php b/web/edit/server/index.php index 1684410f5..78a6e62fd 100644 --- a/web/edit/server/index.php +++ b/web/edit/server/index.php @@ -422,7 +422,7 @@ foreach ($sys_arr as $key => $value) { } // Render page -render_page($user, $TAB, 'admin/edit_server'); +render_page($user, $TAB, 'edit_server'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/edit/user/index.php b/web/edit/user/index.php index 3c2288e13..049ee20da 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -183,13 +183,8 @@ if (!empty($_POST['save'])) { } } - // Render page -if ($_SESSION['user'] == 'admin') { - render_page($user, $TAB, 'admin/edit_user'); -} else { - render_page($user, $TAB, 'user/edit_user'); -} +render_page($user, $TAB, 'edit_user'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/edit/web/index.php b/web/edit/web/index.php index cd6e2a361..06c379a9d 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -694,7 +694,7 @@ if (isset($v_ftp_users_updated)) { } // Render page -render_page($user, $TAB, '*/edit_web'); +render_page($user, $TAB, 'edit_web'); // Flush session messages unset($_SESSION['error_msg']); diff --git a/web/generate/ssl/index.php b/web/generate/ssl/index.php index 3be7dd619..990fbc665 100644 --- a/web/generate/ssl/index.php +++ b/web/generate/ssl/index.php @@ -23,7 +23,7 @@ $_SESSION['back'] = ''; // Check POST if (!isset($_POST['generate'])) { - render_page($user, $TAB, 'admin/generate_ssl'); + render_page($user, $TAB, 'generate_ssl'); exit; } @@ -51,7 +51,7 @@ if (!empty($errors[0])) { } } $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); - render_page($user, $TAB, 'admin/generate_ssl'); + render_page($user, $TAB, 'generate_ssl'); unset($_SESSION['error_msg']); exit; } @@ -79,7 +79,7 @@ if ($return_var != 0) { $error = implode('
', $output); if (empty($error)) $error = __('Error code:',$return_var); $_SESSION['error_msg'] = $error; - render_page($user, $TAB, 'admin/generate_ssl'); + render_page($user, $TAB, 'generate_ssl'); unset($_SESSION['error_msg']); exit; } @@ -98,6 +98,6 @@ $v_csr = $data[$v_domain]['CSR']; $_SESSION['back'] = $_SERVER['REQUEST_URI']; // Render page -render_page($user, $TAB, 'admin/list_ssl'); +render_page($user, $TAB, 'list_ssl'); unset($_SESSION['ok_msg']); diff --git a/web/inc/main.php b/web/inc/main.php index 75a66c732..039cd1419 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -97,7 +97,6 @@ function check_return_code($return_var,$output) { function render_page($user, $TAB, $page) { $__template_dir = dirname(__DIR__) . '/templates/'; - $__template_base = $__template_dir . str_replace('*', $_SESSION['user'] === 'admin' ? 'admin' : 'user', $page); // Header include($__template_dir . 'header.html'); @@ -115,7 +114,16 @@ function render_page($user, $TAB, $page) { //*/ // Body - @include($__template_base . '.html'); + if (($_SESSION['user'] !== 'admin') && (@include($__template_dir . "user/$page.html"))) { + // User page exists + // Use user page + $__template_base = $__template_dir . "user/$page"; + } else { + // Not admin or user page doesn't exist + // Use admin page + $__template_base = $__template_dir . "admin/$page"; + include($__template_base . '.html'); + } // Footer $JS_FILE = $__template_base . '.js.html'; diff --git a/web/list/backup/exclusions/index.php b/web/list/backup/exclusions/index.php index c533129cb..8089e8d72 100644 --- a/web/list/backup/exclusions/index.php +++ b/web/list/backup/exclusions/index.php @@ -11,7 +11,7 @@ $data = json_decode(implode('', $output), true); unset($output); // Render page -render_page($user, $TAB, 'admin/list_backup_exclusions'); +render_page($user, $TAB, 'list_backup_exclusions'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/backup/index.php b/web/list/backup/index.php index b25284eb1..2e29a50ac 100644 --- a/web/list/backup/index.php +++ b/web/list/backup/index.php @@ -12,14 +12,14 @@ if (empty($_GET['backup'])){ $data = array_reverse($data,true); unset($output); - render_page($user, $TAB, 'admin/list_backup'); + render_page($user, $TAB, 'list_backup'); } else { exec (VESTA_CMD."v-list-user-backup $user ".escapeshellarg($_GET['backup'])." json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data,true); unset($output); - render_page($user, $TAB, 'admin/list_backup_detail'); + render_page($user, $TAB, 'list_backup_detail'); } // Back uri diff --git a/web/list/cron/index.php b/web/list/cron/index.php index 5461ba0bf..230483cb5 100644 --- a/web/list/cron/index.php +++ b/web/list/cron/index.php @@ -12,7 +12,7 @@ $data = array_reverse($data,true); unset($output); // Render page -render_page($user, $TAB, '*/list_cron'); +render_page($user, $TAB, 'list_cron'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/db/index.php b/web/list/db/index.php index 711560029..421290640 100644 --- a/web/list/db/index.php +++ b/web/list/db/index.php @@ -12,7 +12,7 @@ $data = array_reverse($data, true); unset($output); // Render page -render_page($user, $TAB, '*/list_db'); +render_page($user, $TAB, 'list_db'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/dns/index.php b/web/list/dns/index.php index 88bd8bf53..df5b4a83a 100644 --- a/web/list/dns/index.php +++ b/web/list/dns/index.php @@ -12,14 +12,14 @@ if (empty($_GET['domain'])){ $data = array_reverse($data, true); unset($output); - render_page($user, $TAB, '*/list_dns'); + render_page($user, $TAB, 'list_dns'); } else { exec (VESTA_CMD."v-list-dns-records '".$user."' '".escapeshellarg($_GET['domain'])."' 'json'", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data, true); unset($output); - render_page($user, $TAB, '*/list_dns_rec'); + render_page($user, $TAB, 'list_dns_rec'); } // Back uri diff --git a/web/list/firewall/banlist/index.php b/web/list/firewall/banlist/index.php index a4964ef35..6d8cddb4b 100644 --- a/web/list/firewall/banlist/index.php +++ b/web/list/firewall/banlist/index.php @@ -18,7 +18,7 @@ $data = array_reverse($data, true); unset($output); // Render page -render_page($user, $TAB, 'admin/list_firewall_banlist'); +render_page($user, $TAB, 'list_firewall_banlist'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/firewall/index.php b/web/list/firewall/index.php index ea7826d15..e4e3d4dfb 100644 --- a/web/list/firewall/index.php +++ b/web/list/firewall/index.php @@ -18,7 +18,7 @@ $data = array_reverse($data, true); unset($output); // Render page -render_page($user, $TAB, 'admin/list_firewall'); +render_page($user, $TAB, 'list_firewall'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/ip/index.php b/web/list/ip/index.php index 9360d5a11..04f4fbe72 100644 --- a/web/list/ip/index.php +++ b/web/list/ip/index.php @@ -19,7 +19,7 @@ $data = array_reverse($data, true); unset($output); // Render page -render_page($user, $TAB, 'admin/list_ip'); +render_page($user, $TAB, 'list_ip'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/log/index.php b/web/list/log/index.php index d5712b2ff..5c70e96e3 100644 --- a/web/list/log/index.php +++ b/web/list/log/index.php @@ -13,4 +13,4 @@ $data = array_reverse($data); unset($output); // Render page -render_page($user, $TAB, 'admin/list_log'); +render_page($user, $TAB, 'list_log'); diff --git a/web/list/mail/index.php b/web/list/mail/index.php index 1c81ad193..6b767768c 100644 --- a/web/list/mail/index.php +++ b/web/list/mail/index.php @@ -12,14 +12,14 @@ if (empty($_GET['domain'])){ $data = array_reverse($data, true); unset($output); - render_page($user, $TAB, '*/list_mail'); + render_page($user, $TAB, 'list_mail'); } else { exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".escapeshellarg($_GET['domain'])."' json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data, true); unset($output); - render_page($user, $TAB, '*/list_mail_acc'); + render_page($user, $TAB, 'list_mail_acc'); } // Back uri diff --git a/web/list/notifications/index.php b/web/list/notifications/index.php index 8dc5cfad9..1323b5323 100644 --- a/web/list/notifications/index.php +++ b/web/list/notifications/index.php @@ -28,7 +28,7 @@ $data = json_decode(implode('', $output), true); $data = array_reverse($data,true); // Render page -render_page($user, $TAB, '*/list_notifications'); +render_page($user, $TAB, 'list_notifications'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/package/index.php b/web/list/package/index.php index d2cfb881d..7d7f35e50 100644 --- a/web/list/package/index.php +++ b/web/list/package/index.php @@ -18,7 +18,7 @@ $data = json_decode(implode('', $output), true); unset($output); // Render page -render_page($user, $TAB, 'admin/list_packages'); +render_page($user, $TAB, 'list_packages'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/rrd/index.php b/web/list/rrd/index.php index 42f389627..7a13b78b3 100644 --- a/web/list/rrd/index.php +++ b/web/list/rrd/index.php @@ -17,7 +17,7 @@ $data = json_decode(implode('', $output), true); unset($output); // Render page -render_page($user, $TAB, 'admin/list_rrd'); +render_page($user, $TAB, 'list_rrd'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/server/index.php b/web/list/server/index.php index 89b19eb32..c37448aea 100644 --- a/web/list/server/index.php +++ b/web/list/server/index.php @@ -121,7 +121,7 @@ $data = json_decode(implode('', $output), true); unset($output); // Render page -render_page($user, $TAB, 'admin/list_services'); +render_page($user, $TAB, 'list_services'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/stats/index.php b/web/list/stats/index.php index 18d1306f9..c758705a6 100644 --- a/web/list/stats/index.php +++ b/web/list/stats/index.php @@ -5,7 +5,7 @@ $TAB = 'STATS'; // Main include include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -// Data & Render page +// Data if ($user == 'admin') { if (empty($_GET['user'])) { exec (VESTA_CMD."v-list-users-stats json", $output, $return_var); @@ -23,16 +23,15 @@ if ($user == 'admin') { exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var); $users = json_decode(implode('', $output), true); unset($output); - - render_page($user, $TAB, 'admin/list_stats'); } else { exec (VESTA_CMD."v-list-user-stats $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data, true); unset($output); - - render_page($user, $TAB, 'user/list_stats'); } +// Render page +render_page($user, $TAB, 'list_stats'); + // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/updates/index.php b/web/list/updates/index.php index 8ead39610..ef1f9b179 100644 --- a/web/list/updates/index.php +++ b/web/list/updates/index.php @@ -20,7 +20,7 @@ $autoupdate = $output['0']; unset($output); // Render page -render_page($user, $TAB, 'admin/list_updates'); +render_page($user, $TAB, 'list_updates'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/user/index.php b/web/list/user/index.php index 9b63bbaf2..302e8c144 100644 --- a/web/list/user/index.php +++ b/web/list/user/index.php @@ -15,7 +15,7 @@ $data = json_decode(implode('', $output), true); $data = array_reverse($data,true); // Render page -render_page($user, $TAB, '*/list_user'); +render_page($user, $TAB, 'list_user'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/list/web/index.php b/web/list/web/index.php index 59e455d58..1db6c29c7 100644 --- a/web/list/web/index.php +++ b/web/list/web/index.php @@ -11,7 +11,7 @@ $data = json_decode(implode('', $output), true); $data = array_reverse($data,true); // Render page -render_page($user, $TAB, '*/list_web'); +render_page($user, $TAB, 'list_web'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; diff --git a/web/search/index.php b/web/search/index.php index 5854df795..808b6f41f 100644 --- a/web/search/index.php +++ b/web/search/index.php @@ -30,4 +30,4 @@ exec (VESTA_CMD . $command, $output, $return_var); $data = json_decode(implode('', $output), true); // Render page -render_page($user, $TAB, '*/list_search'); +render_page($user, $TAB, 'list_search');