Changed usage of template class.

[devedit.git] / modules / Output.pm

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

 package Output;
 
 #
 package Output;
 
 #


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

-# Last modified: 2005-05-10
+# Last modified: 2005-05-11

 #
 # 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


@@ -69,10 +68,9 @@ sub error($;$$)
  $tpl->read_file($tpl_error);
 
  $tpl->fillin('ERROR',$message);
  $tpl->read_file($tpl_error);
 
  $tpl->fillin('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'}));
+ $tpl->fillin('BACK',encode_html($path));
+ $tpl->fillin('BACK_URL',escape($path));
+ $tpl->fillin('SCRIPT',encode_html($ENV{'SCRIPT_NAME'}));

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


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

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

   }
  }
 
   }
  }
 

- $tpl->parse;
-

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