diff -Nur smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.qmail/18Filter smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.qmail/18Filter --- smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.qmail/18Filter 2007-03-17 13:52:10.000000000 +1100 +++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.qmail/18Filter 1970-01-01 10:00:00.000000000 +1000 @@ -1,26 +0,0 @@ -{ - if ($USERNAME) - { - return "# Procmail/Maildrop disabled for admin" - if ($USERNAME eq 'admin'); - } - - if ($props{MailFilter}) - { - my $MailFilter = $props{MailFilter} || 'on'; - - return '# Procmail/Maildrop disabled for this user' - if ($MailFilter eq 'bypass'); - } - - if ($qmail{FilterType}) - { - return '| /usr/bin/procmail ~/.procmailrc ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;' - if ($qmail{FilterType} eq 'procmail'); - - return '| /usr/bin/maildrop ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;' - if ($qmail{FilterType} eq 'maildrop' ); - } - - return '# Procmail/Maildrop disabled for all users' -} diff -Nur smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.qmail/76Filter smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.qmail/76Filter --- smeserver-mailsorting-1.2.po/root/etc/e-smith/templates-user/.qmail/76Filter 1970-01-01 10:00:00.000000000 +1000 +++ smeserver-mailsorting-1.2/root/etc/e-smith/templates-user/.qmail/76Filter 2007-03-17 13:52:10.000000000 +1100 @@ -0,0 +1,26 @@ +{ + if ($USERNAME) + { + return "# Procmail/Maildrop disabled for admin" + if ($USERNAME eq 'admin'); + } + + if ($props{MailFilter}) + { + my $MailFilter = $props{MailFilter} || 'on'; + + return '# Procmail/Maildrop disabled for this user' + if ($MailFilter eq 'bypass'); + } + + if ($qmail{FilterType}) + { + return '| /usr/bin/procmail ~/.procmailrc ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;' + if ($qmail{FilterType} eq 'procmail'); + + return '| /usr/bin/maildrop ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;' + if ($qmail{FilterType} eq 'maildrop' ); + } + + return '# Procmail/Maildrop disabled for all users' +}