Merge branch 'master' into 'master'

Marius Cramer

2015-01-30 accfcafdae46cfc1cc5567ee111c63dc223b6c8e

 interface/web/dns/dns_dkim_edit.php

@@ -71,7 +71,7 @@

      parent::onShowNew();

        $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ?'", $_GET['zone'], $app->tform->getAuthSQL('r'));
        $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);
@@ -108,6 +108,7 @@
      if (!empty($this->dataRecord['data'])) {
         $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
         $this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
         $this->dataRecord['ttl']=60;
      }
         // Update the serial number  and timestamp of the RR record
         $soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);