[Rt-commit] r10640 - in rt/branches/3.999-DANGEROUS: lib lib/RT/Interface

[jesse at bestpractical.com]

Author: jesse
Date: Thu Jan 31 20:56:30 2008
New Revision: 10640

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/lib/RT.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm

Log:
 r76041 at pinglin:  jesse | 2008-01-31 20:55:41 -0500
 * More  API fixes for email sending


Modified: rt/branches/3.999-DANGEROUS/lib/RT.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT.pm	Thu Jan 31 20:56:30 2008
@@ -12,32 +12,32 @@
 use vars qw($Config $System $nobody $Handle );
 our $VERSION = '3.7.14';
 
-our $BASE_PATH         = '/home/cubic/projs/RT/3.999-DANGEROUS';
-our $EtcPath          = '/home/cubic/projs/RT/3.999-DANGEROUS/etc';
-our $BinPath          = '/home/cubic/projs/RT/3.999-DANGEROUS/bin';
-our $VarPath          = '/home/cubic/projs/RT/3.999-DANGEROUS/var';
-our $LocalPath        = '/home/cubic/projs/RT/3.999-DANGEROUS/local';
-our $LocalLibPath     = '/home/cubic/projs/RT/3.999-DANGEROUS/local/lib';
-our $LocalEtcPath     = '/home/cubic/projs/RT/3.999-DANGEROUS/local/etc';
-our $LocalLexiconPath = '/home/cubic/projs/RT/3.999-DANGEROUS/local/po';
+our $BASE_PATH         = '/home/jesse/svk/3.999-DANGEROUS';
+our $EtcPath          = '/home/jesse/svk/3.999-DANGEROUS/etc';
+our $BinPath          = '/home/jesse/svk/3.999-DANGEROUS/bin';
+our $VarPath          = '/home/jesse/svk/3.999-DANGEROUS/var';
+our $LocalPath        = '/home/jesse/svk/3.999-DANGEROUS/local';
+our $LocalLibPath     = '/home/jesse/svk/3.999-DANGEROUS/local/lib';
+our $LocalEtcPath     = '/home/jesse/svk/3.999-DANGEROUS/local/etc';
+our $LocalLexiconPath = '/home/jesse/svk/3.999-DANGEROUS/local/po';
 our $LocalPluginPath  = $LocalPath . "/plugins";
 
 # $MasonComponentRoot is where your rt instance keeps its mason html files
 
-our $MasonComponentRoot = '/home/cubic/projs/RT/3.999-DANGEROUS/html';
+our $MasonComponentRoot = '/home/jesse/svk/3.999-DANGEROUS/html';
 
 # $MasonLocalComponentRoot is where your rt instance keeps its site-local
 # mason html files.
 
-our $MasonLocalComponentRoot = '/home/cubic/projs/RT/3.999-DANGEROUS/local/html';
+our $MasonLocalComponentRoot = '/home/jesse/svk/3.999-DANGEROUS/local/html';
 
 # $MasonDataDir Where mason keeps its datafiles
 
-our $MasonDataDir = '/home/cubic/projs/RT/3.999-DANGEROUS/var/mason_data';
+our $MasonDataDir = '/home/jesse/svk/3.999-DANGEROUS/var/mason_data';
 
 # RT needs to put session data (for preserving state between connections
 # via the web interface)
-our $MasonSessionDir = '/home/cubic/projs/RT/3.999-DANGEROUS/var/session_data';
+our $MasonSessionDir = '/home/jesse/svk/3.999-DANGEROUS/var/session_data';
 
 =head1 name
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	Thu Jan 31 20:56:30 2008
@@ -289,10 +289,10 @@
 
     }
 
-    SendEmail( Entity => $entity, Bounce => 1 );
+    send_email( Entity => $entity, Bounce => 1 );
 }
 
-=head2 SendEmail Entity => undef, [ Bounce => 0, Ticket => undef, Transaction => undef ]
+=head2 send_email Entity => undef, [ Bounce => 0, Ticket => undef, Transaction => undef ]
 
 Sends an email (passed as a L<MIME::Entity> object C<ENTITY>) using
 RT's outgoing mail configuration. If C<BOUNCE> is passed, and is a
@@ -544,7 +544,7 @@
     return $template;
 }
 
-=head2 SendEmailUsingTemplate template => '', Arguments => {}, From => correspond_address, To => '', Cc => '', Bcc => ''
+=head2 send_email_using_template template => '', Arguments => {}, From => correspond_address, To => '', Cc => '', Bcc => ''
 
 Sends email using a template, takes name of template, arguments for it and recipients.
 
@@ -578,7 +578,7 @@
 
     set_in_reply_to( Message => $mail, InReplyTo => $args{'InReplyTo'} );
 
-    return SendEmail( Entity => $mail );
+    return send_email( Entity => $mail );
 }
 
 =head2 ForwardTransaction TRANSACTION, To => '', Cc => '', Bcc => ''
@@ -697,8 +697,8 @@
     my $status = RT->config->get('ForwardFromUser')
 
         # never sign if we forward from User
-        ? SendEmail( Entity => $mail, Transaction => $txn, sign => 0 )
-        : SendEmail( Entity => $mail, Transaction => $txn );
+        ? send_email( Entity => $mail, Transaction => $txn, sign => 0 )
+        : send_email( Entity => $mail, Transaction => $txn );
     return ( 0, $txn->_("Couldn't send email") ) unless $status;
     return ( 1, $txn->_("Send email successfully") );
 }
@@ -764,7 +764,7 @@
         foreach @bad_recipients;
 
     foreach my $recipient (@bad_recipients) {
-        my $status = SendEmailUsingTemplate(
+        my $status = send_email_using_template(
             To        => $recipient->{'AddressObj'}->address,
             template  => 'Error: public key',
             Arguments => {
@@ -778,7 +778,7 @@
         }
     }
 
-    my $status = SendEmailUsingTemplate(
+    my $status = send_email_using_template(
         To        => RT->config->get('OwnerEmail'),
         template  => 'Error to RT owner: public key',
         Arguments => {