diff --git a/interface/web/dns/dns_spf_edit.php b/interface/web/dns/dns_spf_edit.php
index dc9a9520d56aa754996f1067b99551c3c6269492..ba770a9cfa43a8936e7d6f1e05b0bef7433e985c 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');
// Loading classes
-class page_action extends dns_page_action {
+$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);
+ }
}
diff --git a/interface/web/dns/form/dns_spf.tform.php b/interface/web/dns/form/dns_spf.tform.php
index c3daed3ed3d57d785baf3db21f2b13c3ca2fafcc..1d43e680b6e9662a72396df37cae5f751dcfa3d6 100644
--- a/interface/web/dns/form/dns_spf.tform.php
+++ b/interface/web/dns/form/dns_spf.tform.php
@@ -105,17 +105,21 @@ $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',
@@ -132,7 +136,6 @@ $form["tabs"]['dns'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'Y',
- 'value' => array(0 => 'N', 1 => 'Y')
),
'stamp' => array (
'datatype' => 'VARCHAR',
@@ -151,15 +154,11 @@ $form["tabs"]['dns'] = array (
'maxlength' => '10'
),
//#################################
- // ENDE Datatable fields
+ // End 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_spf.lng b/interface/web/dns/lib/lang/de_dns_spf.lng
index 2c36e08bd38530d3b97b35f4d129b8e23a7d5b93..e75cd7aaaf5b4ac5647c02b0688166fa625d390d 100644
--- a/interface/web/dns/lib/lang/de_dns_spf.lng
+++ b/interface/web/dns/lib/lang/de_dns_spf.lng
@@ -1,17 +1,28 @@
+
+
+
diff --git a/interface/web/dns/lib/lang/en_dns_spf.lng b/interface/web/dns/lib/lang/en_dns_spf.lng
index d7fe128456ad57fd05951e862d66802750da5ad4..7ac24dd227b26b9a34faa0b6877a8a7c5a53b99a 100644
--- a/interface/web/dns/lib/lang/en_dns_spf.lng
+++ b/interface/web/dns/lib/lang/en_dns_spf.lng
@@ -1,17 +1,28 @@
+
+
+
diff --git a/interface/web/dns/templates/dns_spf_edit.htm b/interface/web/dns/templates/dns_spf_edit.htm
index f493457c1437307cfb85676ec4f53fb0cc2313bf..b267e223b163718215ea6240e5a2b777a96a7b51 100644
--- a/interface/web/dns/templates/dns_spf_edit.htm
+++ b/interface/web/dns/templates/dns_spf_edit.htm
@@ -5,28 +5,58 @@
-