[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-140-gdc7d83e

[sartak at bestpractical.com]

The branch, 3.8-trunk has been updated
       via  dc7d83edb9fc81a4383ef78f1e5531c51ee567a9 (commit)
      from  d7f9eefe35a999ae9ec84696df1e3b7c73cb979a (commit)

Summary of changes:
 etc/RT_Config.pm.in |    2 +-
 lib/RT/Config.pm    |   34 ----------------------------------
 2 files changed, 1 insertions(+), 35 deletions(-)

- Log -----------------------------------------------------------------
commit dc7d83edb9fc81a4383ef78f1e5531c51ee567a9
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Feb 5 01:05:57 2010 -0500

    Revert "yell at people and autogen RTAddressRegexp"
    
    This reverts commit bbc4db537e908f20083b76e15eaf47f2344d1e4d.
    
    See branch rt-address-regexp

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 3468af8..5500356 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -286,7 +286,7 @@ avoid sending mail to itself.  It will also hide RT addresses from the list of
 
 =cut
 
-Set($RTAddressRegexp , undef);
+Set($RTAddressRegexp , '^rt\@example.com$');
 
 =item C<$CanonicalizeEmailAddressMatch>, C<$CanonicalizeEmailAddressReplace>
 
diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index b652d3e..6fc1b89 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -333,40 +333,6 @@ our %META = (
         },
     },
 
-    RTAddressRegexp => {
-        Type    => 'SCALAR',
-        PostLoadCheck => sub {
-            my $self = shift;
-            my $value = $self->Get('RTAddressRegexp');
-            return if $value;
-
-            $RT::Logger->error(
-                'RTAddressRegexp option is not set in the config.'
-                .' Not setting this option may result in big mail loops.'
-                .' Going to generate value for you, but generating value takes'
-                .' time and only a few queues are accounted. So this slow downs'
-                .' server restarts and command line utilities, as well dont'
-                .' protect you from loops if you have many queues'
-            );
-
-            my @emails = (
-                $self->Get('CorrespondAddress'),
-                $self->Get('CommentAddress'),
-            );
-            my $queues = RT::Queues->new( $RT::SystemUser );
-            $queues->UnLimit;
-            $queues->RowsPerPage(100);
-            while ( my $queue = $queues->Next ) {
-                push @emails, $queue->CorrespondAddress, $queue->CommentAddress;
-            }
-
-            my %seen;
-            my $re = join '|', map "\Q$_\E",
-                grep defined && length && !$seen{ lc $_ }++,
-                @emails;
-            $self->Set( qr/$re/ );
-        },
-    },
     # User overridable mail options
     EmailFrequency => {
         Section         => 'Mail',                                     #loc

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