diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings
--- e-smith-email-4.16.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2007-01-14 20:20:11.000000000 -0700
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/emailsettings 2007-01-14 20:18:51.000000000 -0700
@@ -260,22 +260,9 @@
E-mail to unknown users
- LABEL_ADDRESS
- Forwarding address for administrative notices
-
-
- DESC_ADDRESS
- admin account. If you would like them to be
- e-mailed elsewhere, please enter the e-mail address below.
- Otherwise, leave this field blank.
- ]]>
-
-
- DESC_UNKNOWN
Unknown Users
Selecting Reject (recommended setting) will configure the server to only
accept mail for valid email addresses (for example users, groups, pseudonyms).
Mail for other addresses will be rejected.
@@ -289,7 +276,8 @@
DESC_SMARTHOST
-
+
SMTP server
The server can deliver outgoing messages directly to their
destination (recommended in most cases) or can deliver them via
your Internet provider's SMTP server (recommended if you have an
@@ -297,6 +285,7 @@
service). If using your Internet provider's SMTP server, specify
its hostname or IP address below. Otherwise leave this field
blank.
+ ]]>
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings
--- e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings 2006-03-14 12:23:58.000000000 -0700
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings 2007-01-14 20:16:29.000000000 -0700
@@ -252,18 +252,11 @@
-
- DESC_SECTIONBAR
-
-
-
+ DESC_SECTIONBAR
-
- DESC_ADDRESS
-
-
- {cgi};
-
- my $admin_email = $q->param('AdminEmail') || '';
- $admin_email =~ s/^\s+|\s+$//g;
-
- my $response = $self->email_simple($admin_email);
- if (($response eq 'OK') or ($admin_email eq ''))
- {
- return 'OK';
- }
- else
- {
- return 'UNACCEPTABLE_CHARS';
- }
-}
-
-=head2 get_admin_email
-
-=cut
-
-sub get_admin_email
-{
- my $self = shift;
- my $accounts = esmith::AccountsDB->open_ro();
- my $admin = $accounts->get('admin');
- return ($admin->prop('EmailForward') eq 'forward') ?
- $admin->prop('ForwardAddress') : '';
-}
-
=pod
=head2 getExtraParams