From f182841fdae9239802485e471eb7f37cfb1ef82c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 26 Jan 2014 21:25:42 +0200 Subject: [PATCH 01/16] fixed months associations for awstats index --- bin/v-update-web-domain-stat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat index ba80a5c1d..0443d187b 100755 --- a/bin/v-update-web-domain-stat +++ b/bin/v-update-web-domain-stat @@ -110,7 +110,7 @@ build_awstats() { grep -v icon | sort -r ) for link in $months; do year=$(echo $link |cut -f 1 -d \-) - month=$(echo $link |cut -f 2 -d \-) + month=$(echo $link |cut -f 2 -d \-| sed -e "s/^0//") case "$month" in 1) month='January';; 2) month='February';; From d23b35c9d18311425d251dfa0d7a75a412aa332b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 26 Jan 2014 22:19:39 +0200 Subject: [PATCH 02/16] updated cron list layout --- web/templates/admin/list_cron.html | 2 +- web/templates/user/list_cron.html | 111 +++++++++++------------------ 2 files changed, 41 insertions(+), 72 deletions(-) diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html index 481e26cf3..e5225aea3 100644 --- a/web/templates/admin/list_cron.html +++ b/web/templates/admin/list_cron.html @@ -118,7 +118,7 @@ - +
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html index 4922a41a5..68cc693c8 100644 --- a/web/templates/user/list_cron.html +++ b/web/templates/user/list_cron.html @@ -6,8 +6,8 @@
- - + +
@@ -33,10 +33,8 @@ ++$i; if ($data[$key]['SUSPENDED'] == 'yes') { $status = 'suspended'; - $spnd_action = 'unsuspend' ; } else { $status = 'active'; - $spnd_action = 'suspend'; } ?> @@ -67,81 +65,52 @@ - - - - - - +
+
- - - - - - - -
- -
- -
+ 		+
+ +
+
+ +
- - - - - - - -
- -
- -
+ 		+
+ +
+
+ +
- - - - - - - -
- -
- -
+ 		+
+ +
+
+ +
- - - - - - - -
- -
- -
+ 		+
+ +
+
+ +
- - - - - - - -
- -
- -
+ 		+
+ +
+
+ +
@@ -155,7 +124,7 @@ - +
Date: Sun, 26 Jan 2014 22:21:15 +0200 Subject: [PATCH 03/16] symmetric padding for multiple selector --- web/css/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/css/main.css b/web/css/main.css index 619a3c796..9da8e43f8 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -263,7 +263,7 @@ form { .submenu-select-block { float:left; - padding-left: 22px; + padding-left: 31px; } .submenu-select-link { @@ -274,7 +274,7 @@ form { letter-spacing: 0.1em; margin: 7px 7px 0 0; text-decoration: none; - padding: 0 4px 0 14px + padding: 0 4px } .submenu-select-link:hover { From abba4ab84c2540ab590af8c2d5b3dc3413ed150e Mon Sep 17 00:00:00 2001 From: Disketsa - Azuya Date: Mon, 27 Jan 2014 23:50:25 +0700 Subject: [PATCH 04/16] Update id.php rev1 --- web/inc/i18n/id.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index 0f8169439..5f20aa422 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -128,10 +128,10 @@ $LANG['id'] = array( 'minute' => 'menit', 'hour' => 'jam', 'day' => 'hari', - 'days' => 'beberapa hari', - 'hours' => 'beberapa jam', - 'minutes' => 'beberapa jam', - 'month' => 'beberapa month', + 'days' => ' hari', + 'hours' => ' jam', + 'minutes' => ' jam', + 'month' => ' month', 'package' => 'paket', 'Bandwidth' => 'Bandwidth', 'Disk' => 'Cakram', @@ -205,7 +205,7 @@ $LANG['id'] = array( 'Bandwidth Usage eth0' => 'Penggunaan Bandwidth eth0', 'FTP Usage' => 'Penggunaan FTP', 'SSH Usage' => 'Penggunaan SSH', - 'reverse proxy' => 'membalikkan proxy', + 'reverse proxy' => 'reverse proxy', 'web server' => 'server web', 'dns server' => 'server dns', 'mail server' => 'server mail', @@ -363,7 +363,7 @@ $LANG['id'] = array( 'IP_CREATED_OK' => 'Alamat IP %s udah berhasil dibikin.', 'PACKAGE_CREATED_OK' => 'Paket %s udah berhasil dibikin.', 'SSL_GENERATED_OK' => 'Sertifikat udah berhasil dihasilkan.', - 'Changes has been saved.' => 'PErubahan udah disimpan.', + 'Changes has been saved.' => 'Perubahan udah disimpan.', 'Confirmation' => 'Konfirmasi', 'DELETE_USER_CONFIRMATION' => 'Yakin pengguna %s mau dihapus nih?', 'SUSPEND_USER_CONFIRMATION' => 'Yakin pengguna %s mau ditangguhkan nih?', From f8178b16d7881f852c0ee9d0af31861c3de351b5 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 4 Feb 2014 11:21:19 +0200 Subject: [PATCH 05/16] same template for users and admin --- web/add/dns/index.php | 19 +- web/add/web/index.php | 5 - web/templates/user/add_dns.html | 143 ------------- web/templates/user/add_web.html | 365 -------------------------------- 4 files changed, 11 insertions(+), 521 deletions(-) delete mode 100644 web/templates/user/add_dns.html delete mode 100644 web/templates/user/add_web.html diff --git a/web/add/dns/index.php b/web/add/dns/index.php index e62f7a686..8f6ec6c8e 100644 --- a/web/add/dns/index.php +++ b/web/add/dns/index.php @@ -40,14 +40,14 @@ if (!empty($_POST['ok'])) { $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); } else { // Add DNS - exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4, $output, $return_var); + exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$v_ns4." no", $output, $return_var); check_return_code($return_var,$output); unset($output); // Change Expiriation date if ((!empty($_POST['v_exp'])) && ($_POST['v_exp'] != date('Y-m-d', strtotime('+1 year')))) { $v_exp = escapeshellarg($_POST['v_exp']); - exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp, $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp." no", $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -55,7 +55,7 @@ if (!empty($_POST['ok'])) { // Change TTL if ((!empty($_POST['v_ttl'])) && ($_POST['v_ttl'] != '14400') && (empty($_SESSION['error_msg']))) { $v_ttl = escapeshellarg($_POST['v_ttl']); - exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl, $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl." no", $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -64,6 +64,13 @@ if (!empty($_POST['ok'])) { $_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]); unset($v_domain); } + + if (empty($_SESSION['error_msg'])) { + exec (VESTA_CMD."v-restart-dns", $output, $return_var); + check_return_code($return_var,$output); + unset($output); + } + } } @@ -120,11 +127,7 @@ if ((empty($_GET['domain'])) && (empty($_POST['domain']))) { } if (empty($v_ttl)) $v_ttl = 14400; if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year')); - if ($_SESSION['user'] == 'admin') { - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html'); - } else { - include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_dns.html'); - } + include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html'); unset($_SESSION['error_msg']); unset($_SESSION['ok_msg']); } else { diff --git a/web/add/web/index.php b/web/add/web/index.php index 394fb7bc6..db4f525ed 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -272,12 +272,7 @@ $v_ftp_email = $panel[$user]['CONTACT']; $stats = json_decode(implode('', $output), true); unset($output); -// Are you admin? -if ($_SESSION['user'] == 'admin') { include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_web.html'); -} else { - include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_web.html'); -} unset($_SESSION['error_msg']); unset($_SESSION['ok_msg']); //} diff --git a/web/templates/user/add_dns.html b/web/templates/user/add_dns.html deleted file mode 100644 index e9fbb8d33..000000000 --- a/web/templates/user/add_dns.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - -
- → ".$_SESSION['error_msg'].""; - } else { - if (!empty($_SESSION['ok_msg'])) { - echo " → ".$_SESSION['ok_msg'].""; - } - } - ?> -
- - -
- - - - - -
- - -
- 		- - - - -
- - - - - - - - - - - - - -
- -
- - -
- - -
- - - - - - - - - - - - - - - -
- () -
- - TTL -
- - -
- -
- - - -
-
- diff --git a/web/templates/user/add_web.html b/web/templates/user/add_web.html deleted file mode 100644 index a55e1797e..000000000 --- a/web/templates/user/add_web.html +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - -
- → ".$_SESSION['error_msg'].""; - } else { - if (!empty($_SESSION['ok_msg'])) { - echo " → ".$_SESSION['ok_msg'].""; - } - } - ?> -
- -
- - - - - -
- - - - -
- 		- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - -
- -
- -
- > -
- -
- > -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- onclick="javascript:elementHideShow('proxytable');"> -
- - - - - - - -
- -
- -
-
- / - -
- onclick="javascript:elementHideShow('ssltable');"> -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- () -
- -
-
- -
- -
- -
- onclick="javascript:elementHideShow('statstable');"> -
- - - - - - - - - - -
- -
- - / -
- -
-
- -
- onclick="javascript:elementHideShow('ftptable');"> -
- - - - - - - - - - - - - - - - - - -
-
- -
- -
- / -
- - -
- -
- - - -
-
- - - From 4b24b4e1b23afd06183e4cf6b66b54817ac5dc84 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 4 Feb 2014 11:23:09 +0200 Subject: [PATCH 06/16] new html layout using border-collapse --- web/css/main.css | 50 +++++++++------- web/templates/admin/add_cron.html | 23 +++----- web/templates/admin/add_db.html | 27 ++++----- web/templates/admin/add_dns.html | 23 +++----- web/templates/admin/add_dns_rec.html | 21 +++---- web/templates/admin/add_ip.html | 23 +++----- web/templates/admin/add_mail.html | 19 +++---- web/templates/admin/add_mail_acc.html | 39 ++++++------- web/templates/admin/add_package.html | 47 +++++++-------- web/templates/admin/add_user.html | 30 ++++------ web/templates/admin/add_web.html | 55 ++++++++---------- web/templates/admin/edit_cron.html | 24 +++----- web/templates/admin/edit_db.html | 23 +++----- web/templates/admin/edit_dns.html | 25 ++++---- web/templates/admin/edit_dns_rec.html | 25 ++++---- web/templates/admin/edit_ip.html | 25 ++++---- web/templates/admin/edit_mail.html | 23 +++----- web/templates/admin/edit_mail_acc.html | 33 +++++------ web/templates/admin/edit_package.html | 47 +++++++-------- web/templates/admin/edit_user.html | 32 +++++------ web/templates/admin/edit_web.html | 54 ++++++++---------- web/templates/admin/generate_ssl.html | 22 +++---- web/templates/admin/list_backup.html | 30 ++++------ web/templates/admin/list_backup_detail.html | 55 +++++++++--------- web/templates/admin/list_cron.html | 16 +++--- web/templates/admin/list_db.html | 22 +++---- web/templates/admin/list_dns.html | 22 +++---- web/templates/admin/list_dns_rec.html | 20 +++---- web/templates/admin/list_ip.html | 16 +++--- web/templates/admin/list_log.html | 10 ++-- web/templates/admin/list_mail.html | 22 +++---- web/templates/admin/list_mail_acc.html | 29 ++++------ web/templates/admin/list_packages.html | 38 ++++++------- web/templates/admin/list_rrd.html | 14 ++--- web/templates/admin/list_search.html | 20 +++---- web/templates/admin/list_services.html | 58 ++++++++----------- web/templates/admin/list_ssl.html | 19 +++---- web/templates/admin/list_stats.html | 40 ++++++------- web/templates/admin/list_updates.html | 40 +++++-------- web/templates/admin/list_user.html | 42 +++++++------- web/templates/admin/list_web.html | 36 ++++++------ web/templates/user/edit_dns.html | 42 +++++++------- web/templates/user/edit_user.html | 40 ++++++------- web/templates/user/edit_web.html | 63 ++++++++++----------- web/templates/user/list_cron.html | 20 ++++--- web/templates/user/list_db.html | 30 +++++----- web/templates/user/list_dns.html | 31 +++++----- web/templates/user/list_dns_rec.html | 28 ++++----- web/templates/user/list_mail.html | 56 +++++++++--------- web/templates/user/list_mail_acc.html | 38 ++++++------- web/templates/user/list_search.html | 63 ++++++++++++++------- web/templates/user/list_stats.html | 42 +++++++------- web/templates/user/list_user.html | 55 +++++++++--------- web/templates/user/list_web.html | 37 ++++++------ 54 files changed, 831 insertions(+), 953 deletions(-) diff --git a/web/css/main.css b/web/css/main.css index 9da8e43f8..d306de594 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -10,6 +10,16 @@ form { margin: 0; } + +table { + border-collapse: collapse; +} + +td { + padding: 0; +} + + .hidden { display: none; } @@ -263,7 +273,7 @@ form { .submenu-select-block { float:left; - padding-left: 31px; + padding-left: 30px; } .submenu-select-link { @@ -441,10 +451,9 @@ form { .data-dotted { text-align: left; vertical-align:top; - border-top:1px dotted #d3d3d3; + border-top: 1px dotted #d3d3d3; padding: 0 0 26px 0; margin: 0; - width: 166px; } .data-dotted td { @@ -453,33 +462,33 @@ form { .data-col1 { text-align: left; - padding:0; + padding: 0; + width: 173px; } .data-col1 tr td { - padding:0 0 6px 24px; + padding:2px 0 6px 26px; } .data-col1 tr:first-child td { - padding:22px 0 0 24px; + padding:24px 0 0 26px; } .data-col2 { text-align: left; - padding: 0; overflow: hidden; + width: 827px; } .data-col5 { - table-layout: fixed; text-align: left; - padding: 0; overflow: hidden; + width: 817px; + table-layout: fixed; white-space: nowrap; } .data-date { - padding: 0 0 0 18; letter-spacing: 0.3em; font-size: 8pt; color: #6A6A6A @@ -489,14 +498,12 @@ form { font-size: 8pt; letter-spacing: 0.1em; color: #81a64f; - padding: 0 0 13 18; } .data-suspended { font-size: 8pt; letter-spacing: 0.1em; color: #de5543; - padding: 0 0 13 18; } .data-controls { @@ -504,7 +511,7 @@ form { height: 16px; border-left: 1px solid #d3d3d3; font-size: 8pt; - padding: 2px 12px 0 6px; + padding: 2px 12px 1px 6px; letter-spacing: 0.1em; color: #2361a1; text-decoration: none; @@ -546,21 +553,25 @@ form { .username { color: #222; font-size: 14pt; + padding: 1px 0 2px 0; } .domain { color: #222; font-size: 14pt; + padding: 1px 0 2px 0; } .cron { color: #222; font-size: 18px; + padding: 1px 0 2px 0; } .log { color: #222; font-size: 12pt; + padding: 1px 0 2px 0; } .aliases { @@ -587,14 +598,14 @@ form { line-height: 1.3em; font-size: 10pt; color: #222; - padding: 0 4px 0 0; + padding: 2px 4px 1px 0; } .cron-counter-name { vertical-align:top; line-height: 0.8em; font-size: 8pt; - padding: 4 0 0 0; + padding: 4px 0 0 0; color: #222; } @@ -603,7 +614,7 @@ form { line-height: 1.3em; font-size: 10pt; color: #222; - padding: 0 0 0 2px; + padding: 2px 0 1px 2px; } .log-counter-value { @@ -685,7 +696,7 @@ form { padding: 5px; width: 360px; height: 28px; - margin: 0 6px 0 0; + margin: 2px 6px 0 0; } .vst-input:hover { @@ -706,6 +717,7 @@ form { color: #555; height: 30px; min-width: 138px; + margin: 2px 6px 0 0; } @-moz-document url-prefix() { @@ -718,6 +730,7 @@ form { padding: 5px; font-size: 12pt; border: 1px solid #f7f6ed; + margin: 2px 6px 0 0; } .vst-checkbox:hover { @@ -857,7 +870,6 @@ form { vertical-align:top; width: 500px; height: 50px; - padding: 0 8px 0 0; margin: 0; } @@ -865,7 +877,7 @@ form { font-size: 8pt; color: #222; text-align: right; - padding: 20px 0 0 0; + padding: 0 8px 0 0; } .error { diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html index 9c0c43d75..c988cba9b 100644 --- a/web/templates/admin/add_cron.html +++ b/web/templates/admin/add_cron.html @@ -8,7 +8,7 @@ ?> -
+ → ".$_SESSION['error_msg'].""; @@ -26,20 +26,15 @@
- -
+
- - - - -
+ 		- @@ -49,7 +44,7 @@ - @@ -59,7 +54,7 @@ - @@ -69,7 +64,7 @@ - @@ -79,7 +74,7 @@ - @@ -89,7 +84,7 @@ - diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html index ad6952e91..438824ab3 100644 --- a/web/templates/admin/add_db.html +++ b/web/templates/admin/add_db.html @@ -8,7 +8,7 @@ ?>
+
+
+
+
+
+
-
+ → ".$_SESSION['error_msg'].""; @@ -46,25 +46,20 @@ - -
+
- - - - -
+ 		- - @@ -75,7 +70,7 @@ - @@ -86,7 +81,7 @@ - @@ -96,7 +91,7 @@ - @@ -114,7 +109,7 @@ - @@ -133,7 +128,7 @@ - @@ -179,7 +174,7 @@ - diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html index 727d1489a..c7d042594 100644 --- a/web/templates/admin/add_dns.html +++ b/web/templates/admin/add_dns.html @@ -8,7 +8,7 @@ ?>
+
+
+
+ /
+
+
+
+
-
+ → ".$_SESSION['error_msg'].""; @@ -37,20 +37,15 @@ - -
+
- - - - -
+ 		- @@ -60,7 +55,7 @@ - @@ -70,7 +65,7 @@ - @@ -78,7 +73,7 @@
+
+
+
- @@ -88,7 +83,7 @@ - @@ -98,7 +93,7 @@ - diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html index 44024745c..2fe3be4db 100644 --- a/web/templates/admin/add_dns_rec.html +++ b/web/templates/admin/add_dns_rec.html @@ -8,7 +8,7 @@ ?>
+ ()
+ TTL
+
-
+ → ".$_SESSION['error_msg'].""; @@ -26,20 +26,15 @@ - -
+
- - - - -
+ 		- @@ -49,7 +44,7 @@ - @@ -59,7 +54,7 @@ - @@ -82,7 +77,7 @@ - @@ -92,7 +87,7 @@ - diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html index fdf03a080..2957bd6c4 100644 --- a/web/templates/admin/add_ip.html +++ b/web/templates/admin/add_ip.html @@ -8,7 +8,7 @@ ?>
+
+
+
+
+ ()
-
+ → ".$_SESSION['error_msg'].""; @@ -37,20 +37,15 @@ - -
+
- - - - -
+ 		- @@ -60,7 +55,7 @@ - @@ -70,7 +65,7 @@ - @@ -88,7 +83,7 @@ - @@ -122,7 +117,7 @@ - @@ -132,7 +127,7 @@ - diff --git a/web/templates/admin/add_mail.html b/web/templates/admin/add_mail.html index 006648aef..3c839b482 100644 --- a/web/templates/admin/add_mail.html +++ b/web/templates/admin/add_mail.html @@ -8,7 +8,7 @@ ?>
+
+
+
+
+ ()
+ ()
-
+ → ".$_SESSION['error_msg'].""; @@ -26,20 +26,15 @@ - -
+
- - - - -
+ 		- @@ -49,7 +44,7 @@ - @@ -59,7 +54,7 @@ - @@ -69,7 +64,7 @@ - diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index 0ddb92d4c..bbf943e62 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -8,7 +8,7 @@ ?>
+
+
+
+
-
+ → ".$_SESSION['error_msg'].""; @@ -47,20 +47,15 @@ - -
+
- - - - -
+ 		- @@ -70,7 +65,7 @@ - @@ -80,7 +75,7 @@ - @@ -90,16 +85,16 @@ - - -
+
+
+ /
+
+ - @@ -108,8 +103,8 @@ - @@ -118,8 +113,8 @@ - @@ -128,7 +123,7 @@ - @@ -154,5 +149,5 @@
- () + + ()
- () + + ()
- () + + ()
+
- +
+ diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index 90ba8f02f..56777f656 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -9,7 +9,7 @@ -
+ → ".$_SESSION['error_msg'].""; @@ -27,20 +27,15 @@
- -
+
- +
+ - - -
- - - @@ -50,7 +45,7 @@ - @@ -73,7 +68,7 @@ - @@ -96,7 +91,7 @@ - @@ -119,7 +114,7 @@ - @@ -142,7 +137,7 @@ - @@ -152,7 +147,7 @@ - @@ -162,7 +157,7 @@ - @@ -172,7 +167,7 @@ - @@ -182,7 +177,7 @@ - @@ -192,7 +187,7 @@ - @@ -202,7 +197,7 @@ - @@ -212,7 +207,7 @@ - @@ -222,7 +217,7 @@ - @@ -232,7 +227,7 @@ - @@ -242,7 +237,7 @@ - @@ -252,7 +247,7 @@ - diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html index fe1bc63eb..b645e7ac9 100644 --- a/web/templates/admin/add_user.html +++ b/web/templates/admin/add_user.html @@ -8,7 +8,7 @@ ?>
+
+
+
+
+
+
+ ()
+
+ ()
+
+ ()
+
+
+
+ ()
+ ()
+
-
+ → ".$_SESSION['error_msg'].""; @@ -45,21 +45,15 @@ - -
+
- +
+ - - -
- - - - @@ -69,7 +63,7 @@ - @@ -79,7 +73,7 @@ - @@ -89,7 +83,7 @@ - @@ -113,7 +107,7 @@ - @@ -139,7 +133,7 @@ - @@ -149,7 +143,7 @@ - @@ -159,7 +153,7 @@ - diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 920cdec92..c1ef3db55 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -8,7 +8,7 @@ ?>
+
+ /
+
+
+
+
+
+
-
+ → ".$_SESSION['error_msg'].""; @@ -65,22 +65,17 @@ - -
+
- +
+ - - -
- - - @@ -90,7 +85,7 @@ - @@ -112,7 +107,7 @@ - @@ -122,7 +117,7 @@ - @@ -132,14 +127,14 @@ -
+
+
+
+
+
- @@ -149,7 +144,7 @@ - @@ -162,7 +157,7 @@
+
+
- @@ -175,7 +170,7 @@ - @@ -189,7 +184,7 @@
+
+ / - @@ -206,7 +201,7 @@ - @@ -216,7 +211,7 @@ - @@ -226,7 +221,7 @@ - @@ -239,7 +234,7 @@ - @@ -261,7 +256,7 @@ - @@ -274,7 +269,7 @@
+
+
+
+ ()
+
+
- @@ -284,7 +279,7 @@ - @@ -297,7 +292,7 @@ - @@ -310,7 +305,7 @@
+
+ /
+
- @@ -322,7 +317,7 @@ - @@ -332,7 +327,7 @@ - diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html index e578adb43..9a6cd1bcb 100644 --- a/web/templates/admin/edit_cron.html +++ b/web/templates/admin/edit_cron.html @@ -8,7 +8,7 @@ ?>
+
+ /
+
-
+ → ".$_SESSION['error_msg'].""; @@ -26,7 +26,7 @@ - -
+
@@ -37,16 +37,10 @@
- - - - -
- + 		- @@ -56,7 +50,7 @@ - @@ -66,7 +60,7 @@ - @@ -76,7 +70,7 @@ - @@ -86,7 +80,7 @@ - @@ -96,7 +90,7 @@ - diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html index 28d36fc88..8a7af352d 100644 --- a/web/templates/admin/edit_db.html +++ b/web/templates/admin/edit_db.html @@ -8,7 +8,7 @@ ?>
+
+
+
+
+
+
-
+ → ".$_SESSION['error_msg'].""; @@ -47,7 +47,7 @@ - -
+
@@ -58,15 +58,10 @@
- - - - -
+ 		- @@ -77,7 +72,7 @@ - @@ -88,7 +83,7 @@ - @@ -98,7 +93,7 @@ - @@ -108,7 +103,7 @@ - @@ -118,7 +113,7 @@ - diff --git a/web/templates/admin/edit_dns.html b/web/templates/admin/edit_dns.html index b1832e1fb..017ffca65 100644 --- a/web/templates/admin/edit_dns.html +++ b/web/templates/admin/edit_dns.html @@ -8,7 +8,7 @@ ?>
+
+
+ /
+
+
+
-
+ → ".$_SESSION['error_msg'].""; @@ -26,7 +26,7 @@ - -
+
@@ -37,15 +37,10 @@
- +
+ - - -
- - - @@ -55,7 +50,7 @@ - @@ -65,7 +60,7 @@ - @@ -86,7 +81,7 @@ - @@ -96,7 +91,7 @@ - @@ -106,7 +101,7 @@ - diff --git a/web/templates/admin/edit_dns_rec.html b/web/templates/admin/edit_dns_rec.html index c66906b7c..ad900fa75 100644 --- a/web/templates/admin/edit_dns_rec.html +++ b/web/templates/admin/edit_dns_rec.html @@ -8,7 +8,7 @@ ?>
+
+
+
+ ()
+ SOA
+ TTL
-
+ → ".$_SESSION['error_msg'].""; @@ -26,7 +26,7 @@ - -
+
@@ -37,15 +37,10 @@
- +
+ - - -
- - - @@ -56,7 +51,7 @@ - @@ -66,7 +61,7 @@ - @@ -76,7 +71,7 @@ - @@ -86,7 +81,7 @@ - @@ -96,7 +91,7 @@ - diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html index e077e641e..49e97b1c5 100644 --- a/web/templates/admin/edit_ip.html +++ b/web/templates/admin/edit_ip.html @@ -8,7 +8,7 @@ ?>
+
+
+
+
+ ()
+ ()
-
+ → ".$_SESSION['error_msg'].""; @@ -38,7 +38,7 @@ - -
+
@@ -49,15 +49,10 @@
- - - - -
+ 		- @@ -67,7 +62,7 @@ - @@ -77,7 +72,7 @@ - @@ -87,7 +82,7 @@ - @@ -97,7 +92,7 @@ - @@ -115,7 +110,7 @@ - @@ -125,7 +120,7 @@ - diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html index b916b1358..4f4e82006 100644 --- a/web/templates/admin/edit_mail.html +++ b/web/templates/admin/edit_mail.html @@ -8,7 +8,7 @@ ?>
+
+
+
+
+
+ ()
+ ()
-
+ → ".$_SESSION['error_msg'].""; @@ -26,7 +26,7 @@ - -
+
@@ -37,15 +37,10 @@
- +
+ - - -
- - - @@ -55,7 +50,7 @@ - @@ -65,7 +60,7 @@ - @@ -75,7 +70,7 @@ - @@ -85,7 +80,7 @@ - diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index a2c9c828e..c427685b1 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -9,7 +9,7 @@
+
+
+
+
+
-
+ → ".$_SESSION['error_msg'].""; @@ -48,7 +48,7 @@ - -
+
@@ -59,15 +59,10 @@
- - - - -
+ 		- @@ -79,7 +74,7 @@ - @@ -89,8 +84,8 @@ - @@ -99,8 +94,8 @@ - @@ -109,8 +104,8 @@ - @@ -119,7 +114,7 @@ - @@ -129,7 +124,7 @@ - @@ -142,7 +137,7 @@
+
+ /
- () + + ()
- () + + ()
- () + + ()
+
+
- diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index f310dabab..079d637b5 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -8,7 +8,7 @@ ?>
+
-
+ → ".$_SESSION['error_msg'].""; @@ -26,7 +26,7 @@ - -
+
@@ -37,15 +37,10 @@
- +
+ - - -
- - - @@ -56,7 +51,7 @@ - @@ -79,7 +74,7 @@ - @@ -102,7 +97,7 @@ - @@ -125,7 +120,7 @@ - @@ -148,7 +143,7 @@ - @@ -158,7 +153,7 @@ - @@ -168,7 +163,7 @@ - @@ -178,7 +173,7 @@ - @@ -188,7 +183,7 @@ - @@ -198,7 +193,7 @@ - @@ -208,7 +203,7 @@ - @@ -218,7 +213,7 @@ - @@ -228,7 +223,7 @@ - @@ -238,7 +233,7 @@ - @@ -248,7 +243,7 @@ - @@ -258,7 +253,7 @@ - diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html index 5c2615942..c1b93a3c5 100644 --- a/web/templates/admin/edit_user.html +++ b/web/templates/admin/edit_user.html @@ -8,7 +8,7 @@ ?>
+
+
+
+
+
+
+ ()
+
+ ()
+
+ ()
+
+
+
+ ()
+ ()
+
-
+ → ".$_SESSION['error_msg'].""; @@ -38,7 +38,7 @@ - -
+
@@ -49,16 +49,10 @@
- +
+ - - -
- - - - @@ -68,7 +62,7 @@ - @@ -78,7 +72,7 @@ - @@ -88,7 +82,7 @@ - @@ -109,7 +103,7 @@ - @@ -133,7 +127,7 @@ - @@ -143,7 +137,7 @@ - @@ -153,7 +147,7 @@ - @@ -174,7 +168,7 @@ - diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index bcee54c68..2466293fd 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -8,7 +8,7 @@ ?>
+
+ /
+
+
+
+
+
+
+
-
+ → ".$_SESSION['error_msg'].""; @@ -58,7 +58,7 @@ - -
+
@@ -69,16 +69,10 @@
- +
+ - - -
- - - @@ -88,7 +82,7 @@ - @@ -111,7 +105,7 @@ - @@ -121,7 +115,7 @@ - @@ -142,7 +136,7 @@ - @@ -155,7 +149,7 @@
- +
+
+
+
+
- @@ -179,7 +173,7 @@ - @@ -192,7 +186,7 @@ - @@ -206,7 +200,7 @@
+
+
+ / - @@ -224,7 +218,7 @@ - @@ -234,7 +228,7 @@ - @@ -244,7 +238,7 @@ - @@ -257,7 +251,7 @@ - @@ -279,7 +273,7 @@ - @@ -292,7 +286,7 @@
+
+
+
+ ()
+
+
- @@ -302,7 +296,7 @@ - @@ -315,7 +309,7 @@ - @@ -328,7 +322,7 @@
+
+ /
+
- @@ -340,7 +334,7 @@ - @@ -354,7 +348,7 @@ echo ''; ?> - diff --git a/web/templates/admin/generate_ssl.html b/web/templates/admin/generate_ssl.html index 8b64a515f..1469265a4 100644 --- a/web/templates/admin/generate_ssl.html +++ b/web/templates/admin/generate_ssl.html @@ -8,7 +8,7 @@ ?>
+ ' . __('Prefix will be automaticaly added to username',$user."_") . '' ?>
+ /
+
-
+ → ".$_SESSION['error_msg'].""; @@ -26,7 +26,7 @@ - -
+
@@ -34,15 +34,15 @@
- +
+
- +
- @@ -52,7 +52,7 @@ - @@ -62,7 +62,7 @@ - @@ -73,7 +73,7 @@ - @@ -83,7 +83,7 @@ - @@ -93,7 +93,7 @@ - diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html index 046f98386..a888ef014 100644 --- a/web/templates/admin/list_backup.html +++ b/web/templates/admin/list_backup.html @@ -1,6 +1,6 @@
+
+
+ ()
+
+
+
-
+
@@ -78,25 +78,25 @@ - +
- - - -
+
+ -
: -
-
+
: +
+
+ - - - -
@@ -106,19 +106,9 @@
- : - - - - -
+
@@ -144,7 +134,7 @@ - + - - - - - - -
+
@@ -27,18 +27,15 @@
-
-
+
-
-
+ - +
- - @@ -89,19 +86,19 @@
+ +
+ - +
- - @@ -126,19 +123,19 @@
+ +
+ - +
- - @@ -163,19 +160,19 @@
+ +
+ - +
- - @@ -200,19 +197,19 @@
+ +
+ - +
- - @@ -237,19 +234,19 @@
+ +
+ - +
- - diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html index e5225aea3..14ea68c5a 100644 --- a/web/templates/admin/list_cron.html +++ b/web/templates/admin/list_cron.html @@ -1,6 +1,6 @@
+ +
-
+
@@ -79,14 +79,14 @@ - +
- - - - - -
+
@@ -94,7 +94,7 @@ 		+
@@ -102,7 +102,7 @@ 		+
@@ -110,7 +110,7 @@ 		+
@@ -118,7 +118,7 @@ 		+
@@ -140,7 +140,7 @@ - + -
+
@@ -58,7 +58,7 @@
+ @@ -91,25 +91,25 @@ - +
- - - -
+
+ -
: -
-
+
: +
+
+
@@ -129,7 +129,7 @@
+
@@ -161,7 +161,7 @@ - + - -
+
@@ -45,12 +45,12 @@
- +
" >
">
 + @@ -89,28 +89,28 @@ - +
- - - - -
+
+ - -
+
+
+ @@ -122,7 +122,7 @@
:
 + @@ -146,7 +146,7 @@
:
- + - - + ?>
+
@@ -28,15 +28,13 @@
-
-
+
-
$value) { @@ -58,7 +56,7 @@
+ @@ -75,11 +73,11 @@ - +
- - - + + +
@@ -87,12 +85,12 @@
- -
+
+
@@ -42,7 +42,7 @@
+ @@ -60,16 +60,16 @@ - +
- - - -
+ ' . $data[$key]['NAT'] . ''; ?>
+
@@ -83,7 +83,7 @@
+
@@ -103,7 +103,7 @@
+ - -
@@ -137,7 +137,7 @@ - + -
+
@@ -28,11 +28,11 @@
">
 +
- +
- @@ -48,7 +48,7 @@
+
- + -
+
@@ -57,7 +57,7 @@
+ @@ -102,26 +102,26 @@ - +
- - - -
+
+ -
+ : -
-
+
+
+
@@ -141,7 +141,7 @@
+
@@ -172,7 +172,7 @@ - + - -
+
@@ -28,15 +28,13 @@
-
-
+
-
$value) { @@ -60,7 +58,7 @@
+ @@ -87,25 +85,22 @@ - - +
+ - - -
+ - - -
-
+ : -
-
+
+
+
@@ -125,7 +120,7 @@
+ -
@@ -149,7 +144,7 @@ - + -
+
@@ -40,7 +40,7 @@
">
 + @@ -58,14 +58,14 @@ - +
- - -
+
+ @@ -80,27 +80,27 @@ - -
:
+ : -
-
+
+
+ : -
-
+
+
- + -
+ - + @@ -117,14 +117,14 @@ - +
::
: ',$data[$key]['NS']) ?>
- +
+ - + @@ -161,7 +161,7 @@
::
- + - -
+
- +
">
">
 + " target="_blank" class="data-controls"> - - +
+ -
- +
+
"> diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html index 871b9a318..726c4051e 100644 --- a/web/templates/admin/list_search.html +++ b/web/templates/admin/list_search.html @@ -1,6 +1,6 @@ - -
+
@@ -37,12 +37,12 @@
- +
">
 + - - +
+ - - - -
+
@@ -159,7 +159,7 @@
+
@@ -171,13 +171,13 @@
+ - @@ -195,7 +195,7 @@
: +
- + -
+
@@ -33,21 +33,21 @@
+ - +
- - - - -
+
+
@@ -61,36 +61,26 @@
+ -
: - + +
- - - - - -
- -
- 		+ -
: - + +
@@ -139,42 +129,42 @@ - +
- - - - -
+
+ -
+
+ - -
+ : - % + + %
+ -
: - + +
@@ -185,8 +175,8 @@ 		: - + +
diff --git a/web/templates/admin/list_ssl.html b/web/templates/admin/list_ssl.html index a88134f81..8f583b093 100644 --- a/web/templates/admin/list_ssl.html +++ b/web/templates/admin/list_ssl.html @@ -8,7 +8,7 @@ ?> -
+ → ".$_SESSION['error_msg'].""; @@ -26,7 +26,7 @@ - -
+
@@ -34,15 +34,10 @@
- +
+ - - -
- - - @@ -52,7 +47,7 @@ - @@ -61,7 +56,7 @@ - diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html index 34d6ac3bf..b553e7439 100644 --- a/web/templates/admin/list_stats.html +++ b/web/templates/admin/list_stats.html @@ -1,6 +1,6 @@
+
+
+
- -
+
@@ -40,39 +40,39 @@
- +
-
- +
+
+ - -
+
+ - - - -
+ : % ()
-
+
+ : % () -
-
+
+
+
@@ -95,10 +95,10 @@
- + -
+ -
+ : @@ -139,10 +139,10 @@
- +
+ - -
+ : @@ -196,7 +196,7 @@ - + -
+
@@ -44,10 +44,10 @@
+ + ?> @@ -56,17 +56,17 @@ -
+ ?> +
- +
- - - - - -
+
+
@@ -75,38 +75,26 @@
+ -
: - + + ()
+ - - -
: - -
- 		- - - -
- : - - + +
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html index fea210e44..c99b1a42d 100644 --- a/web/templates/admin/list_user.html +++ b/web/templates/admin/list_user.html @@ -1,6 +1,6 @@ - - +
+
">
 + @@ -131,47 +131,47 @@ - +
- + - -
+ - - + + - - -
[]
[]
: % () + : % ()
: % () + : % ()
+ -
- : + : - : + + :
- : + : - : + :
@@ -179,8 +179,8 @@
- +
+ @@ -203,12 +203,12 @@ - +
: /
:
',$data[$key]['NS']) ?>
- +
@@ -251,7 +251,7 @@
: /
- - -
+
+
@@ -78,10 +78,10 @@ - +
">
 + @@ -127,38 +127,38 @@ - +
- - - -
- + +
+ - - -
+
+ : -
-
+
+
: -
-
+
: +
+
+ @@ -179,7 +179,7 @@
:
 + @@ -189,12 +189,10 @@ - - @@ -213,7 +211,7 @@
::
: >
:
-
+ - -
+ → ".$_SESSION['error_msg'].""; + echo " → ".$_SESSION['error_msg'].""; } else { if (!empty($_SESSION['ok_msg'])) { - echo " → ".$_SESSION['ok_msg'].""; + echo " → ".$_SESSION['ok_msg'].""; } } - ?> + ?>
@@ -27,26 +26,21 @@ - -
+ - +
-
- +
+
- +
+ - - -
- - - @@ -56,7 +50,7 @@ - @@ -66,7 +60,7 @@ - @@ -76,7 +70,7 @@ - @@ -86,7 +80,7 @@ - @@ -95,9 +89,13 @@ - + diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html index 1508c59f7..0e5c8e4a3 100644 --- a/web/templates/user/edit_user.html +++ b/web/templates/user/edit_user.html @@ -6,16 +6,15 @@ $back = "location.href='".$back."'"; } ?> -
+
+
+ ()
+ SOA
+ TTL
+ +
-
+ → ".$_SESSION['error_msg'].""; + echo " → ".$_SESSION['error_msg'].""; } else { if (!empty($_SESSION['ok_msg'])) { - echo " → ".$_SESSION['ok_msg'].""; + echo " → ".$_SESSION['ok_msg'].""; } } ?> @@ -39,26 +38,21 @@ - -
+ - +
-
- +
+
- +
+ - - -
- - - @@ -68,7 +62,7 @@ - @@ -78,8 +72,8 @@ - @@ -88,7 +82,7 @@ - @@ -107,13 +101,13 @@ } echo ">".$value."\n"; } - ?> + ?> - diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index 7263128b7..4b51deed9 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -6,10 +6,9 @@ $back = "location.href='".$back."'"; } ?> -
+
+ /
- + +
+
- + +
-
+ → ".$_SESSION['error_msg'].""; @@ -59,26 +58,21 @@ - -
+
-
- +
+
- +
+ - - -
- - - @@ -88,7 +82,7 @@ - @@ -111,7 +105,7 @@ - @@ -121,7 +115,7 @@ - @@ -134,7 +128,7 @@
+
+
+
+
- @@ -147,7 +141,7 @@ - @@ -161,13 +155,14 @@
+
+ / - - @@ -188,7 +183,7 @@ - @@ -198,7 +193,7 @@ - @@ -211,7 +206,7 @@ - @@ -233,7 +228,7 @@ - @@ -246,7 +241,7 @@
+
- + +
+
+ ()
+
+
- @@ -256,7 +251,7 @@ - @@ -269,7 +264,7 @@ - @@ -282,25 +277,25 @@
+
+ /
+
- - diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html index 68cc693c8..b2169f395 100644 --- a/web/templates/user/list_cron.html +++ b/web/templates/user/list_cron.html @@ -1,6 +1,6 @@
+ ' . __('Prefix will be automaticaly added to username',$user."_") . '' ?>
-
- / + + /
- +
-
+
@@ -33,8 +33,12 @@ ++$i; if ($data[$key]['SUSPENDED'] == 'yes') { $status = 'suspended'; + $spnd_action = 'unsuspend'; + $spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ; } else { $status = 'active'; + $spnd_action = 'suspend'; + $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ; } ?> @@ -63,14 +67,14 @@ - +
- - - - -
+
@@ -78,7 +82,7 @@ 		+
@@ -86,7 +90,7 @@ 		+
@@ -94,7 +98,7 @@ 		+
@@ -102,7 +106,7 @@ 		+
@@ -124,7 +128,7 @@ - + - -
+
- - + +
@@ -28,15 +28,17 @@
$value) { ++$i; if ($data[$key]['SUSPENDED'] == 'yes') { $status = 'suspended'; $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ; } else { $status = 'active'; $spnd_action = 'suspend' ; + $spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ; } if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST']; if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin"; @@ -54,7 +56,7 @@
+ @@ -77,25 +79,25 @@ - +
- - - -
+
+ -
: -
-
+
: +
+
+
@@ -115,7 +117,7 @@
+
@@ -147,7 +149,7 @@ - + -
+
- - + +
@@ -24,6 +24,7 @@
+
-
- +
" >
">
 + @@ -74,31 +77,31 @@ - +
- - - -
+
+ - -
+
+
+ - + @@ -107,7 +110,7 @@
::
+ @@ -131,7 +134,7 @@
:
- + - - + ?>
+
- +
- - + +
@@ -26,15 +26,13 @@
-
-
+
-
$value) { @@ -42,9 +40,11 @@ if ($data[$key]['SUSPENDED'] == 'yes') { $status = 'suspended'; $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ; } else { $status = 'active'; $spnd_action = 'suspend' ; + $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ; } ?> @@ -54,7 +54,7 @@
+ @@ -71,11 +71,11 @@ - +
- - - + + +
@@ -83,12 +83,12 @@
- -
+ -
-
- -
-
-
- - -
-
+ + + -
+
+ +
+
+
+ + +
+
- +
@@ -28,7 +28,7 @@
+ @@ -88,26 +90,26 @@ - +
- - - -
+
+ -
+ : -
-
+
+
+
@@ -127,7 +129,7 @@
+
@@ -158,7 +160,7 @@ - + - -
+
- - + +
@@ -26,15 +26,13 @@
-
-
+
-
$value) { @@ -42,9 +40,11 @@ if ($data[$key]['SUSPENDED'] == 'yes') { $status = 'suspended'; $spnd_action = 'unsuspend' ; + $spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' ; } else { $status = 'active'; $spnd_action = 'suspend'; + $spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' ; } ?> @@ -56,7 +56,7 @@
+ @@ -73,26 +73,22 @@ - - +
+ - - -
+ - - - -
-
+ : -
-
+
+
+
@@ -112,7 +108,7 @@
+
@@ -136,7 +132,7 @@ - + - -
+
- - + +
@@ -37,32 +37,32 @@
- +
">
 + @@ -71,11 +71,35 @@ + + - - +
+ - - -
+ -
- : -
+
@@ -127,13 +148,13 @@
+ - @@ -151,7 +172,7 @@
: +
- + - @@ -23,39 +25,39 @@ -
+
+
+
- +
-
- +
+
+ - -
+
+ - - - -
+ : % ()
-
+
+ : % () -
-
+
+
+
@@ -78,10 +80,10 @@
- + -
+ -
+ : @@ -122,10 +124,10 @@
- +
+ -
+ : @@ -179,7 +181,7 @@ - + -
+
- +
@@ -24,6 +24,7 @@
+
- + ?> -
- +
">
 - " class="data-controls"> + + - + - + +
- + - -
+ - - + + - - -
[]
[]
: % () + : % ()
: % () + : % ()
+ -
- : + : - : + + :
- : + : - : + :
@@ -101,8 +104,8 @@
- +
+ @@ -125,12 +128,12 @@ - +
: /
:
',$data[$key]['NS']) ?>
- +
@@ -173,7 +176,7 @@
: /
- + - -
+
@@ -76,10 +76,10 @@ - +
">
 + @@ -102,6 +102,7 @@ + @@ -114,38 +115,38 @@ - +
- - - -
- + +
+ - - -
+
+ : -
-
+
+
: -
-
+
: +
+
+ @@ -166,7 +167,7 @@
:
 + @@ -176,12 +177,10 @@ - - @@ -200,7 +199,7 @@
::
: >
:
- -
+ Date: Thu, 6 Feb 2014 11:11:45 +0200 Subject: [PATCH 07/16] restart error handler --- bin/v-add-cron-job | 3 +++ bin/v-add-cron-report | 3 +++ bin/v-add-dns-domain | 3 +++ bin/v-add-dns-record | 3 +++ bin/v-add-sys-ip | 6 ++++++ bin/v-add-web-domain | 3 +++ bin/v-add-web-domain-alias | 7 +++++++ bin/v-add-web-domain-proxy | 3 +++ bin/v-add-web-domain-ssl | 8 ++++++++ bin/v-change-cron-job | 3 +++ bin/v-change-dns-domain-ip | 3 +++ bin/v-change-dns-domain-soa | 3 +++ bin/v-change-dns-domain-tpl | 3 +++ bin/v-change-dns-domain-ttl | 3 +++ bin/v-change-dns-record | 3 +++ bin/v-change-dns-record-id | 3 +++ bin/v-change-sys-ip-nat | 3 +++ bin/v-change-web-domain-ip | 7 +++++++ bin/v-change-web-domain-proxy-tpl | 3 +++ bin/v-change-web-domain-sslcert | 7 +++++++ bin/v-change-web-domain-sslhome | 7 +++++++ bin/v-change-web-domain-tpl | 3 +++ bin/v-delete-cron-job | 3 +++ bin/v-delete-cron-reports | 3 +++ bin/v-delete-dns-domain | 3 +++ bin/v-delete-dns-domains | 3 +++ bin/v-delete-dns-domains-src | 3 +++ bin/v-delete-dns-record | 3 +++ bin/v-delete-domain | 6 +++--- bin/v-delete-sys-ip | 7 +++++++ bin/v-delete-web-domain | 7 +++++++ bin/v-delete-web-domain-alias | 7 +++++++ bin/v-delete-web-domain-proxy | 3 +++ bin/v-delete-web-domain-ssl | 7 +++++++ bin/v-delete-web-domains | 7 +++++++ bin/v-insert-dns-domain | 3 +++ bin/v-insert-dns-record | 3 +++ bin/v-insert-dns-records | 3 +++ bin/v-rebuild-cron-jobs | 3 +++ bin/v-rebuild-dns-domain | 3 +++ bin/v-rebuild-dns-domains | 3 +++ bin/v-rebuild-web-domains | 7 +++++++ bin/v-restart-dns | 1 + bin/v-restart-ftp | 1 + bin/v-restart-mail | 1 + bin/v-restart-proxy | 10 ++++------ bin/v-restart-web | 2 ++ bin/v-restore-user | 16 ++++++++++++++++ bin/v-suspend-cron-job | 3 +++ bin/v-suspend-cron-jobs | 3 +++ bin/v-suspend-dns-domain | 3 +++ bin/v-suspend-dns-domains | 3 +++ bin/v-suspend-dns-record | 3 +++ bin/v-suspend-user | 11 +++++++++++ bin/v-suspend-web-domain | 7 +++++++ bin/v-suspend-web-domains | 8 ++++++++ bin/v-unsuspend-cron-job | 3 +++ bin/v-unsuspend-cron-jobs | 3 +++ bin/v-unsuspend-dns-domain | 3 +++ bin/v-unsuspend-dns-domains | 3 +++ bin/v-unsuspend-dns-record | 3 +++ bin/v-unsuspend-user | 11 +++++++++++ bin/v-unsuspend-web-domain | 7 +++++++ bin/v-unsuspend-web-domains | 8 ++++++++ bin/v-update-sys-ip | 9 +++++++++ bin/v-update-web-templates | 7 +++++++ 66 files changed, 297 insertions(+), 9 deletions(-) diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job index 3f2c2255d..cd20d26aa 100755 --- a/bin/v-add-cron-job +++ b/bin/v-add-cron-job @@ -74,6 +74,9 @@ increase_user_value $user '$U_CRON_JOBS' # Restart crond $BIN/v-restart-cron +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_history "added cron job $job" diff --git a/bin/v-add-cron-report b/bin/v-add-cron-report index f42ade3a5..8a3ded277 100755 --- a/bin/v-add-cron-report +++ b/bin/v-add-cron-report @@ -46,6 +46,9 @@ sync_cron_jobs # Restart crond $BIN/v-restart-cron +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_history "enabled cron reporting" diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain index 8224543e9..a415959bb 100755 --- a/bin/v-add-dns-domain +++ b/bin/v-add-dns-domain @@ -162,6 +162,9 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records" # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index 7562218de..075586f89 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -107,6 +107,9 @@ increase_user_value "$user" '$U_DNS_RECORDS' # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip index 4acd375aa..4ac749e31 100755 --- a/bin/v-add-sys-ip +++ b/bin/v-add-sys-ip @@ -152,7 +152,13 @@ fi # Restart web server $BIN/v-restart-web +if [ $? -ne 0 ]; then + exit E_RESTART +fi $BIN/v-restart-proxy +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_history "added system ip address $ip" '' 'admin' diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index 048da8ea8..898d1e15d 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -176,6 +176,9 @@ chmod 660 $USER_DATA/web.conf # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index b8000d398..7a27c822a 100755 --- a/bin/v-add-web-domain-alias +++ b/bin/v-add-web-domain-alias @@ -103,7 +103,14 @@ increase_user_value "$user" '$U_WEB_ALIASES' # Adding task to the vesta pipe if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi log_history "added $dom_alias as alias for $domain" diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy index cd3d733ba..6a0745b6a 100755 --- a/bin/v-add-web-domain-proxy +++ b/bin/v-add-web-domain-proxy @@ -103,6 +103,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions" # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi log_history "enabled proxy support for $domain" diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl index ca44e1483..af8cb0790 100755 --- a/bin/v-add-web-domain-ssl +++ b/bin/v-add-web-domain-ssl @@ -126,6 +126,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes" # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job index ae90ffc18..faca81446 100755 --- a/bin/v-change-cron-job +++ b/bin/v-change-cron-job @@ -65,6 +65,9 @@ sync_cron_jobs # Restart crond $BIN/v-restart-cron +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_history "changed cron job $job" diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index da4aa1fbe..307fd5cbc 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -70,6 +70,9 @@ fi # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index 48e2851ba..7b1bf9a38 100755 --- a/bin/v-change-dns-domain-soa +++ b/bin/v-change-dns-domain-soa @@ -64,6 +64,9 @@ fi # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index d245a548b..d708edb97 100755 --- a/bin/v-change-dns-domain-tpl +++ b/bin/v-change-dns-domain-tpl @@ -88,6 +88,9 @@ fi # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index 690f57ba6..b05836c26 100755 --- a/bin/v-change-dns-domain-ttl +++ b/bin/v-change-dns-domain-ttl @@ -63,6 +63,9 @@ fi # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 292aae705..22b41d2f3 100755 --- a/bin/v-change-dns-record +++ b/bin/v-change-dns-record @@ -98,6 +98,9 @@ fi # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index e5cf6aa31..a9474b56c 100755 --- a/bin/v-change-dns-record-id +++ b/bin/v-change-dns-record-id @@ -70,6 +70,9 @@ fi # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat index b3b4f9268..a60fb9b3d 100755 --- a/bin/v-change-sys-ip-nat +++ b/bin/v-change-sys-ip-nat @@ -77,6 +77,9 @@ fi # Restart ftp server if [ "$restart" != 'no' ]; then $BIN/v-restart-ftp + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index de88ca78b..429784e60 100755 --- a/bin/v-change-web-domain-ip +++ b/bin/v-change-web-domain-ip @@ -87,7 +87,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$3" # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl index e276868b1..a92c87bf9 100755 --- a/bin/v-change-web-domain-proxy-tpl +++ b/bin/v-change-web-domain-proxy-tpl @@ -94,6 +94,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions" # Restart web if [ "$restart" != 'no' ]; then $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index 204b2e3d7..42b567931 100755 --- a/bin/v-change-web-domain-sslcert +++ b/bin/v-change-web-domain-sslcert @@ -71,7 +71,14 @@ fi # Restart web server $BIN/v-restart-web +if [ $? -ne 0 ]; then + exit E_RESTART +fi + $BIN/v-restart-proxy +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_history "changed ssl certificate for $domain" diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome index c2b360f2b..091ad3be1 100755 --- a/bin/v-change-web-domain-sslhome +++ b/bin/v-change-web-domain-sslhome @@ -71,7 +71,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME" # Restart web server $BIN/v-restart-web +if [ $? -ne 0 ]; then + exit E_RESTART +fi + $BIN/v-restart-proxy +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_history "changed ssl home for $domain to $ssl_home" diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index ff7ae8353..66ada8028 100755 --- a/bin/v-change-web-domain-tpl +++ b/bin/v-change-web-domain-tpl @@ -96,6 +96,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template" # Restart web if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job index 3a62618d5..6e8d8b727 100755 --- a/bin/v-delete-cron-job +++ b/bin/v-delete-cron-job @@ -54,6 +54,9 @@ decrease_user_value "$user" '$U_CRON_JOBS' # Restart crond $BIN/v-restart-cron +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_history "deleted cron job $job" diff --git a/bin/v-delete-cron-reports b/bin/v-delete-cron-reports index df70b30a7..6ce3fa382 100755 --- a/bin/v-delete-cron-reports +++ b/bin/v-delete-cron-reports @@ -46,6 +46,9 @@ sync_cron_jobs # Restart crond $BIN/v-restart-cron +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_history "disabled cron reporting" diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain index 774f53819..61907d514 100755 --- a/bin/v-delete-dns-domain +++ b/bin/v-delete-dns-domain @@ -75,6 +75,9 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records" # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns $restart + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains index 7e94eae96..dfb361531 100755 --- a/bin/v-delete-dns-domains +++ b/bin/v-delete-dns-domains @@ -43,6 +43,9 @@ done # Restart named $BIN/v-restart-dns +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-delete-dns-domains-src b/bin/v-delete-dns-domains-src index 8c9f4de4e..69f86614b 100755 --- a/bin/v-delete-dns-domains-src +++ b/bin/v-delete-dns-domains-src @@ -46,6 +46,9 @@ done # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record index e3de75fa8..2e02dc5e6 100755 --- a/bin/v-delete-dns-record +++ b/bin/v-delete-dns-record @@ -69,6 +69,9 @@ decrease_user_value "$user" '$U_DNS_RECORDS' # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-delete-domain b/bin/v-delete-domain index be7d487f6..a9c966be8 100755 --- a/bin/v-delete-domain +++ b/bin/v-delete-domain @@ -39,7 +39,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then if [ ! -z "$check_web" ]; then $BIN/v-delete-web-domain $user $domain if [ $? -ne 0 ]; then - exit $? + exit E_RESTART fi fi fi @@ -50,7 +50,7 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then if [ ! -z "$check_dns" ]; then $BIN/v-delete-dns-domain $user $domain if [ $? -ne 0 ]; then - exit $? + exit E_RESTART fi fi fi @@ -61,7 +61,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then if [ ! -z "$check_mail" ]; then $BIN/v-delete-mail-domain $user $domain if [ $? -ne 0 ]; then - exit $? + exit E_RESTART fi fi fi diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip index 54601bc11..0a1c9aac8 100755 --- a/bin/v-delete-sys-ip +++ b/bin/v-delete-sys-ip @@ -121,7 +121,14 @@ fi # Adding task to the vesta pipe $BIN/v-restart-web +if [ $? -ne 0 ]; then + exit E_RESTART +fi + $BIN/v-restart-proxy +if [ $? -ne 0 ]; then + exit E_RESTART +fi # Logging log_history "deleted system ip address $ip" diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index edba9747e..532ce00ff 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -154,7 +154,14 @@ fi # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias index c7b66a474..d6862a5f6 100755 --- a/bin/v-delete-web-domain-alias +++ b/bin/v-delete-web-domain-alias @@ -101,7 +101,14 @@ decrease_user_value "$user" '$U_WEB_ALIASES' # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy index 20c4ff4a0..25e6b9d9e 100755 --- a/bin/v-delete-web-domain-proxy +++ b/bin/v-delete-web-domain-proxy @@ -80,6 +80,9 @@ fi # Restart proxy server if [ "$restart" != 'no' ]; then $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index 61d0072d3..d09dc9ad4 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -92,7 +92,14 @@ decrease_user_value "$user" '$U_WEB_SSL' # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains index ff7052c8a..aff5436d5 100755 --- a/bin/v-delete-web-domains +++ b/bin/v-delete-web-domains @@ -45,7 +45,14 @@ done # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index cdd98de66..949cdfde5 100755 --- a/bin/v-insert-dns-domain +++ b/bin/v-insert-dns-domain @@ -72,6 +72,9 @@ chmod 660 $USER_DATA/dns.conf # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns $restart + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-insert-dns-record b/bin/v-insert-dns-record index cd888471b..29bb3b2cd 100755 --- a/bin/v-insert-dns-record +++ b/bin/v-insert-dns-record @@ -47,6 +47,9 @@ echo "$data" >> $USER_DATA/dns/$domain.conf # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns $restart + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-insert-dns-records b/bin/v-insert-dns-records index 302951e70..5b5b230f0 100755 --- a/bin/v-insert-dns-records +++ b/bin/v-insert-dns-records @@ -50,6 +50,9 @@ fi # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs index 0edc1909b..1f229b94b 100755 --- a/bin/v-rebuild-cron-jobs +++ b/bin/v-rebuild-cron-jobs @@ -43,6 +43,9 @@ sync_cron_jobs # Restart crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain index 564b2aaaa..31be08d13 100755 --- a/bin/v-rebuild-dns-domain +++ b/bin/v-rebuild-dns-domain @@ -78,6 +78,9 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns" # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns "$restart" + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains index 2fd2aeee2..e34e38120 100755 --- a/bin/v-rebuild-dns-domains +++ b/bin/v-rebuild-dns-domains @@ -78,6 +78,9 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns" # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index 90294eb98..663dee410 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -148,7 +148,14 @@ update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases" # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-restart-dns b/bin/v-restart-dns index 67025040a..9b3dbae2f 100755 --- a/bin/v-restart-dns +++ b/bin/v-restart-dns @@ -56,6 +56,7 @@ if [ $? -ne 0 ]; then /etc/init.d/$DNS_SYSTEM restart >/dev/null 2>&1 if [ $? -ne 0 ]; then send_email_report + echo "Error: $DNS_SYSTEM restart failed" exit $E_RESTART fi fi diff --git a/bin/v-restart-ftp b/bin/v-restart-ftp index 7d02b0623..c002fc07b 100755 --- a/bin/v-restart-ftp +++ b/bin/v-restart-ftp @@ -48,6 +48,7 @@ fi /etc/init.d/$FTP_SYSTEM restart >/dev/null 2>&1 if [ $? -ne 0 ]; then send_email_report + echo "Error: $FTP_SYSTEM restart failed" exit $E_RESTART fi diff --git a/bin/v-restart-mail b/bin/v-restart-mail index 2247e1200..c1ae4a347 100755 --- a/bin/v-restart-mail +++ b/bin/v-restart-mail @@ -49,6 +49,7 @@ fi /etc/init.d/$MAIL_SYSTEM restart >/dev/null 2>&1 if [ $? -ne 0 ]; then send_email_report + echo "Error: $MAIL_SYSTEM restart failed" exit $E_RESTART fi diff --git a/bin/v-restart-proxy b/bin/v-restart-proxy index c13072a28..89c68437e 100755 --- a/bin/v-restart-proxy +++ b/bin/v-restart-proxy @@ -45,13 +45,11 @@ if [ -z "$PROXY_SYSTEM" ]; then fi # Restart system -/etc/init.d/$PROXY_SYSTEM reload >/dev/null 2>&1 +/etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1 if [ $? -ne 0 ]; then - /etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1 - if [ $? -ne 0 ]; then - send_email_report - exit $E_RESTART - fi + send_email_report + echo "Error: $PROXY_SYSTEM restart failed" + exit $E_RESTART fi # Update restart queue diff --git a/bin/v-restart-web b/bin/v-restart-web index 568db9fbb..9c321cb60 100755 --- a/bin/v-restart-web +++ b/bin/v-restart-web @@ -53,6 +53,7 @@ if [ "$WEB_SYSTEM" == 'apache2' ]; then /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1 if [ $? -ne 0 ]; then send_email_report + echo "Error: $WEB_SYSTEM restart failed" exit $E_RESTART fi fi @@ -62,6 +63,7 @@ else /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1 if [ $? -ne 0 ]; then send_email_report + echo "Error: $WEB_SYSTEM restart failed" exit $E_RESTART fi fi diff --git a/bin/v-restore-user b/bin/v-restore-user index a7a6f74c4..fe48dba70 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -372,7 +372,15 @@ if [ "$web" != 'no' ]; then # Restart WEB $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi + echo msg="$msg\n" fi @@ -482,6 +490,10 @@ if [ "$dns" != 'no' ]; then # Restart DNS $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi + echo msg="$msg\n" fi @@ -695,6 +707,10 @@ if [ "$cron" != 'no' ]; then # Restart cron $BIN/v-restart-cron + if [ $? -ne 0 ]; then + exit E_RESTART + fi + echo msg="$msg\n" fi diff --git a/bin/v-suspend-cron-job b/bin/v-suspend-cron-job index 393ddda93..a26eae21b 100755 --- a/bin/v-suspend-cron-job +++ b/bin/v-suspend-cron-job @@ -49,6 +49,9 @@ sync_cron_jobs # Restart crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-suspend-cron-jobs b/bin/v-suspend-cron-jobs index cd6b30771..577860c48 100755 --- a/bin/v-suspend-cron-jobs +++ b/bin/v-suspend-cron-jobs @@ -44,6 +44,9 @@ done # Restart crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index 25b430342..3972fc39f 100755 --- a/bin/v-suspend-dns-domain +++ b/bin/v-suspend-dns-domain @@ -49,6 +49,9 @@ increase_user_value "$user" '$SUSPENDED_DNS' # Restart named #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns +# if [ $? -ne 0 ]; then +# exit E_RESTART +# fi #fi # Logging diff --git a/bin/v-suspend-dns-domains b/bin/v-suspend-dns-domains index e6083e5dc..0b2a5e895 100755 --- a/bin/v-suspend-dns-domains +++ b/bin/v-suspend-dns-domains @@ -45,6 +45,9 @@ done # Restart dns server #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns +# if [ $? -ne 0 ]; then +# exit E_RESTART +# fi #fi # Logging diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index 417c3add2..30da60def 100755 --- a/bin/v-suspend-dns-record +++ b/bin/v-suspend-dns-record @@ -63,6 +63,9 @@ update_domain_zone # Restart named #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns +# if [ $? -ne 0 ]; then +# exit E_RESTART +# fi #fi # Logging diff --git a/bin/v-suspend-user b/bin/v-suspend-user index 5a754d05d..d812d23f4 100755 --- a/bin/v-suspend-user +++ b/bin/v-suspend-user @@ -71,8 +71,19 @@ fi # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-cron + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Changing suspend value diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index 005b81527..963929953 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -91,7 +91,14 @@ increase_user_value "$user" '$SUSPENDED_WEB' # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains index 29e07c6a6..eda982c62 100755 --- a/bin/v-suspend-web-domains +++ b/bin/v-suspend-web-domains @@ -45,6 +45,14 @@ done # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-unsuspend-cron-job b/bin/v-unsuspend-cron-job index 8a184691b..685bcf177 100755 --- a/bin/v-unsuspend-cron-job +++ b/bin/v-unsuspend-cron-job @@ -49,6 +49,9 @@ sync_cron_jobs # Restart crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-unsuspend-cron-jobs b/bin/v-unsuspend-cron-jobs index 0f3994fa6..ad0f07e99 100755 --- a/bin/v-unsuspend-cron-jobs +++ b/bin/v-unsuspend-cron-jobs @@ -44,6 +44,9 @@ done # Restart crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index 4e91f514d..9be0b4c8e 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -51,6 +51,9 @@ sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/dns/$domain.conf # Restart named #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns +# if [ $? -ne 0 ]; then +# exit E_RESTART +# fi #fi # Logging diff --git a/bin/v-unsuspend-dns-domains b/bin/v-unsuspend-dns-domains index 0807912af..f06c22185 100755 --- a/bin/v-unsuspend-dns-domains +++ b/bin/v-unsuspend-dns-domains @@ -45,6 +45,9 @@ done # Restart dns server #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns +# if [ $? -ne 0 ]; then +# exit E_RESTART +# fi #fi # Logging diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index 3d9d048fd..3d4a53ce7 100755 --- a/bin/v-unsuspend-dns-record +++ b/bin/v-unsuspend-dns-record @@ -62,6 +62,9 @@ update_domain_zone # Restart named #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns +# if [ $? -ne 0 ]; then +# exit E_RESTART +# fi #fi # Logging diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user index 47618a4e1..00a21b6f0 100755 --- a/bin/v-unsuspend-user +++ b/bin/v-unsuspend-user @@ -73,8 +73,19 @@ decrease_user_value 'admin' '$SUSPENDED_USERS' if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-cron + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain index eaae49e56..74e4e5f8b 100755 --- a/bin/v-unsuspend-web-domain +++ b/bin/v-unsuspend-web-domain @@ -88,7 +88,14 @@ decrease_user_value "$user" '$SUSPENDED_WEB' # Restart web erver if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains index d60d07274..a9f713f54 100755 --- a/bin/v-unsuspend-web-domains +++ b/bin/v-unsuspend-web-domains @@ -46,6 +46,14 @@ done # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Logging diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index bde0b008d..b0309b182 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -53,6 +53,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then /etc/$PROXY_SYSTEM/conf.d/$new.conf sed -i "s/$old/$new/g" /etc/$PROXY_SYSTEM/conf.d/$new.conf $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi if [ ! -z "$WEB_SYSTEM" ]; then mv /etc/$WEB_SYSTEM/conf.d/$old.conf \ @@ -65,6 +68,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then $BIN/v-rebuild-web-domains $user no done $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi if [ ! -z "$DNS_SYSTEM" ]; then @@ -75,6 +81,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then $BIN/v-rebuild-dns-domains $user no done $BIN/v-restart-dns + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # No further comparation is needed diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates index 8d426240b..5f0778409 100755 --- a/bin/v-update-web-templates +++ b/bin/v-update-web-templates @@ -64,7 +64,14 @@ done # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web + if [ $? -ne 0 ]; then + exit E_RESTART + fi + $BIN/v-restart-proxy + if [ $? -ne 0 ]; then + exit E_RESTART + fi fi # Delete tmpdir From 11a27358d2236dbe1633eb8cb88752dcc0a7900c Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 6 Feb 2014 11:12:48 +0200 Subject: [PATCH 08/16] nginx restart trigger --- web/edit/web/index.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/web/edit/web/index.php b/web/edit/web/index.php index b2343cb22..a607e5465 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -97,6 +97,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); check_return_code($return_var,$output); $restart_web = 'yes'; + $restart_proxy = 'yes'; unset($output); exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $return_var); if ((empty($_SESSION['error_msg'])) && ($return_var == 0 )) { @@ -138,6 +139,7 @@ if (!empty($_POST['save'])) { foreach ($result as $alias) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { $restart_web = 'yes'; + $restart_proxy = 'yes'; $v_template = escapeshellarg($_POST['v_template']); exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); check_return_code($return_var,$output); @@ -160,6 +162,7 @@ if (!empty($_POST['save'])) { foreach ($result as $alias) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { $restart_web = 'yes'; + $restart_proxy = 'yes'; $v_template = escapeshellarg($_POST['v_template']); exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); check_return_code($return_var,$output); @@ -225,6 +228,7 @@ if (!empty($_POST['save'])) { unset($output); $v_ssl = 'no'; $restart_web = 'yes'; + $restart_proxy = 'yes'; } if (($v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) { if (( $v_ssl_crt != str_replace("\r\n", "\n", $_POST['v_ssl_crt'])) || ( $v_ssl_key != str_replace("\r\n", "\n", $_POST['v_ssl_key'])) || ( $v_ssl_ca != str_replace("\r\n", "\n", $_POST['v_ssl_ca']))) { @@ -259,6 +263,7 @@ if (!empty($_POST['save'])) { check_return_code($return_var,$output); unset($output); $restart_web = 'yes'; + $restart_proxy = 'yes'; $v_ssl_crt = $_POST['v_ssl_crt']; $v_ssl_key = $_POST['v_ssl_key']; $v_ssl_ca = $_POST['v_ssl_ca']; @@ -316,6 +321,7 @@ if (!empty($_POST['save'])) { unset($output); $v_ssl = 'yes'; $restart_web = 'yes'; + $restart_proxy = 'yes'; $v_ssl_crt = $_POST['v_ssl_crt']; $v_ssl_key = $_POST['v_ssl_key']; $v_ssl_ca = $_POST['v_ssl_ca']; @@ -474,6 +480,13 @@ if (!empty($_POST['save'])) { unset($output); } + // Restart proxy + if (!empty($restart_proxy) && (empty($_SESSION['error_msg']))) { + exec (VESTA_CMD."v-restart-proxy", $output, $return_var); + check_return_code($return_var,$output); + unset($output); + } + // Restart dns if (!empty($restart_dns) && (empty($_SESSION['error_msg']))) { exec (VESTA_CMD."v-restart-dns", $output, $return_var); From d4b5bddeefbfb0b62535264fc33fe6452cb38b5b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 6 Feb 2014 12:43:47 +0200 Subject: [PATCH 09/16] 1 letter username. fixes #96 --- func/main.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/func/main.sh b/func/main.sh index a761bc8f4..eadfbb825 100644 --- a/func/main.sh +++ b/func/main.sh @@ -616,10 +616,17 @@ validate_format_name_s() { # Username validate_format_username() { - if ! [[ "$1" =~ ^[a-zA-Z0-9][-|\.|_|a-zA-Z0-9]{0,28}[a-zA-Z0-9]$ ]]; then - echo "Error: $2 $1 is not valid" - log_event "$E_INVALID" "$EVENT" - exit $E_INVALID + if [ "${#1}" -eq 1 ]; then + if ! [[ "$1" =~ [a-z] ]]; then + echo "Error: $2 $1 is not valid" + exit 1 + fi + else + if ! [[ "$1" =~ ^[a-zA-Z0-9][-|\.|_|a-zA-Z0-9]{0,28}[a-zA-Z0-9]$ ]] + then + echo "Error: $2 $1 is not valid" + exit 1 + fi fi } From f0477283e046bf48d7905cc751f0c38bf5834250 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 9 Feb 2014 00:09:02 +0200 Subject: [PATCH 10/16] Fix #104. Default dkim size is now set to 1024 --- bin/v-add-mail-domain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index 1051567db..4cb217c29 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -18,7 +18,7 @@ domain_idn=$(idn -t --quiet -a "$domain") antispam=${3-yes} antivirus=${4-yes} dkim=${5-yes} -dkim_size=${6-512} +dkim_size=${6-1024} # Includes source $VESTA/func/main.sh From d4ad08ab3d2636436cd1627960993efdeaf49bee Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 9 Feb 2014 00:24:53 +0200 Subject: [PATCH 11/16] Fix #90. Added del_web_config() call --- bin/v-change-web-domain-tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index 66ada8028..6ba39f903 100755 --- a/bin/v-change-web-domain-tpl +++ b/bin/v-change-web-domain-tpl @@ -75,7 +75,7 @@ fi if [ "$SSL" = 'yes' ]; then conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf" tpl_file="$WEBTPL/$WEB_SYSTEM/$template.stpl" - + del_web_config add_web_config # Running template trigger From 77d787002730f106987e30cc35b12dd284594ffc Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 9 Feb 2014 21:46:36 +0200 Subject: [PATCH 12/16] fixed OR statement --- func/domain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/func/domain.sh b/func/domain.sh index 4215ae678..07c3a1ce2 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -477,7 +477,7 @@ is_dns_record_critical() { is_dns_fqnd() { t=$1 r=$2 - fqdn_type=$(echo $t | grep "[NS|CNAME|MX|PTR|SRV]") + fqdn_type=$(echo $t | grep "NS\|CNAME\|MX\|PTR\|SRV") tree_length=3 if [ $t = 'CNAME' ]; then tree_length=2 From 4ecf44d41b845c18fc072be54e9858a76219aadf Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 9 Feb 2014 22:41:50 +0200 Subject: [PATCH 13/16] one more fix for OR syntax in grep --- bin/v-add-dns-record | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index 075586f89..6fd66d68b 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -39,7 +39,7 @@ if [ "$rtype" != 'MX' ] && [ "$rtype" != 'SRV' ]; then fi # Add trailing dot at the end of NS/CNAME/MX/PTR/SRV record -fqdn_type=$(echo $rtype | grep "[NS|CNAME|MX|PTR|SRV]") +fqdn_type=$(echo $rtype |grep "NS\|CNAME\|MX\|PTR\|SRV") if [ ! -z "$fqdn_type" ]; then trailing_dot=$(echo $dvalue | grep "\.$") if [ -z $trailing_dot ]; then From 0463b1282ac1bd6378107e2967c672afd57b3ef6 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 11 Feb 2014 11:05:45 +0200 Subject: [PATCH 14/16] aligned padding for the disk block --- web/templates/admin/list_stats.html | 2 +- web/templates/admin/list_user.html | 2 +- web/templates/user/list_stats.html | 2 +- web/templates/user/list_user.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html index b553e7439..c9f929b71 100644 --- a/web/templates/admin/list_stats.html +++ b/web/templates/admin/list_stats.html @@ -72,7 +72,7 @@
+ -
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html index c99b1a42d..9232bb9d5 100644 --- a/web/templates/admin/list_user.html +++ b/web/templates/admin/list_user.html @@ -155,7 +155,7 @@
+ -
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html index 43e5f02e4..c02b80cfa 100644 --- a/web/templates/user/list_stats.html +++ b/web/templates/user/list_stats.html @@ -57,7 +57,7 @@
+ -
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html index 261779791..f9c9e5a55 100644 --- a/web/templates/user/list_user.html +++ b/web/templates/user/list_user.html @@ -80,7 +80,7 @@
+
From 31ef50228a27229b995c365a175fdc06c991f5b7 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 11 Feb 2014 16:38:15 +0200 Subject: [PATCH 15/16] Fixed path for custom includes in caching template --- install/debian/templates/web/nginx/caching.stpl | 2 +- install/debian/templates/web/nginx/caching.tpl | 2 +- install/rhel/templates/web/nginx/caching.stpl | 8 ++++---- install/rhel/templates/web/nginx/caching.tpl | 8 ++++---- install/ubuntu/templates/web/nginx/caching.stpl | 2 +- install/ubuntu/templates/web/nginx/caching.tpl | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/install/debian/templates/web/nginx/caching.stpl b/install/debian/templates/web/nginx/caching.stpl index 036dc6ee7..ca6cffe32 100755 --- a/install/debian/templates/web/nginx/caching.stpl +++ b/install/debian/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain%.conf*; } diff --git a/install/debian/templates/web/nginx/caching.tpl b/install/debian/templates/web/nginx/caching.tpl index 04e38d445..36761b65c 100755 --- a/install/debian/templates/web/nginx/caching.tpl +++ b/install/debian/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain%.conf*; } diff --git a/install/rhel/templates/web/nginx/caching.stpl b/install/rhel/templates/web/nginx/caching.stpl index 31f6111fa..ca6cffe32 100755 --- a/install/rhel/templates/web/nginx/caching.stpl +++ b/install/rhel/templates/web/nginx/caching.stpl @@ -4,7 +4,7 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/httpd/domains/%domain%.error.log error; + error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; @@ -19,8 +19,8 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; root %docroot%; - access_log /var/log/httpd/domains/%domain%.log combined; - access_log /var/log/httpd/domains/%domain%.bytes bytes; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain%.conf*; } diff --git a/install/rhel/templates/web/nginx/caching.tpl b/install/rhel/templates/web/nginx/caching.tpl index 8860be198..36761b65c 100755 --- a/install/rhel/templates/web/nginx/caching.tpl +++ b/install/rhel/templates/web/nginx/caching.tpl @@ -1,7 +1,7 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/httpd/domains/%domain%.error.log error; + error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; @@ -16,8 +16,8 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; root %docroot%; - access_log /var/log/httpd/domains/%domain%.log combined; - access_log /var/log/httpd/domains/%domain%.bytes bytes; + access_log /var/log/%web_system%/domains/%domain%.log combined; + access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain%.conf*; } diff --git a/install/ubuntu/templates/web/nginx/caching.stpl b/install/ubuntu/templates/web/nginx/caching.stpl index 036dc6ee7..ca6cffe32 100755 --- a/install/ubuntu/templates/web/nginx/caching.stpl +++ b/install/ubuntu/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/nginx.%domain%.conf*; + include %home%/%user%/conf/web/nginx.%domain%.conf*; } diff --git a/install/ubuntu/templates/web/nginx/caching.tpl b/install/ubuntu/templates/web/nginx/caching.tpl index 04e38d445..1462f9e1f 100755 --- a/install/ubuntu/templates/web/nginx/caching.tpl +++ b/install/ubuntu/templates/web/nginx/caching.tpl @@ -37,5 +37,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/nginx.%domain%.conf*; + include %home%/%user%/web/conf/nginx.%domain%.conf*; } From 59abdee5da3843c6754cfb394d841008b0be667d Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 11 Feb 2014 17:49:45 +0200 Subject: [PATCH 16/16] fix for nginxless configuration --- bin/v-rebuild-web-domains | 53 ++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index 663dee410..092924455 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -69,7 +69,7 @@ if [ "$domain_counter" -lt 1 ]; then # Deleting web configs rm -f $HOMEDIR/$user/conf/web/* sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" $web_conf - if [ -e "$proxy_conf" ]; then + if [ ! -z "$PROXY_SYSTEM" ]; then sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf fi @@ -103,34 +103,35 @@ else fi # Checking proxy - if [ "$proxy_change" = 'yes' ]; then - tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf" - conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" - mv $tmp_conf $conf - proxy_include=$(grep "$conf" $proxy_conf ) - if [ -z "$proxy_include" ]; then - echo "include $conf;" >> $proxy_conf + if [ ! -z "$PROXY_SYSTEM" ]; then + if [ "$proxy_change" = 'yes' ]; then + tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf" + conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" + mv $tmp_conf $conf + proxy_include=$(grep "$conf" $proxy_conf ) + if [ -z "$proxy_include" ]; then + echo "include $conf;" >> $proxy_conf + fi + else + conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" + sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf + rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf fi - else - conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" - sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf - rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf - fi - # Checking SSL proxy - if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then - tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf" - conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" - mv $tmp_conf $conf - proxy_include=$(grep "$conf" $proxy_conf ) - if [ -z "$proxy_include" ]; then - echo "include $conf;" >> $proxy_conf + # Checking SSL proxy + if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then + tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf" + conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" + mv $tmp_conf $conf + proxy_include=$(grep "$conf" $proxy_conf ) + if [ -z "$proxy_include" ]; then + echo "include $conf;" >> $proxy_conf + fi + else + conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" + sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf + rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf fi - else - conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" - sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf - rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf - fi fi