X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Flogin.pl;h=9541684aa3d44095bfc10a3cb2a9065557f0aafe;hb=98662ad2b031a81c88ce6da0babf6f9d0b37059a;hp=cea155976c98b9ebda3d1ab9e62d654745e909b7;hpb=0576299f2aa98125991c4ffcd2f75073ea583d7d;p=kivitendo-erp.git
diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index cea155976..9541684aa 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -84,14 +84,15 @@ sub login_screen {
|
- . $locale->text('Version')
- . qq| $form->{version}
+ . $locale->text('Version') . qq| $form->{version}
|
@@ -141,11 +142,6 @@ sub login {
$err[1] = $err[3] = $locale->text('Incorrect username or password!');
if ($errno == 2) {
-
- # upgraded dataset, login again
- $form->redirect(
- "{login}&password=$form->{password}&path=$form->{path}&action=display>Continue"
- );
exit;
}
@@ -153,8 +149,16 @@ sub login {
}
# made it this far, execute the menu
- $form->{callback} =
- "menu.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display";
+ if ($user->{menustyle} eq "v3") {
+ $form->{callback} =
+ "menuv3.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display";
+ } elsif ($user->{menustyle} eq "neu") {
+ $form->{callback} =
+ "menunew.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display";
+ } else {
+ $form->{callback} =
+ "menu.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display";
+ }
$form->redirect;