Refactoring: SL::Template: Parameterübergabe als Hash, nicht positionsabhängig

diff --git a/SL/Template.pm b/SL/Template.pm
index df6dbec7cdfe2000c1813d820abbd96ea971d527..903ea90d8e8276a3d6d401a2ff4a95c48312fa22 100644 (file)
--- a/SL/Template.pm
+++ b/SL/Template.pm
@@ -25,7 +25,13 @@ sub create {
   my %params  = @_;
   my $package = "SL::Template::" . $params{type};
 
   my %params  = @_;
   my $package = "SL::Template::" . $params{type};
 

-  $package->new($params{file_name}, $params{form}, $params{myconfig} || \%::myconfig, $params{userspath} || $::lx_office_conf{paths}->{userspath});
+  $package->new(
+    %params,
+    source    => $params{file_name},
+    form      => $params{form},
+    myconfig  => $params{myconfig}  || \%::myconfig,
+    userspath => $params{userspath} || $::lx_office_conf{paths}->{userspath},
+  );

 }
 
 sub available_templates {
 }
 
 sub available_templates {

diff --git a/SL/Template/Simple.pm b/SL/Template/Simple.pm
index be5ba8b5db1beecc82178200fcdff44f9a030625..8696796bc914b40681cf5e6c379885abf8ff87b4 100644 (file)
--- a/SL/Template/Simple.pm
+++ b/SL/Template/Simple.pm
@@ -30,12 +30,9 @@ sub new {
 }
 
 sub _init {
 }
 
 sub _init {

-  my $self = shift;
+  my ($self, %params) = @_;

 
 

-  $self->{source}    = shift;
-  $self->{form}      = shift;
-  $self->{myconfig}  = shift;
-  $self->{userspath} = shift;
+  $self->{$_} = $params{$_} for keys %params;

 
   $self->{error}     = undef;
   $self->{quot_re}   = '"';
 
   $self->{error}     = undef;
   $self->{quot_re}   = '"';