X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/89269f652fc46e65006b9aead5eb1ae61ebc311e..86b312116cd7df7a753b697efe3af784b8a7f927:/modules/Output.pm
diff --git a/modules/Output.pm b/modules/Output.pm
index 6139430..9df2450 100644
--- a/modules/Output.pm
+++ b/modules/Output.pm
@@ -5,91 +5,87 @@ package Output;
#
# HTML generating routines
#
-# Author: Patrick Canterino
-# Last modified: 09-23-2003
+# Author: Patrick Canterino
+# Last modified: 2005-05-09
+#
+# 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 CGI qw(header);
-use HTML::Entities;
+use CGI qw(header
+ escape);
+
+use Template;
use Tool;
### Export ###
use base qw(Exporter);
-@EXPORT = qw(htmlhead
- htmlfoot
+@EXPORT = qw(error_template
error
- abort
- error_in_use
- equal_url
- dir_link);
-
-# htmlhead()
-#
-# Generate the head of a HTML document
-# (a text/html HTTP header will also be created)
-#
-# Params: Title and heading
-#
-# Return: Head for the HTML document
-
-sub htmlhead($)
-{
- my $title = shift;
-
- my $html = header(-type => "text/html");
-
- $html .= <
-
-
-
-$title
-
-
-
+ abort);
-$title
+my $tpl_error;
-END
-
- return $html;
-}
-
-# htmlfoot()
+# error_template()
#
-# Generate the foot of a HTML document
+# Set the path to the template file used for error messages
+# (I'm lazy...)
#
-# Params: -nothing-
-#
-# Return: Foot for the HTML document
+# Params: Template file
-sub htmlfoot
+sub error_template($)
{
- return "\n\n";
+ $tpl_error = shift;
}
# error()
#
# Format an error message
#
-# Params: Error message
+# Params: 1. Error message
+# 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)
-sub error($)
+sub error($;$$)
{
- my $message = shift;
+ my ($message,$path,$vars) = @_;
+
+ my $tpl = new Template;
+ $tpl->read_file($tpl_error);
+
+ $tpl->set_var('ERROR',$message);
+ $tpl->set_var('BACK',encode_html($path));
+ $tpl->set_var('BACK_URL',escape($path));
+ $tpl->set_var('SCRIPT',encode_html($ENV{'SCRIPT_NAME'}));
- my $output = htmlhead("Error");
- $output .= "$message
";
- $output .= htmlfoot;
+ $tpl->parse_if_block('dir',defined $path);
+
+ if(ref($vars) eq 'HASH')
+ {
+ while(my ($key,$value) = each(%$vars))
+ {
+ $tpl->set_var($key,$value);
+ }
+ }
+
+ $tpl->parse;
+
+ my $output = header(-type => 'text/html');
+ $output .= $tpl->get_template;
return \$output;
}
@@ -99,75 +95,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, that a file is currently in use
-#
-# Params: File, which is in use
-#
-# Return: Formatted message (Scalar Reference)
-
-sub error_in_use($)
-{
- my $file = encode_entities(shift);
- my $dir = upper_path($file);
-
- my $message = htmlhead("File in use");
- $message .= "The file '$file' is currently editet by someone else.
\n\n";
- $message .= "Back to $dir
";
- $message .= htmlfoot;
-
- return \$message;
-}
-
-# equal_url()
-#
-# Create an "equals"-link and print it out
-#
-# Params: 1. HTTP root
-# 2. Relative path
-#
-# Return: Formatted link (String)
-
-sub equal_url($$)
-{
- my ($root,$path) = @_;
- my $url;
-
- $root =~ s!/$!!;
- $path =~ s!^/!!;
- $url = $root."/".$path;
- $url = encode_entities($url);
-
- return "(equals $url)
\n\n";
-}
-
-# dir_link()
-#
-# Create the link to the directory of a file and
-# print it out
-#
-# Params: File
-#
-# Return: Formatted link (String)
-
-sub dir_link($)
-{
- my $dir = upper_path(shift);
- $dir = encode_entities($dir);
-
- return "Back to $dir
\n\n";
-}
-
# it's true, baby ;-)
1;