1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/events/actions/purge-junkmail-folders mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/events/actions/purge-junkmail-folders |
2 |
|
|
--- e-smith-email-4.16.0/root/etc/e-smith/events/actions/purge-junkmail-folders 2007-06-25 17:12:39.000000000 -0400 |
3 |
|
|
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/events/actions/purge-junkmail-folders 2007-06-25 17:12:06.000000000 -0400 |
4 |
|
|
@@ -1,6 +1,6 @@ |
5 |
|
|
#!/usr/bin/perl -w |
6 |
|
|
#---------------------------------------------------------------------- |
7 |
|
|
-# copyright (C) 1999-2006 Mitel Networks Corporation |
8 |
|
|
+# copyright (C) 1999-2007 Mitel Networks Corporation |
9 |
|
|
#---------------------------------------------------------------------- |
10 |
|
|
|
11 |
|
|
use strict; |
12 |
|
|
@@ -38,9 +38,17 @@ |
13 |
|
|
warn("Couldn't chdir to junkmail folder of user $user: $!\n"); |
14 |
|
|
next; |
15 |
|
|
} |
16 |
|
|
- purgedir("new", $age); |
17 |
|
|
- purgedir("tmp", $age); |
18 |
|
|
- purgedir("cur", $age); |
19 |
|
|
+ foreach my $dir (qw(new tmp cur)) |
20 |
|
|
+ { |
21 |
|
|
+ if (-d $dir) |
22 |
|
|
+ { |
23 |
|
|
+ purgedir($dir, $age); |
24 |
|
|
+ } |
25 |
|
|
+ else |
26 |
|
|
+ { |
27 |
|
|
+ warn("Somebody has been fiddling - ~$user/Maildir/.junkmail/$dir is missing\n"); |
28 |
|
|
+ } |
29 |
|
|
+ } |
30 |
|
|
} |
31 |
|
|
exit 0; |
32 |
|
|
|