Removing one and more whitespace makes more sense than removing no, one and more...

[devedit.git] / modules / Output.pm

diff --git a/modules/Output.pm b/modules/Output.pm
index 449731fda4f2091644b844127eacb34472a50798..eff7459661f11adb6d0540b8159e063968ad065e 100644 (file)
--- a/modules/Output.pm
+++ b/modules/Output.pm
@@ -6,7 +6,7 @@ package Output;
 # HTML generating routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-02-06
+# Last modified: 2004-03-12
 #
 
 use strict;
@@ -25,14 +25,13 @@ use base qw(Exporter);
 
 @EXPORT = qw(error_template
              error
-             abort
-             error_in_use);
+             abort);
 
 my $tpl_error;
 
 # error_template()
 #
-# Set the path to the template file using for error messages
+# Set the path to the template file used for error messages
 # (I'm lazy...)
 #
 # Params: Template file
@@ -84,31 +83,16 @@ sub error($;$$)
 # Print an error message and exit script
 # ^^^^^
 #
-# Params: Error message
+# Params: 1. Error message
+#         2. Hash reference: Template variables (optional)
 
-sub abort($)
+sub abort($;$)
 {
- my $output = error(shift);
+ my $output = error(shift,undef,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;