Merge branch 'master' into 'master'

Marius Burkard · Marius Burkard · commit 82f07cf4cca7 · 2017-05-19T11:44:13.000+02:00
allow active / inactive for caa :)



See merge request !600
diff --git a/interface/web/dns/dns_caa_edit.php b/interface/web/dns/dns_caa_edit.php
@@ -172,7 +172,7 @@ function onSubmit() {
 		}
 
 		// Check for duplicate
-		$temp = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE type = 'CAA' AND name = ? AND data = ?", $this->dataRecord['name'], $this->dataRecord['data']);
+		$temp = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE type = 'CAA' AND name = ? AND data = ? AND active = ?", $this->dataRecord['name'], $this->dataRecord['data'], $POST['active']);
 		if(is_array($temp)) $this->error('caa_exists_error');
 		unset($temp);
 		

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ function onSubmit() {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`// Check for duplicate`
`175`		`- $temp = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE type = 'CAA' AND name = ? AND data = ?", $this->dataRecord['name'], $this->dataRecord['data']);`
	`175`	`+ $temp = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE type = 'CAA' AND name = ? AND data = ? AND active = ?", $this->dataRecord['name'], $this->dataRecord['data'], $POST['active']);`
`176`	`176`	`if(is_array($temp)) $this->error('caa_exists_error');`
`177`	`177`	`unset($temp);`
`178`	`178`