Skip to content

Commit 5f82eef

Browse files
author
Florian Schaal
committed
updated DKIM-Record-Editor
1 parent a12b095 commit 5f82eef

File tree

3 files changed

+22
-102
lines changed

3 files changed

+22
-102
lines changed

‎interface/web/dns/dns_dkim_edit.php‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,20 @@ function onShowNew() {
7070
}
7171

7272
parent::onShowNew();
73+
74+
$soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ?'", $_GET['zone'], $app->tform->getAuthSQL('r'));
75+
$sql=$app->db->queryOneRecord("SELECT dkim_public, dkim_selector FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ?", substr_replace($soa['origin'],'',-1), $app->tform->getAuthSQL('r'));
76+
$public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$sql['dkim_public']);
77+
$app->tpl->setVar('public_key', $public_key);
78+
$app->tpl->setVar('selector', $sql['dkim_selector']);
79+
$app->tpl->setVar('name', $soa['origin']);
80+
7381
}
7482

7583
function onSubmit() {
7684
global $app, $conf;
7785
// Get the parent soa record of the domain
78-
$soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->intval($_POST["zone"]));
86+
$soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ?", $_POST["zone"], $app->tform->getAuthSQL('r'));
7987
// Check if Domain belongs to user
8088
if($soa["id"] != $_POST["zone"]) $app->tform->errorMessage .= $app->tform->wordbook["no_zone_perm"];
8189

@@ -101,24 +109,23 @@ function onSubmit() {
101109
$this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
102110
$this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
103111
}
104-
// Update the serial number and timestamp of the RR record
105-
$soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);
106-
$this->dataRecord["serial"] = $app->validate_dns->increase_serial($soa["serial"]);
107-
$this->dataRecord["stamp"] = date('Y-m-d H:i:s');
108-
109-
// check for duplicate entry
110-
$check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ? AND type = ? AND data = ? AND name = ?", $this->dataRecord['zone'], $this->dataRecord['type'], $this->dataRecord['data'], $this->dataRecord['name']);
111-
if ($check!='') $app->tform->errorMessage .= $app->tform->wordbook["record_exists_txt"];
112-
if (empty($this->dataRecord['data'])) $app->tform->errorMessage .= $app->tform->wordbook["dkim_disabled_txt"];
113-
112+
// Update the serial number and timestamp of the RR record
113+
$soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);
114+
$this->dataRecord["serial"] = $app->validate_dns->increase_serial($soa["serial"]);
115+
$this->dataRecord["stamp"] = date('Y-m-d H:i:s');
116+
117+
// check for duplicate entry
118+
$check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ? AND type = ? AND data = ? AND name = ?", $this->dataRecord["zone"], $this->dataRecord["type"], $this->dataRecord["data"], $this->dataRecord['name']);
119+
if ($check!='') $app->tform->errorMessage .= $app->tform->wordbook["record_exists_txt"];
120+
if (empty($this->dataRecord['data'])) $app->tform->errorMessage .= $app->tform->wordbook["dkim_disabled_txt"];
114121
parent::onSubmit();
115122
}
116123

117124
function onAfterInsert() {
118125
global $app, $conf;
119126

120127
//* Set the sys_groupid of the rr record to be the same then the sys_groupid of the soa record
121-
$soa = $app->db->queryOneRecord("SELECT sys_groupid,serial FROM dns_soa WHERE id = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->intval($this->dataRecord['zone']));
128+
$soa = $app->db->queryOneRecord("SELECT sys_groupid,serial FROM dns_soa WHERE id = ? AND ?", $this->dataRecord["zone"], $app->tform->getAuthSQL('r'));
122129
$app->db->datalogUpdate('dns_rr', "sys_groupid = ".$soa['sys_groupid'], 'id', $this->id);
123130

124131
//* Update the serial number of the SOA record
@@ -131,7 +138,7 @@ function onAfterUpdate() {
131138
global $app, $conf;
132139

133140
//* Update the serial number of the SOA record
134-
$soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = ? AND ".$app->tform->getAuthSQL('r'), $app->functions->intval($this->dataRecord["zone"]));
141+
$soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = ? AND ?", $this->dataRecord["zone"], $app->tform->getAuthSQL('r'));
135142
$soa_id = $app->functions->intval($_POST["zone"]);
136143
$serial = $app->validate_dns->increase_serial($soa["serial"]);
137144
$app->db->datalogUpdate('dns_soa', "serial = $serial", 'id', $soa_id);

‎interface/web/dns/dns_dkim_get.php‎

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎interface/web/dns/templates/dns_dkim_edit.htm‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ <h2><tmpl_var name="list_head_txt"></h2>
66
<fieldset class="inlineLabels">
77
<div class="ctrlHolder">
88
<label for="data">{tmpl_var name='public_key_txt'}</label>
9-
<textarea name="data" id="data" >{tmpl_var name='public_key'}</textarea>
9+
<textarea readonly name="data" id="data" >{tmpl_var name='public_key'}</textarea>
1010
</div>
1111
<div class="ctrlHolder">
1212
<label for="selector">{tmpl_var name='selector_txt'}</label>
13-
<input name="selector" id="selector" value="{tmpl_var name='selector'}" size="20" maxlength="63" type="text" class="textInput" />
13+
<input name="selector" id="selector" value="{tmpl_var name='selector'}" size="20" maxlength="63" type="text" readonly class="textInput" />
1414
</div>
1515
<div class="ctrlHolder">
1616
<label for="ttl">{tmpl_var name='ttl_txt'}</label>
@@ -38,5 +38,4 @@ <h2><tmpl_var name="list_head_txt"></h2>
3838
</div>
3939

4040
</div>
41-
<script language="JavaScript" type="text/javascript" src="js/dns_dkim.js"></script>
4241

0 commit comments

Comments
 (0)