X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Famtemplates.pl;h=77f7659a2f820955167575560a71722fed9fe216;hb=a9d015d8e68020faaed94c1d9db08e0151b84c92;hp=d13046d1acc1aa94aafccd735a7ad255e7447e7b;hpb=a731cd269130cd68f9c3fb5b8a2c26dc20afe82e;p=kivitendo-erp.git

diff --git a/bin/mozilla/amtemplates.pl b/bin/mozilla/amtemplates.pl
index d13046d1a..77f7659a2 100644
--- a/bin/mozilla/amtemplates.pl
+++ b/bin/mozilla/amtemplates.pl
@@ -38,32 +38,20 @@ use Data::Dumper;
 
 1;
 
-require "$form->{path}/common.pl";
+require "bin/mozilla/common.pl";
 
 # end of main
 
 sub display {
-  if ($form->{display_nextsub}) {
-    &{ $form->{display_nextsub} }();
-  } else {
-    die "display_nextsub not defined";
-  }
+  call_sub($form->{display_nextsub});
 }
 
 sub save {
-  if ($form->{save_nextsub}) {
-    &{ $form->{save_nextsub} }();
-  } else {
-    die "save_nextsub not defined";
-  }
+  call_sub($form->{save_nextsub});
 }
 
 sub edit {
-  if ($form->{edit_nextsub}) {
-    &{ $form->{edit_nextsub} }();
-  } else {
-    die "edit_nextsub not defined";
-  }
+  call_sub($form->{edit_nextsub});
 }
 
 sub display_template {
@@ -110,7 +98,7 @@ sub display_template_form {
 
   my %options;
 
-  my @hidden = qw(login path password type format);
+  my @hidden = qw(login password type format);
 
   if (($form->{"type"} ne "stylesheet") && !$form->{"edit"}) {
     $options{"SHOW_EDIT_OPTIONS"} = 1;
@@ -150,7 +138,7 @@ sub display_template_form {
     my (@values, $file, $setup);
 
     while (($file, $setup) = each(%formname_setup)) {
-      next unless (!ref($setup) || $setup->{$format});
+      next if ref($setup) && !$setup->{$format};
 
       push(@values,
            { "value"   => $file,