projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IC: Umstellung IC::save auf single dbh
[kivitendo-erp.git]
/
SL
/
Dispatcher.pm
diff --git
a/SL/Dispatcher.pm
b/SL/Dispatcher.pm
index
7126513
..
a37a01e
100644
(file)
--- a/
SL/Dispatcher.pm
+++ b/
SL/Dispatcher.pm
@@
-143,7
+143,7
@@
sub show_error {
print $::form->parse_html_template($template, \%params);
$::lxdebug->leave_sub;
print $::form->parse_html_template($template, \%params);
$::lxdebug->leave_sub;
-
::end_of
_request();
+
end
_request();
}
sub pre_startup_setup {
}
sub pre_startup_setup {
@@
-305,7
+305,7
@@
sub handle_request {
action => $action,
);
action => $action,
);
-
::end_of_request()
unless $auth_result{auth_ok};
+
$self->end_request
unless $auth_result{auth_ok};
delete @{ $::form }{ grep { m/^\{AUTH\}/ } keys %{ $::form } } unless $auth_result{keep_auth_vars};
delete @{ $::form }{ grep { m/^\{AUTH\}/ } keys %{ $::form } } unless $auth_result{keep_auth_vars};
@@
-370,7
+370,7
@@
sub redirect_to_login {
$action .= '&error=' . $params{error} if $params{error};
print $::request->cgi->redirect("controller.pl?action=${action}");
$action .= '&error=' . $params{error} if $params{error};
print $::request->cgi->redirect("controller.pl?action=${action}");
-
::end_of_request()
;
+
$self->end_request
;
}
sub unrequire_bin_mozilla {
}
sub unrequire_bin_mozilla {
@@
-498,7
+498,7
@@
sub _check_for_old_config_files {
$::form->header;
print $::form->parse_html_template('login_screen/old_configuration_files', { FILES => \@old_files });
$::form->header;
print $::form->parse_html_template('login_screen/old_configuration_files', { FILES => \@old_files });
-
::end_of
_request();
+
end
_request();
}
sub _parse_number_with_unit {
}
sub _parse_number_with_unit {
@@
-549,11
+549,7
@@
sub _memory_usage_is_too_high {
return 0;
}
return 0;
}
-package main;
-
-use strict;
-
-sub end_of_request {
+sub end_request {
die SL::Dispatcher->END_OF_REQUEST;
}
die SL::Dispatcher->END_OF_REQUEST;
}