Revision b2945bf6
Von Sven Schöling vor mehr als 14 Jahren hinzugefügt
bin/mozilla/login.pl | ||
---|---|---|
57 | 57 |
if (SL::Auth::SESSION_EXPIRED == $session_result) { |
58 | 58 |
$form->{error_message} = $locale->text('The session is invalid or has expired.'); |
59 | 59 |
login_screen(); |
60 |
exit;
|
|
60 |
::end_of_request();
|
|
61 | 61 |
} |
62 | 62 |
my $action = $form->{action}; |
63 | 63 |
if (!$action && $auth->{SESSION}->{login}) { |
... | ... | |
104 | 104 |
|
105 | 105 |
unless ($form->{login}) { |
106 | 106 |
login_screen($locale->text('You did not enter a name!')); |
107 |
exit;
|
|
107 |
::end_of_request();
|
|
108 | 108 |
} |
109 | 109 |
|
110 | 110 |
my $user = new User $form->{login}; |
... | ... | |
112 | 112 |
# if we get an error back, bale out |
113 | 113 |
my $result; |
114 | 114 |
if (($result = $user->login($form)) <= -1) { |
115 |
exit if $result == -2;
|
|
115 |
::end_of_request() if $result == -2;
|
|
116 | 116 |
login_screen($locale->text('Incorrect username or password!')); |
117 |
exit;
|
|
117 |
::end_of_request();
|
|
118 | 118 |
} |
119 | 119 |
|
120 | 120 |
my %style_to_script_map = ( 'v3' => 'v3', |
... | ... | |
188 | 188 |
# $form->parse_html_template('login/auth_db_unreachable'); |
189 | 189 |
# $form->parse_html_template('login/authentication_pl_missing'); |
190 | 190 |
|
191 |
exit;
|
|
191 |
::end_of_request();
|
|
192 | 192 |
} |
193 | 193 |
|
194 | 194 |
1; |
Auch abrufbar als: Unified diff
Aufrufe von 'exit' durch eigene Funktion '::end_of_request()' ersetzt.
Außerdem dafür gesorgt, dass Meldungen, die per
$form->show_generic_(error|information) ausgegeben werden, nicht
doppelt angezeigt werden.
Conflicts: