diff --git a/index.php b/index.php index c410881e80..d991d34581 100644 --- a/index.php +++ b/index.php @@ -353,12 +353,7 @@ $message = sprintf($lng['error']['login_blocked'], Settings::Get('login.deactivatetime')); break; case 4: - $cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown'; - if (!Validate::validateEmail($cmail)) { - $message = str_replace('%s', 'invalid.address', $lng['error']['errorsendingmail']); - } else { - $message = str_replace('%s', $cmail, $lng['error']['errorsendingmail']); - } + $message = $lng['error']['errorsendingmailpub']; break; case 5: $message = $lng['error']['user_banned']; diff --git a/lng/english.lng.php b/lng/english.lng.php index 912370d067..5b6907acc7 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -673,6 +673,7 @@ $lng['admin']['text'] = 'Message'; $lng['menu']['message'] = 'Messages'; $lng['error']['errorsendingmail'] = 'The message to "%s" failed'; +$lng['error']['errorsendingmailpub'] = 'The message to the given email-address failed'; $lng['error']['cannotreaddir'] = 'Unable to read directory "%s"'; $lng['message']['success'] = 'Successfully sent message to %s recipients'; $lng['message']['norecipients'] = 'No e-mail has been sent because there are no recipients in the database'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 63aa9f9635..53b29d684e 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -666,6 +666,7 @@ $lng['admin']['text'] = 'Nachricht'; $lng['menu']['message'] = 'Nachrichten'; $lng['error']['errorsendingmail'] = 'Das Versenden der Nachricht an "%s" schlug fehl.'; +$lng['error']['errorsendingmailpub'] = 'Das Versenden der Nachricht an die angegebene E-Mail Adresse schlug fehl.'; $lng['error']['cannotreaddir'] = 'Der Ordner "%s" kann nicht gelesen werden'; $lng['message']['success'] = 'Nachricht erfolgreich an "%s" Empfänger gesendet'; $lng['message']['norecipients'] = 'Es wurde keine E-Mail versendet, da sich keine Empfänger in der Datenbank befinden';