Now, all the error messages are defined in the configuration file.

[devedit.git] / modules / Output.pm

diff --git a/modules/Output.pm b/modules/Output.pm
index 449731fda4f2091644b844127eacb34472a50798..22d4e3c94bf31d35b8003927266f2c56a2137c2a 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>
 # HTML generating routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2004-02-06
+# Last modified: 2004-03-04

 #
 
 use strict;
 #
 
 use strict;


@@ -32,7 +32,7 @@ my $tpl_error;
 
 # error_template()
 #
 
 # 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
 # (I'm lazy...)
 #
 # Params: Template file


@@ -84,31 +84,16 @@ sub error($;$$)
 # Print an error message and exit script
 # ^^^^^
 #
 # 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;
 }
 
  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;
 # it's true, baby ;-)
 
 1;