e-smith-email/sme8/e-smith-email-4.16.0-adminemail.patch2

diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm
--- e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm  2007-01-26 12:47:51.000000000 -0700
+++ mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm        2007-01-26 12:47:31.000000000 -0700
@@ -259,23 +259,6 @@
     $db->set_value('SMTPSmartHost', $q->param('SMTPSmartHost'));
     $db->set_value('DelegateMailServer', $q->param('DelegateMailServer'));
     $db->set_value('EmailUnknownUser', $EmailUnknownUser);
-    my $accounts = esmith::AccountsDB->open;
-    my $admin_email = $q->param('AdminEmail');
-    my $admin = $accounts->get('admin');
-    if ($admin_email)
-    {
-       $admin->merge_props(
-               EmailForward => 'forward',
-               ForwardAddress => $admin_email,
-               );
-    }
-    else
-    {
-       $admin->merge_props(
-               EmailForward => 'local',
-               ForwardAddress => '',
-               );
-    }
 
     my $proxy = $db->get('smtp-auth-proxy');
     my %props = $proxy->props;
1	diff -Nur -x '.orig' -x '.rej' e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm
2	--- e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2007-01-26 12:47:51.000000000 -0700
3	+++ mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2007-01-26 12:47:31.000000000 -0700
4	@@ -259,23 +259,6 @@
5	$db->set_value('SMTPSmartHost', $q->param('SMTPSmartHost'));
6	$db->set_value('DelegateMailServer', $q->param('DelegateMailServer'));
7	$db->set_value('EmailUnknownUser', $EmailUnknownUser);
8	- my $accounts = esmith::AccountsDB->open;
9	- my $admin_email = $q->param('AdminEmail');
10	- my $admin = $accounts->get('admin');
11	- if ($admin_email)
12	- {
13	- $admin->merge_props(
14	- EmailForward => 'forward',
15	- ForwardAddress => $admin_email,
16	- );
17	- }
18	- else
19	- {
20	- $admin->merge_props(
21	- EmailForward => 'local',
22	- ForwardAddress => '',
23	- );
24	- }
25
26	my $proxy = $db->get('smtp-auth-proxy');
27	my %props = $proxy->props;