smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug:12868 fix email settings for spamassassin status

Browse Source
This commit is contained in:
Brian Read 2025-01-09 14:49:56 +00:00
parent a07bdf4aa5
commit 9380ac0264
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm
View File

@ -964,7 +964,7 @@ sub change_settings_filtering {
TagLevel TagLevel
RejectLevel RejectLevel
SortSpam SortSpam
Subject Subject
SubjectTag) ) SubjectTag) )
{ {
$cdb->set_prop('spamassassin', $param, $c->param("Spam$param")); $cdb->set_prop('spamassassin', $param, $c->param("Spam$param"));

6
root/usr/share/smanager/themes/default/templates/emailfilter.html.ep
View File

@ -34,8 +34,8 @@
<p><span class=label> <p><span class=label>
%=l 'mai_LABEL_SPAM_SCAN' %=l 'mai_LABEL_SPAM_SCAN'
</span><span class=input> </span><span class=input>
% param 'SpamStatus' => $mai_datas->{spamstatus} unless param 'SpamStatus'; % param 'Spamstatus' => $mai_datas->{spamstatus} unless param 'Spamstatus';
%= select_field 'SpamStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input' %= select_field 'Spamstatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input'
</span></p> </span></p>
<p><span class=label> <p><span class=label>
@ -98,4 +98,4 @@
% end % end
</div> </div>
%end %end

10
root/usr/share/smanager/themes/default/templates/emailsettings.html.ep
View File

@ -86,22 +86,24 @@
</span><span class=data2> </span><span class=data2>
%= $mai_datas->{fetchmailmethod} %= $mai_datas->{fetchmailmethod}
</span></p> </span></p>
% my $smtp_mesg;
% my $smtp_mesg=l('SMTP port %u allow client to authenticate:'); % $smtp_mesg=l('SMTP port %u allow client to authenticate:');
<p><span class=label> <p><span class=label>
%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25));
</span><span class=data2> </span><span class=data2>
%= $c->get_current_smtp_auth( TRUE ) %= $c->get_current_smtp_auth( TRUE )
</span></p> </span></p>
% my $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:'); % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:');
<p><span class=label> <p><span class=label>
%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465));
</span><span class=data2> </span><span class=data2>
%= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) %= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE )
</span></p> </span></p>
%my $smtp_mesg=l 'Submission port %u status:'; % $smtp_mesg=l 'Submission port %u status:';
<p><span class=label> <p><span class=label>
%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587));
</span><span class=data2> </span><span class=data2>
@ -109,7 +111,7 @@
</span></p> </span></p>
<br /> <br />
% my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON'); % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON');
<div class='center'> <div class='center'>
%= submit_button "$btn", class => 'action' %= submit_button "$btn", class => 'action'
</div> </div>

5
smeserver-manager.spec
View File

@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager %define name smeserver-manager
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 35 %define release 36
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -115,6 +115,9 @@ true
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Thu Jan 09 2025 Brian Read <brianr@koozali.org> 11.0.0-36.sme
- Fix spamassassin status not coming through from email filter panel to email settings panel [SME: 12868]
* Tue Dec 31 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-35.sme * Tue Dec 31 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-35.sme
- fix PATH [SME: 12847] - fix PATH [SME: 12847]