X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/d45094b7ee0dee87ae03d62f9e9a0a3e2196add8..8e187e4f2ec51c2306c5d69755db1cc04e5e2cee:/modules/Output.pm?ds=sidebyside diff --git a/modules/Output.pm b/modules/Output.pm index eff7459..19fa248 100644 --- a/modules/Output.pm +++ b/modules/Output.pm @@ -5,8 +5,8 @@ package Output; # # HTML generating routines # -# Author: Patrick Canterino -# Last modified: 2004-03-12 +# Author: Patrick Canterino +# Last modified: 2004-12-17 # use strict; @@ -14,8 +14,6 @@ use strict; use vars qw(@EXPORT); use CGI qw(header); -use Tool; - use HTML::Entities; use Template; @@ -46,7 +44,7 @@ sub error_template($) # Format an error message # # Params: 1. Error message -# 2. Virtual path to which a link should be displayed (optional) +# 2. Display a link to this path at the bottom of the page (optional) # 3. Hash reference: Template variables (optional) # # Return: Formatted message (Scalar Reference) @@ -59,7 +57,7 @@ sub error($;$$) $tpl->read_file($tpl_error); $tpl->fillin("ERROR",$message); - $tpl->fillin("DIR",$path); + $tpl->fillin("BACK",$path); $tpl->fillin("SCRIPT",encode_entities($ENV{'SCRIPT_NAME'})); $tpl->parse_if_block("dir",defined $path); @@ -84,11 +82,12 @@ sub error($;$$) # ^^^^^ # # Params: 1. Error message -# 2. Hash reference: Template variables (optional) +# 2. Display a link to this path at the bottom of the page (optional) +# 3. Hash reference: Template variables (optional) -sub abort($;$) +sub abort($;$$) { - my $output = error(shift,undef,shift); + my $output = error(shift,shift,shift); print $$output; exit; }