X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Flogin.pl;h=9541684aa3d44095bfc10a3cb2a9065557f0aafe;hb=c1bf4079c7a2bc8ce7883e39838c88912d58301b;hp=e6dd8e7a25648d5940e6cd90df698207451c9f06;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index e6dd8e7a2..9541684aa 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -84,14 +84,15 @@ sub login_screen {
   <tr>
     <td class=login align=center><a href="http://www.lx-office.org" target=_top><img src="image/lx-office-erp.png" border=0></a>
 <h1 class=login align=center>|
-    . $locale->text('Version')
-    . qq| $form->{version}
+    . $locale->text('Version') . qq| $form->{version}
 </h1>
 
 <p>
 
 <form method=post name=loginscreen action=$form->{script}>
 
+  <input type="hidden" name="show_dbupdate_warning" value="1">
+
       <table width=100%>
 	<tr>
 	  <td align=center>
@@ -99,7 +100,7 @@ sub login_screen {
 	      <tr>
 		<th align=right>| . $locale->text('Login Name') . qq|</th>
 		<td><input class=login name=login size=30 tabindex="1"></td>
-	      </tr> 
+	      </tr>
 	      <tr>
 		<th align=right>| . $locale->text('Password') . qq|</th>
 		<td><input class=login type=password name=password size=30 tabindex="2"></td>
@@ -108,7 +109,7 @@ sub login_screen {
 	    </table>
 
 	    <br>
-	    <input type=submit name=action value="| . $locale->text('Login') . qq|">
+	    <input type=submit name=action value="| . $locale->text('Login') . qq|" tabindex="3">
 
 	  </td>
 	</tr>
@@ -119,7 +120,7 @@ sub login_screen {
     </td>
   </tr>
 </table>
-  
+
 </body>
 </html>
 |;
@@ -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(
-        "<a href=menu.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display>Continue</a>"
-      );
       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;
 
@@ -238,4 +242,3 @@ $myconfig{company}
 
   $lxdebug->leave_sub();
 }
-