From: Thomas Kasulke Date: Wed, 4 Apr 2007 11:48:33 +0000 (+0000) Subject: Ersatzmuster für Lieferanten/Kundennamen, die \n und/oder \r enthalten eingefügt... X-Git-Tag: release-2.4.3^2~524 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8299e7bc0d4463d5ba08e1feaccd8faa60f5c5ae;p=kivitendo-erp.git Ersatzmuster für Lieferanten/Kundennamen, die \n und/oder \r enthalten eingefügt (bug 543) --- diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 3fbc753b1..a89c06aac 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -249,7 +249,8 @@ sub order_links { if (@{ $form->{"all_$form->{vc}"} }) { $form->{ $form->{vc} } = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|; - map { $form->{"select$form->{vc}"} .= "\n" } (@{ $form->{"all_$form->{vc}"} }); } @@ -259,7 +260,7 @@ sub order_links { $form->{defaultcurrency} = $curr[0]; $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; - map { $form->{selectcurrency} .= "\n" } @curr; $form->{taxincluded} = $taxincluded if ($form->{id}); @@ -270,7 +271,7 @@ sub order_links { map { $form->{selectdepartment} .= - "\n" } (@{ $form->{all_departments} }); } @@ -279,7 +280,7 @@ sub order_links { # sales staff if (@{ $form->{all_employees} }) { $form->{selectemployee} = ""; - map { $form->{selectemployee} .= "\n" } (@{ $form->{all_employees} }); } @@ -416,6 +417,9 @@ sub form_header { #quote select[customer|vendor] Bug 133 $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"}); + #substitute \n and \r to \s (bug 543) + $form->{"select$form->{vc}"} =~ s/[\n\r]/ /g; + my @old_project_ids = ($form->{"globalproject_id"}); map({ push(@old_project_ids, $form->{"project_id_$_"}) if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); @@ -1340,7 +1344,7 @@ sub search { $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP"); - map { $vc .= "\n" } @{ $form->{"all_$form->{vc}"} }; $vclabel = ucfirst $form->{vc}; @@ -1351,7 +1355,7 @@ sub search { $vc = ($vc) - ? qq|| + ? qq|| : qq|{vc} size=35>|; # departments @@ -1360,7 +1364,7 @@ sub search { map { $form->{selectdepartment} .= - "\n" } (@{ $form->{all_departments} }); } @@ -1444,7 +1448,7 @@ sub search { - + $department
$vclabel$vc$vc