Changeset 377

Timestamp:

10/06/10 14:25:41 (14 years ago)

Author:

misc

Message:

• show a error message when the mail server is down

Location:

trunk

Files:

• lib/Epoll/Controller/Newpoll.pm (modified) (1 diff)
• lib/Epoll/View/Mail.pm (modified) (1 diff)
• root/templates/errors (added)
• root/templates/errors/mail.tt (added)

trunk/lib/Epoll/Controller/Newpoll.pm

@@ -66 +66 @@
                 } ]
             );
-            $c->stash->{template} = 'newpoll/request.tt';
+            if ($c->stash->{mail_error}) { 
+                $c->stash->{template} = 'errors/mail.tt';
+            } else { 
+                $c->stash->{template} = 'newpoll/request.tt';
+            }
         }
     }

trunk/lib/Epoll/View/Mail.pm

@@ -36 +36 @@
     $ENV{MAILADDRESS} = $args->{From};
     my $mailer = new Mail::Mailer 'smtp', Server => (Epoll->config->{smtp} || 'localhost');
-    $mailer->open({
-        (map { $_ => $args->{$_} } grep { $_ !~ /^(mail)$/ } keys %{ $args || {}}),
-        'Content-Type' => 'text/plain; charset=UTF-8; format=flowed',
-        'Content-Transfer-Encoding' => '8bit',
-        'X-Epoll-version' => $Epoll::DB::VERSION,
-    });
-    print $mailer
-    Catalyst::View::TT::render($self, $c, $template, { %{ $args->{mail} || {} }, c => $c });
-    $mailer->close;
+    eval { 
+        $mailer->open({
+            (map { $_ => $args->{$_} } grep { $_ !~ /^(mail)$/ } keys %{ $args || {}}),
+            'Content-Type' => 'text/plain; charset=UTF-8; format=flowed',
+            'Content-Transfer-Encoding' => '8bit',
+            'X-Epoll-version' => $Epoll::DB::VERSION,
+        });
+        print $mailer
+        Catalyst::View::TT::render($self, $c, $template, { %{ $args->{mail} || {} }, c => $c });
+        $mailer->close;
+    };
+    if ($@) {
+        $c->stash->{mail_error} = $@;
+    }    
 }