$::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');
$::myconfig{countrycode} = $::lx_office_conf{system}->{language};
- $::form->{stylesheet} = 'css/lx-office-erp.css';
$::form->header;
print $::form->parse_html_template($template);
my ($self) = @_;
SL::LxOfficeConf->read;
- _init_environment();
eval {
package main;
$::auth = SL::Auth->new;
$::form = undef;
%::myconfig = ();
- %::called_subs = (); # currently used for recursion detection
+ $::request = undef;
}
$SIG{__WARN__} = sub {
$self->unrequire_bin_mozilla;
- $::cgi = CGI->new('');
- $::locale = Locale->new($::lx_office_conf{system}->{language});
- $::form = Form->new;
- %::called_subs = ();
+ $::locale = Locale->new($::lx_office_conf{system}->{language});
+ $::form = Form->new;
$::instance_conf = SL::InstanceConfiguration->new;
+ $::request = { cgi => CGI->new({}) };
my $session_result = $::auth->restore_session;
$::auth->create_or_refresh_session;
} else {
show_error('login/password_error', 'session') if SL::Auth::SESSION_EXPIRED == $session_result;
- %::myconfig = $::auth->read_user($::form->{login});
+ %::myconfig = $::auth->read_user(login => $::form->{login});
show_error('login/password_error', 'password') unless $::myconfig{login};
if ($action) {
$::instance_conf->init;
- map { $::form->{$_} = $::myconfig{$_} } qw(stylesheet charset)
+ map { $::form->{$_} = $::myconfig{$_} } qw(charset)
unless $action eq 'save' && $::form->{type} eq 'preferences';
$::form->set_standard_title;
} or do {
if ($EVAL_ERROR ne END_OF_REQUEST) {
print STDERR $EVAL_ERROR;
- $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
+ $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);
eval { show_error('generic/error') };
}
};
$::locale = undef;
$::form = undef;
$::myconfig = ();
+ $::request = undef;
Form::disconnect_standard_dbh;
$::lxdebug->end_request;
1;
} or do {
- $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
+ $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);
show_error('generic/error');
};
1;
} or do {
- $::form->{label_error} = $::cgi->pre($EVAL_ERROR);
+ $::form->{label_error} = $::request->{cgi}->pre($EVAL_ERROR);
show_error('generic/error');
};
return $self->{interface} =~ m/f(?:ast)cgi/i ? $self->{request}->GetHandles() : (\*STDIN, \*STDOUT, \*STDERR);
}
-sub _init_environment {
- my %key_map = ( lib => { name => 'PERL5LIB', append_path => 1 },
- path => { name => 'PATH', append_path => 1 },
- );
- my $cfg = $::lx_office_conf{environment} || {};
-
- while (my ($key, $value) = each %{ $cfg }) {
- next unless $value;
-
- my $info = $key_map{$key} || {};
- $key = $info->{name} || $key;
-
- if ($info->{append_path}) {
- $value = ':' . $value unless $value =~ m/^:/ || !$ENV{$key};
- $value = $ENV{$key} . $value;
- }
-
- $ENV{$key} = $value;
- }
-}
-
sub _check_for_old_config_files {
my @old_files = grep { -f "config/${_}" } qw(authentication.pl console.conf lx-erp.conf lx-erp-local.conf);
return unless @old_files;
$::form->{title} = $::locale->text('Old configuration files');
- $::form->{stylesheet} = 'lx-office-erp.css';
$::form->header;
print $::form->parse_html_template('login/old_configuration_files', { FILES => \@old_files });