From 52c32962a85d0dce91007cb9fd71b8983ed964f7 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 29 Sep 2019 00:09:07 +0300 Subject: [PATCH 1/4] Release 0.9.8-26 --- src/deb/ioncube/control | 2 +- src/deb/nginx/control | 2 +- src/deb/php/control | 2 +- src/deb/softaculous/control | 2 +- src/deb/vesta/control | 2 +- src/rpm/specs/vesta-ioncube.spec | 2 +- src/rpm/specs/vesta-nginx.spec | 2 +- src/rpm/specs/vesta-php.spec | 2 +- src/rpm/specs/vesta-softaculous.spec | 2 +- src/rpm/specs/vesta.spec | 5 ++++- upd/add_notifications.sh | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/deb/ioncube/control b/src/deb/ioncube/control index eb6cbe88..e8dcc311 100644 --- a/src/deb/ioncube/control +++ b/src/deb/ioncube/control @@ -1,7 +1,7 @@ Source: vesta-ioncube Package: vesta-ioncube Priority: optional -Version: 0.9.8-25 +Version: 0.9.8-26 Section: admin Maintainer: Serghey Rodin Homepage: https://www.ioncube.com diff --git a/src/deb/nginx/control b/src/deb/nginx/control index 8ee25b92..2313022f 100644 --- a/src/deb/nginx/control +++ b/src/deb/nginx/control @@ -1,7 +1,7 @@ Source: vesta-nginx Package: vesta-nginx Priority: optional -Version: 0.9.8-25 +Version: 0.9.8-26 Section: admin Maintainer: Serghey Rodin Homepage: http://vestacp.com diff --git a/src/deb/php/control b/src/deb/php/control index 55f27612..9bcbec41 100644 --- a/src/deb/php/control +++ b/src/deb/php/control @@ -1,7 +1,7 @@ Source: vesta-php Package: vesta-php Priority: optional -Version: 0.9.8-25 +Version: 0.9.8-26 Section: admin Maintainer: Serghey Rodin Homepage: http://vestacp.com diff --git a/src/deb/softaculous/control b/src/deb/softaculous/control index 9c5ad99c..121cebed 100644 --- a/src/deb/softaculous/control +++ b/src/deb/softaculous/control @@ -1,7 +1,7 @@ Source: vesta-softaculous Package: vesta-softaculous Priority: optional -Version: 0.9.8-25 +Version: 0.9.8-26 Section: admin Maintainer: Serghey Rodin Homepage: https://www.softaculous.com diff --git a/src/deb/vesta/control b/src/deb/vesta/control index 2a6ddaf2..505b2797 100644 --- a/src/deb/vesta/control +++ b/src/deb/vesta/control @@ -1,7 +1,7 @@ Source: vesta Package: vesta Priority: optional -Version: 0.9.8-25 +Version: 0.9.8-26 Section: admin Maintainer: Serghey Rodin Homepage: http://vestacp.com diff --git a/src/rpm/specs/vesta-ioncube.spec b/src/rpm/specs/vesta-ioncube.spec index 868d84bd..c3ac1187 100644 --- a/src/rpm/specs/vesta-ioncube.spec +++ b/src/rpm/specs/vesta-ioncube.spec @@ -1,6 +1,6 @@ Name: vesta-ioncube Version: 0.9.8 -Release: 25 +Release: 26 Summary: ionCube Loader Group: System Environment/Base License: "Freely redistributable without restriction" diff --git a/src/rpm/specs/vesta-nginx.spec b/src/rpm/specs/vesta-nginx.spec index 3d3ab4bd..f3250c9e 100644 --- a/src/rpm/specs/vesta-nginx.spec +++ b/src/rpm/specs/vesta-nginx.spec @@ -1,6 +1,6 @@ Name: vesta-nginx Version: 0.9.8 -Release: 25 +Release: 26 Summary: Vesta Control Panel Group: System Environment/Base License: BSD-like diff --git a/src/rpm/specs/vesta-php.spec b/src/rpm/specs/vesta-php.spec index ee07bbd0..4272db6a 100644 --- a/src/rpm/specs/vesta-php.spec +++ b/src/rpm/specs/vesta-php.spec @@ -1,6 +1,6 @@ Name: vesta-php Version: 0.9.8 -Release: 25 +Release: 26 Summary: Vesta Control Panel Group: System Environment/Base License: GPL diff --git a/src/rpm/specs/vesta-softaculous.spec b/src/rpm/specs/vesta-softaculous.spec index 23b8cf16..c094ae78 100644 --- a/src/rpm/specs/vesta-softaculous.spec +++ b/src/rpm/specs/vesta-softaculous.spec @@ -1,6 +1,6 @@ Name: vesta-softaculous Version: 0.9.8 -Release: 25 +Release: 26 Summary: Vesta Control Panel Group: System Environment/Base License: Softaculous License diff --git a/src/rpm/specs/vesta.spec b/src/rpm/specs/vesta.spec index d0b59e6a..07c53d1c 100644 --- a/src/rpm/specs/vesta.spec +++ b/src/rpm/specs/vesta.spec @@ -1,6 +1,6 @@ Name: vesta Version: 0.9.8 -Release: 25 +Release: 26 Summary: Vesta Control Panel Group: System Environment/Base License: GPL @@ -68,6 +68,9 @@ fi %config(noreplace) %{_vestadir}/web/css/uploadify.css %changelog +* Sat 29 2019 Serghey Rodin - 0.9.8-26 +- Let's Encrypt HTTP/2 support + * Thu Aug 15 2019 Serghey Rodin - 0.9.8-25 - Security bugfixes - LEv2 idn fix diff --git a/upd/add_notifications.sh b/upd/add_notifications.sh index 06882d29..46974585 100755 --- a/upd/add_notifications.sh +++ b/upd/add_notifications.sh @@ -5,4 +5,4 @@ rm -f /usr/local/vesta/data/users/admin/notifications.conf /usr/local/vesta/bin/v-add-user-notification admin "File Manager" "Browse, copy, edit, view, and retrieve all your web domain files using a fully featured File Manager. Plugin is available for purchase." 'filemanager' /usr/local/vesta/bin/v-add-user-notification admin "Chroot SFTP" "If you want to have SFTP accounts that will be used only to transfer files (and not to SSH), you can purchase and enable SFTP Chroot" /usr/local/vesta/bin/v-add-user-notification admin "Softaculous" "Softaculous is one of the best Auto Installers and it is finally available" -/usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-25" "This release is about stability and refinement. We added Let's Encrypt v2 support and added server certificate management tools. For more information please read release notes" +/usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-26" "This release adds support for Lets Encrypt HTTP/2. For more information please read release notes" From 270d29ff0679cfd1d94e21771eba3941187286cb Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 29 Sep 2019 00:17:54 +0300 Subject: [PATCH 2/4] added month to the release log date --- src/rpm/specs/vesta.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpm/specs/vesta.spec b/src/rpm/specs/vesta.spec index 07c53d1c..904bdc4e 100644 --- a/src/rpm/specs/vesta.spec +++ b/src/rpm/specs/vesta.spec @@ -68,7 +68,7 @@ fi %config(noreplace) %{_vestadir}/web/css/uploadify.css %changelog -* Sat 29 2019 Serghey Rodin - 0.9.8-26 +* Sat Sep 29 2019 Serghey Rodin - 0.9.8-26 - Let's Encrypt HTTP/2 support * Thu Aug 15 2019 Serghey Rodin - 0.9.8-25 From ec8631b2d21222956a82ddf623cab87151de81de Mon Sep 17 00:00:00 2001 From: Robin Dirksen Date: Tue, 1 Oct 2019 16:28:03 +0200 Subject: [PATCH 3/4] Update nl.php --- web/inc/i18n/nl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 851fe46d..b5d68ec4 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -758,5 +758,5 @@ $LANG['nl'] = array( 'maximum characters length, including prefix' => 'maximaal %s karakters lang, inclusief prefix', - 'Email Credentials' => 'Email Credentials', + 'Email Credentials' => 'E-mailreferenties', ); From f0782d1f826e30f00ca888008c8225b13d4b8734 Mon Sep 17 00:00:00 2001 From: dpeca Date: Thu, 3 Oct 2019 16:15:36 +0200 Subject: [PATCH 4/4] Fixing broken autoreply output Broken in https://github.com/serghey-rodin/vesta/commit/0831a198b86a4760e83c0eaec78d84bab7098e6c#diff-f07da7937954ae08bdb2e7379655ae29 @sergio-nadal --- web/edit/mail/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php index e4451fc5..44f122f1 100644 --- a/web/edit/mail/index.php +++ b/web/edit/mail/index.php @@ -72,13 +72,14 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { $v_domain = escapeshellarg($_GET['domain']); $v_account = escapeshellarg($_GET['account']); + $v_account_without_quotas = $_GET['account']; // Parse autoreply if ( $v_autoreply == 'yes' ) { exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." ".$v_domain." ".$v_account." json", $output, $return_var); $autoreply_str = json_decode(implode('', $output), true); unset($output); - $v_autoreply_message = $autoreply_str[$v_account]['MSG']; + $v_autoreply_message = $autoreply_str[$v_account_without_quotas]['MSG']; $v_autoreply_message=str_replace("\\n", "\n", $v_autoreply_message); } }