Skip to content

Commit

Permalink
Merge pull request #42 from aghstrategies/fixazverp
Browse files Browse the repository at this point in the history
Version 2.2.2 - critical fix to handle VERP strings with a-z characters
  • Loading branch information
agh1 authored Jan 8, 2024
2 parents 5d8866c + 159c199 commit 2e0b9d6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CRM/Airmail/Utils.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static function parseSourceString($string) {
$twoDigitString = $twoDigitStringMin . $verpSeperator;
// $string ex: [email protected]
// Based off of CRM/Utils/Mail/EmailProcessor.php
$regex = '/^' . preg_quote($dao->localpart) . '(b|c|e|o|r|u)' . $twoDigitString . '([0-9a-f]{16})@' . preg_quote($dao->domain) . '$/';
$regex = '/^' . preg_quote($dao->localpart) . '(b|c|e|o|r|u)' . $twoDigitString . '([0-9a-z]{16})@' . preg_quote($dao->domain) . '$/';
if (preg_match($regex, $string, $matches)) {
list($match, $action, $job, $queue, $hash) = $matches;
$bounceEvent = array(
Expand Down
4 changes: 2 additions & 2 deletions docs/ses.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ On the *Create Subscription* screen the Topic ARN should be populated. Set the
At first the Subscription will show up as pendingConfirmation, you may need to wait a minute and then refresh the page before it confirms... SNS sends a subscribe URL to your site which this extension responds to.. that process takes a minute or two.

## Useful resources
+ Amazon's Testing Email Addresses: http://docs.aws.amazon.com/ses/latest/DeveloperGuide/mailbox-simulator.html
+ Amazon Documentation on SNS messages to HTTP: http://docs.aws.amazon.com/sns/latest/dg/SendMessageToHttp.html
+ Amazon's Testing Email Addresses: https://docs.aws.amazon.com/ses/latest/dg/send-an-email-from-console.html#send-email-simulator
+ Amazon Documentation on SNS messages to HTTP: https://docs.aws.amazon.com/sns/latest/dg/sns-http-https-endpoint-as-subscriber.html
4 changes: 2 additions & 2 deletions info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<urls>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2023-08-01</releaseDate>
<version>2.2.1</version>
<releaseDate>2024-01-08</releaseDate>
<version>2.2.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.0</ver>
Expand Down

0 comments on commit 2e0b9d6

Please sign in to comment.