echosystem.fr
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3.5.0 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEoQY/Hc/mmBVC5OarTYJo3GjoM50FAl6rbxoACgkQTYJo3Gjo
 M52HGA//cNnwdejAT1S1EHvAyt1oz5tihifeq5PEVTrYD9wzRuoKBMvlE/8dhfzP
 5qwjgBAdmUgLxKhLt5Zi1DjCjBmyZIH2of0cs9TUinBsRerBLuPNQj9VtdoD5aiY
 bj1doiCQRQQ4LGL2LdRDUWmTKmPJprsajlg+RKiTvHEQKJQ8cXDcn3PzosCQqR82
 /Hpf1mApirqPhVkh5LQuKLpEc6l0c2vYIvPaqUVdxZJXFTGDHU4TIBPljfdXk363
 tCyJzLq1cDum7kPRlyEOPewVQt4fAaifSfUaqDB1pdBrL9Pu/Ee8XCnJKRXl53FT
 ogTVBBQURvY4Cee5cigUYeBYSH17dnLlZ4piOupCd2dtzbjC6cfNuvYUOezGBE13
 lMwib1r/qEpU9CLUqsltaH9VQNdyKuLSOv4YBAfT9OFw0gi2Nsbd7PsS8/ymXfz0
 pqL4S0g8l4zSJX+w136Yoc67gvZuobsSwwKEdD6C8At7Li6Pp1yzUxq6+pFlpNPA
 i9ltpHl8UGZlgjTnK3OPowabVadKiFmagUidP5Eeg9hPJqF7may0020r/lehH0/G
 VMPQxoWxbR+xiSspQez/TZ0J7AkZgfAvt/+MLKIwtIvu3J1XlGQiw9yDkSe/vIAM
 OMOaKusmLHjvvSYLFUc336QA6LaBv22PVfG2S/g1JfHbB5MBMeY=
 =Cj+n
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEoQY/Hc/mmBVC5OarTYJo3GjoM50FAl6rb00ACgkQTYJo3Gjo
 M518GRAA3b6JIbqpGEPTTlQhBzOwxqlvzfeOtOU75Z4cdq7en0QNX/NZ0De7yi0u
 8UOQXs9i5zfbWnAnaf0wHCZTN5YvzP7ZRKel96S7v15oOOz362JC9UVfbfiI7n6f
 oavWqXVfGweJk4o7Rs9odB5QJttEPGHk15MYrqWOyKqnRS7zyqzZrDPIPT+uG9o+
 b6PJ4egE+lQVTrRABmrsNlY7ydyEe9+NHIl3Sn/cUXbncDAIqzo89OxK5g43Mdzr
 XDAOgTitCimzXI+7DLCgXoBzpaMCinhmYCMihTLSYWs+I46eiqbLD+Ce/W9wIeSE
 Sm/XKH8a9yUXWlWrbzwl3YvwDIPDhoRSgh++9y4DnZohBmePcnMC7zKlFVEh36sy
 8/swcglEUcSJ3fe1+D2VetseeQDWTFARxDtAUL0iuHrwx5HwL7zTrB8tboth/t5X
 xSb367zWPsWRmgBkQF8yYHJWSQ3lJ38YbrE3qCRTiW+HfRsNMuy/QMRqT3tyBo9D
 0PJvjEwtZUI83e4nEPwCilJ3hgLmCsZgbHDQ6BRYyFQv/j/NWMa77zhdd1rWCXEX
 1bkCR4B9K+FBjBmoLk3Jke934L5mARfWK/i9P/TXYsssRmIhrUGrG3yRGzX0qxgX
 7ZvGx69Qy17+V3udgtH4ulXd9MguYaxtUJtJ5ciNIP3Uem8nsbA=
 =4ytI
 -----END PGP SIGNATURE-----

Merge tag 'v3.5.0' into develop

# gpg: Signature made Fri May  1 02:36:42 2020 CEST
# gpg:                using RSA key A1063F1DCFE6981542E4E6AB4D8268DC68E8339D
# gpg: Good signature from "Tim Zandbergen <TimZ99@users.noreply.github.com>" [ultimate]
This commit is contained in:
TimZ99 2020-05-01 02:36:42 +02:00
parent 02c746ae41 5e4413bb2e
commit 9d0f8982b5
5 changed files with 192 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.rst
View File

@ -6,6 +6,11 @@ Not yet released
----------------
\-
v3.5.0 (released May 1, 2020)
-----------------------------
* See https://github.com/phpservermon/phpservermon/compare/v3.4.5...v3.5.0
v3.4.5 (released September 30, 2019)
------------------------------------

2
README.rst
View File

@ -5,7 +5,7 @@ PHP Server Monitor
:alt: Join the chat at https://gitter.im/erickrf/nlpnet
:target: https://gitter.im/phpservermon/phpservermon
Version 3.4.5
Version 3.5.0
PHP Server Monitor is a script that checks whether your websites and servers are up and running.
It comes with a web based user interface where you can manage your services and websites,

4
docs/conf.py
View File

@ -51,9 +51,9 @@ copyright = u'2008-2017, Pepijn Over'
# built documents.
#
# The short X.Y version.
version = '3.4.6'
version = '3.5.0'
# The full version, including alpha/beta/rc tags.
release = '3.4.6-beta.3'
release = '3.5.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

2
src/includes/psmconfig.inc.php
View File

@ -30,7 +30,7 @@
/**
* Current PSM version
*/
define('PSM_VERSION', '3.4.6-beta.3');
define('PSM_VERSION', '3.5.0');
/**
* URL to check for updates. Will not be checked if turned off on config page.

8
src/psm/Util/Install/Installer.php
View File

@ -354,8 +354,8 @@ class Installer
if (version_compare($version_from, '3.4.2', '<')) {
$this->upgrade342();
}
if (version_compare($version_from, '3.4.6-beta.3', '<')) {
$this->upgrade346();
if (version_compare($version_from, '3.5.0', '<')) {
$this->upgrade350();
}
psm_update_conf('version', $version_to);
}
@ -673,9 +673,9 @@ class Installer
}
/**
* Upgrade for v3.4.6 release
* Upgrade for v3.5.0 release
*/
protected function upgrade346()
protected function upgrade350()
{
$queries = array();
$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers`