[Rt-commit] rt branch, 5.0/login-page-support-email, created. rt-5.0.1-462-gc09334a53e

[Jim Brandt]

The branch, 5.0/login-page-support-email has been created
        at  c09334a53eb1a55855e2d73baa90aa9255d4d758 (commit)

- Log -----------------------------------------------------------------
commit c09334a53eb1a55855e2d73baa90aa9255d4d758
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Wed Jun 16 15:50:02 2021 -0400

    Create new config option for home page support email
    
    $OwnerEmail previously was used for both sending email errors
    and for display on the login page for users who needed help
    with RT. Create a new option RTSupportEmail so admins can
    use a different email address on the login page if desired.
    This also allows admins to set OwnerEmail to get bounces
    without that email being visible on the login page.

diff --git a/docs/UPGRADING-5.0 b/docs/UPGRADING-5.0
index 5abf895152..045469ec92 100644
--- a/docs/UPGRADING-5.0
+++ b/docs/UPGRADING-5.0
@@ -283,4 +283,21 @@ configuration setting.
 
 =back
 
+=head1 UPGRADING FROM 5.0.1 AND EARLIER
+
+=over 4
+
+=item *
+
+Previously C<$OwnerEmail> was shown on the RT login page for users to
+contact with RT issues, in addition to being the address used to send various
+errors like email bounces. A new config option C<$RTSupportEmail> is now used
+for the login page display, allowing admins to set C<$OwnerEmail> to a different
+address if desired, and possibly not display an email address on the login page.
+
+If you want to still display your C<$OwnerEmail> on the login page, just set
+C<$RTSupportEmail> to the same value.
+
+=back
+
 =cut
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 5954410293..f17c59b063 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -388,8 +388,7 @@ setting enabled.
 =item C<$OwnerEmail>
 
 C<$OwnerEmail> is the address of a human who manages RT. RT will send
-errors generated by the mail gateway to this address; it will also be
-displayed as the contact person on the RT's login page.  Because RT
+errors generated by the mail gateway to this address. Because RT
 sends errors to this address, it should I<not> be an address that's
 managed by your RT instance, to avoid mail loops.
 
@@ -1639,6 +1638,17 @@ be overridden by users in their preferences.
 
 Set($WebDefaultStylesheet, "elevator-light");
 
+=item C<$RTSupportEmail>
+
+This is the email address of the person who administers and provides
+support for RT itself. If set, it is displayed on the RT login page
+and as such is likely to receive email from users who are unable to
+log in.
+
+=cut
+
+Set($RTSupportEmail, '');
+
 =item C<$ShowMobileSite>
 
 Starting with RT 5.0, RT's web interface is fully responsive and
diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index 01ee533886..c03bc2fffd 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -1891,6 +1891,9 @@ our %META;
     RedistributeAutoGeneratedMessages => {
         Widget => '/Widgets/Form/String',
     },
+    RTSupportEmail => {
+        Widget => '/Widgets/Form/String',
+    },
     SelfServiceRequestUpdateQueue => {
         Widget => '/Widgets/Form/String',
     },
diff --git a/share/html/Elements/LoginHelp b/share/html/Elements/LoginHelp
index 7ce1877bf3..bbb3cbea65 100644
--- a/share/html/Elements/LoginHelp
+++ b/share/html/Elements/LoginHelp
@@ -46,9 +46,8 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <div class="login-help">
-<&|/l, RT->Config->Get('OwnerEmail')&>For local help, please contact [_1]</&>
+<&|/l, RT->Config->Get('RTSupportEmail')&>For local help, please contact [_1]</&>
 </div>
 <%init>
-my $source = RT->Config->Meta('OwnerEmail')->{Source};
-return unless $source->{SiteConfig} or $source->{Extension};
+return unless RT->Config->Get('RTSupportEmail');
 </%init>

-----------------------------------------------------------------------