16 lines
1.1 KiB
Text
16 lines
1.1 KiB
Text
--- dkimstatus.php.orig Thu Feb 13 16:32:55 2014
|
|
+++ dkimstatus.php Sat May 2 12:53:09 2015
|
|
@@ -102,9 +102,11 @@ class dkimstatus extends rcube_plugin
|
|
/* Verify if its an author's domain signature or a third party
|
|
*/
|
|
|
|
- if(preg_match("/[@]([a-zA-Z0-9]+([.][a-zA-Z0-9]+)?\.[a-zA-Z]{2,4})/", $p['headers']->from, $m)) {
|
|
+ if(preg_match("/[@]([a-zA-Z0-9]+([.][a-zA-Z0-9]+)?\.[a-zA-Z]{2,4})/", $p['headers']->from, $m) ||
|
|
+ preg_match("/[@](([a-zA-Z0-9]+)?\.[a-zA-Z]{2,4})/", $p['headers']->from, $m)) {
|
|
$authordomain = $m[1];
|
|
- if(preg_match("/header\.(d|i|from)=(([a-zA-Z0-9]+[_\.\-]?)+)?($authordomain)/", $results)) {
|
|
+ if(preg_match("/header\.(d|i|from)=(([a-zA-Z0-9]+[_\.\-]?)+)?($authordomain)/", $results) ||
|
|
+ preg_match("/header\.(d|i|from)=[@]{0,1}($authordomain)/", $results)) {
|
|
$image = 'authorsign.png';
|
|
$alt = 'verifiedsender';
|
|
$title = $results;
|