[freeside-commits] freeside/rt/html/REST/1.0/NoAuth mail-gateway, 1.1.1.5, 1.1.1.5.4.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rt/html/REST/1.0/NoAuth
In directory wavetail.420.am:/tmp/cvs-serv10370/html/REST/1.0/NoAuth

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	mail-gateway 
Log Message:
merge in rt 3.4.6.  *gulp*!

Index: mail-gateway
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/REST/1.0/NoAuth/mail-gateway,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.5.4.1
diff -u -d -r1.1.1.5 -r1.1.1.5.4.1
--- mail-gateway	15 Oct 2005 09:10:13 -0000	1.1.1.5
+++ mail-gateway	3 Mar 2008 23:07:38 -0000	1.1.1.5.4.1
@@ -52,26 +52,30 @@
 $ticket => undef
 </%ARGS>
 <%init>
-use RT::Interface::Email; 
+use RT::Interface::Email ();    # It's an exporter, but we don't care
 $r->content_type('text/plain; charset=utf-8');
 $m->error_format('text');
-my ( $status, $error, $Ticket ) = RT::Interface::Email::Gateway(\%ARGS);
- if ($status == -75 ) {
-$m->out("temporary failure - ". $error);
- }
-    elsif ($status == 1) {
-$m->out('ok');
-        if ( $Ticket->Id ) {
-$m->out('Ticket: '. $Ticket->Id);
-$m->out('Queue: '. $Ticket->QueueObj->Name );
-$m->out('Owner: '. $Ticket->OwnerObj->Name);
-$m->out('Status: '. $Ticket->Status );
-$m->out('Subject: '. $Ticket->Subject );
-$m->out('Requestor: '. $Ticket->Requestors->MemberEmailAddressesAsString );
-        }
- }   else { 
-$m->out('not ok - '.$error);
- }
-
+my ( $status, $error, $Ticket ) = RT::Interface::Email::Gateway( \%ARGS );
+if ( $status == 1 ) {
+  $m->out('ok');
+  if ( $Ticket->Id ) {
+    $m->out( 'Ticket: ' . $Ticket->Id );
+    $m->out( 'Queue: ' . $Ticket->QueueObj->Name );
+    $m->out( 'Owner: ' . $Ticket->OwnerObj->Name );
+    $m->out( 'Status: ' . $Ticket->Status );
+    $m->out( 'Subject: ' . $Ticket->Subject );
+    $m->out(
+      'Requestor: ' . $Ticket->Requestors->MemberEmailAddressesAsString );
+  }
+}
+else {
+  $RT::Logger->error( "Could not record email: " . $error );
+  if ( $status == -75 ) {
+    $m->out( "temporary failure - " . $error );
+  }
+  else {
+    $m->out( 'not ok - ' . $error );
+  }
+}
 $m->abort();
 </%init>