[Jifty-commit] r4483 - in apps/spensive: . bin lib/Spensive lib/Spensive/Action

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Tue Nov 20 12:10:37 2007
New Revision: 4483

Modified:
   apps/spensive/   (props changed)
   apps/spensive/bin/mailgate
   apps/spensive/etc/config.yml
   apps/spensive/lib/Spensive/Action/EmailDispatch.pm
   apps/spensive/lib/Spensive/Dispatcher.pm

Log:
 r67189 at pinglin (orig r7317):  jesse | 2007-09-12 20:23:15 -0400
 mail gate bugfixes
 


Modified: apps/spensive/bin/mailgate
==============================================================================
--- apps/spensive/bin/mailgate	(original)
+++ apps/spensive/bin/mailgate	Tue Nov 20 12:10:37 2007
@@ -7,6 +7,7 @@
 use Pod::Usage;
 use Jifty::YAML;
 
+    open(my $file , ">/tmp/gate");
 # Option parsing
 my %opts;
 GetOptions( \%opts, "address=s", "url=s", "timeout=i", "sender=s", "help" )
@@ -15,9 +16,8 @@
 
 # Set up POST parameters
 my %args = ( "J:A-dispatch" => "EmailDispatch" );
-
 # Where the email was sent to
-$args{'J:A:F-address-dispatch'} = $opts{address} || $ENV{RECIPIENT};
+$args{'J:A:F-address-dispatch'} = $opts{address} || $ENV{EXTENSION};
 die "$0: No --address argument, and EXTENSION env variable is empty!"
   unless $args{'J:A:F-address-dispatch'};
 
@@ -25,20 +25,20 @@
 $args{'J:A:F-envelope_sender-dispatch'} = $opts{sender} || $ENV{SENDER};
 die "$0: No --sender argument, and SENDER env variable is empty!"
   unless $args{'J:A:F-envelope_sender-dispatch'};
-
 # Grab the message from STDIN
 $args{'J:A:F-email-dispatch'} = do { local (@ARGV, $/); <> };
 die "$0: No message passed on STDIN\n"
   unless $args{'J:A:F-email-dispatch'} =~ /\S/;
-
 # Send 'er away!
 my $ua = LWP::UserAgent->new();
 $ua->timeout( $opts{timeout} ) if defined $opts{timeout};
 my $r = $ua->post("$opts{url}/__jifty/webservices/yaml", { %args });
 if ($r->is_success) {
     my $data = Jifty::YAML::Load($r->content);
+    print $file $r->content;
     exit( $data->{dispatch}{failure} ? 100 : 0 );
 } else {
+    close $file;
     warn "Failure to post";
     exit 1;
 }

Modified: apps/spensive/etc/config.yml
==============================================================================
--- apps/spensive/etc/config.yml	(original)
+++ apps/spensive/etc/config.yml	Tue Nov 20 12:10:37 2007
@@ -17,7 +17,7 @@
   DevelMode: 0
   L10N: 
     PoDir: share/po
-  LogLevel: DEBUG
+  LogLevel: INFO
   Mailer: IO
   MailerArgs:
     - %log/mail.log%

Modified: apps/spensive/lib/Spensive/Action/EmailDispatch.pm
==============================================================================
--- apps/spensive/lib/Spensive/Action/EmailDispatch.pm	(original)
+++ apps/spensive/lib/Spensive/Action/EmailDispatch.pm	Tue Nov 20 12:10:37 2007
@@ -153,9 +153,7 @@
     my $body = ( grep { ($_->content_type || '') =~ '^text/plain' } $email->parts )[0]
       || $email;
 
-    my $content_type = $body->content_type
-      ? parse_content_type( $body->content_type )->{charset}
-      : '';
+    my $content_type = $body->content_type || '';
     $body = $body->body;
 
     Encode::_utf8_off($body);

Modified: apps/spensive/lib/Spensive/Dispatcher.pm
==============================================================================
--- apps/spensive/lib/Spensive/Dispatcher.pm	(original)
+++ apps/spensive/lib/Spensive/Dispatcher.pm	Tue Nov 20 12:10:37 2007
@@ -13,7 +13,7 @@
 };
 
 
-on '*' => run {
+on  qr'.' => run {
     
     if ( Jifty->web->current_user->id ) {
     Jifty->web->navigation->child( 'Expense Reports',  url =>  '/reports');