From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/lib/classes/monitor_tools.inc.php | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index ce3d4bb..9493dc6 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -62,6 +62,9 @@
$mainver = array_filter($mainver);
$mainver = current($mainver).'.'.next($mainver);
switch ($mainver){
+ case "15.10":
+ $relname = "(Wily Werewolf)";
+ break;
case "15.04":
$relname = "(Vivid Vervet)";
break;
@@ -702,13 +705,16 @@
$mailSubject = '';
$inHeader = true;
for($l = 0; $l < count($lines); $l++) {
- if($lines[$l] == '') {
+ if(trim($lines[$l]) == '') {
$inHeader = false;
continue;
}
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