github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 13:54:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #38 from serghey-rodin/master

Browse source 
Update from official vesta github
This commit is contained in:
myvesta 2019-10-03 16:22:09 +02:00 • committed by GitHub
commit 619874873a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/deb/ioncube/control
View file

@ -1,7 +1,7 @@
Source: vesta-ioncube Source: vesta-ioncube
Package: vesta-ioncube Package: vesta-ioncube
Priority: optional Priority: optional
Version: 0.9.8-25 Version: 0.9.8-26
Section: admin Section: admin
Maintainer: Serghey Rodin <skid@vestacp.com> Maintainer: Serghey Rodin <skid@vestacp.com>
Homepage: https://www.ioncube.com Homepage: https://www.ioncube.com

2
src/deb/nginx/control
View file

@ -1,7 +1,7 @@
Source: vesta-nginx Source: vesta-nginx
Package: vesta-nginx Package: vesta-nginx
Priority: optional Priority: optional
Version: 0.9.8-25 Version: 0.9.8-26
Section: admin Section: admin
Maintainer: Predrag Damnjanovic <predrag@myvestacp.com> Maintainer: Predrag Damnjanovic <predrag@myvestacp.com>
Homepage: http://myvestacp.com Homepage: http://myvestacp.com

2
src/deb/php/control
View file

@ -1,7 +1,7 @@
Source: vesta-php Source: vesta-php
Package: vesta-php Package: vesta-php
Priority: optional Priority: optional
Version: 0.9.8-25 Version: 0.9.8-26
Section: admin Section: admin
Maintainer: Predrag Damnjanovic <predrag@myvestacp.com> Maintainer: Predrag Damnjanovic <predrag@myvestacp.com>
Homepage: http://myvestacp.com Homepage: http://myvestacp.com

2
src/deb/softaculous/control
View file

@ -1,7 +1,7 @@
Source: vesta-softaculous Source: vesta-softaculous
Package: vesta-softaculous Package: vesta-softaculous
Priority: optional Priority: optional
Version: 0.9.8-25 Version: 0.9.8-26
Section: admin Section: admin
Maintainer: Serghey Rodin <skid@vestacp.com> Maintainer: Serghey Rodin <skid@vestacp.com>
Homepage: https://www.softaculous.com Homepage: https://www.softaculous.com

2
src/deb/vesta/control
View file

@ -1,7 +1,7 @@
Source: vesta Source: vesta
Package: vesta Package: vesta
Priority: optional Priority: optional
Version: 0.9.8-25 Version: 0.9.8-26
Section: admin Section: admin
Maintainer: Predrag Damnjanovic <predrag@myvestacp.com> Maintainer: Predrag Damnjanovic <predrag@myvestacp.com>
Homepage: http://myvestacp.com Homepage: http://myvestacp.com

2
src/rpm/specs/vesta-ioncube.spec
View file

@ -1,6 +1,6 @@
Name: vesta-ioncube Name: vesta-ioncube
Version: 0.9.8 Version: 0.9.8
Release: 25 Release: 26
Summary: ionCube Loader Summary: ionCube Loader
Group: System Environment/Base Group: System Environment/Base
License: "Freely redistributable without restriction" License: "Freely redistributable without restriction"

2
src/rpm/specs/vesta-nginx.spec
View file

@ -1,6 +1,6 @@
Name: vesta-nginx Name: vesta-nginx
Version: 0.9.8 Version: 0.9.8
Release: 25 Release: 26
Summary: Vesta Control Panel Summary: Vesta Control Panel
Group: System Environment/Base Group: System Environment/Base
License: BSD-like License: BSD-like

2
src/rpm/specs/vesta-php.spec
View file

@ -1,6 +1,6 @@
Name: vesta-php Name: vesta-php
Version: 0.9.8 Version: 0.9.8
Release: 25 Release: 26
Summary: Vesta Control Panel Summary: Vesta Control Panel
Group: System Environment/Base Group: System Environment/Base
License: GPL License: GPL

2
src/rpm/specs/vesta-softaculous.spec
View file

@ -1,6 +1,6 @@
Name: vesta-softaculous Name: vesta-softaculous
Version: 0.9.8 Version: 0.9.8
Release: 25 Release: 26
Summary: Vesta Control Panel Summary: Vesta Control Panel
Group: System Environment/Base Group: System Environment/Base
License: Softaculous License License: Softaculous License

5
src/rpm/specs/vesta.spec
View file

@ -1,6 +1,6 @@
Name: vesta Name: vesta
Version: 0.9.8 Version: 0.9.8
Release: 25 Release: 26
Summary: Vesta Control Panel Summary: Vesta Control Panel
Group: System Environment/Base Group: System Environment/Base
License: GPL License: GPL
@ -68,6 +68,9 @@ fi
%config(noreplace) %{_vestadir}/web/css/uploadify.css %config(noreplace) %{_vestadir}/web/css/uploadify.css
%changelog %changelog
* Sat Sep 29 2019 Serghey Rodin <builder@vestacp.com> - 0.9.8-26
- Let's Encrypt HTTP/2 support
* Thu Aug 15 2019 Serghey Rodin <builder@vestacp.com> - 0.9.8-25 * Thu Aug 15 2019 Serghey Rodin <builder@vestacp.com> - 0.9.8-25
- Security bugfixes - Security bugfixes
- LEv2 idn fix - LEv2 idn fix

2
upd/add_notifications.sh
View file

@ -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 <a href='http://vestacp.com/features/#filemanager'>File Manager</a>. Plugin is available for <a href='/edit/server/?lead=filemanager#module-filemanager'>purchase</a>." 'filemanager' /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 <a href='http://vestacp.com/features/#filemanager'>File Manager</a>. Plugin is available for <a href='/edit/server/?lead=filemanager#module-filemanager'>purchase</a>." '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 <a href='/edit/server/?lead=sftp#module-sftp'>purchase</a> and enable <a href='http://vestacp.com/features/#sftpchroot'>SFTP Chroot</a>" /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 <a href='/edit/server/?lead=sftp#module-sftp'>purchase</a> and enable <a href='http://vestacp.com/features/#sftpchroot'>SFTP Chroot</a>"
/usr/local/vesta/bin/v-add-user-notification admin "Softaculous" "Softaculous is one of the best Auto Installers and it is finally <a href='/edit/server/?lead=sftp#module-softaculous'>available</a>" /usr/local/vesta/bin/v-add-user-notification admin "Softaculous" "Softaculous is one of the best Auto Installers and it is finally <a href='/edit/server/?lead=sftp#module-softaculous'>available</a>"
/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 <a href='http://vestacp.com/history/#0.9.8-25'>release notes</a>" /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 <a href='http://vestacp.com/history/#0.9.8-26'>release notes</a>"

3
web/edit/mail/index.php
View file

@ -72,13 +72,14 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) {
$v_domain = escapeshellarg($_GET['domain']); $v_domain = escapeshellarg($_GET['domain']);
$v_account = escapeshellarg($_GET['account']); $v_account = escapeshellarg($_GET['account']);
$v_account_without_quotas = $_GET['account'];
// Parse autoreply // Parse autoreply
if ( $v_autoreply == 'yes' ) { if ( $v_autoreply == 'yes' ) {
exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." ".$v_domain." ".$v_account." json", $output, $return_var); exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." ".$v_domain." ".$v_account." json", $output, $return_var);
$autoreply_str = json_decode(implode('', $output), true); $autoreply_str = json_decode(implode('', $output), true);
unset($output); 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); $v_autoreply_message=str_replace("\\n", "\n", $v_autoreply_message);
} }
} }

2
web/inc/i18n/nl.php
View file

@ -758,5 +758,5 @@ $LANG['nl'] = array(
'maximum characters length, including prefix' => 'maximaal %s karakters lang, inclusief prefix', 'maximum characters length, including prefix' => 'maximaal %s karakters lang, inclusief prefix',
'Email Credentials' => 'Email Credentials', 'Email Credentials' => 'E-mailreferenties',
); );