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;
$self->{interface} = lc($interface || 'cgi');
$self->{auth_handler} = SL::Dispatcher::AuthHandler->new;
+ SL::ArchiveZipFixes->apply_fixes;
+
return $self;
}
$::form->{action} =~ s/( |-|,|\#)/_/g;
($script, $path, $suffix) = fileparse($script_name, ".pl");
- require_main_code($script, $suffix);
+ require_main_code($script, $suffix) unless $script eq 'admin';
$::form->{script} = $script . $suffix;
_require_controller('LoginScreen');
}
- if (($script eq 'login') && !$action) {
- print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login');
-
- } elsif ($script eq 'admin') {
- ::run($session_result);
-
- } else {
- $self->redirect_to_login($script) if SL::Auth::SESSION_EXPIRED == $session_result;
+ if ( (($script eq 'login') && !$action)
+ || ($script eq 'admin')
+ || (SL::Auth::SESSION_EXPIRED() == $session_result)) {
+ $self->redirect_to_login($script);
- my %auth_result = $self->{auth_handler}->handle(
- routing_type => $routing_type,
- script => $script,
- controller => $script_name,
- action => $action,
- );
-
- ::end_of_request() unless $auth_result{auth_ok};
+ }
- delete @{ $::form }{ grep { m/^\{AUTH\}/ } keys %{ $::form } } unless $auth_result{keep_auth_vars};
+ my %auth_result = $self->{auth_handler}->handle(
+ routing_type => $routing_type,
+ script => $script,
+ controller => $script_name,
+ action => $action,
+ );
- if ($action) {
- $::instance_conf->init if $auth_result{auth_level} eq 'user';
+ ::end_of_request() unless $auth_result{auth_ok};
- map { $::form->{$_} = $::myconfig{$_} } qw(charset)
- unless $action eq 'save' && $::form->{type} eq 'preferences';
+ delete @{ $::form }{ grep { m/^\{AUTH\}/ } keys %{ $::form } } unless $auth_result{keep_auth_vars};
- $::form->set_standard_title;
- if ($routing_type eq 'old') {
- ::call_sub('::' . $::locale->findsub($action));
- } else {
- _run_controller($script_name, $action);
- }
+ if ($action) {
+ $::form->set_standard_title;
+ if ($routing_type eq 'old') {
+ ::call_sub('::' . $::locale->findsub($action));
} else {
- $::form->error($::locale->text('action= not defined!'));
+ _run_controller($script_name, $action);
}
+ } else {
+ $::form->error($::locale->text('action= not defined!'));
}
1;
my ($script_name, $action);
eval {
- die "Unroutable request -- inavlid module name.\n" if !$::form->{M} || ($::form->{M} !~ m/^${name_re}$/);
+ die "Unroutable request -- invalid module name.\n" if !$::form->{M} || ($::form->{M} !~ m/^${name_re}$/);
$script_name = $::form->{M} . '.pl';
if ($::form->{A}) {
} else {
$action = first { m/^A_${name_re}$/ } keys %{ $::form };
- die "Unroutable request -- inavlid action name.\n" if !$action;
+ die "Unroutable request -- invalid action name.\n" if !$action;
delete $::form->{$action};
$action = substr $action, 2;
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 -- inavlid controller/action.\n";
+ $::form->{action} =~ m|^ ( [A-Z] [A-Za-z0-9_]* ) / ( [a-z] [a-z0-9_]* ) ( \. [a-zA-Z]+ )? $|x || die "Unroutable request -- invalid controller/action.\n";
($controller, $action) = ($1, $2);
delete $::form->{action};