From af9f25562065548045aeee86295f3329af56a08f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 25 May 2012 02:41:56 -0400
Subject: [PATCH] - Fixed bug in mailbox function of the resync tool. - Added missing alias address list to sieve filter template.
---
server/conf/sieve_filter.master | 1 +
interface/web/tools/resync.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/interface/web/tools/resync.php b/interface/web/tools/resync.php
index 86ba27d..dcc0ac2 100644
--- a/interface/web/tools/resync.php
+++ b/interface/web/tools/resync.php
@@ -122,7 +122,7 @@
if(isset($_POST['resync_mailbox']) && $_POST['resync_mailbox'] == 1) {
$db_table = 'mail_user';
$index_field = 'mailuser_id';
- $sql = "SELECT * FROM ".$db_table." WHERE active = 'y'";
+ $sql = "SELECT * FROM ".$db_table;
$records = $app->db->queryAllRecords($sql);
if(is_array($records)) {
foreach($records as $rec) {
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index a34c50b..12507d9 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -33,5 +33,6 @@
vacation :days 1
:subject "Out of office reply"
# :addresses ["test@test.int", "till@test.int"]
+ <tmpl_var name='addresses'>
"<tmpl_var name='autoresponder_text'>";
</tmpl_if>
--
Gitblit v1.9.1