X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Flogin.pl;h=7623bff3e7ec2ca7989d14be3d07ccb1063bb7ed;hb=1d027d8883ed6b13cf6c78b95b3493acc1fb715f;hp=c6c947e7e30357ed385cf00009a50c91de931e08;hpb=155c4129844b6197e6b109f9d933337aa25a8728;p=kivitendo-erp.git

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index c6c947e7e..7623bff3e 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -31,19 +31,21 @@ use DBI;
 use SL::User;
 use SL::Form;
 
+require "bin/mozilla/common.pl";
+
 $form = new Form;
 
 $locale = new Locale $language, "login";
 
 # customization
-if (-f "$form->{path}/custom_$form->{script}") {
-  eval { require "$form->{path}/custom_$form->{script}"; };
+if (-f "bin/mozilla/custom_$form->{script}") {
+  eval { require "bin/mozilla/custom_$form->{script}"; };
   $form->error($@) if ($@);
 }
 
 # per login customization
-if (-f "$form->{path}/$form->{login}_$form->{script}") {
-  eval { require "$form->{path}/$form->{login}_$form->{script}"; };
+if (-f "bin/mozilla/$form->{login}_$form->{script}") {
+  eval { require "bin/mozilla/$form->{login}_$form->{script}"; };
   $form->error($@) if ($@);
 }
 
@@ -53,7 +55,7 @@ $form->{titlebar} =
 
 if ($form->{action}) {
   $form->{titlebar} .= " - $myconfig{name} - $myconfig{dbname}";
-  &{ $locale->findsub($form->{action}) };
+  call_sub($locale->findsub($form->{action}));
 } else {
   &login_screen;
 }
@@ -91,6 +93,8 @@ sub login_screen {
 
 <form method=post name=loginscreen action=$form->{script}>
 
+  <input type="hidden" name="show_dbupdate_warning" value="1">
+
       <table width=100%>
 	<tr>
 	  <td align=center>
@@ -103,11 +107,10 @@ sub login_screen {
 		<th align=right>| . $locale->text('Password') . qq|</th>
 		<td><input class=login type=password name=password size=30 tabindex="2"></td>
 	      </tr>
-	      <input type=hidden name=path value=$form->{path}>
 	    </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>
@@ -140,12 +143,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>" .
-        $locale->text("Continue") . "</a>"
-      );
       exit;
     }
 
@@ -153,12 +150,18 @@ sub login {
   }
 
   # made it this far, execute the menu
-  if ($user->{menustyle} eq "neu") {
+  if ($user->{menustyle} eq "v3") {
+    $form->{callback} =
+      "menuv3.pl?login=$form->{login}&password=$form->{password}&action=display";
+  } elsif ($user->{menustyle} eq "neu") {
+    $form->{callback} =
+      "menunew.pl?login=$form->{login}&password=$form->{password}&action=display";
+  } elsif ($user->{menustyle} eq "xml") {
     $form->{callback} =
-      "menunew.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display";
+      "menuXML.pl?login=$form->{login}&password=$form->{password}&action=display";
   } else {
     $form->{callback} =
-      "menu.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display";
+      "menu.pl?login=$form->{login}&password=$form->{password}&action=display";
   }
 
   $form->redirect;
@@ -172,7 +175,7 @@ sub logout {
   unlink "$userspath/$form->{login}.conf";
 
   # remove the callback to display the message
-  $form->{callback} = "login.pl?path=$form->{path}&action=&login=";
+  $form->{callback} = "login.pl?action=&login=";
   $form->redirect($locale->text('You are logged out!'));
 
   $lxdebug->leave_sub();
@@ -188,7 +191,7 @@ sub company_logo {
   $myconfig{address} =~ s/\\n/<br>/g;
   $myconfig{dbhost} = $locale->text('localhost') unless $myconfig{dbhost};
 
-  map { $form->{$_} = $myconfig{$_} } qw(charset stylesheet);
+  $form->{stylesheet} = $myconfig{stylesheet};
 
   $form->{title} = $locale->text('About');