From b63119417fe6e4bbcd072108d7dec927ee879d4a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 07 Jun 2016 12:47:22 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/dns/dns_import.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 2e4d58e..bd8cc84 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -216,7 +216,7 @@
$line = trim($line);
if ($line != '' && substr($line, 0, 1) != ';'){
if(strpos($line, ";") !== FALSE) {
- if (!preg_match("/v=DKIM|v=DMARC/",$line)) {
+ if(!preg_match("/\"[^\"]+;[^\"]*\"/", $line)) {
$line = substr($line, 0, strpos($line, ";"));
}
}
@@ -267,12 +267,13 @@
$parts = explode(' ', $line);
// make elements lowercase
- $dkim=@($parts[3]=='"v=DKIM1;')?true:false;
- $dmarc=@($parts[3]=='"v=DMARC1;')?true:false;
-
$new_parts = array();
foreach($parts as $part){
- if(!$dkim && !$dmarc) {
+ if(
+ (strpos($part, ';') === false) &&
+ (!preg_match("/^\"/", $part)) &&
+ (!preg_match("/\"$/", $part))
+ ) {
$new_parts[] = strtolower($part);
} else {
$new_parts[] = $part;
--
Gitblit v1.9.1