X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Flogin.pl;h=72032f3df8a573bdf0c30cf0992077ec59865f3e;hb=89dd4ca84494de24ac1ecc7bd3b84fdd35e28020;hp=770df5ce361b669d591d1f14b11b299b6d717e3e;hpb=a7ae494b2e73b5a2aa38f650ff5d136362071692;p=kivitendo-erp.git

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index 770df5ce3..72032f3df 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;
 }
@@ -105,7 +107,6 @@ 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>
@@ -149,12 +150,15 @@ 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}&path=$form->{path}&action=display";
+      "menunew.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;
@@ -168,7 +172,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();
@@ -184,7 +188,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');