[Yapcom checkin] rev 26 - lib/YAPC

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

Author: gabor
Date: 2003-11-24 19:47:01 +0200 (Mon, 24 Nov 2003)
New Revision: 26

Modified:
   lib/YAPC/Organizer.pm
Log:
stop invoking default mode directly from the code

Modified: lib/YAPC/Organizer.pm
===================================================================
--- lib/YAPC/Organizer.pm	2003-11-24 17:11:48 UTC (rev 25)
+++ lib/YAPC/Organizer.pm	2003-11-24 17:47:01 UTC (rev 26)
@@ -47,9 +47,6 @@
    my $self = shift;
    my $run_mode = shift;
 
-   #warn "PRE: $self\n";
-   #warn "PRE: @_\n";
-
    # REQUEST_URI looks like this:  /content.html
    my $page = $ENV{REQUEST_URI} || '';
    $page =~ s@.*/@@;
@@ -370,10 +367,8 @@
     my $self = shift;
     my $q = $self->query;
 
-
     my $t = $self->_server_page('login', "$templates_dir/login.tmpl");
     my $login;
-    #warn "Submit: " . join (':',$q->param()) . "\n";
 
     if ($q->param('submit')) {
        eval {
@@ -384,7 +379,7 @@
          $t->param(MESSAGE => 'Login failed.');
          return $t->output;
        }
-    } else {
+    } else { # first time on this page
        $t->param('next' => $self->param('yapcom_next_page')) if $self->param('yapcom_next_page');
        return $t->output;
     }
@@ -400,15 +395,11 @@
                         -path    => $path,
                         -domain  => $ENV{HTTP_HOST},
                         );
-       $self->header_props(-cookie => $cookie);
+    $self->header_props(-cookie => $cookie);
 
-
-       if ($q->param("next")) {
-          $ENV{REQUEST_URI} = $q->param("next");
-       } else {
-          $ENV{REQUEST_URI} = '/user_account.html';
-       }
-       $self->default;
+     my $page = $q->param("next") || 'user_account';
+     my $tm = $self->_server_page($page, "$templates_dir/$page.tmpl");
+     return $tm->output;
 }
 
 

• [Yapcom checkin] rev 26 - lib/YAPC svn 19:47 on 24 Nov 2003

Generated at 20:06 on 24 Nov 2003 by mariachi 0.51