Commit daa532dd authored by tbrehm's avatar tbrehm
Browse files

Fixed: FS#1681 - Out-of-Office too early

Fixed: FS#1801 - german specialchars making trouble in logs
parent 662d4cc6
......@@ -30,7 +30,7 @@ if header :contains "X-Spam-Flag" "YES" {
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'>
......
......@@ -887,9 +887,6 @@ class monitor_tools {
$state = 'no_state';
$data['output'] = '';
}
//* Encode data
$data['output'] = htmlentities($data['output']);
/*
* Return the Result
......
......@@ -406,6 +406,9 @@ class monitor_core_module {
* 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 @@ class monitor_core_module {
* 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
......
......@@ -114,9 +114,11 @@ class maildeliver_plugin {
$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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment