From: pcanterino <> Date: Sat, 9 May 2009 11:38:39 +0000 (+0000) Subject: In file "Output.pm", make use of new methods defined by the template class X-Git-Tag: version_3_1~7 X-Git-Url: https://git.p6c8.net/devedit.git/commitdiff_plain/a4e44c04a05eb1b2778ab23790e6b86551d976c4?hp=d6b0eacd69eb222641d326aa6cc5f9f4d133ddd7 In file "Output.pm", make use of new methods defined by the template class --- diff --git a/modules/Output.pm b/modules/Output.pm index bf38904..30d60b4 100644 --- a/modules/Output.pm +++ b/modules/Output.pm @@ -6,7 +6,7 @@ package Output; # HTML generating routines # # Author: Patrick Canterino -# Last modified: 2005-04-22 +# Last modified: 2005-05-09 # # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann # Copyright (C) 2003-2009 Patrick Canterino @@ -67,10 +67,10 @@ sub error($;$$) my $tpl = new Template; $tpl->read_file($tpl_error); - $tpl->fillin('ERROR',$message); - $tpl->fillin('BACK',encode_html($path)); - $tpl->fillin('BACK_URL',escape($path)); - $tpl->fillin('SCRIPT',encode_html($ENV{'SCRIPT_NAME'})); + $tpl->set_var('ERROR',$message); + $tpl->set_var('BACK',encode_html($path)); + $tpl->set_var('BACK_URL',escape($path)); + $tpl->set_var('SCRIPT',encode_html($ENV{'SCRIPT_NAME'})); $tpl->parse_if_block('dir',defined $path); @@ -78,10 +78,12 @@ sub error($;$$) { while(my ($key,$value) = each(%$vars)) { - $tpl->fillin($key,$value); + $tpl->set_var($key,$value); } } + $tpl->parse(); + my $output = header(-type => 'text/html'); $output .= $tpl->get_template;