projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Weitere Feinheiten zum Patch "Verkaeufer und Bearbeiter wurden beim Umwandeln nicht...
[kivitendo-erp.git]
/
login.pl
diff --git
a/login.pl
b/login.pl
index
f761de8
..
a01fc10
100755
(executable)
--- a/
login.pl
+++ b/
login.pl
@@
-31,7
+31,8
@@
#######################################################################
BEGIN {
#######################################################################
BEGIN {
- push(@INC, "modules");
+ unshift @INC, "modules/YAML"; # Use our own version of YAML.
+ push @INC, "modules"; # Only use our own versions of modules if there's no system version.
}
# setup defaults, DO NOT CHANGE
}
# setup defaults, DO NOT CHANGE
@@
-47,6
+48,7
@@
use SL::LXDebug;
$lxdebug = LXDebug->new();
eval { require "lx-erp.conf"; };
$lxdebug = LXDebug->new();
eval { require "lx-erp.conf"; };
+eval { require "lx-erp-local.conf"; } if -f "lx-erp-local.conf";
if ($ENV{CONTENT_LENGTH}) {
read(STDIN, $_, $ENV{CONTENT_LENGTH});
if ($ENV{CONTENT_LENGTH}) {
read(STDIN, $_, $ENV{CONTENT_LENGTH});
@@
-70,6
+72,8
@@
$0 =~ tr/\\/\//;
$pos = rindex $0, '/';
$script = substr($0, $pos + 1);
$pos = rindex $0, '/';
$script = substr($0, $pos + 1);
+$form->{login} =~ s|.*/||;
+
if (-e "$userspath/nologin" && $script ne 'admin.pl') {
print "content-type: text/plain
if (-e "$userspath/nologin" && $script ne 'admin.pl') {
print "content-type: text/plain