updated DKIM-Record-Editor

Florian Schaal

2014-12-06 5f82eefa552d533e744160410860f80fd0b087d1

updated DKIM-Record-Editor

 interface/web/dns/dns_dkim_edit.php

@@ -70,12 +70,20 @@
        }

        parent::onShowNew();

        $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ?'", $_GET['zone'], $app->tform->getAuthSQL('r'));
        $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'));
        $public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$sql['dkim_public']);
        $app->tpl->setVar('public_key', $public_key);
        $app->tpl->setVar('selector', $sql['dkim_selector']);
        $app->tpl->setVar('name', $soa['origin']);

    }

    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"]));
        $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ?", $_POST["zone"], $app->tform->getAuthSQL('r'));
        // Check if Domain belongs to user
        if($soa["id"] != $_POST["zone"]) $app->tform->errorMessage .= $app->tform->wordbook["no_zone_perm"];

@@ -101,16 +109,15 @@
            $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
            $this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
        }
        // 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');
            // 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');

        // check for duplicate entry
        $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']);
        if ($check!='') $app->tform->errorMessage .= $app->tform->wordbook["record_exists_txt"];
        if (empty($this->dataRecord['data'])) $app->tform->errorMessage .= $app->tform->wordbook["dkim_disabled_txt"];

            // check for duplicate entry
            $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']);
            if ($check!='') $app->tform->errorMessage .= $app->tform->wordbook["record_exists_txt"];
            if (empty($this->dataRecord['data'])) $app->tform->errorMessage .= $app->tform->wordbook["dkim_disabled_txt"];
        parent::onSubmit();
    }

@@ -118,7 +125,7 @@
        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']));
        $soa = $app->db->queryOneRecord("SELECT sys_groupid,serial FROM dns_soa WHERE id = ? AND ?", $this->dataRecord["zone"], $app->tform->getAuthSQL('r'));
        $app->db->datalogUpdate('dns_rr', "sys_groupid = ".$soa['sys_groupid'], 'id', $this->id);

        //* Update the serial number of the SOA record
@@ -131,7 +138,7 @@
        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 = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = ? AND ?", $this->dataRecord["zone"], $app->tform->getAuthSQL('r'));
        $soa_id = $app->functions->intval($_POST["zone"]);
        $serial = $app->validate_dns->increase_serial($soa["serial"]);
        $app->db->datalogUpdate('dns_soa', "serial = $serial", 'id', $soa_id);

 interface/web/dns/dns_dkim_get.php

File was deleted

 interface/web/dns/templates/dns_dkim_edit.htm

@@ -6,11 +6,11 @@
        <fieldset class="inlineLabels">
              <div class="ctrlHolder">
                <label for="data">{tmpl_var name='public_key_txt'}</label>
                <textarea name="data" id="data" >{tmpl_var name='public_key'}</textarea>
                <textarea readonly name="data" id="data" >{tmpl_var name='public_key'}</textarea>
              </div>
              <div class="ctrlHolder">
                <label for="selector">{tmpl_var name='selector_txt'}</label>
                <input name="selector" id="selector" value="{tmpl_var name='selector'}" size="20" maxlength="63" type="text" class="textInput" />
                <input name="selector" id="selector" value="{tmpl_var name='selector'}" size="20" maxlength="63" type="text" readonly class="textInput" />
              </div>
            <div class="ctrlHolder">
                <label for="ttl">{tmpl_var name='ttl_txt'}</label>
@@ -38,5 +38,4 @@
    </div>
  
</div>
<script language="JavaScript" type="text/javascript" src="js/dns_dkim.js"></script>