From 44a9ecc0e1aac25b06b4f80d94a51b3d0b949030 Mon Sep 17 00:00:00 2001
From: Brian Read <brianr@koozali.org>
Date: Tue, 24 Sep 2024 17:37:52 +0100
Subject: [PATCH] Remove both option for webmail, add in DB re-open in
 Emailsetting and Portforwarding panels

---
 .../lib/SrvMngr/Controller/Emailsettings.pm   | 24 +++++++++----------
 .../lib/SrvMngr/Controller/Portforwarding.pm  |  2 ++
 smeserver-manager.spec                        |  6 ++++-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm
index d66362a..a30a671 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm
@@ -503,8 +503,7 @@ sub get_webmail_opt {
 
     return [[ $c->l('DISABLED') => 'disabled' ],
 	    [ $c->l('mai_ENABLED_SECURE_ONLY') => 'enabledSSL' ],
-	    [ $c->l('mai_ONLY_LOCAL_NETWORK_SSL') => 'localnetworkSSL' ],
-	    [ $c->l('mai_ENABLED_BOTH') => 'public' ]];
+	    [ $c->l('mai_ONLY_LOCAL_NETWORK_SSL') => 'localnetworkSSL' ]];
 
 }
 
@@ -515,10 +514,10 @@ sub get_webmail_options {
 
     my %options = ( 
 		disabled   => 'DISABLED', 
-               enabledSSL => 'mai_ENABLED_SECURE_ONLY',
-               localnetworkSSL => 'mai_ONLY_LOCAL_NETWORK_SSL' );
+		enabledSSL => 'mai_ENABLED_SECURE_ONLY',
+		localnetworkSSL => 'mai_ONLY_LOCAL_NETWORK_SSL')
 
-    \%options;
+    return \%options;
 }
 
 
@@ -654,6 +653,7 @@ sub display_multidrop {
 sub change_settings_reception {
 
     my $c = shift;
+    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
 
     my $FetchmailMethod = ( $c->param('FetchmailMethod') || 'standard' );
 
@@ -720,6 +720,7 @@ sub change_settings_reception {
 sub change_settings_delivery {
 
     my ($c) = shift;
+    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
 
     my $EmailUnknownUser = ($c->param('EmailUnknownUser') || 'returntosender');
 
@@ -748,7 +749,8 @@ sub change_settings_delivery {
 sub change_settings_access {
 
     my $c = shift;
-
+	$cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+    
     my $pop3Access = ($c->param('POPAccess') || 'private');
     if ($pop3Access eq 'disabled') {
         $cdb->set_prop('pop3', "status", "disabled" );
@@ -798,13 +800,7 @@ sub change_settings_access {
     #------------------------------------------------------------
 
     my $webmail = ($c->param('WebMail') || 'disabled');
-    if ( $webmail eq "enabled" ) {
-      $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" ) {
+    if ( $webmail eq "enabledSSL" ) {
       $cdb->set_prop('php81',"status", "enabled" );
       $cdb->set_prop('mariadb',"status", "enabled" );
       $cdb->set_prop('roundcube',"status", 'enabled' );
@@ -833,6 +829,8 @@ sub change_settings_access {
 sub change_settings_filtering {
 
     my $c = shift;
+    $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
+
 
     my $virus_status = ( $c->param('VirusStatus') || 'disabled' );
     $cdb->set_prop("qpsmtpd", 'VirusScan', $virus_status);
diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
index 5350edc..c3254ac 100644
--- a/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
+++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
@@ -171,9 +171,11 @@ sub add_portforward {
 	#work out which protocol   	
 	my $fdb;
 	if ($proto eq 'TCP') {
+		$tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
 		$fdb = $tcp_db;
 	}
 	else {
+		$udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
 		$fdb = $udp_db;
 	}
 	#Get the other values 
diff --git a/smeserver-manager.spec b/smeserver-manager.spec
index 88ae901..6a770e9 100644
--- a/smeserver-manager.spec
+++ b/smeserver-manager.spec
@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 11.0.0
-%define release 20
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -108,6 +108,10 @@ true
 %defattr(-,root,root)
 
 %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
 - webmail switch panel to use roundcube [SME: 12742]
 - prevent browser from caching [SME: 12695]