use SL::DB::Employee;
use SL::Locale::String qw(t8);
use SL::User;
+use SL::Version;
use Rose::Object::MakeMethods::Generic (
'scalar --get_set_init' => [ qw(clients default_client_id) ],
%::myconfig = $login ? $::auth->read_user(login => $login) : ();
$::locale = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
- SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
+ my $auth_result = SL::Dispatcher::AuthHandler::User->new->handle(callback => $::form->{callback});
+
+ $::dispatcher->end_request unless $auth_result;
$::request->layout(SL::Layout::Dispatcher->new(style => $::myconfig{menustyle}));
# Auth DB needs update? If so log the user out forcefully.
if (User::LOGIN_AUTH_DBUPDATE_AVAILABLE() == $result) {
$::auth->destroy_session;
- return $self->render('login_screen/auth_db_needs_update');
+ # must be without layout because menu rights might not exist yet
+ return $self->render('login_screen/auth_db_needs_update', { layout => 0 });
}
# Basic client tables available? If not tell the user to create them
}
# Database update available?
- ::end_of_request() if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
+ $::dispatcher->end_request if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
# Other login errors.
if (User::LOGIN_OK() != $result) {
}
sub set_layout {
- $::request->{layout} = SL::Layout::Dispatcher->new(style => 'login');
+ $::request->{layout} = $::request->is_mobile
+ ? SL::Layout::Dispatcher->new(style => 'mobile_login')
+ : SL::Layout::Dispatcher->new(style => 'login');
}
sub init_clients {
sub show_login_form {
my ($self, %params) = @_;
- $self->render('login_screen/user_login', %params, version => $::form->read_version);
+ $self->render('login_screen/user_login', %params, version => SL::Version->get_version, callback => $::form->{callback});
}
1;