X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/3a2e9378d888f749bf7d94f21c03d64fcbf06fd8..e1cb00366d40cc3a1b07e065b51ad39c84baf7e6:/SL/Auth.pm

diff --git a/SL/Auth.pm b/SL/Auth.pm
index 3e0dc0ad0..94f843a6d 100644
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -122,13 +122,13 @@ sub authenticate {
 }
 
 sub dbconnect {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my $self     = shift;
   my $may_fail = shift;
 
   if ($self->{dbh}) {
-    $main::lxdebug->leave_sub();
+    $main::lxdebug->leave_sub(2);
     return $self->{dbh};
   }
 
@@ -358,7 +358,7 @@ sub read_user {
   my $login = shift;
 
   my $dbh   = $self->dbconnect();
-  my $query = qq|SELECT cfg.cfg_key, cfg.cfg_value
+  my $query = qq|SELECT u.id, u.login, cfg.cfg_key, cfg.cfg_value
                  FROM auth.user_config cfg
                  LEFT JOIN auth."user" u ON (cfg.user_id = u.id)
                  WHERE (u.login = ?)|;
@@ -368,7 +368,7 @@ sub read_user {
 
   while (my $ref = $sth->fetchrow_hashref()) {
     $user_data{$ref->{cfg_key}} = $ref->{cfg_value};
-    $user_data{login}           = $login;
+    @user_data{qw(id login)}    = @{$ref}{qw(id login)};
   }
 
   $sth->finish();
@@ -629,20 +629,20 @@ sub all_rights_full {
   my $locale = $main::locale;
 
   my @all_rights = (
-    ["--crm",			       $locale->text("CRM optional software")], 
-    ["crm_search",		       $locale->text("CRM search")], 
-    ["crm_new",			       $locale->text("CRM create customers, vendors and contacts")], 
-    ["crm_service",		       $locale->text("CRM services")], 
-    ["crm_admin",		       $locale->text("CRM admin")], 
-    ["crm_adminuser",		       $locale->text("CRM user")], 
-    ["crm_adminstatus",		       $locale->text("CRM status")], 
-    ["crm_email",		       $locale->text("CRM send email")], 
-    ["crm_termin",		       $locale->text("CRM termin")], 
-    ["crm_opportunity",		       $locale->text("CRM opportunity")], 
-    ["crm_knowhow",		       $locale->text("CRM know how")], 
-    ["crm_follow",		       $locale->text("CRM follow up")], 
-    ["crm_notices",		       $locale->text("CRM notices")], 
-    ["crm_other",		       $locale->text("CRM other")], 
+    ["--crm",                          $locale->text("CRM optional software")],
+    ["crm_search",                     $locale->text("CRM search")],
+    ["crm_new",                        $locale->text("CRM create customers, vendors and contacts")],
+    ["crm_service",                    $locale->text("CRM services")],
+    ["crm_admin",                      $locale->text("CRM admin")],
+    ["crm_adminuser",                  $locale->text("CRM user")],
+    ["crm_adminstatus",                $locale->text("CRM status")],
+    ["crm_email",                      $locale->text("CRM send email")],
+    ["crm_termin",                     $locale->text("CRM termin")],
+    ["crm_opportunity",                $locale->text("CRM opportunity")],
+    ["crm_knowhow",                    $locale->text("CRM know how")],
+    ["crm_follow",                     $locale->text("CRM follow up")],
+    ["crm_notices",                    $locale->text("CRM notices")],
+    ["crm_other",                      $locale->text("CRM other")],
     ["--master_data",                  $locale->text("Master Data")],
     ["customer_vendor_edit",           $locale->text("Create and edit customers and vendors")],
     ["part_service_assembly_edit",     $locale->text("Create and edit parts, services, assemblies")],