X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Flogin.pl;h=72032f3df8a573bdf0c30cf0992077ec59865f3e;hb=d6bf475aee947e7451eb9b797ed0ad5ab5bcf6f8;hp=f09b8825835462c1d0e0639216ee57c999774fdf;hpb=40782548cf82ac1e4c0fe417113a4cb3072e9390;p=kivitendo-erp.git
diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index f09b88258..72032f3df 100644
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -38,14 +38,14 @@ $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 ($@);
}
@@ -107,7 +107,6 @@ sub login_screen {
| . $locale->text('Password') . qq| |
|
- {path}>
@@ -153,13 +152,13 @@ sub login {
# made it this far, execute the menu
if ($user->{menustyle} eq "v3") {
$form->{callback} =
- "menuv3.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display";
+ "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;
@@ -173,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();
@@ -189,7 +188,7 @@ sub company_logo {
$myconfig{address} =~ s/\\n/
/g;
$myconfig{dbhost} = $locale->text('localhost') unless $myconfig{dbhost};
- map { $form->{$_} = $myconfig{$_} } qw(charset stylesheet);
+ $form->{stylesheet} = $myconfig{stylesheet};
$form->{title} = $locale->text('About');