[Yapcom-commit] rev 85 - lib/YAPC

[prev] [thread] [next] [lurker] [Date index for 2003/11/27]

From: svn
Subject: [Yapcom-commit] rev 85 - lib/YAPC
Date: 23:49 on 27 Nov 2003
Author: gabor
Date: 2003-11-27 23:49:48 +0200 (Thu, 27 Nov 2003)
New Revision: 85

Modified:
   lib/YAPC/Organizer.pm
Log:
tweaking try/catch frase

Modified: lib/YAPC/Organizer.pm
===================================================================
--- lib/YAPC/Organizer.pm	2003-11-27 21:14:00 UTC (rev 84)
+++ lib/YAPC/Organizer.pm	2003-11-27 21:49:48 UTC (rev 85)
@@ -401,7 +401,15 @@
     }
 
     try {
-    $login = YAPC::Login->new($q->Vars);
+      $login = YAPC::Login->new($q->Vars);
+    } 
+     catch YAPC::Error with {
+      my $er = shift;
+      $t->param(MESSAGE => $er);
+    } 
+    catch Error with {
+      $t->param(MESSAGE => 'Login failed.');
+    } or return $t->output; # on error
 
     # success
     my $path = $ENV{REQUEST_URI};
@@ -418,16 +426,6 @@
      my $page = $q->param("next") || 'user_account';
      my $tm = $self->_server_page($page);
      return $tm->output;
-    } 
-    catch YAPC::Error with {
-      my $er = shift;
-      $t->param(MESSAGE => $er);
-      return $t->output;
-    } 
-    catch Error with {
-      $t->param(MESSAGE => 'Login failed.');
-      return $t->output;
-    };
 }
 
 

Generated at 13:30 on 28 Nov 2003 by mariachi 0.51