Aha!

[devedit.git] / modules / Output.pm

diff --git a/modules/Output.pm b/modules/Output.pm
index eff7459661f11adb6d0540b8159e063968ad065e..7248922ba459f832c8b1c413dea8bc3180e72a59 100644 (file)
--- a/modules/Output.pm
+++ b/modules/Output.pm
@@ -5,8 +5,8 @@ package Output;
 #
 # HTML generating routines
 #
 #
 # HTML generating routines
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-03-12
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2005-01-06

 #
 
 use strict;
 #
 
 use strict;


@@ -14,8 +14,6 @@ use strict;
 use vars qw(@EXPORT);
 
 use CGI qw(header);
 use vars qw(@EXPORT);
 
 use CGI qw(header);

-use Tool;
-

 use HTML::Entities;
 use Template;
 
 use HTML::Entities;
 use Template;
 


@@ -46,7 +44,7 @@ sub error_template($)
 # Format an error message
 #
 # Params: 1. Error message
 # 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)
 #         3. Hash reference: Template variables (optional)
 #
 # Return: Formatted message (Scalar Reference)


@@ -58,13 +56,13 @@ sub error($;$$)
  my $tpl = new Template;
  $tpl->read_file($tpl_error);
 
  my $tpl = new Template;
  $tpl->read_file($tpl_error);
 

- $tpl->fillin("ERROR",$message);
- $tpl->fillin("DIR",$path);
- $tpl->fillin("SCRIPT",encode_entities($ENV{'SCRIPT_NAME'}));
+ $tpl->fillin('ERROR',$message);
+ $tpl->fillin('BACK',$path);
+ $tpl->fillin('SCRIPT',encode_entities($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))
   {
  {
   while(my ($key,$value) = each(%$vars))
   {


@@ -72,7 +70,7 @@ sub error($;$$)
   }
  }
 
   }
  }
 

- my $output = header(-type => "text/html");
+ my $output = header(-type => 'text/html');

  $output   .= $tpl->get_template;
 
  return \$output;
  $output   .= $tpl->get_template;
 
  return \$output;


@@ -84,11 +82,12 @@ sub error($;$$)
 # ^^^^^
 #
 # Params: 1. Error message
 # ^^^^^
 #
 # 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;
 }
  print $$output;
  exit;
 }