X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/556a2137c91ce7bb21efb99c6ec705360a12d521..480d9a56bed666562d3c115fa2da4c09ba66ac8d:/SL/Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 37c60e96e..f45d9584e 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -41,7 +41,6 @@ use Data::Dumper;
 use CGI;
 use CGI::Ajax;
 use Cwd;
-use List::Util qw(min max);
 use SL::Auth;
 use SL::Auth::DB;
 use SL::Auth::LDAP;
@@ -512,7 +511,7 @@ sub create_http_response {
   }
 
   my %cgi_params = ('-type' => $params{content_type});
-  $cgi_params{'-charset'} = $params{charset} if ($parmas{charset});
+  $cgi_params{'-charset'} = $params{charset} if ($params{charset});
 
   my $output = $cgi->header('-cookie' => $session_cookie,
                             %cgi_params);
@@ -1412,6 +1411,11 @@ sub get_standard_dbh {
 
   my ($self, $myconfig) = @_;
 
+  if ($standard_dbh && !$standard_dbh->{Active}) {
+    $main::lxdebug->message(LXDebug::INFO, "get_standard_dbh: \$standard_dbh is defined but not Active anymore");
+    undef $standard_dbh;
+  }
+
   $standard_dbh ||= $self->dbconnect_noauto($myconfig);
 
   $main::lxdebug->leave_sub(2);
@@ -2162,41 +2166,22 @@ sub _get_warehouses {
 
   my ($self, $dbh, $param) = @_;
 
-  my ($key, $bins_key, $q_access, @values);
+  my ($key, $bins_key);
 
   if ('' eq ref $param) {
     $key = $param;
+
   } else {
     $key      = $param->{key};
     $bins_key = $param->{bins};
-
-    if ($param->{access}) {
-      $q_access =
-        qq| AND EXISTS (
-              SELECT wa.employee_id
-              FROM warehouse_access wa
-              WHERE (wa.employee_id  = (SELECT id FROM employee WHERE login = ?))
-                AND (wa.warehouse_id = w.id)
-                AND (wa.access IN ('ro', 'rw')))|;
-      push @values, $param->{access};
-    }
-
-    if ($param->{no_personal}) {
-      $q_access .= qq| AND (w.personal_warehouse_of IS NULL)|;
-
-    } elsif ($param->{personal}) {
-      $q_access .= qq| AND (w.personal_warehouse_of = ?)|;
-      push @values, conv_i($param->{personal});
-    }
   }
 
   my $query = qq|SELECT w.* FROM warehouse w
                  WHERE (NOT w.invalid) AND
                    ((SELECT COUNT(b.*) FROM bin b WHERE b.warehouse_id = w.id) > 0)
-                   $q_access
                  ORDER BY w.sortkey|;
 
-  $self->{$key} = selectall_hashref_query($self, $dbh, $query, @values);
+  $self->{$key} = selectall_hashref_query($self, $dbh, $query);
 
   if ($bins_key) {
     $query = qq|SELECT id, description FROM bin WHERE warehouse_id = ?|;