Drop more unused variables

[debbugs.git] / Debbugs / Text.pm

diff --git a/Debbugs/Text.pm b/Debbugs/Text.pm
index 61c77816a239019b4abc9ed1415f2a19a08c1c09..3c34b97c4150eff6eb0708f8c01a1257f0beb642 100644 (file)
--- a/Debbugs/Text.pm
+++ b/Debbugs/Text.pm
@@ -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;
@@ -64,7 +64,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')
@@ -119,7 +118,7 @@ sub fill_in_template{
                                          output    => {type => HANDLE,
                                                        optional => 1,
                                                       },
-                                         safe      => {type => OBJECT,
+                                         safe      => {type => OBJECT|UNDEF,
                                                        optional => 1,
                                                       },
                                          hole_var  => {type => HASHREF,
@@ -141,6 +140,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,55 +154,62 @@ 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),
-                            qw(gmtime time sprintf prtf),
-                           );
-         $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);
-         }
-     }
+#      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),
+#                           qw(gmtime time sprintf prtf),
+#                           qw(sort),
+#                          );
+#        $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
+        ($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') {
@@ -212,7 +219,14 @@ sub fill_in_template{
      if (not defined $tt) {
          die "Unable to create Text::Template for $tt_type:$tt_source";
      }
-     my $ret = $tt->fill_in(SAFE => $safe,
+     my $ret = $tt->fill_in(#SAFE => $safe,
+                           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) {
@@ -222,10 +236,10 @@ sub fill_in_template{
      if ($DEBUG) {
          no strict 'refs';
          no warnings 'uninitialized';
-         my $temp = $param{nosafe}?'main':$safe->{Root};
+#        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}::"};
+#        print STDERR "Safe $temp\n";
+#        print STDERR map {"$_: ".*{$_}."\n"} keys %{"${temp}::"};
      }
 
      return $ret;