From 7cbed050417f967f34340661b7d7a8a7e42e5710 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 26 Feb 2015 06:59:21 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/dns/dns_spf_edit.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/dns/dns_spf_edit.php b/interface/web/dns/dns_spf_edit.php
index e95227a..b20a340 100644
--- a/interface/web/dns/dns_spf_edit.php
+++ b/interface/web/dns/dns_spf_edit.php
@@ -202,7 +202,7 @@
if (!empty($spf_domain)) {
$rec = split(' ', $spf_domain);
foreach ($rec as $domain) {
- if (preg_match('/_^[a-zA-Z0-9\\.\\-\\*]{0,64}$/', $domain))
+ if (preg_match('/^[_a-zA-Z0-9\\.\\-\\*]{0,64}$/', $domain))
$spf_record[] = 'include:' . $domain;
else {
if (isset($app->tform->errorMessage )) $app->tform->errorMessage .= '<br/>' . $app->tform->wordbook["spf_invalid_domain_txt"]. $domain;
@@ -229,7 +229,7 @@
$this->dataRecord["stamp"] = date('Y-m-d H:i:s');
// always update an existing entry
- $check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ? AND type = ? AND data LIKE 'v=spf1%' AND name = ?", $this->dataRecord["zone"], $this->dataRecord["type"], $this->dataRecord['name'].'.');
+ $check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ? AND type = ? AND data LIKE 'v=spf1%' AND name = ?", $this->dataRecord["zone"], $this->dataRecord["type"], $this->dataRecord['name']);
$this->id = $check['id'];
if (!isset($this->dataRecord['active'])) $this->dataRecord['active'] = 'N';
--
Gitblit v1.9.1