smeserver-mailsorting/contribs7/smeserver-mailsorting-1.2-removefwd.patch

diff -urN smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.mailfilter/90default smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/90default
--- smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.mailfilter/90default  2005-09-23 11:50:36.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/90default     2008-09-29 21:47:26.000000000 +1000
@@ -1,41 +1,5 @@
 {
-    use esmith::config;
-    use esmith::db;
-
-    my %accounts;
-    tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
-
-    # get $USERNAME from esmith::config
-    die "Username criterion missing." unless defined ($USERNAME);
-
-    my $type = db_get_type(\%accounts, $USERNAME);
-
-    die
-        "Account $USERNAME is not a user account; "
-        . "update email forwarding failed.\n"
-            unless $type eq 'user';
-
-    # honour EmailForward
-    my $EmailForward   = db_get_prop(\%accounts, $USERNAME, "EmailForward")   || '';
-    my $ForwardAddress = db_get_prop(\%accounts, $USERNAME, "ForwardAddress") || '';
-
-    if ($EmailForward eq 'forward')
-    {
-      $OUT .= "\n";
-      $OUT .= "log \"--- forward mail ---------------- \"\n";
-      $OUT .= "to \"!$ForwardAddress\"";
-    }
-    elsif ($EmailForward eq 'both')
-    {
-      $OUT .= "\n";
-      $OUT .= "log \"--- to the inbox and forward ----- \"\n";
-      $OUT .= "cc Maildir\n";
-      $OUT .= "to \"!$ForwardAddress\"";
-    }
-    else
-    {
-      $OUT .= "\n";
-      $OUT .= "log \"--- to the inbox ----------------- \"\n";
-      $OUT .= "to Maildir";
-    }
-}
\ No newline at end of file
+      $OUT .= "\n";
+      $OUT .= "log \"--- to the inbox ----------------- \"\n";
+      $OUT .= "to Maildir\n";
+}
diff -urN smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.procmailrc/90default smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/90default
--- smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.procmailrc/90default  2005-09-25 15:41:06.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/90default     2008-09-29 21:47:28.000000000 +1000
@@ -1,49 +1,8 @@
 {
-    use esmith::config;
-    use esmith::db;
-
-    my %accounts;
-    tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
-
-    # get $USERNAME from esmith::config
-    die "Username criterion missing." unless defined ($USERNAME);
-
-    my $type = db_get_type(\%accounts, $USERNAME);
-
-    die
-        "Account $USERNAME is not a user account; "
-        . "update email forwarding failed.\n"
-            unless $type eq 'user';
-
-    # use EmailForward
-    my $EmailForward   = db_get_prop(\%accounts, $USERNAME, "EmailForward")   || '';
-    my $ForwardAddress = db_get_prop(\%accounts, $USERNAME, "ForwardAddress") || '';
-
-    if ($EmailForward eq 'forward')
-    {
-      $OUT .= "\n";
-      $OUT .= "# ----  forward mail ------------------\n";
-      $OUT .= ":0\n";
-      $OUT .= "! $ForwardAddress\n";
-    }
-    elsif ($EmailForward eq 'both')
-    {
-      $OUT .= "\n";
-      $OUT .= "# ----  to the inbox and forward-------\n";
-      $OUT .= ":0 c\n";
-      $OUT .= "\$DEFAULT\n";
-      $OUT .= "\n";
-      $OUT .= ":0\n";
-      $OUT .= "! $ForwardAddress\n";
-    }
-    else
-    {
-      $OUT .= "\n";
-      $OUT .= "# ----  to the inbox------------------\n";
-      $OUT .= ":0\n";
-      $OUT .= "\$DEFAULT\n";
-    }
-
-      $OUT .= "\n";
-      $OUT .= "# ----  end of rules ------------------\n";
-}
\ No newline at end of file
+      $OUT .= "\n";
+      $OUT .= "# ----  to the inbox------------------\n";
+      $OUT .= ":0\n";
+      $OUT .= "\$DEFAULT\n";
+      $OUT .= "\n";
+      $OUT .= "# ----  end of rules ------------------\n";
+}
1	dungog	1.1	diff -urN smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.mailfilter/90default smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/90default
2			--- smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.mailfilter/90default 2005-09-23 11:50:36.000000000 +1000
3			+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.mailfilter/90default 2008-09-29 21:47:26.000000000 +1000
4			@@ -1,41 +1,5 @@
5			{
6			- use esmith::config;
7			- use esmith::db;
8			-
9			- my %accounts;
10			- tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
11			-
12			- # get $USERNAME from esmith::config
13			- die "Username criterion missing." unless defined ($USERNAME);
14			-
15			- my $type = db_get_type(\%accounts, $USERNAME);
16			-
17			- die
18			- "Account $USERNAME is not a user account; "
19			- . "update email forwarding failed.\n"
20			- unless $type eq 'user';
21			-
22			- # honour EmailForward
23			- my $EmailForward = db_get_prop(\%accounts, $USERNAME, "EmailForward") \|\| '';
24			- my $ForwardAddress = db_get_prop(\%accounts, $USERNAME, "ForwardAddress") \|\| '';
25			-
26			- if ($EmailForward eq 'forward')
27			- {
28			- $OUT .= "\n";
29			- $OUT .= "log \"--- forward mail ---------------- \"\n";
30			- $OUT .= "to \"!$ForwardAddress\"";
31			- }
32			- elsif ($EmailForward eq 'both')
33			- {
34			- $OUT .= "\n";
35			- $OUT .= "log \"--- to the inbox and forward ----- \"\n";
36			- $OUT .= "cc Maildir\n";
37			- $OUT .= "to \"!$ForwardAddress\"";
38			- }
39			- else
40			- {
41			- $OUT .= "\n";
42			- $OUT .= "log \"--- to the inbox ----------------- \"\n";
43			- $OUT .= "to Maildir";
44			- }
45			-}
46			\ No newline at end of file
47			+ $OUT .= "\n";
48			+ $OUT .= "log \"--- to the inbox ----------------- \"\n";
49			+ $OUT .= "to Maildir\n";
50			+}
51			diff -urN smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.procmailrc/90default smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/90default
52			--- smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.procmailrc/90default 2005-09-25 15:41:06.000000000 +1000
53			+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/90default 2008-09-29 21:47:28.000000000 +1000
54			@@ -1,49 +1,8 @@
55			{
56			- use esmith::config;
57			- use esmith::db;
58			-
59			- my %accounts;
60			- tie %accounts, 'esmith::config', '/home/e-smith/db/accounts';
61			-
62			- # get $USERNAME from esmith::config
63			- die "Username criterion missing." unless defined ($USERNAME);
64			-
65			- my $type = db_get_type(\%accounts, $USERNAME);
66			-
67			- die
68			- "Account $USERNAME is not a user account; "
69			- . "update email forwarding failed.\n"
70			- unless $type eq 'user';
71			-
72			- # use EmailForward
73			- my $EmailForward = db_get_prop(\%accounts, $USERNAME, "EmailForward") \|\| '';
74			- my $ForwardAddress = db_get_prop(\%accounts, $USERNAME, "ForwardAddress") \|\| '';
75			-
76			- if ($EmailForward eq 'forward')
77			- {
78			- $OUT .= "\n";
79			- $OUT .= "# ---- forward mail ------------------\n";
80			- $OUT .= ":0\n";
81			- $OUT .= "! $ForwardAddress\n";
82			- }
83			- elsif ($EmailForward eq 'both')
84			- {
85			- $OUT .= "\n";
86			- $OUT .= "# ---- to the inbox and forward-------\n";
87			- $OUT .= ":0 c\n";
88			- $OUT .= "\$DEFAULT\n";
89			- $OUT .= "\n";
90			- $OUT .= ":0\n";
91			- $OUT .= "! $ForwardAddress\n";
92			- }
93			- else
94			- {
95			- $OUT .= "\n";
96			- $OUT .= "# ---- to the inbox------------------\n";
97			- $OUT .= ":0\n";
98			- $OUT .= "\$DEFAULT\n";
99			- }
100			-
101			- $OUT .= "\n";
102			- $OUT .= "# ---- end of rules ------------------\n";
103			-}
104			\ No newline at end of file
105			+ $OUT .= "\n";
106			+ $OUT .= "# ---- to the inbox------------------\n";
107			+ $OUT .= ":0\n";
108			+ $OUT .= "\$DEFAULT\n";
109			+ $OUT .= "\n";
110			+ $OUT .= "# ---- end of rules ------------------\n";
111			+}