From 7a9c42a2bc9f4a52f87e9aa1385c90d3aa1179bb Mon Sep 17 00:00:00 2001 From: dehoej <110595168+dehoej@users.noreply.github.com> Date: Mon, 16 Sep 2024 21:15:50 +0200 Subject: [PATCH 1/4] Update tls_icon.php --- tls_icon.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tls_icon.php b/tls_icon.php index a6bbecc..cda5da6 100644 --- a/tls_icon.php +++ b/tls_icon.php @@ -5,6 +5,7 @@ class tls_icon extends rcube_plugin const POSTFIX_TLS_REGEX = "/\(using (TLS.*)\) \(/im"; const POSTFIX_LOCAL_REGEX = "/\([a-zA-Z]*, from userid [0-9]*\)/im"; const SENDMAIL_TLS_REGEX = "/\(version=(TLS.*)\)(\s+for|;)/im"; + const STALWART_TLS_REGEX = "/\(using TLSv1\.(2|3) with cipher .+\)/im"; private $message_headers_done = false; private $icon_img; @@ -60,7 +61,8 @@ public function message_headers($p) } if (preg_match_all(tls_icon::POSTFIX_TLS_REGEX, $Received, $items, PREG_PATTERN_ORDER) || - preg_match_all(tls_icon::SENDMAIL_TLS_REGEX, $Received, $items, PREG_PATTERN_ORDER)) { + preg_match_all(tls_icon::SENDMAIL_TLS_REGEX, $Received, $items, PREG_PATTERN_ORDER) || + preg_match_all(tls_icon::STALWART_TLS_REGEX, $Received, $items, PREG_PATTERN_ORDER)) { $data = $items[1][0]; $this->icon_img .= ''; } elseif (preg_match_all(tls_icon::POSTFIX_LOCAL_REGEX, $Received, $items, PREG_PATTERN_ORDER)) { From b50b88d824f89823166d385f2da5f0d72088df78 Mon Sep 17 00:00:00 2001 From: dehoej <110595168+dehoej@users.noreply.github.com> Date: Mon, 16 Sep 2024 21:24:36 +0200 Subject: [PATCH 2/4] Update tls_icon.php --- tls_icon.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tls_icon.php b/tls_icon.php index cda5da6..c735916 100644 --- a/tls_icon.php +++ b/tls_icon.php @@ -5,7 +5,7 @@ class tls_icon extends rcube_plugin const POSTFIX_TLS_REGEX = "/\(using (TLS.*)\) \(/im"; const POSTFIX_LOCAL_REGEX = "/\([a-zA-Z]*, from userid [0-9]*\)/im"; const SENDMAIL_TLS_REGEX = "/\(version=(TLS.*)\)(\s+for|;)/im"; - const STALWART_TLS_REGEX = "/\(using TLSv1\.(2|3) with cipher .+\)/im"; + const STALWART_TLS_REGEX = "/\(using TLSv1\.(?:2|3) with cipher .+\)/im"; private $message_headers_done = false; private $icon_img; From 15d930d4de97b8094877a71dd6de0b7271be2f92 Mon Sep 17 00:00:00 2001 From: dehoej <110595168+dehoej@users.noreply.github.com> Date: Mon, 16 Sep 2024 21:26:48 +0200 Subject: [PATCH 3/4] Update tls_icon.php --- tls_icon.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tls_icon.php b/tls_icon.php index c735916..34f27ea 100644 --- a/tls_icon.php +++ b/tls_icon.php @@ -5,7 +5,7 @@ class tls_icon extends rcube_plugin const POSTFIX_TLS_REGEX = "/\(using (TLS.*)\) \(/im"; const POSTFIX_LOCAL_REGEX = "/\([a-zA-Z]*, from userid [0-9]*\)/im"; const SENDMAIL_TLS_REGEX = "/\(version=(TLS.*)\)(\s+for|;)/im"; - const STALWART_TLS_REGEX = "/\(using TLSv1\.(?:2|3) with cipher .+\)/im"; + const STALWART_TLS_REGEX = "/\(using TLSv1\.[23] with cipher .+\)/im"; private $message_headers_done = false; private $icon_img; From 4466adf46ff5825827643323ae5273160c3d5b9a Mon Sep 17 00:00:00 2001 From: dehoej <110595168+dehoej@users.noreply.github.com> Date: Mon, 16 Sep 2024 21:39:08 +0200 Subject: [PATCH 4/4] Update tls_icon.php --- tls_icon.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tls_icon.php b/tls_icon.php index 34f27ea..2f8c3b5 100644 --- a/tls_icon.php +++ b/tls_icon.php @@ -5,7 +5,7 @@ class tls_icon extends rcube_plugin const POSTFIX_TLS_REGEX = "/\(using (TLS.*)\) \(/im"; const POSTFIX_LOCAL_REGEX = "/\([a-zA-Z]*, from userid [0-9]*\)/im"; const SENDMAIL_TLS_REGEX = "/\(version=(TLS.*)\)(\s+for|;)/im"; - const STALWART_TLS_REGEX = "/\(using TLSv1\.[23] with cipher .+\)/im"; + const STALWART_TLS_REGEX = "/\(using (TLSv1\.[23] with cipher .+)\) by .+ \(Stalwart SMTP\)/im"; private $message_headers_done = false; private $icon_img;