From e16e92278b4698d782faf232bedd4ad38aa7a5d1 Mon Sep 17 00:00:00 2001 From: Flat Date: Sat, 2 Jul 2016 19:51:56 +0900 Subject: [PATCH] Separate scripts from html & New rendering function --- web/add/cron/index.php | 16 +-- web/add/db/index.php | 19 +-- web/add/dns/index.php | 28 ++-- web/add/firewall/banlist/index.php | 15 +- web/add/firewall/index.php | 15 +- web/add/ip/index.php | 16 +-- web/add/mail/index.php | 25 ++-- web/add/package/index.php | 18 +-- web/add/user/index.php | 16 +-- web/add/web/index.php | 18 +-- web/edit/backup/exclusions/index.php | 14 +- web/edit/cron/index.php | 15 +- web/edit/db/index.php | 19 +-- web/edit/dns/index.php | 29 +--- web/edit/firewall/index.php | 15 +- web/edit/ip/index.php | 18 +-- web/edit/mail/index.php | 28 ++-- web/edit/package/index.php | 16 +-- web/edit/server/index.php | 15 +- web/edit/user/index.php | 23 +--- web/edit/web/index.php | 20 +-- web/generate/ssl/index.php | 30 ++-- web/inc/main.php | 31 ++++- web/list/backup/exclusions/index.php | 15 +- web/list/backup/index.php | 21 +-- web/list/cron/index.php | 20 +-- web/list/db/index.php | 17 +-- web/list/dns/index.php | 26 +--- web/list/firewall/banlist/index.php | 15 +- web/list/firewall/index.php | 15 +- web/list/ip/index.php | 28 ++-- web/list/log/index.php | 15 +- web/list/mail/index.php | 26 +--- web/list/notifications/index.php | 18 +-- web/list/package/index.php | 14 +- web/list/rrd/index.php | 25 ++-- web/list/server/index.php | 14 +- web/list/stats/index.php | 16 +-- web/list/updates/index.php | 30 ++-- web/list/user/index.php | 31 ++--- web/list/web/index.php | 17 +-- web/phpinfo.php | 1 + web/search/index.php | 32 ++--- web/templates/admin/add_db.html | 43 ++---- web/templates/admin/add_db.js.html | 21 +++ web/templates/admin/add_dns.html | 40 ------ web/templates/admin/add_dns.js.html | 35 +++++ web/templates/admin/add_dns_rec.html | 5 - web/templates/admin/add_dns_rec.js.html | 4 + web/templates/admin/add_firewall.html | 16 +-- web/templates/admin/add_firewall.js.html | 6 + web/templates/admin/add_firewall_banlist.html | 14 +- .../admin/add_firewall_banlist.js.html | 6 + web/templates/admin/add_ip.html | 10 -- web/templates/admin/add_ip.js.html | 6 + web/templates/admin/add_mail_acc.html | 48 ------- web/templates/admin/add_mail_acc.js.html | 46 +++++++ web/templates/admin/add_package.html | 49 ++----- web/templates/admin/add_package.js.html | 30 ++++ web/templates/admin/add_user.html | 22 +-- web/templates/admin/add_user.js.html | 18 +++ web/templates/admin/add_web.html | 56 +------- web/templates/admin/add_web.js.html | 45 ++++++ web/templates/admin/edit_db.html | 25 ---- web/templates/admin/edit_db.js.html | 21 +++ web/templates/admin/edit_firewall.html | 16 +-- web/templates/admin/edit_firewall.js.html | 6 + web/templates/admin/edit_ip.html | 18 +-- web/templates/admin/edit_ip.js.html | 6 + web/templates/admin/edit_mail_acc.html | 21 --- web/templates/admin/edit_mail_acc.js.html | 18 +++ web/templates/admin/edit_package.html | 47 ++----- web/templates/admin/edit_package.js.html | 31 +++++ web/templates/admin/edit_server.html | 129 +++++++----------- web/templates/admin/edit_server.js.html | 24 ++++ web/templates/admin/edit_user.html | 49 +------ web/templates/admin/edit_user.js.html | 41 ++++++ web/templates/admin/edit_web.html | 66 ++------- web/templates/admin/edit_web.js.html | 42 ++++++ web/templates/footer.html | 9 +- web/templates/user/edit_user.html | 45 +----- web/templates/user/edit_user.js.html | 41 ++++++ web/templates/user/edit_web.html | 56 +------- web/templates/user/edit_web.js.html | 42 ++++++ 84 files changed, 848 insertions(+), 1280 deletions(-) create mode 100644 web/phpinfo.php create mode 100644 web/templates/admin/add_db.js.html create mode 100644 web/templates/admin/add_dns.js.html create mode 100644 web/templates/admin/add_dns_rec.js.html create mode 100644 web/templates/admin/add_firewall.js.html create mode 100644 web/templates/admin/add_firewall_banlist.js.html create mode 100644 web/templates/admin/add_ip.js.html create mode 100644 web/templates/admin/add_mail_acc.js.html create mode 100644 web/templates/admin/add_package.js.html create mode 100644 web/templates/admin/add_user.js.html create mode 100644 web/templates/admin/add_web.js.html create mode 100644 web/templates/admin/edit_db.js.html create mode 100644 web/templates/admin/edit_firewall.js.html create mode 100644 web/templates/admin/edit_ip.js.html create mode 100644 web/templates/admin/edit_mail_acc.js.html create mode 100644 web/templates/admin/edit_package.js.html create mode 100644 web/templates/admin/edit_server.js.html create mode 100644 web/templates/admin/edit_user.js.html create mode 100644 web/templates/admin/edit_web.js.html create mode 100644 web/templates/user/edit_user.js.html create mode 100644 web/templates/user/edit_web.js.html diff --git a/web/add/cron/index.php b/web/add/cron/index.php index 62cae8f1c..9280f25e3 100644 --- a/web/add/cron/index.php +++ b/web/add/cron/index.php @@ -1,10 +1,9 @@ diff --git a/web/add/dns/index.php b/web/add/dns/index.php index bd890c875..ec9dcbfcf 100644 --- a/web/add/dns/index.php +++ b/web/add/dns/index.php @@ -1,10 +1,9 @@ $value) { $_SESSION[$key] = $value; } -// Header -include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); - -// Panel -top_panel($user,$TAB); - -// Display body -include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_server.html'); +// Render page +render_page($user, $TAB, 'admin/edit_server'); // Flush session messages unset($_SESSION['error_msg']); unset($_SESSION['ok_msg']); - -// Footer -include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); diff --git a/web/edit/user/index.php b/web/edit/user/index.php index 2fbd526a5..3c2288e13 100644 --- a/web/edit/user/index.php +++ b/web/edit/user/index.php @@ -1,10 +1,9 @@ ', $output); if (empty($error)) $error = __('Error code:',$return_var); $_SESSION['error_msg'] = $error; - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/generate_ssl.html'); - include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); + render_page($user, $TAB, 'admin/generate_ssl'); unset($_SESSION['error_msg']); - exit(); + exit; } // OK message @@ -106,6 +97,7 @@ $v_csr = $data[$v_domain]['CSR']; // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; -include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_ssl.html'); -include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); +// Render page +render_page($user, $TAB, 'admin/list_ssl'); + unset($_SESSION['ok_msg']); diff --git a/web/inc/main.php b/web/inc/main.php index 4df0ece95..f3f96b872 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -95,6 +95,33 @@ 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'); + + // Panel + top_panel(empty($_SESSION['look']) ? $_SESSION['user'] : $_SESSION['look'], $TAB); + + // Extarct global variables + // I think those variables should be passed via arguments + //* + extract($GLOBALS, EXTR_SKIP); + /*/ + $variables = array_filter($GLOBALS, function($key){return preg_match('/^(v_|[a-z])[a-z\d]+$/', $key);}, ARRAY_FILTER_USE_KEY); + extract($variables, EXTR_OVERWRITE); + //*/ + + // Body + @include($__template_base . '.html'); + + // Footer + $JS_FILE = $__template_base . '.js.html'; + include($__template_dir . 'footer.html'); +} + function top_panel($user, $TAB) { global $panel; $command = VESTA_CMD."v-list-user '".$user."' 'json'"; @@ -107,7 +134,7 @@ function top_panel($user, $TAB) { unset($output); - // getting notifications + // getting notifications $command = VESTA_CMD."v-list-user-notifications '".$user."' 'json'"; exec ($command, $output, $return_var); $notifications = json_decode(implode('', $output), true); @@ -118,7 +145,7 @@ function top_panel($user, $TAB) { } } unset($output); - + if ( $user == 'admin' ) { include(dirname(__FILE__).'/../templates/admin/panel.html'); diff --git a/web/list/backup/exclusions/index.php b/web/list/backup/exclusions/index.php index d03e98614..c533129cb 100644 --- a/web/list/backup/exclusions/index.php +++ b/web/list/backup/exclusions/index.php @@ -3,22 +3,15 @@ error_reporting(NULL); $TAB = 'BACKUP'; // Main include -include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); - -// Header -include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); - -// Panel -top_panel($user,$TAB); +include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php'); // Data exec (VESTA_CMD."v-list-user-backup-exclusions $user json", $output, $return_var); $data = json_decode(implode('', $output), true); unset($output); -include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup_exclusions.html'); + +// Render page +render_page($user, $TAB, 'admin/list_backup_exclusions'); // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; - -// Footer -include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); diff --git a/web/list/backup/index.php b/web/list/backup/index.php index a79205724..b25284eb1 100644 --- a/web/list/backup/index.php +++ b/web/list/backup/index.php @@ -3,31 +3,24 @@ error_reporting(NULL); $TAB = 'BACKUP'; // Main include -include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); +include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php'); -// Header -include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html'); - -// Panel -top_panel($user,$TAB); - -// Data +// Data & Render page if (empty($_GET['backup'])){ exec (VESTA_CMD."v-list-user-backups $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data,true); unset($output); - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup.html'); + + render_page($user, $TAB, 'admin/list_backup'); } else { - exec (VESTA_CMD."v-list-user-backup $user '".escapeshellarg($_GET['backup'])."' json", $output, $return_var); + 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); - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup_detail.html'); + + render_page($user, $TAB, 'admin/list_backup_detail'); } // Back uri $_SESSION['back'] = $_SERVER['REQUEST_URI']; - -// Footer -include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); diff --git a/web/list/cron/index.php b/web/list/cron/index.php index 19f66379c..5461ba0bf 100644 --- a/web/list/cron/index.php +++ b/web/list/cron/index.php @@ -1,16 +1,9 @@ - + @@ -79,7 +60,7 @@ @@ -100,7 +81,7 @@ @@ -112,13 +93,13 @@ if ((!empty($v_type)) && ( $value == $v_type )) echo ' selected'; echo ">".htmlentities($value).""; } - ?> + ?> @@ -130,14 +111,14 @@ if ((!empty($v_host)) && ( $key == $v_host )) echo ' selected'; echo ">".htmlentities($key).""; } - ?> + ?> @@ -183,7 +164,7 @@ @@ -207,9 +188,3 @@
@@ -68,7 +49,7 @@
- +
- +
- +
- +
- +
- +
- - - diff --git a/web/templates/admin/add_db.js.html b/web/templates/admin/add_db.js.html new file mode 100644 index 000000000..764f37967 --- /dev/null +++ b/web/templates/admin/add_db.js.html @@ -0,0 +1,21 @@ + + diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html index 564ca5fa1..e559166b0 100644 --- a/web/templates/admin/add_dns.html +++ b/web/templates/admin/add_dns.html @@ -32,16 +32,6 @@
- @@ -190,33 +180,3 @@
- diff --git a/web/templates/admin/add_dns.js.html b/web/templates/admin/add_dns.js.html new file mode 100644 index 000000000..c3fefaadd --- /dev/null +++ b/web/templates/admin/add_dns.js.html @@ -0,0 +1,35 @@ + diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html index 76964b4c1..2e65de4a0 100644 --- a/web/templates/admin/add_dns_rec.html +++ b/web/templates/admin/add_dns_rec.html @@ -121,8 +121,3 @@ - - - diff --git a/web/templates/admin/add_dns_rec.js.html b/web/templates/admin/add_dns_rec.js.html new file mode 100644 index 000000000..55358442b --- /dev/null +++ b/web/templates/admin/add_dns_rec.js.html @@ -0,0 +1,4 @@ + + diff --git a/web/templates/admin/add_firewall.html b/web/templates/admin/add_firewall.html index de3d63723..c884e85d2 100644 --- a/web/templates/admin/add_firewall.html +++ b/web/templates/admin/add_firewall.html @@ -32,16 +32,6 @@
- @@ -54,7 +44,7 @@
@@ -67,7 +57,7 @@ @@ -128,4 +118,4 @@
- +
- +
- \ No newline at end of file + diff --git a/web/templates/admin/add_firewall.js.html b/web/templates/admin/add_firewall.js.html new file mode 100644 index 000000000..438d2596f --- /dev/null +++ b/web/templates/admin/add_firewall.js.html @@ -0,0 +1,6 @@ + diff --git a/web/templates/admin/add_firewall_banlist.html b/web/templates/admin/add_firewall_banlist.html index 9c09d8da6..3b1ae2bf9 100644 --- a/web/templates/admin/add_firewall_banlist.html +++ b/web/templates/admin/add_firewall_banlist.html @@ -32,16 +32,6 @@ - @@ -54,7 +44,7 @@
@@ -95,4 +85,4 @@
- +
- \ No newline at end of file + diff --git a/web/templates/admin/add_firewall_banlist.js.html b/web/templates/admin/add_firewall_banlist.js.html new file mode 100644 index 000000000..438d2596f --- /dev/null +++ b/web/templates/admin/add_firewall_banlist.js.html @@ -0,0 +1,6 @@ + diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html index 43b37d5d2..47ca95dfe 100644 --- a/web/templates/admin/add_ip.html +++ b/web/templates/admin/add_ip.html @@ -32,16 +32,6 @@ - diff --git a/web/templates/admin/add_ip.js.html b/web/templates/admin/add_ip.js.html new file mode 100644 index 000000000..438d2596f --- /dev/null +++ b/web/templates/admin/add_ip.js.html @@ -0,0 +1,6 @@ + diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 2dd8c78d9..2b6333755 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -32,53 +32,6 @@ -
@@ -229,4 +182,3 @@
- diff --git a/web/templates/admin/add_mail_acc.js.html b/web/templates/admin/add_mail_acc.js.html new file mode 100644 index 000000000..538b53951 --- /dev/null +++ b/web/templates/admin/add_mail_acc.js.html @@ -0,0 +1,46 @@ + + diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index ec4e675c3..d39a5a98b 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -72,11 +72,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> - + " . strtoupper($_SESSION['WEB_BACKEND']). "" ;?> @@ -96,13 +96,13 @@ } echo ">".$value."\n"; } - ?> + ?> - + - + " .strtoupper($_SESSION['PROXY_SYSTEM']) . "" ;?> @@ -123,11 +123,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> - + " .strtoupper($_SESSION['DNS_SYSTEM']) . "" ;?> @@ -147,7 +147,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> @@ -170,7 +170,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> @@ -380,34 +380,3 @@ - - \ No newline at end of file diff --git a/web/templates/admin/add_package.js.html b/web/templates/admin/add_package.js.html new file mode 100644 index 000000000..b4de83b00 --- /dev/null +++ b/web/templates/admin/add_package.js.html @@ -0,0 +1,30 @@ + + diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html index 7f978c65e..069692c4b 100644 --- a/web/templates/admin/add_user.html +++ b/web/templates/admin/add_user.html @@ -34,24 +34,6 @@
- @@ -112,7 +94,7 @@ } echo ">".htmlentities($key)."\n"; } - ?> + ?> @@ -188,4 +170,4 @@
- \ No newline at end of file + diff --git a/web/templates/admin/add_user.js.html b/web/templates/admin/add_user.js.html new file mode 100644 index 000000000..4a3e7cb02 --- /dev/null +++ b/web/templates/admin/add_user.js.html @@ -0,0 +1,18 @@ + diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 2a9170291..22b6a1dfa 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -33,44 +33,6 @@
- @@ -142,7 +104,7 @@ - +
@@ -164,7 +126,7 @@
- + / @@ -242,7 +204,7 @@ } echo ">" . htmlentities(__($value)) . "\n"; } - ?> + ?> @@ -428,15 +390,3 @@ - - - - diff --git a/web/templates/admin/add_web.js.html b/web/templates/admin/add_web.js.html new file mode 100644 index 000000000..538a50092 --- /dev/null +++ b/web/templates/admin/add_web.js.html @@ -0,0 +1,45 @@ + + diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html index 296f8bef9..ded1c9b53 100644 --- a/web/templates/admin/edit_db.html +++ b/web/templates/admin/edit_db.html @@ -32,26 +32,6 @@ - @@ -146,8 +126,3 @@
- - diff --git a/web/templates/admin/edit_db.js.html b/web/templates/admin/edit_db.js.html new file mode 100644 index 000000000..ae45fd7fe --- /dev/null +++ b/web/templates/admin/edit_db.js.html @@ -0,0 +1,21 @@ + + diff --git a/web/templates/admin/edit_firewall.html b/web/templates/admin/edit_firewall.html index 60a13e164..f95557ace 100644 --- a/web/templates/admin/edit_firewall.html +++ b/web/templates/admin/edit_firewall.html @@ -32,16 +32,6 @@
- @@ -60,7 +50,7 @@
@@ -73,7 +63,7 @@ @@ -130,4 +120,4 @@
- +
- +
- \ No newline at end of file + diff --git a/web/templates/admin/edit_firewall.js.html b/web/templates/admin/edit_firewall.js.html new file mode 100644 index 000000000..c55772c7e --- /dev/null +++ b/web/templates/admin/edit_firewall.js.html @@ -0,0 +1,6 @@ + diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html index 4d013f005..aef5f9929 100644 --- a/web/templates/admin/edit_ip.html +++ b/web/templates/admin/edit_ip.html @@ -32,16 +32,6 @@
- @@ -60,7 +50,7 @@
@@ -70,7 +60,7 @@ @@ -80,7 +70,7 @@ @@ -153,4 +143,4 @@
- +
- +
- +
- \ No newline at end of file + diff --git a/web/templates/admin/edit_ip.js.html b/web/templates/admin/edit_ip.js.html new file mode 100644 index 000000000..c55772c7e --- /dev/null +++ b/web/templates/admin/edit_ip.js.html @@ -0,0 +1,6 @@ + diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index c4ae09266..b22f2c325 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -32,26 +32,6 @@
- @@ -163,4 +143,3 @@
- diff --git a/web/templates/admin/edit_mail_acc.js.html b/web/templates/admin/edit_mail_acc.js.html new file mode 100644 index 000000000..5c71cf16b --- /dev/null +++ b/web/templates/admin/edit_mail_acc.js.html @@ -0,0 +1,18 @@ + + diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 4480fa825..f8519cd17 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -72,11 +72,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> - + " .strtoupper($_SESSION['WEB_BACKEND']) . "";?> @@ -96,12 +96,12 @@ } echo ">".$value."\n"; } - ?> + ?> - - + + " .strtoupper($_SESSION['PROXY_SYSTEM']) . "";?> @@ -121,11 +121,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> - + " .strtoupper($_SESSION['DNS_SYSTEM']) . "";?> @@ -145,7 +145,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> @@ -381,34 +381,3 @@ - - \ No newline at end of file diff --git a/web/templates/admin/edit_package.js.html b/web/templates/admin/edit_package.js.html new file mode 100644 index 000000000..ced6604c3 --- /dev/null +++ b/web/templates/admin/edit_package.js.html @@ -0,0 +1,31 @@ + + diff --git a/web/templates/admin/edit_server.html b/web/templates/admin/edit_server.html index 20e494537..b6400e156 100644 --- a/web/templates/admin/edit_server.html +++ b/web/templates/admin/edit_server.html @@ -33,16 +33,7 @@
- + @@ -245,7 +236,7 @@
@@ -54,7 +45,7 @@ @@ -82,7 +73,7 @@ } echo ">".$value."\n"; } - ?> + ?>

@@ -106,7 +97,7 @@ } echo ">".$value."\n"; } - ?> + ?>

@@ -121,10 +112,10 @@ @@ -187,7 +178,7 @@
- +
- + @@ -133,10 +124,10 @@

- + @@ -145,10 +136,10 @@

- + @@ -159,7 +150,7 @@ @@ -169,7 +160,7 @@ - +
- +
- +
- +
- +
@@ -215,10 +206,10 @@ $i = 0; foreach ($dns_cluster as $key => $value) { $i++; - ?> + ?> @@ -227,7 +218,7 @@

- +
- +
- +
@@ -254,10 +245,10 @@

- + @@ -266,11 +257,11 @@

- - + + @@ -279,10 +270,10 @@

- + @@ -324,7 +315,7 @@ @@ -338,10 +329,10 @@ $i = 0; foreach ($v_mysql_hosts as $key => $value) { $i++; - ?> + ?> @@ -352,7 +343,7 @@ @@ -364,7 +355,7 @@ @@ -375,7 +366,7 @@ @@ -384,7 +375,7 @@



- + @@ -404,7 +395,7 @@ @@ -418,10 +409,10 @@ $i = 0; foreach ($v_pgsql_hosts as $key => $value) { $i++; - ?> + ?> @@ -432,7 +423,7 @@ @@ -443,7 +434,7 @@ @@ -452,7 +443,7 @@



- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -470,7 +461,7 @@ @@ -484,7 +475,7 @@ @@ -505,7 +496,7 @@ @@ -524,7 +515,7 @@ - + @@ -296,7 +263,7 @@ } echo ">". htmlentities(__($value)) ."\n"; } - ?> + ?> @@ -430,7 +397,7 @@
- +
- +
- +
@@ -538,7 +529,7 @@ @@ -549,7 +540,7 @@ @@ -560,7 +551,7 @@ @@ -571,7 +562,7 @@ @@ -599,7 +590,7 @@
- +
- +
- +
- +
- +
@@ -638,7 +629,7 @@ @@ -651,7 +642,7 @@ @@ -690,7 +681,7 @@ '.__('Licence Key').':
'; } else { - echo + echo __('Restrict users so that they cannot use SSH and access only their home directory.').' '.__('This is a commercial module, you would need to purchace license key to enable it.'). '
'.__('Enter License Key').':
@@ -712,7 +703,7 @@
@@ -778,23 +769,3 @@
- +
- +
- +
- +
- - \ No newline at end of file diff --git a/web/templates/admin/edit_server.js.html b/web/templates/admin/edit_server.js.html new file mode 100644 index 000000000..2582fc5c7 --- /dev/null +++ b/web/templates/admin/edit_server.js.html @@ -0,0 +1,24 @@ + diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html index 8717ce3f6..6ccb03f3b 100644 --- a/web/templates/admin/edit_user.html +++ b/web/templates/admin/edit_user.html @@ -32,18 +32,7 @@
- + @@ -130,7 +119,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> @@ -171,7 +160,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?> @@ -264,33 +253,3 @@
@@ -106,7 +95,7 @@ } echo ">".htmlentities($key)."\n"; } - ?> + ?>
- \ No newline at end of file diff --git a/web/templates/admin/edit_user.js.html b/web/templates/admin/edit_user.js.html new file mode 100644 index 000000000..1b906fc13 --- /dev/null +++ b/web/templates/admin/edit_user.js.html @@ -0,0 +1,41 @@ + diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index 51822ec78..7ace1abca 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -32,40 +32,7 @@
- - + - - + + @@ -217,7 +184,7 @@
@@ -141,11 +108,11 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?>
" . strtoupper($_SESSION['WEB_BACKEND']) . "";?> @@ -166,12 +133,12 @@ } echo ">".$value."\n"; } - ?> + ?>
@@ -200,7 +167,7 @@ } echo ">".htmlentities($value)."\n"; } - ?> + ?>
/ @@ -247,7 +214,7 @@
- +
- +
# () @@ -485,16 +452,3 @@
- - - diff --git a/web/templates/admin/edit_web.js.html b/web/templates/admin/edit_web.js.html new file mode 100644 index 000000000..79e1b235d --- /dev/null +++ b/web/templates/admin/edit_web.js.html @@ -0,0 +1,42 @@ + + diff --git a/web/templates/footer.html b/web/templates/footer.html index b67ab41b8..e0bd4dea5 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -7,9 +7,12 @@ - - + + - diff --git a/web/templates/user/edit_user.js.html b/web/templates/user/edit_user.js.html new file mode 100644 index 000000000..1b906fc13 --- /dev/null +++ b/web/templates/user/edit_user.js.html @@ -0,0 +1,41 @@ + diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index 878e91402..aef2cd674 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -32,40 +32,7 @@
- - +
@@ -124,7 +91,7 @@
@@ -146,7 +113,7 @@
- + / @@ -176,7 +143,7 @@ - + @@ -225,7 +192,7 @@ } echo ">". htmlentities(__($value)) ."\n"; } - ?> + ?> @@ -359,7 +326,7 @@ - - - diff --git a/web/templates/user/edit_web.js.html b/web/templates/user/edit_web.js.html new file mode 100644 index 000000000..3546f0fd9 --- /dev/null +++ b/web/templates/user/edit_web.js.html @@ -0,0 +1,42 @@ + +