X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/89269f652fc46e65006b9aead5eb1ae61ebc311e..03d83644ce2d958fe3e0466fa272c67f0566f4ab:/modules/Output.pm?ds=inline diff --git a/modules/Output.pm b/modules/Output.pm index 6139430..449731f 100644 --- a/modules/Output.pm +++ b/modules/Output.pm @@ -6,7 +6,7 @@ package Output; # HTML generating routines # # Author: Patrick Canterino -# Last modified: 09-23-2003 +# Last modified: 2004-02-06 # use strict; @@ -14,82 +14,67 @@ use strict; use vars qw(@EXPORT); use CGI qw(header); -use HTML::Entities; use Tool; +use HTML::Entities; +use Template; + ### 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"); + error_in_use); - $html .= < +my $tpl_error; - - -$title - - - - -

$title

- -END - - return $html; -} - -# htmlfoot() +# error_template() # -# Generate the foot of a HTML document +# Set the path to the template file using 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. Virtual path to which a link should be displayed (optional) +# 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->fillin("ERROR",$message); + $tpl->fillin("DIR",$path); + $tpl->fillin("SCRIPT",encode_entities($ENV{'SCRIPT_NAME'})); + + $tpl->parse_if_block("dir",defined $path); - my $output = htmlhead("Error"); - $output .= "

$message

"; - $output .= htmlfoot; + if(ref($vars) eq "HASH") + { + while(my ($key,$value) = each(%$vars)) + { + $tpl->fillin($key,$value); + } + } + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; return \$output; } @@ -110,7 +95,8 @@ sub abort($) # error_in_use() # -# Create a message, that a file is currently in use +# Create a message, which shows, that a +# file is currently in use # # Params: File, which is in use # @@ -118,54 +104,9 @@ sub abort($) 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); + my $file = shift; - return "

Back to $dir

\n\n"; + return error("The file '".encode_entities($file)."' is currently edited by someone else.",upper_path($file)); } # it's true, baby ;-)