From 219bb4b7f28b2f5670fe2d8e7e6a09fbfd3ec70a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 20 Oct 2011 05:32:09 -0400
Subject: [PATCH] - Fixed bug in web folder delete function.

---
 server/plugins-available/maildeliver_plugin.inc.php |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 61cca83..61efb9c 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -112,7 +112,13 @@
 				
 			// Move junk
 			$tpl->setVar('move_junk',$data["new"]["move_junk"]);
-				
+
+			// Set autoresponder start date
+			$tpl->setVar('start_date',$data["new"]["autoresponder_start_date"]);
+
+			// Set autoresponder end date
+			$tpl->setVar('end_date',$data["new"]["autoresponder_end_date"]);
+
 			// Autoresponder
 			$tpl->setVar('autoresponder',$data["new"]["autoresponder"]);
 			
@@ -123,8 +129,8 @@
 			$sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = '".$app->db->quote($data["new"]["email"])."'";
 			$records = $app->db->queryAllRecords($sql);
 			$addresses = '';
-			if(is_array($records)) {
-				$addresses .= ':addresses [';
+			if(is_array($records) && count($records) > 0) {
+				$addresses .= ':addresses ["'.$data["new"]["email"].'",';
 				foreach($records as $rec) {
 					$addresses .= '"'.$rec['source'].'",';
 				}

--
Gitblit v1.9.1