X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/8b505d2b02fe7154f0cb3794e562d98750051f08..104b2df49b9ee7e65d6b48923ea539bf01041575:/modules/Output.pm diff --git a/modules/Output.pm b/modules/Output.pm index 22d4e3c..be4837f 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-04 +# Author: Patrick Canterino +# Last modified: 2004-11-26 # use strict; @@ -25,8 +25,7 @@ use base qw(Exporter); @EXPORT = qw(error_template error - abort - error_in_use); + abort); my $tpl_error; @@ -47,7 +46,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) @@ -60,7 +59,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); @@ -85,11 +84,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; }