projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Das (linksseitige) HTML-MenĂ¼ komaptibel zum Textbrowser Links gemacht."
[kivitendo-erp.git]
/
SL
/
Dispatcher.pm
diff --git
a/SL/Dispatcher.pm
b/SL/Dispatcher.pm
index
abba153
..
8bd2968
100644
(file)
--- a/
SL/Dispatcher.pm
+++ b/
SL/Dispatcher.pm
@@
-16,9
+16,6
@@
use SL::Locale;
use SL::Common;
use Form;
use List::Util qw(first);
use SL::Common;
use Form;
use List::Util qw(first);
-use Moose;
-use Rose::DB;
-use Rose::DB::Object;
use File::Basename;
# Trailing new line is added so that Perl will not add the line
use File::Basename;
# Trailing new line is added so that Perl will not add the line
@@
-85,6
+82,10
@@
sub pre_startup_setup {
%::myconfig = ();
%::called_subs = (); # currently used for recursion detection
}
%::myconfig = ();
%::called_subs = (); # currently used for recursion detection
}
+
+ $SIG{__WARN__} = sub {
+ $::lxdebug->warn(@_);
+ }
}
sub pre_startup_checks {
}
sub pre_startup_checks {
@@
-97,6
+98,7
@@
sub pre_startup {
}
sub require_main_code {
}
sub require_main_code {
+ $::lxdebug->enter_sub;
my ($script, $suffix) = @_;
eval {
my ($script, $suffix) = @_;
eval {
@@
-118,6
+120,7
@@
sub require_main_code {
};
$::form->error($EVAL_ERROR) if ($EVAL_ERROR);
}
};
$::form->error($EVAL_ERROR) if ($EVAL_ERROR);
}
+ $::lxdebug->leave_sub;
}
sub handle_request {
}
sub handle_request {
@@
-127,13
+130,9
@@
sub handle_request {
my $interface = lc(shift || 'cgi');
my ($script_name, $action);
my $interface = lc(shift || 'cgi');
my ($script_name, $action);
- if ($interface =~ m/^(?:fastcgi|fcgid|fcgi)$/) {
- $script_name = $ENV{SCRIPT_NAME};
- unrequire_bin_mozilla();
+ $script_name = $ENV{SCRIPT_NAME};
- } else {
- $script_name = $0;
- }
+ unrequire_bin_mozilla($interface);
$::cgi = CGI->new('');
$::locale = Locale->new($::language);
$::cgi = CGI->new('');
$::locale = Locale->new($::language);
@@
-202,6
+201,8
@@
sub handle_request {
}
sub unrequire_bin_mozilla {
}
sub unrequire_bin_mozilla {
+ return unless $_[0] =~ m/^(?:fastcgi|fcgid|fcgi)$/;
+
for (keys %INC) {
next unless m#^bin/mozilla/#;
next if /\bcommon.pl$/;
for (keys %INC) {
next unless m#^bin/mozilla/#;
next if /\bcommon.pl$/;