Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/roundcube/roundcubemail.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2022-07-09 19:11:37 +0300
committerAleksander Machniak <alec@alec.pl>2022-07-09 19:11:37 +0300
commit185f958102e10136581ebbf02e51aaf6d7368093 (patch)
treef4887a3a19c92698573152eeed7eaa4d88ad3091
parentedf9a3239e279d81585bc4b0ca4fab661df4a39c (diff)
Disable email address spoofchecking on messages list
.. do it only when opening the message, that's when we can display the warning.
-rw-r--r--program/actions/mail/index.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/program/actions/mail/index.php b/program/actions/mail/index.php
index 7447d5d05..269d34178 100644
--- a/program/actions/mail/index.php
+++ b/program/actions/mail/index.php
@@ -522,7 +522,7 @@ class rcmail_action_mail_index extends rcmail_action
$col_name = $col == 'fromto' ? $smart_col : $col;
if (in_array($col_name, ['from', 'to', 'cc', 'replyto'])) {
- $cont = self::address_string($header->$col_name, 3, false, null, $header->charset);
+ $cont = self::address_string($header->$col_name, 3, false, null, $header->charset, null, false);
if (empty($cont)) {
$cont = '&nbsp;'; // for widescreen mode
}
@@ -1361,7 +1361,8 @@ class rcmail_action_mail_index extends rcmail_action
/**
* Decode address string and re-format it as HTML links
*/
- public static function address_string($input, $max = null, $linked = false, $addicon = null, $default_charset = null, $title = null)
+ public static function address_string($input, $max = null, $linked = false, $addicon = null,
+ $default_charset = null, $title = null, $spoofcheck = true)
{
$a_parts = rcube_mime::decode_address_list($input, null, true, $default_charset);
@@ -1404,7 +1405,7 @@ class rcmail_action_mail_index extends rcmail_action
$mailto = rcube_utils::idn_to_utf8($mailto);
// Homograph attack detection (#6891)
- if (!self::$SUSPICIOUS_EMAIL) {
+ if ($spoofcheck && !self::$SUSPICIOUS_EMAIL) {
self::$SUSPICIOUS_EMAIL = rcube_spoofchecker::check($mailto);
}