From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/plugins-available/maildeliver_plugin.inc.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 85293ae..2c16601 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -132,13 +132,13 @@
// Custom filters
if($data["new"]["custom_mailfilter"] == 'NULL') $data["new"]["custom_mailfilter"] = '';
- $tpl->setVar('custom_mailfilter', $data["new"]["custom_mailfilter"]);
+ $tpl->setVar('custom_mailfilter', str_replace("\r\n","\n",$data["new"]["custom_mailfilter"]));
// Move junk
$tpl->setVar('move_junk', $data["new"]["move_junk"]);
// Check autoresponder dates
- if($data["new"]["autoresponder_start_date"] == '0000-00-00 00:00:00' && $data["new"]["autoresponder_end_date"] == '0000-00-00 00:00:00') {
+ if((!$data['new']['autoresponder_start_date'] || $data["new"]["autoresponder_start_date"] == '0000-00-00 00:00:00') && (!$data['new']['autoresponder_end_date'] || $data["new"]["autoresponder_end_date"] == '0000-00-00 00:00:00')) {
$tpl->setVar('autoresponder_date_limit', 0);
} else {
$tpl->setVar('autoresponder_date_limit', 1);
@@ -165,8 +165,8 @@
$tpl->setVar('autoresponder_text', $data["new"]["autoresponder_text"]);
//* Set alias addresses for autoresponder
- $sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = '".$app->db->quote($data["new"]["email"])."'";
- $records = $app->db->queryAllRecords($sql);
+ $sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = ?";
+ $records = $app->db->queryAllRecords($sql, $data["new"]["email"]);
$addresses = array();
$addresses[] = $data["new"]["email"];
@@ -181,8 +181,8 @@
$alias_addresses = array();
$email_parts = explode('@', $data["new"]["email"]);
- $sql = "SELECT * FROM mail_forwarding WHERE type = 'aliasdomain' AND destination = '@".$app->db->quote($email_parts[1])."'";
- $records = $app->db->queryAllRecords($sql);
+ $sql = "SELECT * FROM mail_forwarding WHERE type = 'aliasdomain' AND destination = ?";
+ $records = $app->db->queryAllRecords($sql, '@'.$email_parts[1]);
if(is_array($records) && count($records) > 0) {
$app->log("Found " . count($records) . " records (aliasdomains).", LOGLEVEL_DEBUG);
foreach($records as $rec) {
--
Gitblit v1.9.1