public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Web] Fix BCC error message

c7a85fc5

andryyy <[email protected]> 7 years ago

data/web/inc/functions.address_rewriting.inc.php | 2 +-
 data/web/lang/lang.de.php                        | 2 +-
 data/web/lang/lang.en.php                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Diff

diff --git a/data/web/inc/functions.address_rewriting.inc.php b/data/web/inc/functions.address_rewriting.inc.php
index df67d5b7..7caf65e3 100644
--- a/data/web/inc/functions.address_rewriting.inc.php
+++ b/data/web/inc/functions.address_rewriting.inc.php
@@ -69,7 +69,7 @@ function bcc($_action, $_data = null, $attr = null) {
         $_SESSION['return'][] = array(
           'type' => 'danger',
           'log' => array(__FUNCTION__, $_action, $_data, $_attr),
-          'msg' => 'bcc_must_be_email'
+          'msg' => array('bcc_must_be_email', htmlspecialchars($bcc_dest))
         );
         return false;
       }
diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php
index c5fa06ac..f5232815 100644
--- a/data/web/lang/lang.de.php
+++ b/data/web/lang/lang.de.php
@@ -61,7 +61,7 @@ $lang['success']['delete_filters'] = "Filter gelöscht: %s";
 $lang['success']['delete_filter'] = "Filter ID %s wurde gelöscht";
 $lang['danger']['invalid_bcc_map_type'] = "Ungültiger BCC Map-Typ";
 $lang['danger']['bcc_empty'] = "BCC Ziel darf nicht leer sein";
-$lang['danger']['bcc_must_be_email'] = "BCC Map %s ist keine gültige E-Mail-Adresse";
+$lang['danger']['bcc_must_be_email'] = "BCC Ziel %s ist keine gültige E-Mail-Adresse";
 $lang['danger']['bcc_exists'] = "Ein BCC Map Eintrag %s existiert bereits als Typ %s";
 $lang['success']['bcc_saved'] = "BCC Map Eintrag wurde gespeichert";
 $lang['success']['bcc_edited'] = "BCC Map Eintrag %s wurde editiert";
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index f9f4fc90..2e1b5078 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -62,7 +62,7 @@ $lang['success']['delete_filters'] = "Deleted filters: %s";
 $lang['success']['delete_filter'] = "Deleted filters ID %s";
 $lang['danger']['invalid_bcc_map_type'] = "Invalid BCC map type";
 $lang['danger']['bcc_empty'] = "BCC destination cannot be empty";
-$lang['danger']['bcc_must_be_email'] = "BCC map %s is not a valid email address";
+$lang['danger']['bcc_must_be_email'] = "BCC destination %s is not a valid email address";
 $lang['danger']['bcc_exists'] = "A BCC map %s exists for type %s";
 $lang['success']['bcc_saved'] = "BCC map entry saved";
 $lang['success']['bcc_edited'] = "BCC map entry %s edited";