X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/4d557032f1dd4208660d21cd162f356ce34cb972..e51c98a37882eaa39c0e3f1b8727ba06ecd7e626:/modules/Output.pm?ds=inline diff --git a/modules/Output.pm b/modules/Output.pm index 19fa248..cd4e53e 100644 --- a/modules/Output.pm +++ b/modules/Output.pm @@ -6,16 +6,18 @@ package Output; # HTML generating routines # # Author: Patrick Canterino -# Last modified: 2004-12-17 +# Last modified: 2005-04-22 # use strict; use vars qw(@EXPORT); -use CGI qw(header); -use HTML::Entities; +use CGI qw(header + escape); + use Template; +use Tool; ### Export ### @@ -45,6 +47,7 @@ sub error_template($) # # Params: 1. Error message # 2. Display a link to this path at the bottom of the page (optional) +# Please use the unencoded form of the string! # 3. Hash reference: Template variables (optional) # # Return: Formatted message (Scalar Reference) @@ -56,13 +59,14 @@ sub error($;$$) my $tpl = new Template; $tpl->read_file($tpl_error); - $tpl->fillin("ERROR",$message); - $tpl->fillin("BACK",$path); - $tpl->fillin("SCRIPT",encode_entities($ENV{'SCRIPT_NAME'})); + $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->parse_if_block("dir",defined $path); + $tpl->parse_if_block('dir',defined $path); - if(ref($vars) eq "HASH") + if(ref($vars) eq 'HASH') { while(my ($key,$value) = each(%$vars)) { @@ -70,7 +74,7 @@ sub error($;$$) } } - my $output = header(-type => "text/html"); + my $output = header(-type => 'text/html'); $output .= $tpl->get_template; return \$output;