From ea692399d5729aaf6041e8f979444ab76968ed46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=2E=20T=C3=A4ffner?= Date: Mon, 25 Jan 2016 09:43:30 +0100 Subject: [PATCH] LOC,DS,TLSA and SPF RRs --- interface/web/dns/dns_ds_edit.php | 53 +++++ interface/web/dns/dns_loc_edit.php | 53 +++++ interface/web/dns/dns_spf_edit.php | 222 +----------------- interface/web/dns/form/dns_ds.tform.php | 166 +++++++++++++ interface/web/dns/form/dns_loc.tform.php | 170 ++++++++++++++ interface/web/dns/form/dns_spf.tform.php | 29 +-- interface/web/dns/lib/lang/de_dns_ds.lng | 17 ++ interface/web/dns/lib/lang/de_dns_loc.lng | 16 ++ interface/web/dns/lib/lang/de_dns_spf.lng | 30 +-- interface/web/dns/lib/lang/de_dns_tlsa.lng | 4 +- interface/web/dns/lib/lang/en_dns_ds.lng | 18 ++ interface/web/dns/lib/lang/en_dns_loc.lng | 16 ++ interface/web/dns/lib/lang/en_dns_spf.lng | 28 +-- interface/web/dns/lib/lang/en_dns_tlsa.lng | 4 +- interface/web/dns/list/dns_a.list.php | 2 +- interface/web/dns/templates/dns_a_list.htm | 2 + interface/web/dns/templates/dns_ds_edit.htm | 32 +++ interface/web/dns/templates/dns_loc_edit.htm | 32 +++ interface/web/dns/templates/dns_spf_edit.htm | 46 +--- interface/web/dns/templates/dns_tlsa_edit.htm | 52 ++-- server/conf/bind_pri.domain.master | 3 +- 21 files changed, 650 insertions(+), 345 deletions(-) create mode 100644 interface/web/dns/dns_ds_edit.php create mode 100644 interface/web/dns/dns_loc_edit.php create mode 100644 interface/web/dns/form/dns_ds.tform.php create mode 100644 interface/web/dns/form/dns_loc.tform.php create mode 100644 interface/web/dns/lib/lang/de_dns_ds.lng create mode 100644 interface/web/dns/lib/lang/de_dns_loc.lng create mode 100644 interface/web/dns/lib/lang/en_dns_ds.lng create mode 100644 interface/web/dns/lib/lang/en_dns_loc.lng create mode 100644 interface/web/dns/templates/dns_ds_edit.htm create mode 100644 interface/web/dns/templates/dns_loc_edit.htm diff --git a/interface/web/dns/dns_ds_edit.php b/interface/web/dns/dns_ds_edit.php new file mode 100644 index 0000000000..9785916c5d --- /dev/null +++ b/interface/web/dns/dns_ds_edit.php @@ -0,0 +1,53 @@ +onLoad(); + +?> diff --git a/interface/web/dns/dns_loc_edit.php b/interface/web/dns/dns_loc_edit.php new file mode 100644 index 0000000000..6c13ab9f90 --- /dev/null +++ b/interface/web/dns/dns_loc_edit.php @@ -0,0 +1,53 @@ +onLoad(); + +?> diff --git a/interface/web/dns/dns_spf_edit.php b/interface/web/dns/dns_spf_edit.php index ba770a9cfa..dc9a9520d5 100644 --- a/interface/web/dns/dns_spf_edit.php +++ b/interface/web/dns/dns_spf_edit.php @@ -1,7 +1,7 @@ auth->check_module_permissions('dns'); +require_once './dns_edit_base.php'; // Loading classes -$app->uses('tpl,tform,tform_actions,validate_dns'); -$app->load('tform_actions'); - -class page_action extends tform_actions { - - function onShowNew() { - global $app, $conf; - // we will check only users, not admins - if($_SESSION["s"]["user"]["typ"] == 'user') { - - // 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); - - // Check if the user may add another mailbox. - if($client["limit_dns_record"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_rr WHERE sys_groupid = ?", $client_group_id); - if($tmp["number"] >= $client["limit_dns_record"]) { - $app->error($app->tform->wordbook["limit_dns_record_txt"]); - } - } - } - - parent::onShowNew(); - } - - function onShowEnd() { - global $app, $conf; - - $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 " . $app->tform->getAuthSQL('r'); - $rec = $app->db->queryOneRecord($sql, $zone); - if ( isset($rec) && !empty($rec) ) { - $this->id = 1; - $old_data = strtolower($rec['data']); - - $app->tpl->setVar("data", $old_data); - if ($rec['active'] == 'Y') $app->tpl->setVar("active", "CHECKED"); else $app->tpl->setVar("active", "UNCHECKED"); - - $spf_hostname = ''; - $spf_ip = ''; - $spf_domain = ''; - $spf_mechanism = ''; - - // browse through data - $temp = explode(' ', $old_data); - foreach ($temp as $part) { - if ($part == 'a') $app->tpl->setVar("spf_a_active", "CHECKED"); - if ($part == 'mx') $app->tpl->setVar("spf_mx_active", "CHECKED"); - if (preg_match("/^ip(4|6):/", $part)) $spf_ip .= str_replace(array('ip4:','ip6:'), '', $part) . ' '; - if (preg_match("/^a:/", $part)) $spf_hostname .= str_replace('a:', '', $part) . ' '; - if (preg_match("/^\\??include/", $part)) $spf_domain .= str_replace(array('include:', '?'), '', $part) . ' '; - } - unset($temp); - $spf_ip = rtrim($spf_ip); - $spf_hostname = rtrim($spf_hostname); - $spf_domain = rtrim($spf_domain); - $spf_mechanism = substr($rec['data'], -4, 1); - } - - //set html-values - $app->tpl->setVar("spf_ip", $spf_ip); - $app->tpl->setVar("spf_hostname", $spf_hostname); - $app->tpl->setVar("spf_domain", $spf_domain); - //create spf-mechanism-list - $spf_mechanism_value = array( - '+' => 'spf_mechanism_pass_txt', - '-' => 'spf_mechanism_fail_txt', - '~' => 'spf_mechanism_softfail_txt', - '?' => 'spf_mechanism_neutral_txt' - ); - $spf_mechanism_list=''; - foreach($spf_mechanism_value as $value => $txt) { - $selected = @($spf_mechanism == $value)?' selected':''; - $spf_mechanism_list .= "\r\n"; - } - $app->tpl->setVar('spf_mechanism', $spf_mechanism_list); - - parent::onShowEnd(); - - } - - function onSubmit() { - global $app, $conf; - - - // Get the parent soa record of the domain - $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"]; - - // Check the client limits, if user is not the admin - if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin - // 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); - - // Check if the user may add another mailbox. - if($this->id == 0 && $client["limit_dns_record"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM dns_rr WHERE sys_groupid = ?", $client_group_id); - if($tmp["number"] >= $client["limit_dns_record"]) { - $app->error($app->tform->wordbook["limit_dns_record_txt"]); - } - } - } // end if user is not admin - - //create spf-record - if (!empty($this->dataRecord['spf_mx'])) { - $spf_record[] = 'mx'; - } - if (!empty($this->dataRecord['spf_a'])) { - $spf_record[] = 'a'; - } - $spf_ip = trim($this->dataRecord['spf_ip']); - if (!empty($spf_ip)) { - $rec = split(' ', $spf_ip); - foreach ($rec as $ip) { - $temp_ip = explode('/', $ip); - if (filter_var($temp_ip[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { - $temp = 'ip4:' . $temp_ip[0]; - if (isset($temp_ip[1])) $temp .= '/' . $temp_ip[1]; - $spf_record[] = $temp; - unset($temp); - } - elseif (filter_var($temp_ip[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) { - $temp = 'ip6:' . $temp_ip[0]; - if (isset($temp_ip[1])) $temp .= '/' . $temp_ip[1]; - $spf_record[] = $temp; - unset($temp); - } - else { - if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '
' . $app->tform->errorMessage; - $app->tform->errorMessage .= $app->tform->wordbook["spf_invalid_ip_txt"]. $temp_ip[0]; - if (isset( $temp_ip[1])) $app->tform->errorMessage .= "/".$temp_ip[1]; - } - } - } - $spf_hostname = trim($this->dataRecord['spf_hostname']); - if (!empty($spf_hostname)) { - $rec = split(' ', $spf_hostname); - foreach ($rec as $hostname) { - if (preg_match('/^[a-zA-Z0-9\\.\\-\\*]{0,64}$/', $hostname)) - $spf_record[] = 'a:' . $hostname; - else { - if (isset($app->tform->errorMessage )) $app->tform->errorMessage .= '
' . $app->tform->wordbook["spf_invalid_hostname_txt"]. $hostname; - $app->tform->errorMessage .= $app->tform->wordbook["spf_invalid_hostname_txt"]. $hostname; - } - } - unset($rec); - } - $spf_domain = trim($this->dataRecord['spf_domain']); - if (!empty($spf_domain)) { - $rec = split(' ', $spf_domain); - foreach ($rec as $domain) { - if (preg_match('/^[_a-zA-Z0-9\\.\\-\\*]{0,64}$/', $domain)) - $spf_record[] = 'include:' . $domain; - else { - if (isset($app->tform->errorMessage )) $app->tform->errorMessage .= '
' . $app->tform->wordbook["spf_invalid_domain_txt"]. $domain; - $app->tform->errorMessage .= $app->tform->wordbook["spf_invalid_domain_txt"]. $domain; - } - } - } - - $temp = implode(' ', $spf_record);unset($spf_record); - if (!empty($temp)) - $this->dataRecord['data'] = 'v=spf1 ' . $temp . ' ' . $this->dataRecord['spf_mechanism'] . 'all'; - else $this->dataRecord['data'] = 'v=spf1 ' . $this->dataRecord['spf_mechanism'] . 'all'; - unset($temp); - - $this->dataRecord['name'] = $soa['origin']; - if (isset($this->dataRecord['active'])) $this->dataRecord['active'] = 'Y'; - - // Set the server ID of the rr record to the same server ID as the parent record. - $this->dataRecord["server_id"] = $soa["server_id"]; - - // Update the serial number and timestamp of the RR record - $soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id); - $this->dataRecord["serial"] = $app->validate_dns->increase_serial($soa["serial"]); - $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']); - $this->id = $check['id']; - - if (!isset($this->dataRecord['active'])) $this->dataRecord['active'] = 'N'; - - parent::onSubmit(); - } - - function onAfterInsert() { - 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->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', array("serial" => $serial), 'id', $soa_id); - - } - - function onAfterUpdate() { - global $app, $conf; - - //* Update the serial number of the SOA record - $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', array("serial" => $serial), 'id', $soa_id); - } +class page_action extends dns_page_action { } diff --git a/interface/web/dns/form/dns_ds.tform.php b/interface/web/dns/form/dns_ds.tform.php new file mode 100644 index 0000000000..274bcfe82a --- /dev/null +++ b/interface/web/dns/form/dns_ds.tform.php @@ -0,0 +1,166 @@ + 0 id must match with id of current user +$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user +$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete +$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete +$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete + +$form["tabs"]['dns'] = array ( + 'title' => "DNS DS", + 'width' => 100, + 'template' => "templates/dns_ds_edit.htm", + 'fields' => array ( + //################################# + // Begin Datatable fields + //################################# + 'server_id' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'SELECT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'zone' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'default' => @$app->functions->intval($_REQUEST["zone"]), + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'name' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'filters' => array( 0 => array( 'event' => 'SAVE', + 'type' => 'IDNTOASCII'), + 1 => array( 'event' => 'SHOW', + 'type' => 'IDNTOUTF8'), + 2 => array( 'event' => 'SAVE', + 'type' => 'TOLOWER') + ), + 'validators' => array ( 0 => array ( 'type' => 'REGEX', + 'regex' => '/^[a-zA-Z0-9\.\-\_]{0,255}$/', + 'errmsg'=> 'name_error_regex'), + ), + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'type' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => 'DS', + 'value' => '', + 'width' => '5', + 'maxlength' => '5' + ), + 'data' => array ( //TODO Regex validation does not take place obviously + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'validators' => array ( + 0 => array ( + 'type' => 'REGEX', + 'regex' => "/^\d{1,5}\s\d{1,2}\s\d{1,2}\s.+$/s", + 'errmsg'=> 'invalid_type_ds' + ) + ), + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'ttl' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'RANGE', + 'range' => '60:', + 'errmsg'=> 'ttl_range_error'), + ), + 'default' => '3600', + 'value' => '', + 'width' => '10', + 'maxlength' => '10' + ), + 'active' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'Y', + 'value' => array(0 => 'N', 1 => 'Y') + ), + 'stamp' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'serial' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '10', + 'maxlength' => '10' + ), + //################################# + // ENDE Datatable fields + //################################# + ) +); + +if($_SESSION["s"]["user"]["typ"] == 'admin') { + unset($form["tabs"]['dns']['fields']['data']['validators']); + $form["tabs"]['dns']['fields']['data']['validators'][0]['type'] = 'NOTEMPTY'; + $form["tabs"]['dns']['fields']['data']['validators'][0]['errmsg'] = 'data_error_empty'; + $form["tabs"]['dns']['fields']['data']['maxlength'] = 512; +} +?> diff --git a/interface/web/dns/form/dns_loc.tform.php b/interface/web/dns/form/dns_loc.tform.php new file mode 100644 index 0000000000..3803d765f2 --- /dev/null +++ b/interface/web/dns/form/dns_loc.tform.php @@ -0,0 +1,170 @@ + 0 id must match with id of current user +$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user +$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete +$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete +$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete + +$form["tabs"]['dns'] = array ( + 'title' => "DNS LOC", + 'width' => 100, + 'template' => "templates/dns_loc_edit.htm", + 'fields' => array ( + //################################# + // Begin Datatable fields + //################################# + 'server_id' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'SELECT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'zone' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'default' => @$app->functions->intval($_REQUEST["zone"]), + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'name' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'filters' => array( 0 => array( 'event' => 'SAVE', + 'type' => 'IDNTOASCII'), + 1 => array( 'event' => 'SHOW', + 'type' => 'IDNTOUTF8'), + 2 => array( 'event' => 'SAVE', + 'type' => 'TOLOWER') + ), + 'validators' => array ( 0 => array ( 'type' => 'REGEX', + 'regex' => '/^[a-zA-Z0-9\.\-\_]{0,255}$/', + 'errmsg'=> 'name_error_regex'), + ), + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'type' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => 'LOC', + 'value' => '', + 'width' => '5', + 'maxlength' => '5' + ), + 'data' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'validators' => array ( + 0 => array ( + 'type' => 'NOTEMPTY', + 'errmsg'=> 'data_error_empty' + ), + 1 => array ( + 'type' => 'REGEX', + 'regex' => "/^(\d+\s)(\d+\s)?(\d+\s)?[NS]{1}\s(\d\s)(\d+\s)?(\d+\s)?[EW]{1}(\s\d+m?)(\s\d+m?)?(\s\d+m?)?(\s\d+m?)?$/s", + 'errmsg'=> 'invalid_type_dkim' + ), + ), + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'ttl' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'RANGE', + 'range' => '60:', + 'errmsg'=> 'ttl_range_error'), + ), + 'default' => '3600', + 'value' => '', + 'width' => '10', + 'maxlength' => '10' + ), + 'active' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'Y', + 'value' => array(0 => 'N', 1 => 'Y') + ), + 'stamp' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'serial' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '10', + 'maxlength' => '10' + ), + //################################# + // ENDE Datatable fields + //################################# + ) +); + +if($_SESSION["s"]["user"]["typ"] == 'admin') { + unset($form["tabs"]['dns']['fields']['data']['validators']); + $form["tabs"]['dns']['fields']['data']['validators'][0]['type'] = 'NOTEMPTY'; + $form["tabs"]['dns']['fields']['data']['validators'][0]['errmsg'] = 'data_error_empty'; + $form["tabs"]['dns']['fields']['data']['maxlength'] = 512; +} +?> diff --git a/interface/web/dns/form/dns_spf.tform.php b/interface/web/dns/form/dns_spf.tform.php index ea2cf8310c..c3daed3ed3 100644 --- a/interface/web/dns/form/dns_spf.tform.php +++ b/interface/web/dns/form/dns_spf.tform.php @@ -97,7 +97,7 @@ $form["tabs"]['dns'] = array ( 'type' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', - 'default' => 'TXT', + 'default' => 'SPF', 'value' => '', 'width' => '5', 'maxlength' => '5' @@ -105,21 +105,17 @@ $form["tabs"]['dns'] = array ( 'data' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', + 'validators' => array ( + 0 => array ( + 'type' => 'NOTEMPTY', + 'errmsg'=> 'data_error_empty' + ), + ), 'default' => '', 'value' => '', 'width' => '30', 'maxlength' => '255' ), - /* - 'aux' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'TEXT', - 'default' => '0', - 'value' => '', - 'width' => '10', - 'maxlength' => '10' - ), - */ 'ttl' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', @@ -136,6 +132,7 @@ $form["tabs"]['dns'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', 'default' => 'Y', + 'value' => array(0 => 'N', 1 => 'Y') ), 'stamp' => array ( 'datatype' => 'VARCHAR', @@ -154,11 +151,15 @@ $form["tabs"]['dns'] = array ( 'maxlength' => '10' ), //################################# - // End Datatable fields + // ENDE Datatable fields //################################# ) ); - - +if($_SESSION["s"]["user"]["typ"] == 'admin') { + unset($form["tabs"]['dns']['fields']['data']['validators']); + $form["tabs"]['dns']['fields']['data']['validators'][0]['type'] = 'NOTEMPTY'; + $form["tabs"]['dns']['fields']['data']['validators'][0]['errmsg'] = 'data_error_empty'; + $form["tabs"]['dns']['fields']['data']['maxlength'] = 512; +} ?> diff --git a/interface/web/dns/lib/lang/de_dns_ds.lng b/interface/web/dns/lib/lang/de_dns_ds.lng new file mode 100644 index 0000000000..565844cf56 --- /dev/null +++ b/interface/web/dns/lib/lang/de_dns_ds.lng @@ -0,0 +1,17 @@ + diff --git a/interface/web/dns/lib/lang/de_dns_loc.lng b/interface/web/dns/lib/lang/de_dns_loc.lng new file mode 100644 index 0000000000..eb2f83263a --- /dev/null +++ b/interface/web/dns/lib/lang/de_dns_loc.lng @@ -0,0 +1,16 @@ + diff --git a/interface/web/dns/lib/lang/de_dns_spf.lng b/interface/web/dns/lib/lang/de_dns_spf.lng index dc2ca3496a..2c36e08bd3 100644 --- a/interface/web/dns/lib/lang/de_dns_spf.lng +++ b/interface/web/dns/lib/lang/de_dns_spf.lng @@ -1,25 +1,17 @@ diff --git a/interface/web/dns/lib/lang/de_dns_tlsa.lng b/interface/web/dns/lib/lang/de_dns_tlsa.lng index 0629987f2f..ba5e4dca3f 100644 --- a/interface/web/dns/lib/lang/de_dns_tlsa.lng +++ b/interface/web/dns/lib/lang/de_dns_tlsa.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/dns/lib/lang/en_dns_ds.lng b/interface/web/dns/lib/lang/en_dns_ds.lng new file mode 100644 index 0000000000..3f9b447811 --- /dev/null +++ b/interface/web/dns/lib/lang/en_dns_ds.lng @@ -0,0 +1,18 @@ + diff --git a/interface/web/dns/lib/lang/en_dns_loc.lng b/interface/web/dns/lib/lang/en_dns_loc.lng new file mode 100644 index 0000000000..a2e3322bb6 --- /dev/null +++ b/interface/web/dns/lib/lang/en_dns_loc.lng @@ -0,0 +1,16 @@ + diff --git a/interface/web/dns/lib/lang/en_dns_spf.lng b/interface/web/dns/lib/lang/en_dns_spf.lng index 8a1a611c21..d7fe128456 100644 --- a/interface/web/dns/lib/lang/en_dns_spf.lng +++ b/interface/web/dns/lib/lang/en_dns_spf.lng @@ -1,25 +1,17 @@ diff --git a/interface/web/dns/lib/lang/en_dns_tlsa.lng b/interface/web/dns/lib/lang/en_dns_tlsa.lng index 8078c546ef..dcfb3bfa33 100644 --- a/interface/web/dns/lib/lang/en_dns_tlsa.lng +++ b/interface/web/dns/lib/lang/en_dns_tlsa.lng @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/interface/web/dns/list/dns_a.list.php b/interface/web/dns/list/dns_a.list.php index 1c36c13c67..c2fe640d90 100644 --- a/interface/web/dns/list/dns_a.list.php +++ b/interface/web/dns/list/dns_a.list.php @@ -132,7 +132,7 @@ $liste["item"][] = array( 'field' => "type", 'prefix' => "", 'suffix' => "", 'width' => "", - 'value' => array('A'=>'A', 'AAAA' => 'AAAA', 'ALIAS'=>'ALIAS', 'CNAME'=>'CNAME', 'HINFO'=>'HINFO', 'MX'=>'MX', 'NS'=>'NS', 'PTR'=>'PTR', 'RP'=>'RP', 'SPF'=>'SPF', 'SRV'=>'SRV', 'TLSA'=>'TLSA', 'TXT'=>'TXT')); + 'value' => array('A'=>'A', 'AAAA' => 'AAAA', 'ALIAS'=>'ALIAS', 'CNAME'=>'CNAME', 'DS'=>'DS', 'HINFO'=>'HINFO', 'LOC'=>'LOC', 'MX'=>'MX', 'NS'=>'NS', 'PTR'=>'PTR', 'RP'=>'RP', 'SPF'=>'SPF', 'SRV'=>'SRV', 'TLSA'=>'TLSA', 'TXT'=>'TXT')); ?> diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 51aa559d36..1f9d125152 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -22,8 +22,10 @@ + + diff --git a/interface/web/dns/templates/dns_ds_edit.htm b/interface/web/dns/templates/dns_ds_edit.htm new file mode 100644 index 0000000000..56113f0ec0 --- /dev/null +++ b/interface/web/dns/templates/dns_ds_edit.htm @@ -0,0 +1,32 @@ +
+

+
+

+ + + +
+ +
+
+ +
+
+ +
+
+ +
+ {tmpl_var name='active'} +
+
+ + + + + + +
+ + +
\ No newline at end of file diff --git a/interface/web/dns/templates/dns_loc_edit.htm b/interface/web/dns/templates/dns_loc_edit.htm new file mode 100644 index 0000000000..12cfb6357f --- /dev/null +++ b/interface/web/dns/templates/dns_loc_edit.htm @@ -0,0 +1,32 @@ +
+

+
+

+ + + +
+ +
+
+ +
+
+ +
+
+ +
+ {tmpl_var name='active'} +
+
+ + + + + + +
+ + +
\ No newline at end of file diff --git a/interface/web/dns/templates/dns_spf_edit.htm b/interface/web/dns/templates/dns_spf_edit.htm index 3c34b37a41..f493457c14 100644 --- a/interface/web/dns/templates/dns_spf_edit.htm +++ b/interface/web/dns/templates/dns_spf_edit.htm @@ -6,57 +6,27 @@
- -
-
- -
-
-
- -
-
+ +
- -
-
-
- -
- {tmpl_var name='spf_ip_note_txt'} -
-
- -
- {tmpl_var name='spf_hostname_note_txt'} -
-
- -
- {tmpl_var name='spf_domain_note_txt'} -
+ +
-
- +
+ {tmpl_var name='active'}
{tmpl_var name='info_txt'}
- - + - -
-
- + \ No newline at end of file diff --git a/interface/web/dns/templates/dns_tlsa_edit.htm b/interface/web/dns/templates/dns_tlsa_edit.htm index c93d3b1b0a..c2cde8be61 100644 --- a/interface/web/dns/templates/dns_tlsa_edit.htm +++ b/interface/web/dns/templates/dns_tlsa_edit.htm @@ -1,42 +1,32 @@ -

+
+

+

-
-
-
-
- - -
-
- - -
-
- - -
-
-

{tmpl_var name='active_txt'}

-
+ +
+ +
+
+ +
+
+ +
+
+ +
{tmpl_var name='active'}
-
- - -
-
+ -
- - -
-
- -
\ No newline at end of file +
+ + +
\ No newline at end of file diff --git a/server/conf/bind_pri.domain.master b/server/conf/bind_pri.domain.master index a0d1395aa1..7c8a8b4aac 100644 --- a/server/conf/bind_pri.domain.master +++ b/server/conf/bind_pri.domain.master @@ -45,7 +45,8 @@ $TTL {tmpl_var name='ttl'} {tmpl_var name='name'} {tmpl_var name='ttl'} RP {tmpl_var name='data'} -{tmpl_var name='name'} {tmpl_var name='ttl'} SPF {tmpl_var name='data'} +{tmpl_var name='name'} {tmpl_var name='ttl'} TXT "{tmpl_var name='data'}" +{tmpl_var name='name'} {tmpl_var name='ttl'} SPF "{tmpl_var name='data'}" {tmpl_var name='name'} {tmpl_var name='ttl'} SRV {tmpl_var name='aux'} {tmpl_var name='data'} -- GitLab