projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
SL
/
Dispatcher.pm
diff --git
a/SL/Dispatcher.pm
b/SL/Dispatcher.pm
index
3eaebf0
..
f9ad09a
100644
(file)
--- a/
SL/Dispatcher.pm
+++ b/
SL/Dispatcher.pm
@@
-26,6
+26,7
@@
use File::Basename;
use List::MoreUtils qw(all);
use List::Util qw(first);
use POSIX;
use List::MoreUtils qw(all);
use List::Util qw(first);
use POSIX;
+use SL::ArchiveZipFixes;
use SL::Auth;
use SL::Dispatcher::AuthHandler;
use SL::LXDebug;
use SL::Auth;
use SL::Dispatcher::AuthHandler;
use SL::LXDebug;
@@
-51,6
+52,8
@@
sub new {
$self->{interface} = lc($interface || 'cgi');
$self->{auth_handler} = SL::Dispatcher::AuthHandler->new;
$self->{interface} = lc($interface || 'cgi');
$self->{auth_handler} = SL::Dispatcher::AuthHandler->new;
+ SL::ArchiveZipFixes->apply_fixes;
+
return $self;
}
return $self;
}
@@
-350,7
+353,7
@@
sub _route_dispatcher_request {
my ($script_name, $action);
eval {
my ($script_name, $action);
eval {
- die "Unroutable request -- in
av
lid module name.\n" if !$::form->{M} || ($::form->{M} !~ m/^${name_re}$/);
+ die "Unroutable request -- in
va
lid module name.\n" if !$::form->{M} || ($::form->{M} !~ m/^${name_re}$/);
$script_name = $::form->{M} . '.pl';
if ($::form->{A}) {
$script_name = $::form->{M} . '.pl';
if ($::form->{A}) {
@@
-358,7
+361,7
@@
sub _route_dispatcher_request {
} else {
$action = first { m/^A_${name_re}$/ } keys %{ $::form };
} else {
$action = first { m/^A_${name_re}$/ } keys %{ $::form };
- die "Unroutable request -- in
av
lid action name.\n" if !$action;
+ die "Unroutable request -- in
va
lid action name.\n" if !$action;
delete $::form->{$action};
$action = substr $action, 2;
delete $::form->{$action};
$action = substr $action, 2;
@@
-379,7
+382,7
@@
sub _route_controller_request {
my ($controller, $action, $request_type);
eval {
my ($controller, $action, $request_type);
eval {
- $::form->{action} =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) ( \. [a-zA-Z]+ )? $|x || die "Unroutable request -- in
av
lid controller/action.\n";
+ $::form->{action} =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) ( \. [a-zA-Z]+ )? $|x || die "Unroutable request -- in
va
lid controller/action.\n";
($controller, $action) = ($1, $2);
delete $::form->{action};
($controller, $action) = ($1, $2);
delete $::form->{action};