From daa532ddc1b90e119d4dc0ab797b514dcdc56c22 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 14 Nov 2011 11:30:49 -0500
Subject: [PATCH] Fixed: FS#1681 - Out-of-Office too early Fixed: FS#1801 - german specialchars making trouble in logs
---
server/lib/classes/monitor_tools.inc.php | 3 ---
server/conf/sieve_filter.master | 2 +-
server/mods-available/monitor_core_module.inc.php | 6 ++++++
server/plugins-available/maildeliver_plugin.inc.php | 2 ++
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 9965ebb..89f8f08 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -30,7 +30,7 @@
stop;
}
-if allof(currentdate :value "ge" "date" "<tmpl_var name='start_date'>", currentdate :value "le" "date" "<tmpl_var name='end_date'>") {
+if allof(currentdate :value "ge" "iso8601" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {
vacation :days 1
:subject "Out of office reply"
<tmpl_var name='addresses'>
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 26768c3..6a4804c 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -887,9 +887,6 @@
$state = 'no_state';
$data['output'] = '';
}
-
- //* Encode data
- $data['output'] = htmlentities($data['output']);
/*
* Return the Result
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index ec85bed..ca1e9e4 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -406,6 +406,9 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorSystemUpdate();
+
+ //* Ensure that output is encoded so that it does not break the serialize
+ $res['data']['output'] = htmlentities($res['data']['output']);
/*
* Insert the data into the database
@@ -692,6 +695,9 @@
* First we get the Monitoring-data from the tools
*/
$res = $this->_tools->monitorISPCCronLog();
+
+ //* Ensure that output is encoded so that it does not break the serialize
+ $res['data']['output'] = htmlentities($res['data']['output']);
/*
* Insert the data into the database
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 61efb9c..0576fde 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -114,9 +114,11 @@
$tpl->setVar('move_junk',$data["new"]["move_junk"]);
// Set autoresponder start date
+ $data["new"]["autoresponder_start_date"] = str_replace (" ", "T", $data["new"]["autoresponder_start_date"]);
$tpl->setVar('start_date',$data["new"]["autoresponder_start_date"]);
// Set autoresponder end date
+ $data["new"]["autoresponder_end_date"] = str_replace (" ", "T", $data["new"]["autoresponder_end_date"]);
$tpl->setVar('end_date',$data["new"]["autoresponder_end_date"]);
// Autoresponder
--
Gitblit v1.9.1