[Rt-commit] r14270 - in rt/branches/3.999-DANGEROUS: . etc lib/RT sbin

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Fri Jul 18 12:24:44 2008
New Revision: 14270

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Installer.pm
   rt/branches/3.999-DANGEROUS/sbin/rt-email-digest.in
   rt/branches/3.999-DANGEROUS/share/html/Install/Global.html
   rt/branches/3.999-DANGEROUS/share/html/Install/index.html

Log:
 r14693 at sunnavys-mb:  sunnavy | 2008-07-18 21:02:33 +0800
 CorrespondAddress => correspond_address, commentAddress => comment_address


Modified: rt/branches/3.999-DANGEROUS/etc/RT_Config.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/RT_Config.pm	(original)
+++ rt/branches/3.999-DANGEROUS/etc/RT_Config.pm	Fri Jul 18 12:24:44 2008
@@ -434,21 +434,21 @@
 
 set(@MailParams, ());
 
-=item C<$CorrespondAddress>, C<$CommentAddress>
+=item C<$correspond_address>, C<$comment_address>
 
 RT is designed such that any mail which already has a ticket-id associated
 with it will get to the right place automatically.
 
-C<$CorrespondAddress> and C<$CommentAddress> are the default addresses
+C<$correspond_address> and C<$comment_address> are the default addresses
 that will be listed in From: and Reply-To: headers of correspondence
 and comment mail tracked by RT, unless overridden by a queue-specific
 address.
 
 =cut
 
-set($CorrespondAddress , '');
+set($correspond_address , '');
 
-set($CommentAddress , '');
+set($comment_address , '');
 
 =item C<UseFriendlyFromLine>
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Installer.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Installer.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Installer.pm	Fri Jul 18 12:24:44 2008
@@ -173,7 +173,7 @@
             ,                                            #loc
         },
     },
-    CommentAddress => {
+    comment_address => {
         Widget          => '/Widgets/Form/String',
         WidgetArguments => {
             description => 'Comment address',            #loc
@@ -181,7 +181,7 @@
 'the default addresses that will be listed in From: and Reply-To: headers of comment mail.' #loc
         },
     },
-    CorrespondAddress => {
+    correspond_address => {
         Widget          => '/Widgets/Form/String',
         WidgetArguments => {
             description => 'Correspond address',    #loc

Modified: rt/branches/3.999-DANGEROUS/sbin/rt-email-digest.in
==============================================================================
--- rt/branches/3.999-DANGEROUS/sbin/rt-email-digest.in	(original)
+++ rt/branches/3.999-DANGEROUS/sbin/rt-email-digest.in	Fri Jul 18 12:24:44 2008
@@ -177,7 +177,7 @@
     }
 
     # Set our sender and recipient.
-    $digest_template->MIMEObj->head->replace( 'From', RT::Config->get('CorrespondAddress') );
+    $digest_template->MIMEObj->head->replace( 'From', RT->config->get('correspond_address') );
     $digest_template->MIMEObj->head->replace( 'To',   $to );
 
     if ($print) {

Modified: rt/branches/3.999-DANGEROUS/share/html/Install/Global.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/Global.html	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/Global.html	Fri Jul 18 12:24:44 2008
@@ -68,7 +68,7 @@
 <%init>
 my @errors;
 
-my @Types = qw/CommentAddress CorrespondAddress Timezone/;
+my @Types = qw/comment_address correspond_address Timezone/;
 
 if ( $Run ) {
 
@@ -81,7 +81,7 @@
 'Install/Sendmail.html');
     }
 
-    for ( qw/CommentAddress CorrespondAddress/ ) {
+    for ( qw/comment_address correspond_address/ ) {
         if ( $ARGS{$_} && $ARGS{$_} !~ /.+ at .+/ ) {
             push @errors,
                 loc("Invalid %1: '%2' doesn't look like an email address",

Modified: rt/branches/3.999-DANGEROUS/share/html/Install/index.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Install/index.html	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Install/index.html	Fri Jul 18 12:24:44 2008
@@ -89,7 +89,7 @@
         $RT::Installer->{InstallConfig} ||= {};
         for my $field  ( qw/DatabaseType DatabaseName DatabaseHost DatabasePort
                 DatabaseUser DatabaseRequireSSL rtname
-                organization TimeZone CommentAddress CorrespondAddress 
+                organization TimeZone comment_address correspond_address 
                 SendmailPath WebDomain WebPort/ ) {
             $RT::Installer->{InstallConfig}{$field} ||= RT->config->get($field);
         }