Small changes to README

[devedit.git] / modules / Output.pm

diff --git a/modules/Output.pm b/modules/Output.pm
index 22d4e3c94bf31d35b8003927266f2c56a2137c2a..3670e0e3c665caec1d71ed42f57722ddf860886a 100644 (file)
--- a/modules/Output.pm
+++ b/modules/Output.pm
@@ -5,19 +5,27 @@ package Output;
 #
 # HTML generating routines
 #
 #
 # HTML generating routines
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-03-04
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# 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 strict;
 
 use vars qw(@EXPORT);
 

-use CGI qw(header);
-use Tool;
+use CGI qw(header
+           escape);

 
 

-use HTML::Entities;

 use Template;
 use Template;

+use Tool;

 
 ### Export ###
 
 
 ### Export ###
 


@@ -25,8 +33,7 @@ use base qw(Exporter);
 
 @EXPORT = qw(error_template
              error
 
 @EXPORT = qw(error_template
              error

-             abort
-             error_in_use);
+             abort);

 
 my $tpl_error;
 
 
 my $tpl_error;
 


@@ -47,7 +54,8 @@ 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)
+#            Please use the unencoded form of the string!

 #         3. Hash reference: Template variables (optional)
 #
 # Return: Formatted message (Scalar Reference)
 #         3. Hash reference: Template variables (optional)
 #
 # Return: Formatted message (Scalar Reference)


@@ -59,13 +67,14 @@ 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',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))
   {
  {
   while(my ($key,$value) = each(%$vars))
   {


@@ -73,7 +82,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;


@@ -85,11 +94,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;
 }