Commit Graph

652 Commits

Author SHA1 Message Date
Akshay Jain 76d0c276c0
Update User.php (#1135)
https://www.huntr.dev/bounties/3-phpservermon/phpservermon/
2021-07-28 20:04:12 +02:00
scheibling e28192278c
Update FreeMobileSMS.php - Fix encoding bug (#1132)
Fix the URL encoding by changing urlencode to rawurlencode, since the former uses + instead of %20 to encode an URL and is meant for form submissions. Rawurlencode is meant for creating URLs, and should fix bug #1120
2021-06-23 22:47:27 +02:00
Tim Zandbergen 3daa804d5f
SECURITY: Replaced mt_rand with random_bytes
https://huntr.dev/bounties/2-phpservermon/phpservermon/
CWE-1241: Use of Predictable Algorithm in Random Number Generator
2021-06-23 22:06:34 +02:00
Tim Zandbergen bb10a5f3c6
SECURITY: Replaced mt_rand with random_bytes
https://huntr.dev/bounties/1-phpservermon/phpservermon/
CWE-1241: Use of Predictable Algorithm in Random Number Generator
2021-06-23 22:05:58 +02:00
scheibling 32fcb8b0e8
Added Tele2 API (#1130)
* Added Tele2 API

* Fixed mistake, added to readme, added number formatting

Co-authored-by: larsec <larsec@novea.nu>
Co-authored-by: Lars Scheibling <lars.scheibling@hoglandet.se>
Co-authored-by: Tim Zandbergen <TimZ99@users.noreply.github.com>
2021-06-21 22:49:40 +02:00
wilhelch ecc1c6649a
Fixed SMTPAutoTLS Default (#1129)
PHPMailer will always try to connect to an SMTP server via TLS by default regardless of the SMTPSecure Setting. Added a check to set SMTPAutoTLS to false when email_smtp_security is empty.
2021-06-14 23:35:02 +02:00
Unknown 2eb190e07e
Adding LabsMobile SMS Gateway (#961)
* Adding LabsMobile SMS Gateway

* Adding LabsMobile SMS Gateway Reference

* Update LabsMobile.php

Co-authored-by: Tim <TimZ99@users.noreply.github.com>
2021-05-31 04:12:18 +02:00
Michael 88708240c7
Add error message for missing/invalid header (#1017)
* add error message for missing/invalid header

* Code cleanup

- simplify the check
  - do not invert the result of `preg_match()`
  - do not set the `$result` in loop, it is already set after the loop
- fix the order of code, first set `$this->error` then `$result`
2021-05-31 04:02:20 +02:00
Luke√ 9c8ed81203
Update translation (fix typo issue) (#1125) 2021-05-31 03:57:02 +02:00
TimZ99 c0401fd143
Updated translation
Fixes #1121.
Fixes #1123.
2021-05-09 16:39:30 +02:00
TimZ99 de7c62cbce
Fixed typo in array - related to jabber
Fixes #1049.
2021-04-15 02:52:27 +02:00
Michael 600f63097e
Add more variables for webhook json (#1016)
* Add more variables for webhook json

To allow status specific icons and a special Text defined in the json, not only provide #message as variable, but also #server_ip, #server_label, #server_last_offline_duration and #status.

* Add #server_error as additional variable for webhooks
2021-04-15 02:00:06 +02:00
wienfuchs e5b76ca49e
add feature "add url" to email and telegram (#1085)
Resolved #967.

* add feature "add url" to email and telegram

* Added missing brackets

* Changed $body to correct var $message

And changed PHP_EOL to <br>.

* Changed text a little

* Add dutch translation

Co-authored-by: TimZ99 <TimZ99@users.noreply.github.com>
2021-04-15 01:50:44 +02:00
TimZ99 13b893e1d0
changed whitespace 2021-04-15 01:06:53 +02:00
Seti c3a3c3ab2c
Fix: 'Cookies must be enabled in your browser!' message on some pages (#1032) 2021-04-02 00:58:08 +02:00
Viharm 17cb13364b
Feature ldapauth (#507)
* Composer dependency added

* Updated code for language and config controller

* Added LDAP auth code

* Added blank discord value for new user during install
2020-12-16 00:21:45 +01:00
hjcday 79ccd15a76
Fix Plivo SMS encoding (#981)
Co-authored-by: hjcday <hugh.day@lsv.com.au>
2020-12-16 00:16:05 +01:00
Philip 28caad2c85
Update de_DE.lang.php (#1025)
* Update de_DE.lang.php


Co-authored-by: Tim <TimZ99@users.noreply.github.com>
2020-12-16 00:14:05 +01:00
Joseph Helela 54a5e2801c
Adding Infobip SMS Gateway (#1012) 2020-12-16 00:01:10 +01:00
jamgames2 59f4f44107
Update profile.tpl.html (#1050)
- ADD '   type="button"    ' for prevent ' Enter Button ' from keyboard that open telegram activation page.
2020-12-15 23:54:21 +01:00
Lukas 10f111c830
PromoSMS Gateway (#1064) 2020-12-15 23:52:16 +01:00
Mario Rothauer 31e987a1d5
Improved german translation (#1071) 2020-12-15 23:48:01 +01:00
Samuel Denis-D'Ortun b59f62c139
Merge pull request #986 from phpservermon/feature/public_page
Public page
2020-11-01 11:09:16 -05:00
Edgar Ostrowski aad1a1eda7
Update of Polish translation (#985) 2020-09-09 11:46:32 +02:00
TimZ99 66983a0a66
Indentation and changed readonly to required 2020-08-26 16:00:27 +02:00
TimZ99 f1df99c5ae
Moved update script to 3.6.0 2020-08-26 15:59:46 +02:00
TimZ99 99bcc90c03
Auto gen password for __PUBLIC__ and hide fields 2020-08-26 15:58:58 +02:00
Tim 36e33b3215
Removed old check
Removal of last admin has been fixed with 3568a570.
2020-08-26 15:17:23 +02:00
TimZ99 e599c18f0b
Merge remote-tracking branch 'origin/develop' into feature/public_page
# Conflicts:
#	README.rst
#	config.php.sample
#	src/includes/psmconfig.inc.php
#	src/lang/en_US.lang.php
#	src/psm/Module/User/Controller/UserController.php
#	src/psm/Util/Install/Installer.php
2020-08-24 22:27:51 +02:00
TimZ99 8cbf2dd7bf
Bumped version 2020-08-18 17:53:26 +02:00
TimZ99 27d9bd6a70
Only __public__ can be anonymous 2020-08-18 17:53:18 +02:00
TimZ99 b94d66bfc0
Added user on upgrade 2020-08-18 17:50:22 +02:00
Marc Farré ba0fa251e9
Update Octopush.php (#975)
With the low cost default value, SMS are sometimes received many hours after. For a monitoring software, this has no sense, we need to be sure to receive the alert by SMS instantly to repair the problem as quick as possible. Otherwise, SMS is useless, email is free and good enough. Moreover, the price difference between low cost and premium is small.
2020-08-14 17:56:13 +02:00
Daniel Krusky d0f5d18fc4
Added support for Discord using Webhooks (#971)
* Added support for Discord using Webhooks

* Bumped version

* Fixed broken upgrade

* Moved discord below Jabber

* Fixed broken comment

* Added missing translation

* Updated version

* Typo

* Moved Discord under Jabber

* Fixed icons

* Moved Webhook and discord after Jabber

Co-authored-by: Tim <TimZ99@users.noreply.github.com>
2020-08-12 21:33:44 +02:00
Dylan Ysmal 74b97db66f
Add Ysmal.fr SMS gateway (#906) 2020-08-12 21:26:28 +02:00
milux 9fe598d774
Increased graph data processing speed (#944) 2020-08-12 21:23:47 +02:00
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