Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2015-01-06 9724f8f13bdc6bfb2f9649c54ad37fb45bea9870

 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);