X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/863abbbee47daf6df718856079cb50833e3552c2..7897c609d415e2362b8c42c3b918a7ebcb5c4bda:/modules/Output.pm?ds=sidebyside

diff --git a/modules/Output.pm b/modules/Output.pm
index ba41e38..7248922 100644
--- a/modules/Output.pm
+++ b/modules/Output.pm
@@ -5,8 +5,8 @@ package Output;
 #
 # HTML generating routines
 #
-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-02-23
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2005-01-06
 #
 
 use strict;
@@ -14,8 +14,6 @@ use strict;
 use vars qw(@EXPORT);
 
 use CGI qw(header);
-use Tool;
-
 use HTML::Entities;
 use Template;
 
@@ -25,8 +23,7 @@ use base qw(Exporter);
 
 @EXPORT = qw(error_template
              error
-             abort
-             error_in_use);
+             abort);
 
 my $tpl_error;
 
@@ -47,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,13 +56,13 @@ sub 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))
   {
@@ -73,7 +70,7 @@ sub error($;$$)
   }
  }
 
- my $output = header(-type => "text/html");
+ my $output = header(-type => 'text/html');
  $output   .= $tpl->get_template;
 
  return \$output;
@@ -85,31 +82,16 @@ 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;
 }
 
-# error_in_use()
-#
-# Create a message, which shows, that a
-# file is currently in use
-#
-# Params: File, which is in use
-#
-# Return: Formatted message (Scalar Reference)
-
-sub error_in_use($)
-{
- my $file = shift;
-
- return error("The file '".encode_entities($file)."' is currently edited by someone else.",upper_path($file));
-}
-
 # it's true, baby ;-)
 
 1;