Skip to content

Commit dc6e082

Browse files
author
Till Brehm
committed
Fixes #5095 update serial when DNS records are deleted with remote api.
1 parent 09a9ecb commit dc6e082

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

interface/lib/classes/remote.d/dns.inc.php

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public function dns_aaaa_delete($session_id, $primary_id, $update_serial=false)
331331
return false;
332332
}
333333
$affected_rows = $this->deleteQuery('../dns/form/dns_aaaa.tform.php', $primary_id);
334-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
334+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
335335
return $affected_rows;
336336
}
337337

@@ -382,7 +382,7 @@ public function dns_a_delete($session_id, $primary_id, $update_serial=false)
382382
return false;
383383
}
384384
$affected_rows = $this->deleteQuery('../dns/form/dns_a.tform.php', $primary_id);
385-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
385+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
386386
return $affected_rows;
387387
}
388388

@@ -433,7 +433,7 @@ public function dns_alias_delete($session_id, $primary_id, $update_serial=false)
433433
return false;
434434
}
435435
$affected_rows = $this->deleteQuery('../dns/form/dns_alias.tform.php', $primary_id);
436-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
436+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
437437
return $affected_rows;
438438
}
439439

@@ -484,7 +484,7 @@ public function dns_cname_delete($session_id, $primary_id, $update_serial=false)
484484
return false;
485485
}
486486
$affected_rows = $this->deleteQuery('../dns/form/dns_cname.tform.php', $primary_id);
487-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
487+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
488488
return $affected_rows;
489489
}
490490

@@ -535,7 +535,7 @@ public function dns_hinfo_delete($session_id, $primary_id, $update_serial=false)
535535
return false;
536536
}
537537
$affected_rows = $this->deleteQuery('../dns/form/dns_hinfo.tform.php', $primary_id);
538-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
538+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
539539
return $affected_rows;
540540
}
541541

@@ -586,7 +586,7 @@ public function dns_mx_delete($session_id, $primary_id, $update_serial=false)
586586
return false;
587587
}
588588
$affected_rows = $this->deleteQuery('../dns/form/dns_mx.tform.php', $primary_id);
589-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
589+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
590590
return $affected_rows;
591591
}
592592

@@ -637,7 +637,7 @@ public function dns_ns_delete($session_id, $primary_id, $update_serial=false)
637637
return false;
638638
}
639639
$affected_rows = $this->deleteQuery('../dns/form/dns_ns.tform.php', $primary_id);
640-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
640+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
641641
return $affected_rows;
642642
}
643643

@@ -688,7 +688,7 @@ public function dns_ptr_delete($session_id, $primary_id, $update_serial=false)
688688
return false;
689689
}
690690
$affected_rows = $this->deleteQuery('../dns/form/dns_ptr.tform.php', $primary_id);
691-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
691+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
692692
return $affected_rows;
693693
}
694694

@@ -739,7 +739,7 @@ public function dns_rp_delete($session_id, $primary_id, $update_serial=false)
739739
return false;
740740
}
741741
$affected_rows = $this->deleteQuery('../dns/form/dns_rp.tform.php', $primary_id);
742-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
742+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
743743
return $affected_rows;
744744
}
745745

@@ -790,7 +790,7 @@ public function dns_srv_delete($session_id, $primary_id, $update_serial=false)
790790
return false;
791791
}
792792
$affected_rows = $this->deleteQuery('../dns/form/dns_srv.tform.php', $primary_id);
793-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
793+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
794794
return $affected_rows;
795795
}
796796

@@ -841,7 +841,7 @@ public function dns_txt_delete($session_id, $primary_id, $update_serial=false)
841841
return false;
842842
}
843843
$affected_rows = $this->deleteQuery('../dns/form/dns_txt.tform.php', $primary_id);
844-
if($update_serial) $this->increase_serial($session_id, $client_id, $params);
844+
if($update_serial) $this->increase_serial($session_id, $client_id, array('dns_rr_id' => $primary_id));
845845
return $affected_rows;
846846
}
847847

@@ -916,6 +916,12 @@ public function dns_zone_set_status($session_id, $primary_id, $status) {
916916
}
917917

918918
private function increase_serial($session_id, $client_id, $params) {
919+
global $app;
920+
if(!isset($params['zone']) && isset($params['dns_rr_id'])) {
921+
$tmp = $app->db->queryOneRecord('SELECT zone FROM dns_rr WHERE id = ?',$params['dns_rr_id']);
922+
$params['zone'] = $tmp['zone'];
923+
unset($tmp);
924+
}
919925
$soa = $this->dns_zone_get($session_id, $params['zone']);
920926
$serial=$soa['serial'];
921927
$serial_date = intval(substr($serial, 0, 8));

0 commit comments

Comments
 (0)