From 64e47b819d746158d520a028abf73c87da14212e Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 9 Jan 2008 16:34:08 +0000 Subject: [PATCH] =?utf8?q?Wenn=20man=20nach=20einem=20erfolgreichen=20Logi?= =?utf8?q?n=20die=20selbe=20Installation=20in=20einem=20zweiten=20Browserf?= =?utf8?q?enster=20=C3=B6ffnet,=20so=20wird=20gleich=20die=20Startseite=20?= =?utf8?q?angezeigt=20und=20nicht=20mehr=20das=20Login.=20Technisch=20ausg?= =?utf8?q?edr=C3=BCckt:=20Wenn=20"login.pl"=20aufgerufen=20wird,=20keine?= =?utf8?q?=20Aktion=20=C3=BCbergeben=20wird=20und=20eine=20g=C3=BCltige=20?= =?utf8?q?Session=20vorliegt,=20dann=20wird=20der=20Loginbildschirm=20umga?= =?utf8?q?ngen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/login.pl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl index 2d96b5400..9df72327e 100644 --- a/bin/mozilla/login.pl +++ b/bin/mozilla/login.pl @@ -68,7 +68,13 @@ if (-f "bin/mozilla/$form->{login}_$form->{script}") { # window title bar, user info $form->{titlebar} = "Lx-Office " . $locale->text('Version') . " $form->{version}"; -if ($form->{action}) { +my $action = $form->{action}; + +if (!$action && $auth->{SESSION}->{login}) { + $action = 'login'; +} + +if ($action) { our %myconfig = $auth->read_user($form->{login}) if ($form->{login}); if (!$myconfig{login} || (SL::Auth::OK != $auth->authenticate($form->{login}, $form->{password}, 0))) { @@ -81,7 +87,7 @@ if ($form->{action}) { $auth->create_or_refresh_session(); $form->{titlebar} .= " - $myconfig{name} - $myconfig{dbname}"; - call_sub($locale->findsub($form->{action})); + call_sub($locale->findsub($action)); } else { login_screen(); -- 2.20.1