smecontribs/smeserver-mailsorting
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-8.sme

Browse Source 
- Add defaults for postfix/FilterType and qmail/FilterType [SME: 13267]
- Make mailsorting use postfix/FilterType for global filter value [SME: 13267]
- Sort out reverting to admin after new rule or apply to inbox [SME: 13255]
This commit is contained in:
Brian Read
2025-11-04 09:22:26 +00:00
parent f5b30e511d
commit 265eba3721
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
root/etc/e-smith/db/configuration/defaults/postfix/FilterType Normal file
View File

@@ -0,0 +1 @@
sieve

1
root/etc/e-smith/db/configuration/defaults/qmail/FilterType Normal file
View File

@@ -0,0 +1 @@
sieve

4
root/usr/share/smanager/lib/SrvMngr/Controller/Mailsorting-Custom.pm
View File

@@ -173,7 +173,7 @@ sub get_filtertype{
$cdb = esmith::ConfigDB::UTF8->open();
$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
#Either the filtertype is set per user or it is global
my $globalFilterType = $cdb->get_prop('qmail', "FilterType");
my $globalFilterType = $cdb->get_prop('postfix', "FilterType");
if (! $globalFilterType) {
return $adb->get_prop($PanelUser,'FilterType') || ''
} else {
@@ -842,4 +842,4 @@ sub nonblankWithSort
1;
1;

8
root/usr/share/smanager/themes/default/templates/partials/_ms_TABLE.html.ep
View File

@@ -15,7 +15,7 @@
%= form_for "mailsortingu" => (method => 'POST') => begin
% param 'trt' => $ms_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $ms_data->{trt}
%= hidden_field 'account' => $c->{account}
%= hidden_field 'account' => $ms_data->{account}
%# Inputs etc in here.
<h1 class='head'><%=l('ms_Mail_sorting_rules')%></h1>
@@ -89,15 +89,15 @@
<br />
<div class = 'inline-buttons'>
<a href='mailsortingd?trt=RULES' class='link link1'>
<a href='mailsortingd?trt=RULES&account=<%= $ms_data->{account} %>' class='link link1'>
%= l('ms_Add_new_rule')
</a>
% if ($filterstr eq "Dovecot Sieve"){
<a href='mailsortingx?ApplyRules' class='link link1'>
<a href='mailsortingx?ApplyRules&account=<%= $ms_data->{account} %>' class='link link1'>
%= l('ms_Apply_Sieve');
</a>
% }
%# <a href='mailsortingx?ReSerialise' class='link link1'>
%# <a href='mailsortingx?ReSerialise&account=<%= $ms_data->{account} %>' class='link link1'>
%#= l('ms_Re_Serialise');
%# </a>