Commit Graph

666 Commits

Author SHA1 Message Date
wienfuchs c090a398d1
change rtime to numerical to avoid DB update conflicts (#963) 2020-08-12 21:11:50 +02:00
Malte Grosse 14f6e491cf
webhook support (#951)
* added webhook support

* Added missing upgrade lines

* Removed todo

* Removed linebreak

* Moved webhook below Jabber

* Fixed description not showing

* Moved webhook below jabber

* Indentation and table name fix

* Bumped version

* Fixed “header already sent” error

Co-authored-by: TimZ99 <TimZ99@users.noreply.github.com>
2020-08-12 19:27:13 +02:00
Alexandre ZANELLI 60955f799e
Adding OVH SMS Gateway. (#953)
Co-authored-by: Alexandre ZANELLI <azanelli@uuds.com>
2020-08-12 15:33:48 +02:00
Marc Farré 97d61a972c
Update Octopush.php (#968)
Replace `urlencode` by `rawurlencode` and `XXXX` by `XXXXX` otherwise you get error 121 (see https://www.octopush-dm.com/en/errors)
2020-08-12 15:31:09 +02:00
TimZ99 f29da63fb8
Merge branch 'production' into develop 2020-08-12 13:12:32 +02:00
TimZ99 be83403834
Added correct version number 2020-08-12 13:11:52 +02:00
TimZ99 e69ae1f375 Security update. jQuery vulnerability CVE-2020-11022 and CVE-2020-11023.
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEoQY/Hc/mmBVC5OarTYJo3GjoM50FAl8zwgcACgkQTYJo3Gjo
 M53YOxAA4hTTVmxr721bXZilKFDblNjGg7GJ8n1eSaa6KsYDfaaFar0M5KLPqwbV
 zupGTZK4GNPAd7lywOQsFJDyQQ1OtlRxJ1sYmSuiSBcsfRj2VfKoH463P01PxuEv
 wmSCCDCe6tdpnS2Fy3rpUL2gQmsZtF1OQatV5m9VgV8BBe9tNPhnAdTA6ZO75ofB
 jtDB2gBl1Tdp6vwNa1oa5I2xl4vgPG5zVT571z7ubIbPG8fNgBjYwu587kwZFDqy
 nvN8atkNA6+CJCrFH67kXw4Ao7r8z0gbhy/85a9gWPSLnn53HYZX65PmPqGsSZQL
 MHE8acu3vERFwDiweJwPYILJNv5+Z2xkrMwOeWXS1LawjlX+VMNkHAX+tHKIBK6M
 g7IhDuW2CNfwB6eiHGXosLPxsGzIIN4I1SLo5zLvGQvDbFKlxO/+YT5ZHCbQPw7P
 tT6umF27ULIxTSAlM/Ray8nbUJkFxi5++tvT1GX2RCexPeeSwmU2xZJDPrqqW8e6
 5VhZdOOjI+yTJVpxcySrVH2d2wDx9IHuYb1ImGq3tUM+PJzwJ4hToln32zB/rKWK
 0kPEU5kiM//09dMyDxOKRGqnIOy1klHw4Rbdf6ZEIEN0okUi5jNq6LkGXut7Eh7U
 //L8A5G8Lu1RAsZ66J5Nt5e47XTR2YA8cDRgz3Fvedw4oZJj020=
 =NTB1
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEoQY/Hc/mmBVC5OarTYJo3GjoM50FAl8zwgcACgkQTYJo3Gjo
 M50kNhAAuOehEe9EwCgSIAVBmoONpEskpX+dgLMCKQa7SX4bRrnXgtqAxEdxxhvE
 alHEJKhx+SEI/m/X0ExUHix8Vrzc3sInWIsxjG51MmHucNMfCwxOmz/sLz/jYER0
 ZHvhUxOafIjpWn0eByOls858aovVd6eNrWJS0c9K8VzNxmTBAjc1sDtkl9deRYjB
 BZ4cT/623OBqI1GEBrrxZIL+FZ573wnruZCWq2fezr72gfI9J4+LZxgVjG80c5n+
 3MsCLkI2KN/1ETd9iOybuoGRhhNKABNaboNssgM7alpAsF4O88F03dNfMD+I1jAd
 fqwGA4R5wJDtahcVwiDfoIqLk0hJIDQ7EwWpCsOPVHmNJmQ8/Iradesq77v4b3qk
 gQCt0lL5zSD6SVjT026EdJ0w5d0fmUTNzEvRgH0PlS3L7GzLxvG7cGDCTJNQK2HH
 mdjJGSHuc+SaM5XzGLOa3FRor+/V9Ljt6rC1ALL6H59u86Ef1d2yeXuz/2Oa6Q8Z
 2rbksZz5+5a8aUCi/1Vh2Lqk3YafvxbMzOU4ZGqEeyqc8vPtBRrt1YCig3J3i+zi
 cllYMWvwZlOYwd0mqA3MzYX8vL0J7WohbvZEtYq2srY3alCdi4RlW0G+HcEYrKjy
 73ti6yN10/bLEBf1P/IWADT6oi0O2SHCbC+3OGgCxbghnSpI5M0=
 =CBnn
 -----END PGP SIGNATURE-----

Merge tag 'jQuery-security-update' into develop

Security update. jQuery vulnerability CVE-2020-11022 and CVE-2020-11023.

# gpg: Signature made Wed Aug 12 12:18:47 2020 CEST
# gpg:                using RSA key A1063F1DCFE6981542E4E6AB4D8268DC68E8339D
# gpg: Good signature from "Tim Zandbergen <TimZ99@users.noreply.github.com>" [ultimate]
2020-08-12 12:18:47 +02:00
TimZ99 dd915ae97b
Updated jQuery to 3.5.1
Fixes #972.
jQuery below 3.5.0 is vulnerable to code injection even when inputs are sanitised. Please see:

[CVE-2020-11022](https://nvd.nist.gov/vuln/detail/CVE-2020-11022)
[CVE-2020-11023](https://nvd.nist.gov/vuln/detail/CVE-2020-11023)
2020-08-12 12:16:50 +02:00
dhanrajbsheth f5db23b1e5
Installer checks for needed PHP functions (#939)
Closes #903.
2020-05-25 21:36:57 +02:00
Mateusz Małek 2a15b31ecd
Ability to pan & zoom on charts (#926)
* Add ability to pan & zoom on charts

* Added map

* Added rangeMax and zoom speed

Co-authored-by: TimZ99 <TimZ99@users.noreply.github.com>
2020-05-25 18:12:43 +02:00
wienfuchs 7deac0815a
changing Windows ping routine back to socket usage, leaving Linux changes made (#938)
* use openssl_x509_parse to parse certinfo (avoid literal case conflict)

* use OS specific ping (CLI/socket)

* Moved Windows and non-Windows check to a private class


Co-authored-by: TimZ99 <TimZ99@users.noreply.github.com>
2020-05-25 18:10:10 +02:00
Tim f02d55635e
Changed ping6 to ping -6 for windows (#936)
Resolving #935.
2020-05-25 14:39:30 +02:00
wienfuchs 07abc7d294
use OS specific ping count parameter (#932)
* use OS specific ping count parameter

* Reorganized and complied with PSR-12

Co-authored-by: TimZ99 <TimZ99@users.noreply.github.com>
2020-05-24 23:40:19 +02:00
wienfuchs 96d0c3fa57
use openssl_x509_parse to parse certinfo (avoid literal case conflict) (#931) 2020-05-24 23:31:19 +02:00
Tim ea33ba07ca
Updated ping check (#919)
Check if transmitted and received packets is equal.
2020-05-18 22:05:19 +02:00
Tim 7856de4bbb
Better fit for bigger screens (#875)
Fixes #857.
2020-05-18 20:43:13 +02:00
Tim a19127721c
Display time in ms instead of seconds (#918) 2020-05-18 19:58:33 +02:00
Mateusz Małek 7f1ea8452a
Fixed issue with choosing user permissions while adding server (#923) 2020-05-18 19:57:37 +02:00
Mateusz Małek de653fce9b
Set custom user agent (#924) 2020-05-18 19:55:05 +02:00
Mateusz Małek 2fd9702485
Add ability to set custom site title (#922) 2020-05-18 19:45:44 +02:00
Mateusz Małek 4894653891
Show recent status logs on server details page (#921) 2020-05-18 19:42:24 +02:00
Tim 6a869aff18
SMSAPI gateway (#920) 2020-05-18 19:41:27 +02:00
TimZ99 875b0208b5
Indentation 2020-05-18 19:41:08 +02:00
Mateusz Małek 586c01136e
SMSAPI gateway 2020-05-18 00:39:50 +02:00
TimZ99 c0e0b260d5
Indent to space 2020-05-17 21:03:42 +02:00
wienfuchs 7bee25cc1e
Re-adding support PHP 5.5.9/7.0.x (#915)
Resolves #908.
2020-05-15 16:55:57 +02:00
TimZ99 76687d8c45
Bumped version to 3.5.0 2020-05-01 02:36:18 +02:00
imsoftware 02c746ae41
Set php5 support to 5.6+ (#891)
See bug report for php 5.5.9: https://github.com/phpservermon/phpservermon/issues/889
Fixes #889.

Co-authored-by: Tim <TimZ99@users.noreply.github.com>
2020-05-01 01:17:48 +02:00
imsoftware 6c5665d0cd
Added link to server at single view template (#890) 2020-04-22 16:05:46 +02:00
Petr Suchy af5334a073
Jabber (XMPP) notifications (#852)
Added Jabber/XMPP notifications.
Closes #829.
2020-04-19 15:31:40 +02:00
Flávio Gomes da Silva Lisboa b346cd9c4d
Fixed fail to ping IPv6 #879 (#880)
Fixes #879.
2020-04-19 14:41:29 +02:00
Tim a129d88167
Disable web page preview for Telegram (#886)
Resolves #883.
2020-04-08 13:43:36 +02:00
Rich B ec21df1555
Corrected grammar in Telegram activation message (#885) 2020-04-08 13:20:15 +02:00
TimZ99 ee16078884
Delete button on server edit
Fixes #860.
2020-03-15 21:34:27 +01:00
TimZ99 86bff4dbae
Removed English translations 2020-03-15 21:12:27 +01:00
TimZ99 11b1850754
Updated style sheets 2020-03-15 17:49:32 +01:00
TimZ99 951586d77d
Misplaced user dropdown
Fixes #867.
2020-03-15 17:45:40 +01:00
TimZ99 be928f8241
Fixed delete server dialog
Fixes #873.
2020-03-15 17:34:26 +01:00
TimZ99 02f8484b3b
Set sender's phone number to max 15 characters
E.164 standard.
Fixes #866.
2020-02-11 20:11:07 +01:00
TimZ99 39be47d573
Hide icon if it's globally disabled
Closes #858.
2020-02-09 20:19:08 +01:00
TimZ99 7ca93c40a6
Hide port for ping
Closes #859.
2020-02-09 19:57:31 +01:00
TimZ99 c6e53b9a6f
Added missing pushover and telegram description 2020-02-09 19:48:07 +01:00
TimZ99 7efffff40e
Added target _blank to external urls
Resolves #862.
2020-02-09 19:47:28 +01:00
TimZ99 019d4050ac
File mode changed from 775 to 644
Fixes #863.
2020-02-09 18:04:26 +01:00
Petr Suchy 3193665ef8
Encrypt email_smtp_password (#854)
Fixes #853.
Email_smtp_password is saved encrypted and not as plain text.


Co-authored-by: Tim <TimZ99@users.noreply.github.com>
2020-02-09 17:45:08 +01:00
Michael 1d779760ce
Improve accessibility of cards and tableview (#851)
To enable keyboard users to show server details the links are added as
HTML `a` Tags not only for <noscript> variant.
This also improves accessibility as screen reader users usually are not
able to perform click events on div elements. The do not even know there
is a click event handler. Click event handlers only work on buttons by
default as browsers forward the keyboard activity on buttons to the
onclick handler.
2020-02-09 15:40:45 +01:00
TimZ99 ed6ef89df5
Hotfix - sslCheck warning days
Minimum amount of days the ssl cert needs to be valid before expiration wasn't used.
2020-02-09 15:16:23 +01:00
Tim 19fb244592
Hotfix - check ssl (#850)
Fixes #849.
Check ssl just when other error is not already in
CheckSsl should check PHP_VERSION and not PHP_RELEASE_VERSION
2020-02-09 15:12:07 +01:00
TimZ99 7ffc75598a
Refactor 2020-02-09 15:10:07 +01:00
TimZ99 51dbbf9510
Refactor 2020-02-08 20:57:53 +01:00
Ing. Petr Suchy 5934e9a25c
*fix - checkSsl should check PHP_VERSION and not PHP_RELEASE_VERSION 2020-02-07 08:03:12 +01:00
Ing. Petr Suchy 8fa1bf6c0d
*edit - check ssl just when other error is not already in 2020-02-07 07:59:50 +01:00
Ing. Petr Suchy e32977ffff
*fix - check and update latest version 2020-02-07 07:43:16 +01:00
Tim 45d1c03e5a
Feature/ssl cert expiration check (#831)
Added ssl expiration to warning state.
2020-02-04 16:44:48 +01:00
Petr Suchy 442f9d115e
Added Separate check when server is down (#844)
Future request - separate checks when down.
Closes #755.
2020-02-04 16:41:34 +01:00
Nayef Alebrahim 3568a5700b
Fixed removing and demoting last admin (#841)
Fixes #824.


Co-authored-by: Tim <TimZ99@users.noreply.github.com>
2020-02-04 16:16:30 +01:00
Petr Suchy 71c4114747
Fixed psm_password_decrypt
BUG: HTTP2 Authentification
Fixes #706.
2020-02-04 15:44:11 +01:00
TimZ99 676e80d42f
Improved servers table layout
Fixes #779.

Co-Authored-By: James <jigr1969@users.noreply.github.com>
2020-01-15 23:15:30 +01:00
TimZ99 0550ff7dcf
Added ping error 2020-01-15 10:33:47 +01:00
TimZ99 6ba4b59239
Changed ping from socket to exec function
As there are a lot of problems with permissions and ping, the function now uses exec(). Resolved #405, #576, #614, #748.

Co-Authored-By: Sean Perryman <se@nperryman.com>
Co-Authored-By: Luke C <crawford.luke@outlook.com>
2020-01-14 20:12:40 +01:00
Tim d7536d209e
Add Traditional Chinese Language File. (#618)
Translate all contents according to v3.3.1 version
2019-12-19 20:29:14 +01:00
Tim 50b5a6937b
Update zh_TW.lang.php 2019-12-19 20:26:26 +01:00
Tim 620ab023f9
Update zh_TW.lang.php 2019-12-19 20:19:41 +01:00
TimZ99 a9f0f64c78
Public server page 2019-12-13 14:13:04 +01:00
TimZ99 95d30f9619
Fixing indentation 2019-12-12 21:34:55 +01:00
Tim 07243f4cb5
Merge branch 'develop' into patch-1 2019-12-12 18:32:29 +01:00
TimZ99 97f8a6d637
Refactor
Removed unreachable code

Removed useless method overriding
2019-12-12 17:52:36 +01:00
Jeremy GHYS b7426291f8
Fix Server Downtime is displayed incorrectly
Server Downtime is displayed in correctly when receiveing e-mails about it.
2019-12-12 17:26:42 +01:00
TimZ99 084dd59b84
Removed not translated parts 2019-12-12 16:52:23 +01:00
Tim cb806361ed
Ukrainian translation (#821) 2019-12-11 21:51:55 +01:00
Tim dd6d9973fe
Implementing the PSR12 standard
Just updated it to the latest commit.
2019-12-11 21:48:29 +01:00
TimZ99 0a5a8c02f5
Implementing the PSR12 standard
Using PHPCS and PHPSBF.

For language files also used PSMLE.
2019-12-11 21:27:14 +01:00
TimZ99 2c51ad12f7
Implementing the PSR12 standard
Using PHPCS and PHPSBF.
2019-12-11 21:27:04 +01:00
Oleksa e415d0fa41
Translated admin_cant_be_deleted 2019-12-11 12:59:44 +02:00
Tim 235f848d16
A few cosmetic updates and added new translation 2019-12-10 20:27:48 +01:00
TimZ99 0c91d27a70
Fixed Error QUERY_STRING on sign in
Added default value for QUERY_STRING.
2019-12-10 19:51:20 +01:00
TimZ99 7f5e698752
Fixed #811 DB wrong field type on fresh install.
Added the first part with #770. Forgot to  add it to the fresh install function.

Also removed the default value for TEXT as TEXT can't have a default value.

Co-Authored-By: Matěj Kmínek <matej.kminek@attendees.eu>
2019-12-10 19:43:42 +01:00
TimZ99 d7ea421d5c
Fixed #822 website auth setting not showing
Wrong variable was used.
2019-12-10 18:59:40 +01:00
TimZ99 420211f61f
Fixed #816 url validation 2019-12-10 18:09:56 +01:00
Oleksa 32ab865ae0
Ukrainian translation 2019-12-09 12:57:22 +02:00
TimZ99 24ee6d02c4
Fixed false trigger_error() after redirect.
Resolves #814.
2019-12-03 00:34:01 +01:00
ICTman1076 93ceb42a10 Hopefully fix #704 (#791)
* Fix #704 - use regex instead of PHP's own function

* Updated .ltd length to 12

For domains like .company .services .business.
2019-11-29 23:44:26 +01:00
Travis Botello 7e3cbc94a9 Replaced mcrypt with openssl (#678) (#805)
* Replaced mcrypt with openssl (#678)

* Removed TODO
2019-11-29 23:32:09 +01:00
TimZ99 627a93cc7c
Added cachebuster
Resolves #802.
2019-10-22 20:39:33 +02:00
sx404 0969f4043e Increased password length (#796)
Fixes #786.
Increased password length drastically.
2019-10-10 14:35:53 +02:00
TimZ99 d40df0c024
Fixed typo
Fixes #797.
2019-10-10 14:33:05 +02:00
TimZ99 030b2b3c2f
Prevented removal of last admin
Fixes #687.
2019-10-10 00:03:56 +02:00
TimZ99 0198d76a75
Added default timeout
Fixes #794.
2019-10-09 22:03:53 +02:00
TimZ99 cf2566d1d3
Fixed undefined index issue
Fixes #792.
2019-10-09 20:59:32 +02:00
TimZ99 25e8cece3c
Bringing back the warning state.
Fixes #790.
2019-10-09 20:39:15 +02:00
TimZ99 43c60867b3
Improving accessibility
Comming closer to WCAG 2.0 AAA.
2019-10-09 20:33:59 +02:00
TimZ99 56587826a3
Bumped version to 3.4.5 2019-09-30 17:59:24 +02:00
TimZ99 a8eaedc817
Fixed undefined index
Fixes #787.
2019-09-30 17:50:20 +02:00
TimZ99 86b75c3068
Removed unsused css 2019-09-26 19:49:26 +02:00
TimZ99 7316355658
Changed to ‘local - English’ 2019-09-26 18:48:29 +02:00
TimZ99 dc45eee0d3
Fixed update message 2019-09-26 18:36:17 +02:00
Rémy Lebrun 6fd71e1d55 Correction FR translation (#668) 2019-09-26 18:21:23 +02:00
Emmanuel RABOTTEAU 884a563e6a Update fr_FR.lang.php (#776)
- Added and translated missing string in 'system' array
- Updated translation of 'level' in 'users' array
- Added and translated missing string in 'users' array about Telegram
- Added and translated missing string in 'log' array about Telegram
- Added and translated missing string in 'servers' array
- Added and translated missing string in 'config' array
- Added and translated missing string in 'notifications' array
2019-09-26 18:00:59 +02:00
TimZ99 f84061ee14
Get latest version from Github.
The latest version number will now come from Github instead of phpservermonitor.org.
2019-09-26 14:07:16 +02:00
TimZ99 b0df0e77bf
Bumped version to 3.4.4 2019-09-26 13:15:34 +02:00