Resolved differences in sql incremental files between master and stable

Marius Cramer

2014-01-23 88d47d2ce65e549ffccda213f4e53609cc75d882

 interface/web/dns/dns_dkim_edit.php

@@ -57,7 +57,7 @@
      if($_SESSION["s"]["user"]["typ"] == 'user') {

         // Get the limits of the client
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         $client_group_id = $app->functions->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 record.
@@ -82,7 +82,7 @@
      // 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 = $_SESSION["s"]["user"]["default_group"];
         $client_group_id = $app->functions->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 record.
         if($this->id == 0 && $client["limit_dns_record"] >= 0) {
@@ -97,7 +97,7 @@
      $this->dataRecord["server_id"] = $soa["server_id"];

      // add dkim-settings to the public-key in the txt-record
      $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
      if (!empty($this->dataRecord['data'])) $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
      $this->dataRecord['name']='default._domainkey.'.$this->dataRecord['name'];

      // Update the serial number  and timestamp of the RR record
@@ -108,7 +108,7 @@
      // check for duplicate entry
      $check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ".$this->dataRecord["zone"]." AND type = '".$this->dataRecord["type"]."' AND data ='".$this->dataRecord["data"]."' AND name = '".$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();
   }