Make use of new methods defined by template class.

[devedit.git] / modules / Output.pm

diff --git a/modules/Output.pm b/modules/Output.pm
index bf38904eefcd16f4da57c36970d32bb29fb0485d..c9b652561a25fb438eddf2c9c3890cc1dcd2d284 100644 (file)
--- a/modules/Output.pm
+++ b/modules/Output.pm
@@ -1,3 +1,4 @@
+

 package Output;
 
 #
 package Output;
 
 #


@@ -6,7 +7,7 @@ package Output;
 # HTML generating routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # HTML generating routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2005-04-22
+# Last modified: 2005-05-10

 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 # Copyright (C) 2003-2009 Patrick Canterino
 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 # Copyright (C) 2003-2009 Patrick Canterino


@@ -68,9 +69,10 @@ sub error($;$$)
  $tpl->read_file($tpl_error);
 
  $tpl->fillin('ERROR',$message);
  $tpl->read_file($tpl_error);
 
  $tpl->fillin('ERROR',$message);

- $tpl->fillin('BACK',encode_html($path));
- $tpl->fillin('BACK_URL',escape($path));
- $tpl->fillin('SCRIPT',encode_html($ENV{'SCRIPT_NAME'}));
+
+ $tpl->set_var('BACK',encode_html($path));
+ $tpl->set_var('BACK_URL',escape($path));
+ $tpl->set_var('SCRIPT',encode_html($ENV{'SCRIPT_NAME'}));

 
  $tpl->parse_if_block('dir',defined $path);
 
 
  $tpl->parse_if_block('dir',defined $path);
 


@@ -78,10 +80,12 @@ sub error($;$$)
  {
   while(my ($key,$value) = each(%$vars))
   {
  {
   while(my ($key,$value) = each(%$vars))
   {

-   $tpl->fillin($key,$value);
+   $tpl->set_var($key,$value);

   }
  }
 
   }
  }
 

+ $tpl->parse;
+

  my $output = header(-type => 'text/html');
  $output   .= $tpl->get_template;
 
  my $output = header(-type => 'text/html');
  $output   .= $tpl->get_template;