X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=f4a07f6674b29025799aafdebbcf6d02f4522c5f;hb=b5157f97d47413e5f33cced1d0de527979ff3d61;hp=86f797bb5b45787fd3fe5936856cc28d64f893f5;hpb=ebef09a8bde1d401fc7b0d60cfe09393e9a84c0f;p=kivitendo-erp.git

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index 86f797bb5..f4a07f667 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -17,9 +17,7 @@ use SL::Common;
 sub save_form {
   $lxdebug->enter_sub();
 
-  my $yaml = new YAML;
-  $yaml->Indent(1);
-  my $old_form = $yaml->dump($form);
+  my $old_form = YAML::Dump($form);
   $old_form =~ s|!|!!|g;
   $old_form =~ s|\n|!n|g;
   $old_form =~ s|\r|!r|g;
@@ -38,7 +36,8 @@ sub restore_form {
   $old_form =~ s|!r|\r|g;
   $old_form =~ s|!n|\n|g;
   $old_form =~ s|!!|!|g;
-  $form = YAML::Load($old_form);
+  my $new_form = YAML::Load($old_form);
+  map({ $form->{$_} = $new_form->{$_}; } keys(%{$new_form}));
 
   $lxdebug->leave_sub();
 }
@@ -48,7 +47,7 @@ sub build_std_url {
 
   my $url = "$form->{script}?";
   my $first = 1;
-  foreach my $key ((qw(login password path), @_)) {
+  foreach my $key ((qw(login password), @_)) {
     next unless ($key);
     $url .= "&" unless ($first);
     $first = 0;
@@ -98,7 +97,7 @@ sub select_employee_internal {
 
   restore_form($form->{"old_form"});
 
-  &{ $callback_sub }($new_id, $new_name);
+  call_sub($callback_sub, $new_id, $new_name);
 
   $lxdebug->leave_sub();
 }
@@ -168,7 +167,7 @@ sub select_part_internal {
 
   restore_form($form->{"old_form"});
 
-  &{ $callback_sub }($new_item);
+  call_sub($callback_sub, $new_item);
 
   $lxdebug->leave_sub();
 }
@@ -544,4 +543,24 @@ sub show_history {
 	$lxdebug->leave_sub();	
 }
 
+sub call_sub {
+  $lxdebug->enter_sub();
+
+  my $name = shift;
+
+  if (!$name) {
+    $form->error($locale->text("Trying to call a sub without a name"));
+  }
+
+  $name =~ s/[^a-zA-Z0-9_]//g;
+
+  if (!defined(&{ $name })) {
+    $form->error(sprintf($locale->text("Attempt to call an undefined sub named '%s'"), $name));
+  }
+
+  &{ $name }(@_);
+
+  $lxdebug->leave_sub();
+}
+
 1;