use strict;
+# Force scripts/locales.pl to parse these templates:
+# parse_html_template('login_screen/auth_db_unreachable')
+# parse_html_template('login_screen/user_login')
+# parse_html_template('generic/error')
+
BEGIN {
- unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
- push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+ use SL::System::Process;
+ my $exe_dir = SL::System::Process::exe_dir;
+
+ unshift @INC, "${exe_dir}/modules/override"; # Use our own versions of various modules (e.g. YAML).
+ push @INC, "${exe_dir}/modules/fallback"; # Only use our own versions of modules if there's no system version.
+ unshift @INC, $exe_dir;
}
use CGI qw( -no_xhtml);
use SL::Helper::DateTime;
use SL::InstanceConfiguration;
use SL::Template::Plugin::HTMLFixes;
+use SL::Layout::None;
# Trailing new line is added so that Perl will not add the line
# number 'die' was called in.
$::form->{error} = $::locale->text('The session is invalid or has expired.') if ($error_type eq 'session');
$::form->{error} = $::locale->text('Incorrect password!') if ($error_type eq 'password');
- $::form->header;
+ $::form->header(no_menu => 1);
print $::form->parse_html_template($template, \%params);
$::lxdebug->leave_sub;
$::locale = Locale->new($::lx_office_conf{system}->{language});
$::form = Form->new;
$::instance_conf = SL::InstanceConfiguration->new;
- $::request = { cgi => CGI->new({}) };
+ $::request = {
+ cgi => CGI->new({}),
+ layout => SL::Layout::None->new,
+ };
my $session_result = $::auth->restore_session;
$::auth->create_or_refresh_session;
$::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin';
- ($routing_type, $script, $script_name, $action) = qw(controller controller LoginScreen login) if ($script eq 'login') && ($action eq 'login');
+ # For compatibility with a lot of database upgrade scripts etc:
+ # Re-write request to old 'login.pl?action=login' to new
+ # 'LoginScreen' controller. Make sure to load its code!
+ if (($script eq 'login') && ($action eq 'login')) {
+ ($routing_type, $script, $script_name, $action) = qw(controller controller LoginScreen login);
+ _require_controller('LoginScreen');
+ }
if (($script eq 'login') && !$action) {
print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login');
::run($session_result);
} else {
- show_error('login_screen/user_login', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
+ if (SL::Auth::SESSION_EXPIRED == $session_result) {
+ print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login&error=session');
+ }
my %auth_result = $self->{auth_handler}->handle(
routing_type => $routing_type,
if ($EVAL_ERROR ne END_OF_REQUEST) {
print STDERR $EVAL_ERROR;
$::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);
+ chdir SL::System::Process::exe_dir;
eval { show_error('generic/error') };
}
};
+ $::form->footer;
+
# cleanup
$::auth->save_session;
$::auth->expire_sessions;