[prev] [thread] [next] [lurker] [Date index for 2003/11/25]
Author: gabor
Date: 2003-11-25 01:02:18 +0200 (Tue, 25 Nov 2003)
New Revision: 35
Modified:
lib/YAPC/Organizer.pm
Log:
eliminate redundant parameter of _server_page
Modified: lib/YAPC/Organizer.pm
===================================================================
--- lib/YAPC/Organizer.pm 2003-11-24 22:51:28 UTC (rev 34)
+++ lib/YAPC/Organizer.pm 2003-11-24 23:02:18 UTC (rev 35)
@@ -99,7 +99,7 @@
# maybe this should be replaced with a generic show page call
sub user_account {
my $self = shift;
- my $t = $self->_server_page('user_account', "$templates_dir/user_account.tmpl");
+ my $t = $self->_server_page('user_account');
return $t->output;
}
@@ -125,7 +125,7 @@
sub no_such_page {
my $self = shift;
- my $t = $self->_server_page('error', "$templates_dir/error.tmpl");
+ my $t = $self->_server_page('error');
return $t->output;
}
@@ -133,7 +133,7 @@
sub show_message {
my $self = shift;
- my $t = $self->_server_page('message', "$templates_dir/message.tmpl");
+ my $t = $self->_server_page('message');
$t->param($self->param('yapcom_message') => 1);
return $t->output;
}
@@ -145,7 +145,7 @@
my $id = $self->is_logged_in;
if (not $id) {
- my $t = $self->_server_page('login', "$templates_dir/login.tmpl");
+ my $t = $self->_server_page('login');
$t->param(next => "change_password.html");
return $t->output;
}
@@ -160,11 +160,11 @@
$person->password($q->param('password'));
$person->update();
- my $t = $self->_server_page('message', "$templates_dir/message.tmpl");
+ my $t = $self->_server_page('message');
$t->param(password_changed => 1);
return $t->output;
} else {
- my $t = $self->_server_page('change_password', "$templates_dir/change_password.tmpl");
+ my $t = $self->_server_page('change_password');
$t->param(message => "Error");
return $t->output;
}
@@ -176,12 +176,12 @@
my ($person) = YAPC::Person->search(email => $q->param('email'));
if (not $person) {
- my $t = $self->_server_page('lost_validation', "$templates_dir/lost_validation.tmpl");
+ my $t = $self->_server_page('lost_validation');
$t->param(MESSAGE => 'No such e-mail');
return $t->output;
}
- my $t = $self->_server_page('email_sent', "$templates_dir/email_sent.tmpl");
+ my $t = $self->_server_page('email_sent');
if ($person->authcode ) {
$self->send_email_with_validation_code($person);
$t->param(SENT_AUTHCODE => 1);
@@ -197,12 +197,12 @@
my ($person) = YAPC::Person->search(email => $q->param('email'));
if (not $person) {
- my $t = $self->_server_page('lost_password', "$templates_dir/lost_password.tmpl");
+ my $t = $self->_server_page('lost_password');
$t->param(MESSAGE => 'No such e-mail');
return $t->output;
}
- my $t = $self->_server_page('email_sent', "$templates_dir/email_sent.tmpl");
+ my $t = $self->_server_page('email_sent');
$self->send_email_with_password($person);
$t->param(SENT_PASSWORD => 1);
return $t->output;
@@ -253,7 +253,7 @@
sub _server_page {
my $self = shift;
- my ($page , $filename) = @_;
+ my ($page) = @_;
my $q = $self->query;
# we allow tags like this in our templates that will define values
@@ -267,17 +267,15 @@
}
};
-
- my $t = $self->load_tmpl($filename,
+ my $t = $self->load_tmpl(
+ "$page.tmpl",
die_on_bad_params => 0,
filter => $filter,
associate => $q,
+ path => $templates_dir,
);
$t->param(%h);
- $t->param(uc $page, $page);
- $t->param('run' => 'registration') if $page eq 'registration';
- $t->param('run' => 'login') if $page eq 'login';
$t->param(VERSION => $YAPC::Organizer::VERSION);
return $t;
@@ -298,7 +296,7 @@
mongers => $p->mongers,
};
}
- my $t = $self->_server_page('list_people', "$templates_dir/list_people.tmpl");
+ my $t = $self->_server_page('list_people');
my $stat = YAPC::Person->get_statistics();
$t->param(%$stat);
$t->param(USERS => $ar);
@@ -307,7 +305,7 @@
sub admin {
my $self = shift;
- my $t = $self->_server_page('admin', "$templates_dir/admin.tmpl");
+ my $t = $self->_server_page('admin');
return $t->output;
}
@@ -321,7 +319,7 @@
push @$ar, $p;
}
- my $t = $self->_server_page('admin_list_people', "$templates_dir/admin_list_people.tmpl");
+ my $t = $self->_server_page('admin_list_people');
my $stat = YAPC::Person->get_statistics();
$t->param(%$stat);
$t->param(USERS => $ar);
@@ -340,7 +338,7 @@
};
}
- my $t = $self->_server_page('admin_list_proposals', "$templates_dir/admin_list_proposals.tmpl");
+ my $t = $self->_server_page('admin_list_proposals');
$t->param(TALKS => $ar);
return $t->output;
}
@@ -356,7 +354,7 @@
}
- my $t = $self->_server_page('login', "$templates_dir/login.tmpl");
+ my $t = $self->_server_page('login');
my $login;
if ($q->param('submit')) {
@@ -387,7 +385,7 @@
$self->header_props(-cookie => $cookie);
my $page = $q->param("next") || 'user_account';
- my $tm = $self->_server_page($page, "$templates_dir/$page.tmpl");
+ my $tm = $self->_server_page($page);
return $tm->output;
}
@@ -406,7 +404,7 @@
YAPC::Login->logout(cookie => $cookie);
};
my $err = $@;
- my $t = $self->_server_page('logout', "$templates_dir/logout.tmpl");
+ my $t = $self->_server_page('logout');
$t->param(ERROR => $err);
$t->output;
}
@@ -424,7 +422,7 @@
if ($@) {
my $msg = $@;
# cannot register (duplicate email ?, other problem ?)
- my $t = $self->_server_page('registration', "$templates_dir/registration.tmpl");
+ my $t = $self->_server_page('registration');
$t->param(MESSAGE => 'There was an error in the provided data.');
return $t->output;
} else {
@@ -447,7 +445,7 @@
sendmail(%spymail) or die $Mail::Sendmail::error unless $ENV{YAPCOM_NOMAIL};
- my $t = $self->_server_page('validation', "$templates_dir/validation.tmpl");
+ my $t = $self->_server_page('validation');
$t->param('run' => 'validation');
return $t->output;
}
@@ -461,10 +459,10 @@
my $gbr = YAPC::Person->acknowladge($q->Vars);
};
if ($@) {
- my $t = $self->_server_page('validation', "$templates_dir/validation.tmpl");
+ my $t = $self->_server_page('validation');
return $t->output;
} else {
- my $t = $self->_server_page('thankyou', "$templates_dir/thankyou.tmpl");
+ my $t = $self->_server_page('thankyou');
return $t->output;
}
}
@@ -490,7 +488,7 @@
my $talk;
my $id = $self->is_logged_in;
- my $t = $self->_server_page('proposal', "$templates_dir/proposal.tmpl");
+ my $t = $self->_server_page('proposal');
if ($q->param('submit')) {
eval {
@@ -507,7 +505,7 @@
# success
$self->send_new_proposal_to_admin($talk);
- $t = $self->_server_page('thank_proposal', "$templates_dir/thank_proposal.tmpl");
+ $t = $self->_server_page('thank_proposal');
return $t->output;
}
Generated at 02:06 on 25 Nov 2003 by mariachi 0.51