Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --combined SL/Auth.pm
index 10855e25b60fde0975fc444731dd8545b0d1ff72,72e36978f378148accd5126f2ba36b619fa1d645..e7f8f7bee37403a0de434236f81fdb00031fa807
--- 1/SL/Auth.pm
--- 2/SL/Auth.pm
+++ b/SL/Auth.pm
@@@ -1,13 -1,18 +1,13 @@@
  package SL::Auth;
  
 -use constant OK              =>   0;
 -use constant ERR_PASSWORD    =>   1;
 -use constant ERR_BACKEND     => 100;
 -
 -use constant SESSION_OK      =>   0;
 -use constant SESSION_NONE    =>   1;
 -use constant SESSION_EXPIRED =>   2;
 +use DBI;
  
  use Digest::MD5 qw(md5_hex);
  use IO::File;
  use Time::HiRes qw(gettimeofday);
  use List::MoreUtils qw(uniq);
  
 +use SL::Auth::Constants qw(:all);
  use SL::Auth::DB;
  use SL::Auth::LDAP;
  
@@@ -824,7 -829,7 +824,7 @@@ sub evaluate_rights_ary 
      }
    }
  
-   $main::lxdebug->enter_sub(2);
+   $main::lxdebug->leave_sub(2);
  
    return $value;
  }
@@@ -858,7 -863,7 +858,7 @@@ sub _parse_rights_string 
        pop @stack;
  
        if (!@stack) {
-         $main::lxdebug->enter_sub(2);
+         $main::lxdebug->leave_sub(2);
          return 0;
        }
  
@@@ -874,7 -879,7 +874,7 @@@
  
    my $result = ($access || (1 < scalar @stack)) ? 0 : evaluate_rights_ary($stack[0]);
  
-   $main::lxdebug->enter_sub(2);
+   $main::lxdebug->leave_sub(2);
  
    return $result;
  }