From 480fefcaac7473ba68c9656e4b03cab949d55d2c Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 21 Apr 2016 13:39:01 -0400
Subject: [PATCH] Add support for Ubuntu 16.04
---
server/lib/classes/monitor_tools.inc.php | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 9b706ce..9493937 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -62,6 +62,13 @@
$mainver = array_filter($mainver);
$mainver = current($mainver).'.'.next($mainver);
switch ($mainver){
+ case "16.04":
+ $relname = "(Xenial Xerus)";
+ $distid = 'ubuntu1604';
+ break;
+ case "15.10":
+ $relname = "(Wily Werewolf)";
+ break;
case "15.04":
$relname = "(Vivid Vervet)";
break;
@@ -708,7 +715,10 @@
}
if($inHeader == true) {
$parts = explode(':', $lines[$l], 2);
- if(strtolower($parts[0]) == 'subject') $mailSubject = trim($parts[1]);
+ if(strtolower($parts[0]) == 'subject') {
+ $mailSubject = trim($parts[1]);
+ continue;
+ }
unset($parts);
$mailHeaders .= trim($lines[$l]) . "\n";
} else {
--
Gitblit v1.9.1