Commit Graph

1000 Commits

Author SHA1 Message Date
Tim Zandbergen fccc264107
Merge pull request #1183 from viharm/fix/DBUserDetailRetention-LDAP
Retain user data in DB for existing users
2023-08-14 21:31:43 +02:00
Viharm 61afb81554
Cleanup 2023-08-14 05:43:24 +00:00
Viharm 537b17ac01
Merge branch 'phpservermon:develop' into fix/DBUserDetailRetention-LDAP 2023-08-14 06:34:37 +01:00
Tim Zandbergen 5f65f92678
Merge pull request #1255 from RaphaelBergmann/develop
Updated SMSGlobal API URL
2023-08-13 21:59:07 +02:00
Marc Farré 850f0eac8d
Update Octopush.php (#1259)
Update Octopush.php. Now accepting 200 as a valid response code.
2023-08-13 21:55:17 +02:00
Viharm 59966c6cd2
Signed commit 2023-08-13 18:52:19 +00:00
Viharm c81a4a426c
Merge branch 'phpservermon:develop' into fix/DBUserDetailRetention-LDAP 2023-08-10 15:01:35 +01:00
Raphael.Bergmann 7245f65873
Updated SMSGlobal API URL 2023-05-31 15:45:17 +02:00
Samuel Denis-D'Ortun 04a4d959fd
Merge pull request #1119 from RedKage/patch-1
Support for mysql unix socket
2022-04-14 08:27:05 -04:00
Samuel Denis-D'Ortun 015cc9553b
Merge pull request #1184 from phpservermon/dependabot/composer/viharm/psm-ldap-auth-1.1.4
Bump viharm/psm-ldap-auth from 1.1.3 to 1.1.4
2022-04-14 08:18:36 -04:00
Samuel Denis-D'Ortun 462f091c69
Merge pull request #1188 from Germs2004/patch-2
Clarify description of permission setting
2022-04-14 08:16:30 -04:00
Germs2004 7f5b5878da
Clarify description of permission setting
This setting only says it controls which users this server is visible to.  But it also affects which users get notifications when this server's status changes.  This pull request clarifies the setting's description so users will understand that it affects both visibility and notifications.
2022-03-27 16:36:17 -04:00
dependabot[bot] 4693ff3910
Bump viharm/psm-ldap-auth from 1.1.3 to 1.1.4
Bumps [viharm/psm-ldap-auth](https://gitlab.com/viharm/PsmLDAPauth) from 1.1.3 to 1.1.4.
- [Release notes](https://gitlab.com/viharm/PsmLDAPauth/tags)
- [Commits](https://gitlab.com/viharm/PsmLDAPauth/compare/v1.1.3...v1.1.4)

---
updated-dependencies:
- dependency-name: viharm/psm-ldap-auth
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-14 19:00:44 +00:00
viharm 9643ef3f6f
Added additional parameter passed to LDAP auth module for checking existing user data in DB 2022-03-14 17:11:51 +00:00
Tim Zandbergen b18c4d2855
Changed IP from 192.168.50.100 to 192.168.56.100 2021-12-27 23:56:35 +01:00
Tim Zandbergen 460db614f8
Removed double locale 2021-12-12 23:40:33 +01:00
Marc Farré 8dcf5c2666
Update Octopush.php (#1147)
* Update Octopush.php

Now works with the new API V1 : https://octopush.com/en/sms-gateway-api-documentation/

* Update Octopush.php

* Updated send check

Co-authored-by: Tim Zandbergen <TimZ99@users.noreply.github.com>
2021-12-11 01:36:08 +01:00
Tim Zandbergen 74dfeea08b
Add note to db-password containing % causes error
Closes #1154.
2021-12-10 23:10:27 +01:00
Tim Zandbergen d725bd9234
Increased max lenght for post field value
Fixes #1148.
2021-12-10 22:40:14 +01:00
Tim Zandbergen 87dfcd183b
Ignore /.vscode 2021-12-10 22:38:52 +01:00
Tim Zandbergen cc6cece19c
Renamed configfile to prevent confusion 2021-12-10 22:09:50 +01:00
ivnilv 162bba0046
Update and Fix Vagrant development setup (#1111)
CHANGES

- Updated to Ubuntu 20.04 bento vagrant box
- Updated PHP to PHP-FPM 7.4
- Updated MySQL to Percona Server 5.7
- Now runs with NGINX as web server (default vhost kept as before http://192.168.50.100/)
- DEPRECATED: No longer relying on puphpet code (it's outdated and no longer maintained)
- Updated Vagrantfile to use ansible
- NEW: Automation in vagrant is now handled by ansible (see provision.yaml for details)
- A couple of shell scripts to handle "re-running" of the vagrant up command for faster executions ( setup-php.sh, setup-mysql.sh )
2021-12-10 20:57:20 +01:00
Tim Zandbergen b81f173a05
Update FUNDING.yml 2021-09-03 21:02:40 +02:00
Akshay Jain 76d0c276c0
Update User.php (#1135)
https://www.huntr.dev/bounties/3-phpservermon/phpservermon/
2021-07-28 20:04:12 +02:00
Tim Zandbergen 689afca21f
phpmailer/phpmailer update to non-vulnerable version
Does not affect PSM, just a precocious.
2021-06-24 19:48:43 +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
Tim 6d74c45e0b
Added huntr badge 2021-06-21 22:23:36 +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
Denis Stepanov 434159e461
Update uk_UA.lang.php (#911)
* Update uk_UA.lang.php
2021-05-31 04:08:23 +02:00
imsoftware cfe3a6f61c
Make updater.sh more robust #898 (#979)
Integrate updater.sh changes from #898 for more robust updates e.g. for Synology, see: https://github.com/phpservermon/phpservermon/issues/898

Closes #898
2021-05-31 04:06:52 +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 056b429230
Updated minimal version of phpmailer
CVE-2020-36326. PHPMailer 6.4.1 has been patched.
2021-05-09 15:50:42 +02:00
TacticalFreak 617adeea6f
Support for mysql unix socket
This will add support for connecting with a unix socket path to the mysql database.
Users will need to set their `PSM_DB_HOST` the unix socket path starting with an ":" symbol, like so
`:/home/xxxxxx/var/run/mysql.sock`

I stole this way idea of using the database host to store the unix socket path from Nextcloud. They do the same.

Related: https://github.com/phpservermon/phpservermon/issues/1118
2021-05-02 14:08:23 +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 dbd0217053
Updated composer.lock 2021-04-15 01:07:02 +02:00
TimZ99 13b893e1d0
changed whitespace 2021-04-15 01:06:53 +02:00
Oleg Petrov 6281ae07bf
Update updater.sh (#1086)
Allow curl to download file with url redirection
2021-04-15 00:21:24 +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
dependabot[bot] 803519479a
Bump phpmailer/phpmailer from 6.1.7 to 6.4.0 (#1105) 2021-04-01 22:53:27 +00:00
dependabot[bot] 0a54b1444d
Bump paragonie/random_compat from 2.0.18 to 2.0.19 (#1073) 2021-04-01 22:53:16 +00: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