- While processing a file upload, check if the user wants to replace a directory

[devedit.git] / modules / Output.pm

diff --git a/modules/Output.pm b/modules/Output.pm
index 449731fda4f2091644b844127eacb34472a50798..19fa2483c75aabd564c650ff355dd67ed3a82daa 100644 (file)
--- 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-06
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-12-17
 #
 
 use strict;
@@ -14,8 +14,6 @@ use strict;
 use vars qw(@EXPORT);
 
 use CGI qw(header);
-use Tool;
-
 use HTML::Entities;
 use Template;
 
@@ -25,14 +23,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
@@ -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)
@@ -60,7 +57,7 @@ sub error($;$$)
  $tpl->read_file($tpl_error);
 
  $tpl->fillin("ERROR",$message);
- $tpl->fillin("DIR",$path);
+ $tpl->fillin("BACK",$path);
  $tpl->fillin("SCRIPT",encode_entities($ENV{'SCRIPT_NAME'}));
 
  $tpl->parse_if_block("dir",defined $path);
@@ -84,31 +81,17 @@ sub error($;$$)
 # Print an error message and exit script
 # ^^^^^
 #
-# Params: Error message
+# Params: 1. Error message
+#         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);
+ 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;