diff --git a/addon/mailcomment_extras/mailcomment_extras.module b/addon/mailcomment_extras/mailcomment_extras.module index 9c23279..ed74530 100644 --- a/addon/mailcomment_extras/mailcomment_extras.module +++ b/addon/mailcomment_extras/mailcomment_extras.module @@ -8,6 +8,7 @@ function mailcomment_extras_mailcomment_alter(&$node, $op) { * gmail 2 => On Mon, Mar 9, 2009 at 10:14 PM, * mac_mail_1 => On Feb 17, 2009, at 2:30 PM, foo@example.com wrote: * mac_mail_2 => On Feb 17, 2009, at 2:30 PM, + * mac_mail_3 => On 17 Feb 2009, at 2:30 PM, foo@example wrote: * outlook_express => ----- Original Message ----- * outlook_legacy => From: foo@example.com [foo@example.com] * @@ -18,6 +19,7 @@ function mailcomment_extras_mailcomment_alter(&$node, $op) { 'gmail_2' => "/On \w{3}, \w{3} \d{1,2}, \d{4} at \d{1,2}:\d{1,2} [AP]M/", 'mac_mail_1' => "/On [A-Z][a-z]{2} [0-9]{1,2}, [0-9]{4}, at [0-9]{1,2}:[0-9]{2} [AP]M, [a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4} wrote/", 'mac_mail_2' => "/On [A-Z][a-z]{2} [0-9]{1,2}, [0-9]{4}, at [0-9]{1,2}:[0-9]{2} [AP]M,/", // currently mac mail uses a name rather than the email address + 'mac_mail_3' => "/On [0-9]{1,2} [A-Z][a-z]{2} [0-9]{4}, at [0-9]{1,2}:[0-9]{2} [AP]M, [a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4} wrote/", 'outlook_express' => '/-----\s?Original Message\s?-----/', 'outlook_legacy' => '/From:(\s*)[A-Za-z0-9._%+-]+@[A-Za-z0-9._%+-]+\.[A-Za-z]{2,3}(\s*)\[mailto:[A-Za-z0-9._%+-]+@[A-Za-z0-9._%+-]+\.[A-Za-z]{2,3}\]/', 'generic_1' => '/From:.*Sent:.*To:.*Subject:/msU',