Merge von 681 aus unstable: Sammelauftraege + Bugfix

[kivitendo-erp.git] / bin / mozilla / login.pl

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index e6dd8e7..e888721 100644 (file)
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -84,8 +84,7 @@ 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>
@@ -99,7 +98,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>
@@ -119,7 +118,7 @@ sub login_screen {
     </td>
   </tr>
 </table>
-  
+
 </body>
 </html>
 |;
@@ -153,8 +152,13 @@ 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 "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();
 }
-