Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

interface/web/dns/dns_a_edit.php

@@ -46,6 +46,7 @@ require_once './dns_edit_base.php';
 class page_action extends dns_page_action {
 
 	protected function checkDuplicate() {
+		global $app;
 		//* Check for duplicates where IP and hostname are the same
 		$tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_rr WHERE (type = 'A' AND name = ? AND zone = ? and data = ? and id != ?) OR (type = 'CNAME' AND name = ? AND zone = ? and id != ?)", $this->dataRecord["name"], $this->dataRecord["zone"], $this->dataRecord["data"], $this->id, $this->dataRecord["name"], $this->dataRecord["zone"], $this->id);
 		if($tmp['number'] > 0) return true;

interface/web/dns/dns_cname_edit.php

@@ -46,6 +46,7 @@ require_once './dns_edit_base.php';
 class page_action extends dns_page_action {
 
 	protected function checkDuplicate() {
+		global $app;
 		//* Check for duplicates where IP and hostname are the same
 		$tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_rr WHERE (type = 'A' AND name = ? AND zone = ? and id != ?) OR (type = 'CNAME' AND name = ? AND zone = ? and id != ?)", $this->dataRecord["name"], $this->dataRecord["zone"], $this->id, $this->dataRecord["name"], $this->dataRecord["zone"], $this->id);
 		if($tmp['number'] > 0) return true;