AJAX-Antworten nicht direkt $cgi->header() ausgeben, sondern über eine Funktion,...

diff --git a/SL/Form.pm b/SL/Form.pm
index 58614c4156adebb57f69a9ba5e37933f87d974a8..5fcd09ef8462bbcc7a1bc9d14be5360722661648 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -639,6 +639,20 @@ sub header {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+sub ajax_response_header {
+  $main::lxdebug->enter_sub();
+
+  my ($self) = @_;
+
+  my $db_charset = $main::dbcharset ? $main::dbcharset : Common::DEFAULT_CHARSET;
+  my $cgi        = $main::cgi || CGI->new('');
+  my $output     = $cgi->header('-charset' => $db_charset);
+
+  $main::lxdebug->leave_sub();
+
+  return $output;
+}
+

 sub _prepare_html_template {
   $main::lxdebug->enter_sub();
 
 sub _prepare_html_template {
   $main::lxdebug->enter_sub();
 

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 086565d7d4a20fbc10c1eb88ed2634dcbbf35669..29a0283cdf461fcbbe939d8b2e8ea100dd1b4c9b 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -566,7 +566,7 @@ sub get_contact {
   $auth->assert('customer_vendor_edit');
 
   CT->get_contact(\%myconfig, \%$form);
   $auth->assert('customer_vendor_edit');
 
   CT->get_contact(\%myconfig, \%$form);

-  print $cgi->header(), join '__pjx__', map $form->{"cp_$_"}, 
+  print $form->ajax_response_header(), join '__pjx__', map $form->{"cp_$_"}, 

     qw(name greeting title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used);
   $lxdebug->leave_sub();
 
     qw(name greeting title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used);
   $lxdebug->leave_sub();
 


@@ -578,7 +578,7 @@ sub get_shipto {
   $auth->assert('customer_vendor_edit');
 
   CT->get_shipto(\%myconfig, \%$form);
   $auth->assert('customer_vendor_edit');
 
   CT->get_shipto(\%myconfig, \%$form);

-  print $cgi->header(),  join '__pjx__', map $form->{"shipto$_"},
+  print $form->ajax_response_header(),  join '__pjx__', map $form->{"shipto$_"},

     qw(name department_1 department_2 street zipcode city country contact phone fax email used);
   $lxdebug->leave_sub();
 
     qw(name department_1 department_2 street zipcode city country contact phone fax email used);
   $lxdebug->leave_sub();
 


@@ -591,7 +591,7 @@ sub get_delivery {
 
   CT->get_delivery(\%myconfig, \%$form );
 
 
   CT->get_delivery(\%myconfig, \%$form );
 

-  print $cgi->header(), $form->parse_html_template('ct/get_delivery');
+  print $form->ajax_response_header(), $form->parse_html_template('ct/get_delivery');

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

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 87cb3ea7834ca210da567f51c66eba7ec5cc3ca7..a15f2acb880a3023f8ef0aa1e29d551b1e1e30cb 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1849,7 +1849,7 @@ sub set_duedate {
 
   $form->get_duedate(\%myconfig);
 
 
   $form->get_duedate(\%myconfig);
 

-  print $cgi->header() . $form->{duedate};
+  print $form->ajax_response_header() . $form->{duedate};

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

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 07efa666af41c7b602192bf31fe1c21e4bfb3489..022c858406cae22b08af05b92bf93ba459170975 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -1219,9 +1219,9 @@ sub yes {
 sub set_duedate_vendor {
   $lxdebug->enter_sub();
 
 sub set_duedate_vendor {
   $lxdebug->enter_sub();
 

-  print $cgi->header(), IR->get_duedate('vendor_id' => $form->{vendor_id},
-                                        'invdate'   => $form->{invdate},
-                                        'default'   => $form->{old_duedate});
+  print $form->ajax_response_header(), IR->get_duedate('vendor_id' => $form->{vendor_id},
+                                                       'invdate'   => $form->{invdate},
+                                                       'default'   => $form->{old_duedate});

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