From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/dns/dns_spf_edit.php | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/interface/web/dns/dns_spf_edit.php b/interface/web/dns/dns_spf_edit.php
index b20a340..ca10927 100644
--- a/interface/web/dns/dns_spf_edit.php
+++ b/interface/web/dns/dns_spf_edit.php
@@ -57,7 +57,7 @@
// Get the limits of the client
$client_group_id = intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT limit_dns_record FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = =", $client_group_id);
+ $client = $app->db->queryOneRecord("SELECT limit_dns_record FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
// Check if the user may add another mailbox.
if($client["limit_dns_record"] >= 0) {
@@ -77,8 +77,8 @@
$zone = $app->functions->intval($_GET['zone']);
//* check for an existing spf-record
- $sql = "SELECT data, active FROM dns_rr WHERE data LIKE 'v=spf1%' AND zone = ? AND ?";
- $rec = $app->db->queryOneRecord($sql, $zone, $app->tform->getAuthSQL('r'));
+ $sql = "SELECT data, active FROM dns_rr WHERE data LIKE 'v=spf1%' AND zone = ? AND " . $app->tform->getAuthSQL('r');
+ $rec = $app->db->queryOneRecord($sql, $zone);
if ( isset($rec) && !empty($rec) ) {
$this->id = 1;
$old_data = strtolower($rec['data']);
@@ -134,7 +134,7 @@
// Get the parent soa record of the domain
- $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ?", $app->functions->intval($_POST["zone"]), $app->tform->getAuthSQL('r'));
+ $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND " . $app->tform->getAuthSQL('r'), $app->functions->intval($_POST["zone"]));
// Check if Domain belongs to user
if($soa["id"] != $_POST["zone"]) $app->tform->errorMessage .= $app->tform->wordbook["no_zone_perm"];
@@ -163,7 +163,7 @@
}
$spf_ip = trim($this->dataRecord['spf_ip']);
if (!empty($spf_ip)) {
- $rec = split(' ', $spf_ip);
+ $rec = explode(' ', $spf_ip);
foreach ($rec as $ip) {
$temp_ip = explode('/', $ip);
if (filter_var($temp_ip[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
@@ -187,7 +187,7 @@
}
$spf_hostname = trim($this->dataRecord['spf_hostname']);
if (!empty($spf_hostname)) {
- $rec = split(' ', $spf_hostname);
+ $rec = explode(' ', $spf_hostname);
foreach ($rec as $hostname) {
if (preg_match('/^[a-zA-Z0-9\\.\\-\\*]{0,64}$/', $hostname))
$spf_record[] = 'a:' . $hostname;
@@ -200,7 +200,7 @@
}
$spf_domain = trim($this->dataRecord['spf_domain']);
if (!empty($spf_domain)) {
- $rec = split(' ', $spf_domain);
+ $rec = explode(' ', $spf_domain);
foreach ($rec as $domain) {
if (preg_match('/^[_a-zA-Z0-9\\.\\-\\*]{0,64}$/', $domain))
$spf_record[] = 'include:' . $domain;
@@ -241,13 +241,13 @@
global $app, $conf;
//* Set the sys_groupid of the rr record to be the same then the sys_groupid of the soa record
- $soa = $app->db->queryOneRecord("SELECT sys_groupid,serial FROM dns_soa WHERE id = ? AND ?", $app->functions->intval($this->dataRecord["zone"]), $app->tform->getAuthSQL('r'));
- $app->db->datalogUpdate('dns_rr', "sys_groupid = ".$soa['sys_groupid'], 'id', $this->id);
+ $soa = $app->db->queryOneRecord("SELECT sys_groupid,serial FROM dns_soa WHERE id = ? AND " . $app->tform->getAuthSQL('r'), $app->functions->intval($this->dataRecord["zone"]));
+ $app->db->datalogUpdate('dns_rr', array("sys_groupid" => $soa['sys_groupid']), 'id', $this->id);
//* Update the serial number of the SOA record
$soa_id = $app->functions->intval($_POST["zone"]);
$serial = $app->validate_dns->increase_serial($soa["serial"]);
- $app->db->datalogUpdate('dns_soa', "serial = $serial", 'id', $soa_id);
+ $app->db->datalogUpdate('dns_soa', array("serial" => $serial), 'id', $soa_id);
}
@@ -255,10 +255,10 @@
global $app, $conf;
//* Update the serial number of the SOA record
- $soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = ? AND ?", $app->functions->intval($this->dataRecord["zone"]), $app->tform->getAuthSQL('r'));
+ $soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = ? AND " . $app->tform->getAuthSQL('r'), $app->functions->intval($this->dataRecord["zone"]));
$soa_id = $app->functions->intval($_POST["zone"]);
$serial = $app->validate_dns->increase_serial($soa["serial"]);
- $app->db->datalogUpdate('dns_soa', "serial = $serial", 'id', $soa_id);
+ $app->db->datalogUpdate('dns_soa', array("serial" => $serial), 'id', $soa_id);
}
}
--
Gitblit v1.9.1