Merge branch 'release/v3.5.0' into production

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: TimZ99
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ["https://www.paypal.me/TimZandbergen99", "https://bunq.me/t"]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG] "
+labels: 'Type: bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version (please complete the following information):**
+ - Version [e.g. 3.3.5]
+ - PHP [e.g. 7.3]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature Request]"
+labels: 'Type: Feature'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,19 @@
+---
+name: Question
+about: Ask your questions
+title: "[Question] "
+labels: 'Type: Question'
+assignees: ''
+
+---
+
+- [ ] Looked at the documentation first
+
+**Describe the question**
+
+**Version (please complete the following information):**
+ - Version [e.g. 3.3.5]
+ - PHP [e.g. 7.3]
+
+**Additional context**
+Add any other context about the problem here.

.gitignore

@@ -9,3 +9,6 @@
 /puphpet/files/dot/ssh/
 *.bak
 __MACOSX/
+.DS_Store
+.buildpath
+.settings/

CHANGELOG.rst

@@ -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)
 ------------------------------------
 

README.rst

@@ -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,
@@ -16,7 +16,7 @@ Features:
 ---------
 
 * Monitor services and websites (see below).
-* Email, SMS, Pushover, Telegram notifications.
+* Email, SMS, Pushover, Telegram and Jabber notifications.
 * View history graphs of uptime and latency.
 * User authentication with 2 levels (administrator and regular user).
 * Logs of connection errors, outgoing emails and text messages.
@@ -39,7 +39,7 @@ There are two different ways to monitor a server:
   In both cases the script will return a "status offline", and will start sending out notifications.
 
 Each server has its own settings regarding notification.
-You can choose for email, text message (SMS), Pushover.net and Telegram notifications.
+You can choose for email, text message (SMS), Pushover.net, Telegram and Jabber notifications.
 The following SMS gateways are currently available:
 
 * Clickatell - <https://www.clickatell.com>
@@ -77,7 +77,7 @@ Requirements
 
 * Web server
 * MySQL database
-* For PHP5: 5.5.9+
+* For PHP5: 5.6.0+
 * For PHP7: 7.0.8+
 * PHP cURL package
 * PHP PDO mysql driver

composer.json

@@ -12,11 +12,12 @@
 		"symfony/config": "~3.4",
 		"symfony/dependency-injection": "~3.4",
 		"symfony/event-dispatcher": "~3.4",
-		"symfony/http-foundation": "~3.4",
+		"symfony/http-foundation": ">=3.4.35 ~3.4",
 		"symfony/filesystem": "~3.4",
 		"php-pushover/php-pushover": "dev-master",
 		"paragonie/random_compat": "^2.0",
-		"twig/twig": "~1.35"
+		"twig/twig": "~1.35",
+		"jaxl/jaxl": "^3.1"
 	},
 	"autoload": {
 		"files": [
@@ -27,4 +28,4 @@
 			"psm\\": "src/psm/"
 		}
 	}
-}
+}