Bugfix für Bug 1127. webpages/ct/get_delivery_master ist nicht customer/vendor sicher...

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 4febdc72a61e9b9402c41ddb66f9a80cd7553b53..e034a203c197e3bce4f1dbcd5c51e04ca509ad7a 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -306,11 +306,13 @@ sub new {
   my $db_charset   = $main::dbcharset;
   $db_charset    ||= Common::DEFAULT_CHARSET;
 
   my $db_charset   = $main::dbcharset;
   $db_charset    ||= Common::DEFAULT_CHARSET;
 

-  if ($self->{INPUT_ENCODING} && (lc $self->{INPUT_ENCODING} ne $db_charset)) {
-    require Text::Iconv;
-    my $iconv = Text::Iconv->new($self->{INPUT_ENCODING}, $db_charset);
+  if ($self->{INPUT_ENCODING}) {
+    if (lc $self->{INPUT_ENCODING} ne lc $db_charset) {
+      require Text::Iconv;
+      my $iconv = Text::Iconv->new($self->{INPUT_ENCODING}, $db_charset);

 
 

-    _recode_recursively($iconv, $self);
+      _recode_recursively($iconv, $self);
+    }

 
     delete $self{INPUT_ENCODING};
   }
 
     delete $self{INPUT_ENCODING};
   }


@@ -2019,6 +2021,8 @@ sub get_employee {
 
   my ($self, $dbh) = @_;
 
 
   my ($self, $dbh) = @_;
 

+  $dbh ||= $self->get_standard_dbh(\%main::myconfig);
+

   my $query = qq|SELECT id, name FROM employee WHERE login = ?|;
   ($self->{"employee_id"}, $self->{"employee"}) = selectrow_query($self, $dbh, $query, $self->{login});
   $self->{"employee_id"} *= 1;
   my $query = qq|SELECT id, name FROM employee WHERE login = ?|;
   ($self->{"employee_id"}, $self->{"employee"}) = selectrow_query($self, $dbh, $query, $self->{login});
   $self->{"employee_id"} *= 1;


@@ -2061,11 +2065,11 @@ sub get_duedate {
 
   my ($self, $myconfig, $reference_date) = @_;
 
 
   my ($self, $myconfig, $reference_date) = @_;
 

-  my $reference_date = $reference_date ? conv_dateq($reference_date) . '::DATE' : 'current_date';
+  $reference_date = $reference_date ? conv_dateq($reference_date) . '::DATE' : 'current_date';

 
 

-  my $dbh            = $self->get_standard_dbh($myconfig);
-  my $query          = qq|SELECT ${reference_date} + terms_netto FROM payment_terms WHERE id = ?|;
-  my ($duedate)      = selectrow_query($self, $dbh, $query, $self->{payment_id});
+  my $dbh         = $self->get_standard_dbh($myconfig);
+  my $query       = qq|SELECT ${reference_date} + terms_netto FROM payment_terms WHERE id = ?|;
+  my ($duedate)   = selectrow_query($self, $dbh, $query, $self->{payment_id});

 
   $main::lxdebug->leave_sub();
 
 
   $main::lxdebug->leave_sub();