banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display custom error messages from plugins hooks (as documented in the API spec)

Browse Source
pull/231/head
Thomas Bruederli 10 years ago
parent 507dad3354
commit b51de3279f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
index.php
Unescape Escape View File

@ -147,7 +147,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
$error_code = RCMAIL::ERROR_INVALID_REQUEST; $error_code = RCMAIL::ERROR_INVALID_REQUEST;
} }
else { else {
$error_code = $auth['error'] ? $auth['error'] : $RCMAIL->login_error(); $error_code = is_numeric($auth['error']) ? $auth['error'] : $RCMAIL->login_error();
} }
$error_labels = array( $error_labels = array(
@ -157,7 +157,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
RCMAIL::ERROR_INVALID_HOST => 'invalidhost', RCMAIL::ERROR_INVALID_HOST => 'invalidhost',
); );
$error_message = $error_labels[$error_code] ? $error_labels[$error_code] : 'loginfailed'; $error_message = !is_numeric($auth['error']) ? $auth['error'] : ($error_labels[$error_code] ?: 'loginfailed');
$OUTPUT->show_message($error_message, 'warning'); $OUTPUT->show_message($error_message, 'warning');

Write Preview
Loading…
Cancel
Save