In some parts of file "Command.pm", make use of new methods defined by the

[devedit.git] / modules / Output.pm

diff --git a/modules/Output.pm b/modules/Output.pm
index cd4e53eaeda032a001e01c18863ed62d6f9c20cb..9df2450003b7c4461563dec0b497c5d4118849bc 100644 (file)
--- a/modules/Output.pm
+++ b/modules/Output.pm
@@ -6,7 +6,15 @@ 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-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 strict;


@@ -59,10 +67,10 @@ sub error($;$$)
  my $tpl = new Template;
  $tpl->read_file($tpl_error);
 
  my $tpl = new Template;
  $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('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->parse_if_block('dir',defined $path);
 
 
  $tpl->parse_if_block('dir',defined $path);
 


@@ -70,10 +78,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;