Beim Laden von Entwürfen nicht restore_form() benutzen, weil restore_form() erwartet...

[mfinanz.git] / bin / mozilla / common.pl

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index 6793a1ddc6a3452fc8d972ed24b67a4fc2ac5e10..47de5b0446a22c7476809b370436f3dbee6d769b 100644 (file)
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -9,57 +9,34 @@
 #
 ######################################################################
 
 #
 ######################################################################
 

-use YAML;
-
+use SL::Form;

 use SL::Common;
 use SL::Common;

+use SL::MoreCommon;

 
 

-sub save_form {
-  $lxdebug->enter_sub();
-
-  my $yaml = new YAML;
-  $yaml->Indent(1);
-  my $old_form = $yaml->dump($form);
-  $old_form =~ s|!|!!|g;
-  $old_form =~ s|\n|!n|g;
-  $old_form =~ s|\r|!r|g;
-  $lxdebug->message(0, "yeah!???\n\n$old_form\n\n\n");
-
-  $lxdebug->leave_sub();
-
-  return $old_form;
-}
-
-sub restore_form {
+sub build_std_url {

   $lxdebug->enter_sub();
 
   $lxdebug->enter_sub();
 

-  my ($old_form, $no_delete) = @_;
+  my $script = $form->{script};

 
 

-  map({ delete($form->{$_}); } keys(%{$form})) unless ($no_delete);
-  $old_form =~ s|!r|\r|g;
-  $old_form =~ s|!n|\n|g;
-  $old_form =~ s|!!|!|g;
-  $form = YAML::Load($old_form);
+  my @parts;

 
 

-  $lxdebug->leave_sub();
-}
-
-sub build_std_url {
-  $lxdebug->enter_sub();
-
-  my $url = "$form->{script}?";
-  my $first = 1;
-  foreach my $key ((qw(login password path), @_)) {
+  foreach my $key ((qw(login password), @_)) {

     next unless ($key);
     next unless ($key);

-    $url .= "&" unless ($first);
-    $first = 0;

 
 

-    if ($key =~ /=/) {
-      $url .= $key;
+    if ($key =~ /(.*?)=(.*)/) {
+      if ($1 eq 'script') {
+        $script = $2;
+      } else {
+        push @parts, $key;
+      }
+

     } else {
     } else {

-      $url .= "${key}=" . E($form->{$key});
+      push @parts, "${key}=" . E($form->{$key});

     }
   }
 
     }
   }
 

+  my $url = "${script}?" . join('&', @parts);
+

   $lxdebug->leave_sub();
 
   return $url;
   $lxdebug->leave_sub();
 
   return $url;


@@ -98,7 +75,7 @@ sub select_employee_internal {
 
   restore_form($form->{"old_form"});
 
 
   restore_form($form->{"old_form"});
 

-  &{ $callback_sub }($new_id, $new_name);
+  call_sub($callback_sub, $new_id, $new_name);

 
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }


@@ -168,7 +145,7 @@ sub select_part_internal {
 
   restore_form($form->{"old_form"});
 
 
   restore_form($form->{"old_form"});
 

-  &{ $callback_sub }($new_item);
+  call_sub($callback_sub, $new_item);

 
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }


@@ -452,6 +429,13 @@ sub E {
   return $form->escape($_[0]);
 }
 
   return $form->escape($_[0]);
 }
 

+sub NTI {
+  my ($element) = @_;
+
+  $element =~ s/tabindex\s*=\s*"\d+"//;
+  return $element;
+}
+

 sub format_dates {
   $lxdebug->enter_sub();
 
 sub format_dates {
   $lxdebug->enter_sub();
 


@@ -522,4 +506,63 @@ sub reformat_numbers {
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }
 

+sub show_history {
+       $lxdebug->enter_sub();
+       my $dbh = $form->dbconnect(\%myconfig);
+       my ($sort, $sortby) = split(/\-\-/, $form->{order});
+  $sort =~ s/.*\.(.*)/$1/;
+  
+       $form->{title} = $locale->text("History");
+    $form->header();
+    print $form->parse_html_template( "common/show_history", {
+       "DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
+       "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"),
+      uc($sort) => 1,
+      uc($sort)."BY" => $sortby
+       } );
+       
+       $dbh->disconnect();
+       $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();
+}
+
+sub show_vc_details {
+       $lxdebug->enter_sub();
+
+  $form->{vc} = $form->{vc} eq "customer" ? "customer" : "vendor";
+  $form->isblank("vc_id",
+                 $form->{vc} eq "customer" ?
+                 $locale->text("No customer has been selected yet.") :
+                 $locale->text("No vendor has been selected yet."));
+
+  Common->get_vc_details(\%myconfig, $form, $form->{vc}, $form->{vc_id});
+
+  $form->{title} = $form->{vc} eq "customer" ?
+    $locale->text("Customer details") : $locale->text("Vendor details");
+  $form->header();
+  print($form->parse_html_template("common/show_vc_details",
+                                   { "is_customer" => $form->{vc} eq "customer" }));
+
+       $lxdebug->leave_sub();
+}
+

 1;
 1;