X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/59507c0a5e5507868ebf6db407219da3f17c8ed9..5dad386ebee545eaf6775cf00cee149856ac7e6c:/modules/Output.pm diff --git a/modules/Output.pm b/modules/Output.pm index c9b6525..1a3d7fc 100644 --- a/modules/Output.pm +++ b/modules/Output.pm @@ -1,4 +1,3 @@ - package Output; # @@ -7,14 +6,14 @@ package Output; # HTML generating routines # # Author: Patrick Canterino -# Last modified: 2005-05-10 +# Last modified: 2011-02-11 # # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann -# Copyright (C) 2003-2009 Patrick Canterino +# Copyright (C) 2003-2011 Patrick Canterino # All Rights Reserved. # # This file can be distributed and/or modified under the terms of -# of the Artistic License 1.0 (see also the LICENSE file found at +# of the Artistic License 2.0 (see also the LICENSE file found at # the top level of the Dev-Editor distribution). # @@ -69,10 +68,9 @@ sub error($;$$) $tpl->read_file($tpl_error); $tpl->fillin('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->fillin('BACK',encode_html($path)); + $tpl->fillin('BACK_URL',escape($path)); + $tpl->fillin('SCRIPT',encode_html($ENV{'SCRIPT_NAME'})); $tpl->parse_if_block('dir',defined $path); @@ -80,12 +78,10 @@ sub error($;$$) { while(my ($key,$value) = each(%$vars)) { - $tpl->set_var($key,$value); + $tpl->fillin($key,$value); } } - $tpl->parse; - my $output = header(-type => 'text/html'); $output .= $tpl->get_template;