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

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index fb98b70c0..86f797bb5 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -9,16 +9,20 @@
 #
 ######################################################################
 
-use Data::Dumper;
+use SL::Form;
+use YAML;
 
 use SL::Common;
 
 sub save_form {
   $lxdebug->enter_sub();
 
-  my $old_form = "";
-  map({ $old_form .= "$_=" . $form->escape($form->{$_}) . '&'; } keys(%{$form}));
-  chop($old_form);
+  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->leave_sub();
 
@@ -28,16 +32,37 @@ sub save_form {
 sub restore_form {
   $lxdebug->enter_sub();
 
-  my ($old_form) = @_;
+  my ($old_form, $no_delete) = @_;
 
-  map({ delete($form->{$_}); } keys(%{$form}));
+  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);
 
-  foreach my $pair (split('&', $old_form)) {
-    my ($key, $value) = split('=', $form->unescape($pair), 2);
-    $form->{$key} = $value;
+  $lxdebug->leave_sub();
+}
+
+sub build_std_url {
+  $lxdebug->enter_sub();
+
+  my $url = "$form->{script}?";
+  my $first = 1;
+  foreach my $key ((qw(login password path), @_)) {
+    next unless ($key);
+    $url .= "&" unless ($first);
+    $first = 0;
+
+    if ($key =~ /=/) {
+      $url .= $key;
+    } else {
+      $url .= "${key}=" . E($form->{$key});
+    }
   }
 
   $lxdebug->leave_sub();
+
+  return $url;
 }
 
 sub select_employee {
@@ -400,68 +425,123 @@ sub calculate_qty {
   $lxdebug->leave_sub();
 }
 
-sub calculate_alu {
+sub set_longdescription {
   $lxdebug->enter_sub();
 
-  my ($length, $weight) = split /\r\n/,$form->{formel};
-
-  map({ $form->{$_} = "" } (qw(qty_alu price_alu total_alu qty_eloxal price_eloxal total_eloxal total)));
 
-  if ($form->{description} =~ /.*Alupreisberechnung.*/) {
-    $form->{description} =~ /.*Alupreisberechnung:\n(.*)kg Aluminiumprofil Einzelpreis: (.*) Gesamt: (.*)\n(.*)m Eloxal Einzelpreis: (.*) Gesamt: (.*)/;
-    $form->{qty_alu} = $1;
-    $form->{price_alu} = $2;
-    $form->{total_alu} = $3;
-    $form->{qty_eloxal} = $4;
-    $form->{price_eloxal} = $5;
-    $form->{total_eloxal} = $6;
-    $form->{total} = $form->format_amount(\%myconfig, ($form->parse_amount(\%myconfig, $form->{total_alu}) + $form->parse_amount(\%myconfig, $form->{total_eloxal})));
-  }
-  ($form->{description}, $null) = split /\nAlupreisberechnung/, $form->{description};
-
-  my $callback = "$form->{script}?action=vendor_selection&";
+  my $callback = "$form->{script}?action=set_longdescription&";
   map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
       (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
 
-  my @header_sort = qw(name customernumber address);
-  my %header_title = ( "name" => $locale->text("Name"),
-                       "customernumber" => $locale->text("Customer Number"),
-                       "address" => $locale->text("Address"),
-                     );
-  ($null, $form->{weight}) = split / /, $weight;
-  ($null, $form->{length}) = split / /, $length;
+  $form->{"title"} = $locale->text("Enter longdescription");
+  $form->header();
+  print($form->parse_html_template("generic/set_longdescription"));
 
-  $form->{calc_weight} = $form->parse_amount(\%myconfig, $form->{weight});
-  $form->{calc_length} = $form->parse_amount(\%myconfig, $form->{length});
+  $lxdebug->leave_sub();
+}
 
+sub H {
+  return $form->quote_html($_[0]);
+}
 
-  my @header =
-    map(+{ "column_title" => $header_title{$_},
-           "column" => $_,
-         },
-        @header_sort);
+sub Q {
+  return $form->quote($_[0]);
+}
 
-  $form->{"title"} = $locale->text("Enter values for aluminium calculation");
-  $form->header();
-  print($form->parse_html_template("generic/calculate_alu"));
+sub E {
+  return $form->escape($_[0]);
+}
 
-  $lxdebug->leave_sub();
+sub NTI {
+  my ($element) = @_;
+
+  $element =~ s/tabindex\s*=\s*"\d+"//;
+  return $element;
 }
 
+sub format_dates {
+  $lxdebug->enter_sub();
 
-sub set_longdescription {
+  my ($dateformat, $longformat, @indices) = @_;
+
+  $dateformat = $myconfig{"dateformat"} unless ($dateformat);
+
+  foreach my $idx (@indices) {
+    next unless (defined($form->{$idx}));
+
+    if (!ref($form->{$idx})) {
+      $form->{$idx} = $locale->reformat_date(\%myconfig, $form->{$idx},
+                                             $dateformat, $longformat);
+
+    } elsif (ref($form->{$idx}) eq "ARRAY") {
+      for (my $i = 0; $i < scalar(@{$form->{$idx}}); $i++) {
+        $form->{$idx}->[$i] =
+          $locale->reformat_date(\%myconfig, $form->{$idx}->[$i],
+                                 $dateformat, $longformat);
+      }
+    }
+  }
+
+  $lxdebug->leave_sub();
+}
+
+sub reformat_numbers {
   $lxdebug->enter_sub();
 
+  my ($numberformat, $places, @indices) = @_;
 
-  my $callback = "$form->{script}?action=set_longdescription&";
-  map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
-      (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
+  return $lxdebug->leave_sub()
+    if (!$numberformat || ($numberformat eq $myconfig{"numberformat"}));
 
-  $form->{"title"} = $locale->text("Enter longdescription");
-  $form->header();
-  print($form->parse_html_template("generic/set_longdescription"));
+  foreach my $idx (@indices) {
+    next unless (defined($form->{$idx}));
+
+    if (!ref($form->{$idx})) {
+      $form->{$idx} = $form->parse_amount(\%myconfig, $form->{$idx});
+
+    } elsif (ref($form->{$idx}) eq "ARRAY") {
+      for (my $i = 0; $i < scalar(@{$form->{$idx}}); $i++) {
+        $form->{$idx}->[$i] =
+          $form->parse_amount(\%myconfig, $form->{$idx}->[$i]);
+      }
+    }
+  }
+
+  my $saved_numberformat = $myconfig{"numberformat"};
+  $myconfig{"numberformat"} = $numberformat;
+
+  foreach my $idx (@indices) {
+    next unless (defined($form->{$idx}));
+
+    if (!ref($form->{$idx})) {
+      $form->{$idx} = $form->format_amount(\%myconfig, $form->{$idx}, $places);
+
+    } elsif (ref($form->{$idx}) eq "ARRAY") {
+      for (my $i = 0; $i < scalar(@{$form->{$idx}}); $i++) {
+        $form->{$idx}->[$i] =
+          $form->format_amount(\%myconfig, $form->{$idx}->[$i], $places);
+      }
+    }
+  }
+
+  $myconfig{"numberformat"} = $saved_numberformat;
 
   $lxdebug->leave_sub();
 }
 
+sub show_history {
+	$lxdebug->enter_sub();
+	my $dbh = $form->dbconnect(\%myconfig);
+	
+	$form->{title} = $locale->text("History");
+    $form->header();
+    print $form->parse_html_template( "common/show_history", {
+    	"DATEN" => $form->get_history($dbh,$form->{input_name}),
+    	"SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0")
+    	} );
+	
+	$dbh->disconnect();
+	$lxdebug->leave_sub();	
+}
+
 1;