| 1 |
jpp |
1.1 |
diff -Nur --no-dereference e-smith-email-5.6.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm e-smith-email-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm |
| 2 |
|
|
--- e-smith-email-5.6.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm 2021-03-11 11:35:28.857000000 -0500 |
| 3 |
|
|
+++ e-smith-email-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm 2021-03-11 11:39:56.801000000 -0500 |
| 4 |
|
|
@@ -332,31 +332,20 @@ |
| 5 |
|
|
#------------------------------------------------------------ |
| 6 |
|
|
|
| 7 |
|
|
my $webmail = ($q->param('WebMail') || 'disabled'); |
| 8 |
|
|
- if ( $webmail eq "enabled" ) { |
| 9 |
|
|
- $db->set_prop('php', "status", $webmail ); |
| 10 |
|
|
- $db->set_prop('mariadb',"status", $webmail ); |
| 11 |
|
|
- $db->set_prop('imp',"status", $webmail ); |
| 12 |
|
|
- $db->set_prop('horde', "status", $webmail ); |
| 13 |
|
|
- $db->set_prop('imp',"access", "full" ); |
| 14 |
|
|
- $db->set_prop('horde',"access", "public" ); |
| 15 |
|
|
- $db->set_prop('horde',"HttpsOnly", "no" ); |
| 16 |
|
|
- } |
| 17 |
|
|
- elsif ( $webmail eq "enabledSSL" ) { |
| 18 |
|
|
+ if ( $webmail eq "enabledSSL" || $webmail eq "enabled") { |
| 19 |
|
|
$db->set_prop('php',"status", "enabled" ); |
| 20 |
|
|
$db->set_prop('mariadb',"status", "enabled" ); |
| 21 |
|
|
$db->set_prop('imp',"status", 'enabled' ); |
| 22 |
|
|
$db->set_prop('horde',"status", 'enabled' ); |
| 23 |
|
|
- $db->set_prop('imp',"access", "SSL" ); |
| 24 |
|
|
$db->set_prop('horde',"access", "public" ); |
| 25 |
|
|
$db->set_prop('horde',"HttpsOnly", "yes" ); |
| 26 |
|
|
} |
| 27 |
|
|
|
| 28 |
|
|
- elsif ( $webmail eq "localnetworkSSL" ) { |
| 29 |
|
|
+ elsif ( $webmail eq "localnetworkSSL" || $webmail eq "localnetwork" ) { |
| 30 |
|
|
$db->set_prop('php',"status", "enabled" ); |
| 31 |
|
|
$db->set_prop('mariadb',"status", "enabled" ); |
| 32 |
|
|
$db->set_prop('imp',"status", 'enabled' ); |
| 33 |
|
|
$db->set_prop('horde',"status", 'enabled' ); |
| 34 |
|
|
- $db->set_prop('imp',"access", "SSL" ); |
| 35 |
|
|
$db->set_prop('horde',"access", "private" ); |
| 36 |
|
|
$db->set_prop('horde',"HttpsOnly", "yes" ); |
| 37 |
|
|
} |
| 38 |
|
|
@@ -570,7 +559,6 @@ |
| 39 |
|
|
my $WebmailStatus = "disabled"; |
| 40 |
|
|
|
| 41 |
|
|
my $IMPStatus = $db->get_prop('imp', 'status') || 'disabled'; |
| 42 |
|
|
- my $SSLonly = $db->get_prop('imp', 'access') || 'disabled'; |
| 43 |
|
|
|
| 44 |
|
|
my $HordeStatus = $db->get_prop('horde', 'status') || 'disabled'; |
| 45 |
|
|
|
| 46 |
|
|
@@ -587,7 +575,7 @@ |
| 47 |
|
|
&& ( $PHPStatus eq "enabled" ) |
| 48 |
|
|
&& ( $Networkaccess eq "public")) |
| 49 |
|
|
{ |
| 50 |
|
|
- $WebmailStatus = ( $SSLonly eq "SSL" ) ? "enabledSSL" : "enabled"; |
| 51 |
|
|
+ $WebmailStatus = "enabledSSL" ; |
| 52 |
|
|
} |
| 53 |
|
|
|
| 54 |
|
|
elsif ( ( $IMPStatus eq "enabled" ) |
| 55 |
|
|
@@ -596,7 +584,7 @@ |
| 56 |
|
|
&& ( $PHPStatus eq "enabled" ) |
| 57 |
|
|
&& ( $Networkaccess eq "private" )) |
| 58 |
|
|
{ |
| 59 |
|
|
- $WebmailStatus = ( $SSLonly eq "SSL" ) ? "localnetworkSSL" : "enabled"; |
| 60 |
|
|
+ $WebmailStatus = "localnetworkSSL"; |
| 61 |
|
|
} |
| 62 |
|
|
|
| 63 |
|
|
my $options = get_webmail_options(); |
| 64 |
|
|
@@ -765,10 +753,6 @@ |
| 65 |
|
|
enabledSSL => 'ENABLED_SECURE_ONLY', |
| 66 |
|
|
localnetworkSSL => 'ONLY_LOCAL_NETWORK_SSL' ); |
| 67 |
|
|
|
| 68 |
|
|
- my $access = $db->get_prop('imp', 'access') || 'SSL'; |
| 69 |
|
|
- |
| 70 |
|
|
- $options{public} = 'ENABLED_BOTH' if ($access eq 'full'); |
| 71 |
|
|
- |
| 72 |
|
|
\%options; |
| 73 |
|
|
} |
| 74 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
