my $form = $main::form;
my %myconfig = %main::myconfig;
- my $charset = $main::dbcharset || 'ISO-8859-1';
+ my $charset = $::lx_office_conf{system}->{dbcharset} || 'ISO-8859-1';
my $callback = $form->unescape($form->{callback});
$callback = URI->new($callback)->rel($callback) if $callback;
$callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/;
my $mainlevel = $form->{level};
$mainlevel =~ s/$mainlevel--//g;
- my $menu = Menu->new($::menufile);
+ my $menu = Menu->new("menu.ini");
$| = 1;