smeserver-mailsorting/contribs8/smeserver-mailsorting-1.2-zarafaprocmail2.patch

diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/40global smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/40global
--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/40global 2009-06-12 21:53:52.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/40global      2009-06-12 22:01:25.000000000 +1000
@@ -33,8 +33,12 @@
         my $copy       = db_get_prop(\%processmail, $pmGlobRule, "copy")       || '';
         my $action     = db_get_prop(\%processmail, $pmGlobRule, "action")     || '';
         my $action2    = db_get_prop(\%processmail, $pmGlobRule, "action2")    || '';
-        $deliver       =~ s/ /\\ /g;
-        $deliver2      =~ s/ /\\ /g;
+
+        unless (($zarafa1 eq 'enabled') || ($zarafa2 eq 'enabled'))
+        { 
+          $deliver       =~ s/ /\\ /g;
+          $deliver2      =~ s/ /\\ /g;
+        }
 
         foreach ($basis, $basis2)
         {
diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/60user smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/60user
--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/60user   2009-06-12 21:53:52.000000000 +1000
+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/60user        2009-06-12 22:01:48.000000000 +1000
@@ -33,9 +33,13 @@
         my $copy       = db_get_prop(\%processmail, $pmRule, "copy")       || '';
         my $action     = db_get_prop(\%processmail, $pmRule, "action")     || '';
         my $action2    = db_get_prop(\%processmail, $pmRule, "action2")    || '';
+
         #allow for spaces _ to \_
-       $deliver       =~ s/ /\\ /g;
-        $deliver2      =~ s/ /\\ /g;
+        unless (($zarafa1 eq 'enabled') || ($zarafa2 eq 'enabled'))
+        { 
+          $deliver       =~ s/ /\\ /g;
+          $deliver2      =~ s/ /\\ /g;
+        }
 
         foreach ($basis, $basis2)
         {
1	diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/40global smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/40global
2	--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/40global 2009-06-12 21:53:52.000000000 +1000
3	+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/40global 2009-06-12 22:01:25.000000000 +1000
4	@@ -33,8 +33,12 @@
5	my $copy = db_get_prop(\%processmail, $pmGlobRule, "copy") \|\| '';
6	my $action = db_get_prop(\%processmail, $pmGlobRule, "action") \|\| '';
7	my $action2 = db_get_prop(\%processmail, $pmGlobRule, "action2") \|\| '';
8	- $deliver =~ s/ /\\ /g;
9	- $deliver2 =~ s/ /\\ /g;
10	+
11	+ unless (($zarafa1 eq 'enabled') \|\| ($zarafa2 eq 'enabled'))
12	+ {
13	+ $deliver =~ s/ /\\ /g;
14	+ $deliver2 =~ s/ /\\ /g;
15	+ }
16
17	foreach ($basis, $basis2)
18	{
19	diff -urN smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/60user smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/60user
20	--- smeserver-mailsorting-1.2.orig/root/etc/e-smith/templates-user/.procmailrc/60user 2009-06-12 21:53:52.000000000 +1000
21	+++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.procmailrc/60user 2009-06-12 22:01:48.000000000 +1000
22	@@ -33,9 +33,13 @@
23	my $copy = db_get_prop(\%processmail, $pmRule, "copy") \|\| '';
24	my $action = db_get_prop(\%processmail, $pmRule, "action") \|\| '';
25	my $action2 = db_get_prop(\%processmail, $pmRule, "action2") \|\| '';
26	+
27	#allow for spaces _ to \_
28	- $deliver =~ s/ /\\ /g;
29	- $deliver2 =~ s/ /\\ /g;
30	+ unless (($zarafa1 eq 'enabled') \|\| ($zarafa2 eq 'enabled'))
31	+ {
32	+ $deliver =~ s/ /\\ /g;
33	+ $deliver2 =~ s/ /\\ /g;
34	+ }
35
36	foreach ($basis, $basis2)
37	{