From 93e7c2d51119be25b34fec4b2eb5771f40cf7d31 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 17 Mar 2016 06:56:08 -0400
Subject: [PATCH] changed regex for backup_dir (allow empty backup-dir to disable backups)
---
server/lib/classes/monitor_tools.inc.php | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 9b706ce..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;
@@ -708,7 +711,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