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

Remove both option for webmail, add in DB re-open in Emailsetting and Portforwarding panels

Browse Source
This commit is contained in:
Brian Read 2024-09-24 17:37:52 +01:00
parent 785ebcfaaf
commit 44a9ecc0e1
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -503,8 +503,7 @@ sub get_webmail_opt {
return [[ $c->l('DISABLED') => 'disabled' ], return [[ $c->l('DISABLED') => 'disabled' ],
[ $c->l('mai_ENABLED_SECURE_ONLY') => 'enabledSSL' ], [ $c->l('mai_ENABLED_SECURE_ONLY') => 'enabledSSL' ],
[ $c->l('mai_ONLY_LOCAL_NETWORK_SSL') => 'localnetworkSSL' ], [ $c->l('mai_ONLY_LOCAL_NETWORK_SSL') => 'localnetworkSSL' ]];
[ $c->l('mai_ENABLED_BOTH') => 'public' ]];
} }
@ -516,9 +515,9 @@ sub get_webmail_options {
my %options = ( my %options = (
disabled => 'DISABLED', disabled => 'DISABLED',
enabledSSL => 'mai_ENABLED_SECURE_ONLY', enabledSSL => 'mai_ENABLED_SECURE_ONLY',
localnetworkSSL => 'mai_ONLY_LOCAL_NETWORK_SSL' ); localnetworkSSL => 'mai_ONLY_LOCAL_NETWORK_SSL')
\%options; return \%options;
} }
@ -654,6 +653,7 @@ sub display_multidrop {
sub change_settings_reception { sub change_settings_reception {
my $c = shift; my $c = shift;
$cdb = esmith::ConfigDB->open || die "Couldn't open config db";
my $FetchmailMethod = ( $c->param('FetchmailMethod') || 'standard' ); my $FetchmailMethod = ( $c->param('FetchmailMethod') || 'standard' );
@ -720,6 +720,7 @@ sub change_settings_reception {
sub change_settings_delivery { sub change_settings_delivery {
my ($c) = shift; my ($c) = shift;
$cdb = esmith::ConfigDB->open || die "Couldn't open config db";
my $EmailUnknownUser = ($c->param('EmailUnknownUser') || 'returntosender'); my $EmailUnknownUser = ($c->param('EmailUnknownUser') || 'returntosender');
@ -748,6 +749,7 @@ sub change_settings_delivery {
sub change_settings_access { sub change_settings_access {
my $c = shift; my $c = shift;
$cdb = esmith::ConfigDB->open || die "Couldn't open config db";
my $pop3Access = ($c->param('POPAccess') || 'private'); my $pop3Access = ($c->param('POPAccess') || 'private');
if ($pop3Access eq 'disabled') { if ($pop3Access eq 'disabled') {
@ -798,13 +800,7 @@ sub change_settings_access {
#------------------------------------------------------------ #------------------------------------------------------------
my $webmail = ($c->param('WebMail') || 'disabled'); my $webmail = ($c->param('WebMail') || 'disabled');
if ( $webmail eq "enabled" ) { if ( $webmail eq "enabledSSL" ) {
$cdb->set_prop('php81', "status", $webmail );
$cdb->set_prop('mariadb',"status", $webmail );
$cdb->set_prop('roundcube',"status", $webmail );
$cdb->set_prop('roundcube',"access", "public" );
}
elsif ( $webmail eq "enabledSSL" ) {
$cdb->set_prop('php81',"status", "enabled" ); $cdb->set_prop('php81',"status", "enabled" );
$cdb->set_prop('mariadb',"status", "enabled" ); $cdb->set_prop('mariadb',"status", "enabled" );
$cdb->set_prop('roundcube',"status", 'enabled' ); $cdb->set_prop('roundcube',"status", 'enabled' );
@ -833,6 +829,8 @@ sub change_settings_access {
sub change_settings_filtering { sub change_settings_filtering {
my $c = shift; my $c = shift;
$cdb = esmith::ConfigDB->open || die "Couldn't open config db";
my $virus_status = ( $c->param('VirusStatus') || 'disabled' ); my $virus_status = ( $c->param('VirusStatus') || 'disabled' );
$cdb->set_prop("qpsmtpd", 'VirusScan', $virus_status); $cdb->set_prop("qpsmtpd", 'VirusScan', $virus_status);

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

@ -171,9 +171,11 @@ sub add_portforward {
#work out which protocol #work out which protocol
my $fdb; my $fdb;
if ($proto eq 'TCP') { if ($proto eq 'TCP') {
$tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
$fdb = $tcp_db; $fdb = $tcp_db;
} }
else { else {
$udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
$fdb = $udp_db; $fdb = $udp_db;
} }
#Get the other values #Get the other values

6
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 20 %define release 21
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -108,6 +108,10 @@ true
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Mon Sep 23 2024 Brian Read <brianr@koozali.org> 11.0.0-21.sme
- Remove both option for webmail [SME: 12744]
- Add in re-open DB for portforwarding and email settings.
* Mon Sep 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-20.sme * Mon Sep 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-20.sme
- webmail switch panel to use roundcube [SME: 12742] - webmail switch panel to use roundcube [SME: 12742]
- prevent browser from caching [SME: 12695] - prevent browser from caching [SME: 12695]