smeserver-vacation/contribs8/smeserver-vacation-1.0-filterorder.patch

--- smeserver-vacation-1.0/root/etc/e-smith/templates-user/.qmail/74vacationMessage.filterorder 2009-06-06 10:50:03.000000000 +1000
+++ smeserver-vacation-1.0/root/etc/e-smith/templates-user/.qmail/74vacationMessage     2009-06-06 10:51:16.000000000 +1000
@@ -1,4 +1,10 @@
 {
+  if ($qmail{FilterOrder})
+  {
+    return '# qmail FilterOrder enabled - vacation'
+  }
+  else
+  {
     my $VacationDelay =  $qmail{VacationDelay}  || '';
 
     if ($props{EmailVacation})
@@ -8,4 +14,5 @@
     }
 
     return '# Vacation Message not set'
+  }
 }
--- smeserver-vacation-1.0/root/etc/e-smith/templates-user/.qmail/49vacationMessage.filterorder 2009-06-06 10:43:43.000000000 +1000
+++ smeserver-vacation-1.0/root/etc/e-smith/templates-user/.qmail/49vacationMessage     2009-06-06 10:48:19.000000000 +1000
@@ -0,0 +1,15 @@
+{
+  if ($qmail{FilterOrder})
+  {
+
+    my $VacationDelay =  $qmail{VacationDelay}  || '';
+
+    if ($props{EmailVacation})
+    {
+      return "| /usr/local/bin/vacation -j $VacationDelay $USERNAME"
+         if ($props{EmailVacation} eq 'yes');
+    }
+
+    return '# Vacation Message not set'
+  }
+}
1	unnilennium	1.1	--- smeserver-vacation-1.0/root/etc/e-smith/templates-user/.qmail/74vacationMessage.filterorder 2009-06-06 10:50:03.000000000 +1000
2			+++ smeserver-vacation-1.0/root/etc/e-smith/templates-user/.qmail/74vacationMessage 2009-06-06 10:51:16.000000000 +1000
3			@@ -1,4 +1,10 @@
4			{
5			+ if ($qmail{FilterOrder})
6			+ {
7			+ return '# qmail FilterOrder enabled - vacation'
8			+ }
9			+ else
10			+ {
11			my $VacationDelay = $qmail{VacationDelay} \|\| '';
12
13			if ($props{EmailVacation})
14			@@ -8,4 +14,5 @@
15			}
16
17			return '# Vacation Message not set'
18			+ }
19			}
20			--- smeserver-vacation-1.0/root/etc/e-smith/templates-user/.qmail/49vacationMessage.filterorder 2009-06-06 10:43:43.000000000 +1000
21			+++ smeserver-vacation-1.0/root/etc/e-smith/templates-user/.qmail/49vacationMessage 2009-06-06 10:48:19.000000000 +1000
22			@@ -0,0 +1,15 @@
23			+{
24			+ if ($qmail{FilterOrder})
25			+ {
26			+
27			+ my $VacationDelay = $qmail{VacationDelay} \|\| '';
28			+
29			+ if ($props{EmailVacation})
30			+ {
31			+ return "\| /usr/local/bin/vacation -j $VacationDelay $USERNAME"
32			+ if ($props{EmailVacation} eq 'yes');
33			+ }
34			+
35			+ return '# Vacation Message not set'
36			+ }
37			+}