diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings mezzanine_patched_e-smith-email-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings
--- e-smith-email-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2008-03-11 18:03:25.000000000 +0100
+++ mezzanine_patched_e-smith-email-4.18.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2008-04-27 10:48:43.000000000 +0200
@@ -174,14 +174,6 @@
Allow HTTPS (secure)
- PUBLIC
- Allow public access (entire Internet)
-
-
- PRIVATE
- Allow access only from local networks
-
-
INSECURE_POP3
Allow both POP3 and POP3S
@@ -319,10 +311,6 @@
LABEL_WEBMAIL
Webmail access
-
- ERROR_UPDATING
- Error occurred while updating system configuration.
-
LABEL_BLOCK_EXECUTABLE_CONTENT
Executable content blocking
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm mezzanine_patched_e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm
--- e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2008-03-11 18:03:25.000000000 +0100
+++ mezzanine_patched_e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2008-04-27 10:47:14.000000000 +0200
@@ -243,7 +243,7 @@
unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
{
- $fm->error('ERROR_UPDATING');
+ $fm->error('ERROR_UPDATING_CONFIGURATION');
return undef;
}
$fm->success('SUCCESS');
@@ -272,7 +272,7 @@
unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
{
- $fm->error('ERROR_UPDATING');
+ $fm->error('ERROR_UPDATING_CONFIGURATION');
return undef;
}
$fm->success('SUCCESS');
@@ -352,7 +352,7 @@
unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
{
- $fm->error('ERROR_UPDATING');
+ $fm->error('ERROR_UPDATING_CONFIGURATION');
return undef;
}
@@ -383,7 +383,7 @@
unless ( system( "/sbin/e-smith/signal-event", "email-update" ) == 0 )
{
- $fm->error('ERROR_UPDATING');
+ $fm->error('ERROR_UPDATING_CONFIGURATION');
return undef;
}
@@ -708,7 +708,7 @@
{
my %options = (
disabled => 'DISABLED',
- private => 'ALLOW_PRIVATE',
+ private => 'NETWORKS_ALLOW_LOCAL',
publicSSL => 'SECURE_POP3'
);
@@ -723,7 +723,7 @@
{
my %options = (
disabled => 'DISABLED',
- private => 'ALLOW_PRIVATE',
+ private => 'NETWORKS_ALLOW_LOCAL',
publicSSL => 'SECURE_IMAP'
);