X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/6fdf290898b160dd60af5e00fab9f5820394947d..670f76a:/bin/mozilla/admin.pl diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 95c030390..42971fac5 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -75,7 +75,7 @@ our $auth; my @valid_dateformats = qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd); my @valid_numberformats = ('1,000.00', '1000.00', '1.000,00', '1000,00'); -my @all_stylesheets = qw(lx-office-erp.css Win2000.css); +my @all_stylesheets = qw(lx-office-erp.css Win2000.css Mobile.css kivitendo.css); my @all_menustyles = ( { id => 'old', title => $::locale->text('Old (on the side)') }, { id => 'v3', title => $::locale->text('Top (CSS)') }, @@ -91,20 +91,17 @@ sub run { $locale = $::locale; $auth = $::auth; - $::auth->store_root_credentials_in_session($form->{rpw}) if $session_result == SL::Auth->SESSION_OK; - $form->{stylesheet} = "lx-office-erp.css"; $form->{favicon} = "favicon.ico"; if ($form->{action}) { - if ($auth->authenticate_root($form->{rpw}) != $auth->OK()) { + if ($auth->authenticate_root($form->{'{AUTH}admin_password'}) != $auth->OK()) { $form->{error_message} = $locale->text('Incorrect Password!'); - $auth->delete_session_value('rpw'); + $auth->delete_session_value('admin_password'); adminlogin(); } else { if ($auth->session_tables_present()) { - $::auth->store_root_credentials_in_session($::form->{rpw}); - delete $::form->{rpw}; + delete $::form->{'{AUTH}admin_password'}; _apply_dbupgrade_scripts(); } @@ -197,7 +194,7 @@ sub create_auth_tables { my $locale = $main::locale; $main::auth->create_tables(); - $main::auth->set_session_value('rpw', $form->{rpw}); + $main::auth->set_session_value('admin_password', $form->{'{AUTH}admin_password'}); $main::auth->create_or_refresh_session(); my $memberfile = $::lx_office_conf{paths}->{memberfile};