login nicht aus $::form nehmen. Teil 2

Dabei ergibt sich ein kleines Problem. User spezifische bin/mozilla/
Controller werden geladen bevor das User handling abgeschlossen ist.
Nach dieser Änderung sind die also de facto kaputt.

diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index d38736b..80700b9 100644 (file)
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -56,7 +56,6 @@ sub action_login {
   }
 
   %::myconfig      = $login ? $::auth->read_user(login => $login) : ();
-  $::form->{login} = $login;
   $::locale        = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
   SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
 

diff --git a/scripts/console b/scripts/console
index ba287fd..1d97581 100755 (executable)
--- a/scripts/console
+++ b/scripts/console
@@ -117,8 +117,6 @@ sub lxinit {
 
   die "cannot find user $login"            unless %::myconfig = $::auth->read_user(login => $login);
 
-  $::form->{login} = $login; # normaly implicit at login
-
   die "cannot find locale for user $login" unless $::locale   = Locale->new($::myconfig{countrycode});
 
   $::instance_conf->init;

diff --git a/scripts/task_server.pl b/scripts/task_server.pl
index b1baef4..ff21183 100755 (executable)
--- a/scripts/task_server.pl
+++ b/scripts/task_server.pl
@@ -86,7 +86,6 @@ sub per_job_initialization {
 
   $::auth->restore_session;
 
-  $::form->{login} = $lx_office_conf{task_server}->{login};
   $::instance_conf->init;
 
   $::form->{__ERROR_HANDLER} = sub { die @_ };

diff --git a/t/Support/TestSetup.pm b/t/Support/TestSetup.pm
index 7e5774e..037cfb5 100644 (file)
--- a/t/Support/TestSetup.pm
+++ b/t/Support/TestSetup.pm
@@ -44,8 +44,6 @@ sub login {
 
   die "cannot find user $login"            unless %::myconfig = $::auth->read_user(login => $login);
 
-  $::form->{login} = $login; # normaly implicit at login
-
   die "cannot find locale for user $login" unless $::locale   = Locale->new($::myconfig{countrycode});
 
   $SIG{__DIE__} = sub { Carp::confess( @_ ) } if $::lx_office_conf{debug}->{backtrace_on_die};