From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 20 Aug 2012 08:39:26 +0000 (+0200)
Subject: Controller-Code nach internem Umschreiben des Requests von 'login.pl' laden
X-Git-Tag: release-3.0.0beta1~283^2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a54282a94a61654e8bcdc638c0d2adce5faff48b;p=kivitendo-erp.git

Controller-Code nach internem Umschreiben des Requests von 'login.pl' laden
---

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index f6c9f60cf..9083b8df6 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -200,7 +200,13 @@ sub handle_request {
 
     $::form->error($::locale->text('System currently down for maintenance!')) if -e ($::lx_office_conf{paths}->{userspath} . "/nologin") && $script ne 'admin';
 
-    ($routing_type, $script, $script_name, $action) = qw(controller controller LoginScreen login) if ($script eq 'login') && ($action eq 'login');
+    # For compatibility with a lot of database upgrade scripts etc:
+    # Re-write request to old 'login.pl?action=login' to new
+    # 'LoginScreen' controller. Make sure to load its code!
+    if (($script eq 'login') && ($action eq 'login')) {
+      ($routing_type, $script, $script_name, $action) = qw(controller controller LoginScreen login);
+      _require_controller('LoginScreen');
+    }
 
     if (($script eq 'login') && !$action) {
       print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login');