Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard · Marius Burkard · commit 1083ffcd9109 · 2017-08-09T14:07:52.000+02:00
DNS DKIM TTL records (Fixes #4728)

See merge request !623
diff --git a/interface/web/dns/dns_dkim_edit.php b/interface/web/dns/dns_dkim_edit.php
@@ -118,7 +118,7 @@ function onSubmit() {
 		if (!empty($this->dataRecord['data'])) {
 			$this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
 			$this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
-			$this->dataRecord['ttl']=60;
+//			$this->dataRecord['ttl']=60;
 		}
 		// Update the serial number  and timestamp of the RR record
 		$soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ function onSubmit() {`
`118`	`118`	`if (!empty($this->dataRecord['data'])) {`
`119`	`119`	`$this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];`
`120`	`120`	`$this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];`
`121`		`- $this->dataRecord['ttl']=60;`
	`121`	`+// $this->dataRecord['ttl']=60;`
`122`	`122`	`}`
`123`	`123`	`// Update the serial number and timestamp of the RR record`
`124`	`124`	`$soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);`