X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/548d69a4ee38cc59612e787f479ac198d5c37741..1fa7943caa4368a8031e1d7bf470b385ff7cad50:/modules/Output.pm?ds=inline diff --git a/modules/Output.pm b/modules/Output.pm index 7248922..3670e0e 100644 --- a/modules/Output.pm +++ b/modules/Output.pm @@ -6,16 +6,26 @@ package Output; # HTML generating routines # # Author: Patrick Canterino -# Last modified: 2005-01-06 +# Last modified: 2005-05-11 +# +# Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann +# Copyright (C) 2003-2009 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 +# the top level of the Dev-Editor distribution). # 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 +55,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) @@ -57,8 +68,9 @@ sub error($;$$) $tpl->read_file($tpl_error); $tpl->fillin('ERROR',$message); - $tpl->fillin('BACK',$path); - $tpl->fillin('SCRIPT',encode_entities($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);