e-smith-email/sme7/e-smith-email-4.16.0-adminemail.patch

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 @@
         <trans>E-mail to unknown users</trans>
     </entry>
     <entry>
-        <base>LABEL_ADDRESS</base>
-        <trans>Forwarding address for administrative notices</trans>
-    </entry>
-    <entry>
-        <base>DESC_ADDRESS</base>
-        <trans><![CDATA[
-            Administrative notices generated by the server are normally
-            e-mailed to the <B>admin</B> account. If you would like them to be
-            e-mailed elsewhere, please enter the e-mail address below.
-            Otherwise, leave this field blank.
-            ]]>
-        </trans>
-    </entry>
-    <entry>
         <base>DESC_UNKNOWN</base>
         <trans><![CDATA[
+            <h2>Unknown Users</h2>
             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 @@
 
     <entry>
         <base>DESC_SMARTHOST</base>
-        <trans>
+        <trans><![CDATA[
+            <hr class="sectionbar" /><h2>SMTP server</h2>
             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.
+            ]]>
         </trans>
     </entry>
 
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 @@
         </field>
 
         <field
-            type="literal"
-            id="state_AdminEmail"
-            value="get_admin_email()">
-            <label>LABEL_ADDRESS</label>
-            <description>DESC_SECTIONBAR</description>
-        </field>
-
-        <field
             type="literal" 
             id="state_EmailUnknownUser" 
             value="get_emailunknownuser_status('localise')">
             <label>LABEL_UNKNOWN</label>
+            <description>DESC_SECTIONBAR</description>
         </field>
     
         <field 
@@ -464,15 +457,6 @@
         pre-event="turn_off_buttons"
         post-event="change_settings_delivery()">
         <field
-            type="text"
-            id="AdminEmail"
-            validation="validate_admin_email()"
-            value="get_admin_email()">
-            <label>LABEL_ADDRESS</label>
-            <description>DESC_ADDRESS</description>
-        </field>
-
-        <field
             type="select" 
             id="EmailUnknownUser" 
             options="get_emailunknownuser_options()"
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  2006-03-14 12:23:58.000000000 -0700
+++ mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm        2007-01-14 20:19:55.000000000 -0700
@@ -22,7 +22,7 @@
   blank_or_ip_number
   get_current_webmail_status validate_smarthost getExtraParams
   get_current_pop3_access get_current_imap_access get_current_smtp_auth
-  get_prop get_value validate_admin_email get_admin_email
+  get_prop get_value
 );
 
 our $VERSION = sprintf '%d.%03d', q$Revision: 1.16 $ =~ /: (\d+).(\d+)/;
@@ -627,44 +627,6 @@
     
 }
 
-=head2 validate_admin_email
-
-This method validates the admin email address.
-
-=cut
-
-sub validate_admin_email
-{
-    my $self = shift;
-    my $q = $self->{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
1	slords	1.1	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
2			--- 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
3			+++ 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
4			@@ -260,22 +260,9 @@
5			<trans>E-mail to unknown users</trans>
6			</entry>
7			<entry>
8			- <base>LABEL_ADDRESS</base>
9			- <trans>Forwarding address for administrative notices</trans>
10			- </entry>
11			- <entry>
12			- <base>DESC_ADDRESS</base>
13			- <trans><![CDATA[
14			- Administrative notices generated by the server are normally
15			- e-mailed to the <B>admin</B> account. If you would like them to be
16			- e-mailed elsewhere, please enter the e-mail address below.
17			- Otherwise, leave this field blank.
18			- ]]>
19			- </trans>
20			- </entry>
21			- <entry>
22			<base>DESC_UNKNOWN</base>
23			<trans><![CDATA[
24			+ <h2>Unknown Users</h2>
25			Selecting Reject (recommended setting) will configure the server to only
26			accept mail for valid email addresses (for example users, groups, pseudonyms).
27			Mail for other addresses will be rejected.
28			@@ -289,7 +276,8 @@
29
30			<entry>
31			<base>DESC_SMARTHOST</base>
32			- <trans>
33			+ <trans><![CDATA[
34			+ <hr class="sectionbar" /><h2>SMTP server</h2>
35			The server can deliver outgoing messages directly to their
36			destination (recommended in most cases) or can deliver them via
37			your Internet provider's SMTP server (recommended if you have an
38			@@ -297,6 +285,7 @@
39			service). If using your Internet provider's SMTP server, specify
40			its hostname or IP address below. Otherwise leave this field
41			blank.
42			+ ]]>
43			</trans>
44			</entry>
45
46			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
47			--- e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings 2006-03-14 12:23:58.000000000 -0700
48			+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/web/functions/emailsettings 2007-01-14 20:16:29.000000000 -0700
49			@@ -252,18 +252,11 @@
50			</field>
51
52			<field
53			- type="literal"
54			- id="state_AdminEmail"
55			- value="get_admin_email()">
56			- <label>LABEL_ADDRESS</label>
57			- <description>DESC_SECTIONBAR</description>
58			- </field>
59			-
60			- <field
61			type="literal"
62			id="state_EmailUnknownUser"
63			value="get_emailunknownuser_status('localise')">
64			<label>LABEL_UNKNOWN</label>
65			+ <description>DESC_SECTIONBAR</description>
66			</field>
67
68			<field
69			@@ -464,15 +457,6 @@
70			pre-event="turn_off_buttons"
71			post-event="change_settings_delivery()">
72			<field
73			- type="text"
74			- id="AdminEmail"
75			- validation="validate_admin_email()"
76			- value="get_admin_email()">
77			- <label>LABEL_ADDRESS</label>
78			- <description>DESC_ADDRESS</description>
79			- </field>
80			-
81			- <field
82			type="select"
83			id="EmailUnknownUser"
84			options="get_emailunknownuser_options()"
85			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
86			--- e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2006-03-14 12:23:58.000000000 -0700
87			+++ mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2007-01-14 20:19:55.000000000 -0700
88			@@ -22,7 +22,7 @@
89			blank_or_ip_number
90			get_current_webmail_status validate_smarthost getExtraParams
91			get_current_pop3_access get_current_imap_access get_current_smtp_auth
92			- get_prop get_value validate_admin_email get_admin_email
93			+ get_prop get_value
94			);
95
96			our $VERSION = sprintf '%d.%03d', q$Revision: 1.16 $ =~ /: (\d+).(\d+)/;
97			@@ -627,44 +627,6 @@
98
99			}
100
101			-=head2 validate_admin_email
102			-
103			-This method validates the admin email address.
104			-
105			-=cut
106			-
107			-sub validate_admin_email
108			-{
109			- my $self = shift;
110			- my $q = $self->{cgi};
111			-
112			- my $admin_email = $q->param('AdminEmail') \|\| '';
113			- $admin_email =~ s/^\s+\|\s+$//g;
114			-
115			- my $response = $self->email_simple($admin_email);
116			- if (($response eq 'OK') or ($admin_email eq ''))
117			- {
118			- return 'OK';
119			- }
120			- else
121			- {
122			- return 'UNACCEPTABLE_CHARS';
123			- }
124			-}
125			-
126			-=head2 get_admin_email
127			-
128			-=cut
129			-
130			-sub get_admin_email
131			-{
132			- my $self = shift;
133			- my $accounts = esmith::AccountsDB->open_ro();
134			- my $admin = $accounts->get('admin');
135			- return ($admin->prop('EmailForward') eq 'forward') ?
136			- $admin->prop('ForwardAddress') : '';
137			-}
138			-
139			=pod
140
141			=head2 getExtraParams