Revert "Briefe: Rechteprüfung gefixed"

[kivitendo-erp.git] / SL / Template / Excel.pm

diff --git a/SL/Template/Excel.pm b/SL/Template/Excel.pm
index 3ed7618..a590b38 100644 (file)
--- a/SL/Template/Excel.pm
+++ b/SL/Template/Excel.pm
@@ -1,10 +1,7 @@
 package SL::Template::Excel;
 
-use SL::Template::Simple;
-
-use vars qw(@ISA);
-
-@ISA = qw(SL::Template::Simple);
+use strict;
+use parent qw(SL::Template::Simple);
 
 sub new {
   my $type = shift;
@@ -50,11 +47,11 @@ sub parse {
 
   my $contents = join("", @lines);
   my @indices;
-  $contents =~ s{
-    $self->{tag_start} [<]* (\s?) [<>\s]* ([\w\s]+) [<>\s]* $self->{tag_end}
-  }{
-    $self->format_vars(align_right => $1 ne '', varstring => $2, length => length($&), indices =>  \@indices)
-  }egx;
+  $contents =~ s%
+    ( $self->{tag_start} [<]* (\s?) [<>\s]* ([\w\s]+) [<>\s]* $self->{tag_end} )
+  %
+    $self->format_vars(align_right => $2 ne '', varstring => $3, length => length($1), indices =>  \@indices)
+  %egx;
 
   if (!defined($contents)) {
     $main::lxdebug->leave_sub();
@@ -78,10 +75,6 @@ sub format_vars {
   $varstring =~ s/(\w+)/ $self->_get_loop_variable($1, 0, @indices) /eg;
   my $old_string=$varstring;
   my $new_string = sprintf "%*s", ($align_right ? 1 : -1 ) * $length, $varstring;
-  if (!defined($new_string) || $new_string eq ''){
-    $main::lxdebug->message(0, 'varstring' . $varstring . "old" . $old_string);
-    #  return substr $varstring, ($align_right ? (0, $length) : -$length);
-  }
   return substr $new_string, ($align_right ? (0, $length) : -$length);
 }