X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FText.pm;h=1edb17477fcfdb45a9b7181a580c331d3f72acf8;hb=1c4ce01f78b112c2247a08f1a0dc9efb5ab3adca;hp=0f3a5299a226d8647e07aa97d54d3f59de5faf3c;hpb=03820c4df63c2f71623951a5919b072fb9a67d15;p=debbugs.git

diff --git a/Debbugs/Text.pm b/Debbugs/Text.pm
index 0f3a529..1edb174 100644
--- a/Debbugs/Text.pm
+++ b/Debbugs/Text.pm
@@ -16,8 +16,8 @@ Debbugs::Text -- General routines for text templates
 
 =head1 SYNOPSIS
 
-use Debbugs::Text qw(:templates);
-print fill_in_template(template => 'cgi/foo');
+ use Debbugs::Text qw(:templates);
+ print fill_in_template(template => 'cgi/foo');
 
 =head1 DESCRIPTION
 
@@ -33,7 +33,7 @@ None known.
 
 
 use vars qw($DEBUG $VERSION @EXPORT_OK %EXPORT_TAGS @EXPORT @ISA);
-use base qw(Exporter);
+use Exporter qw(import);
 
 BEGIN {
      $VERSION = 1.00;
@@ -45,11 +45,8 @@ BEGIN {
      @EXPORT_OK = ();
      Exporter::export_ok_tags(qw(templates));
      $EXPORT_TAGS{all} = [@EXPORT_OK];
-     push @ISA,qw(Safe::Hole::User);
 }
 
-use Safe;
-use Safe::Hole;
 use Text::Template;
 
 use Storable qw(dclone);
@@ -63,8 +60,6 @@ use Data::Dumper;
 
 our %tt_templates;
 our %filled_templates;
-our $safe;
-our $hole = Safe::Hole->new({});
 our $language;
 
 # This function is what is called when someone does include('foo/bar')
@@ -73,7 +68,7 @@ our $language;
 sub include {
      my $template = shift;
      $filled_templates{$template}++;
-     print STDERR "include template $template language $language safe $safe\n" if $DEBUG;
+     print STDERR "include template $template language $language\n" if $DEBUG;
      # Die if we're in a template loop
      die "Template loop with $template" if $filled_templates{$template} > 10;
      my $filled_tmpl = '';
@@ -81,7 +76,6 @@ sub include {
 	  $filled_tmpl = fill_in_template(template  => $template,
 					  variables => {},
 					  language  => $language,
-					  safe      => $safe,
 					 );
      };
      if ($@) {
@@ -119,7 +113,7 @@ sub fill_in_template{
 					  output    => {type => HANDLE,
 							optional => 1,
 						       },
-					  safe      => {type => OBJECT,
+					  safe      => {type => OBJECT|UNDEF,
 							optional => 1,
 						       },
 					  hole_var  => {type => HASHREF,
@@ -127,7 +121,6 @@ sub fill_in_template{
 						       },
 					 },
 			      );
-     #@param{qw(template variables language safe output hole_var no_safe)} = @_;
      if ($DEBUG) {
 	  print STDERR "fill_in_template ";
 	  print STDERR join(" ",map {exists $param{$_}?"$_:$param{$_}":()} keys %param);
@@ -141,6 +134,7 @@ sub fill_in_template{
 	 ref(\$param{template}) eq 'GLOB') {
 	  $tt_type = 'FILE_HANDLE';
 	  $tt_source = $param{template};
+	  binmode($tt_source,":encoding(UTF-8)");
      }
      elsif (ref($param{template}) eq 'SCALAR') {
 	  $tt_type = 'STRING';
@@ -154,54 +148,28 @@ sub fill_in_template{
 	  die "Unable to find template $param{template} with language $param{language}";
      }
 
-     if (defined $param{safe}) {
-	  $safe = $param{safe};
-     }
-     else {
-	  print STDERR "Created new safe\n" if $DEBUG;
-	  $safe = Safe->new() or die "Unable to create safe compartment";
-	  $safe->permit_only(':base_core',':base_loop',':base_mem',
-			     qw(padsv padav padhv padany),
-			     qw(rv2gv refgen srefgen ref),
-			     qw(caller require entereval),
-			    );
-	  $safe->share('*STDERR');
-	  $safe->share('%config');
-	  $hole->wrap(\&Debbugs::Text::include,$safe,'&include');
-	  my $root = $safe->root();
-	  # load variables into the safe
-	  for my $key (keys %{$param{variables}||{}}) {
-	       print STDERR "Loading $key\n" if $DEBUG;
-	       if (ref($param{variables}{$key})) {
-		    no strict 'refs';
-		    print STDERR $safe->root().'::'.$key,qq(\n) if $DEBUG;
-		    *{"${root}::$key"} = $param{variables}{$key};
-	       }
-	       else {
-		    no strict 'refs';
-		    ${"${root}::$key"} = $param{variables}{$key};
-	       }
-	  }
-	  for my $key (keys %{exists $param{hole_var}?$param{hole_var}:{}}) {
-	       print STDERR "Wraping $key as $param{hole_var}{$key}\n" if $DEBUG;
-	       $hole->wrap($param{hole_var}{$key},$safe,$key);
-	  }
-     }
      $language = $param{language};
      my $tt;
      if ($tt_type eq 'FILE' and
 	 defined $tt_templates{$tt_source} and
-	 (stat $tt_source)[9] > $tt_templates{$tt_source}{mtime}
+	 ($tt_templates{$tt_source}{mtime} + 60) < time and
+	 (stat $tt_source)[9] <= $tt_templates{$tt_source}{mtime}
 	) {
 	  $tt = $tt_templates{$tt_source}{template};
      }
      else {
+	 my $passed_source = $tt_source;
+	 my $passed_type = $tt_type;
 	  if ($tt_type eq 'FILE') {
 	       $tt_templates{$tt_source}{mtime} =
 		    (stat $tt_source)[9];
+	       $passed_source = IO::File->new($tt_source,'r');
+	       binmode($passed_source,":encoding(UTF-8)");
+	       $passed_type = 'FILEHANDLE';
 	  }
-	  $tt = Text::Template->new(TYPE => $tt_type,
-				    SOURCE => $tt_source,
+	  $tt = Text::Template->new(TYPE => $passed_type,
+				    SOURCE => $passed_source,
+				    UNTAINT => 1,
 				   );
 	  if ($tt_type eq 'FILE') {
 	       $tt_templates{$tt_source}{template} = $tt;
@@ -210,10 +178,13 @@ sub fill_in_template{
      if (not defined $tt) {
 	  die "Unable to create Text::Template for $tt_type:$tt_source";
      }
-     my $ret = $tt->fill_in(#(defined $param{nosafe} and $param{nosafe})?():(HASH=>$param{variables}),
-			    #(defined $param{nosafe} and $param{nosafe})?():(SAFE=>$safe),
-			    SAFE => $safe,
-			    #(defined $param{nosafe} and $param{nosafe})?(PACKAGE => 'main'):(),
+     my $ret = $tt->fill_in(PACKAGE => 'DTT',
+			    HASH => {%{$param{variables}//{}},
+				     (map {my $t = $_; $t =~ s/^\&//; ($t => $param{hole_var}{$_})}
+				      keys %{$param{hole_var}//{}}),
+				     include => \&Debbugs::Text::include,
+				     config  => \%config,
+				    },
 			    defined $param{output}?(OUTPUT=>$param{output}):(),
 			   );
      if (not defined $ret) {
@@ -223,10 +194,7 @@ sub fill_in_template{
      if ($DEBUG) {
 	  no strict 'refs';
 	  no warnings 'uninitialized';
-	  my $temp = $param{nosafe}?'main':$safe->{Root};
 	  print STDERR "Variables for $param{template}\n";
-	  print STDERR "Safe $temp\n";
-	  print STDERR map {"$_: ".*{$_}."\n"} keys %{"${temp}::"};
      }
 
      return $ret;