Revert "Avoid running checkzone for each rr when deleting a soa, #6647"

This reverts commit b571cfe.

Too complex, alterative suggested

Author: helmo

interface/lib/classes/db_mysql.inc.php

@@ -686,7 +686,7 @@ public function getDatabaseSize($database_name) {
 	}
 
 	//** Function to fill the datalog with a full differential record.
-	public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new, $force_update = false, $options = []) {
+	public function datalogSave($db_table, $action, $primary_field, $primary_id, $record_old, $record_new, $force_update = false) {
 		global $app;
 
 		// Insert backticks only for incomplete table names.
@@ -712,7 +712,6 @@ public function datalogSave($db_table, $action, $primary_field, $primary_id, $re
 		$server_id = (isset($record_old['server_id']) && $record_old['server_id'] > 0)?$record_old['server_id']:0;
 		if(isset($record_new['server_id'])) $server_id = $record_new['server_id'];
 
-		$diffrec_full['options'] = $options;
 
 		if($diff_num > 0) {
 			$diffstr = serialize($diffrec_full);
@@ -811,7 +810,7 @@ public function datalogUpdate($tablename, $update_data, $index_field, $index_val
 	}
 
 	//** Deletes a record and saves the changes into the datalog
-	public function datalogDelete($tablename, $index_field, $index_value, $options = []) {
+	public function datalogDelete($tablename, $index_field, $index_value) {
 		global $app;
 
 		// Check fields
@@ -821,7 +820,7 @@ public function datalogDelete($tablename, $index_field, $index_value, $options =
 		$old_rec = $this->queryOneRecord("SELECT * FROM ?? WHERE ?? = ?", $tablename, $index_field, $index_value);
 		$this->query("DELETE FROM ?? WHERE ?? = ?", $tablename, $index_field, $index_value);
 		$new_rec = array();
-		$this->datalogSave($tablename, 'DELETE', $index_field, $index_value, $old_rec, $new_rec, FALSE, $options);
+		$this->datalogSave($tablename, 'DELETE', $index_field, $index_value, $old_rec, $new_rec);
 
 		return true;
 	}

interface/web/dns/dns_soa_del.php

@@ -55,11 +55,10 @@ function onBeforeDelete() {
 
 		if($app->tform->checkPerm($this->id, 'd') == false) $app->error($app->lng('error_no_delete_permission'));
 
-		// Delete all records that belong to this zone.
+		// Delete all records that belog to this zone.
 		$records = $app->db->queryAllRecords("SELECT id FROM dns_rr WHERE zone = ?", $this->id);
-		$options = ['deleting_dns_soa' => TRUE];
 		foreach($records as $rec) {
-			$app->db->datalogDelete('dns_rr', 'id', $rec['id'], $options);
+			$app->db->datalogDelete('dns_rr', 'id', $rec['id']);
 		}
 	}
 

server/plugins-available/bind_plugin.inc.php

@@ -352,7 +352,7 @@ function soa_update($event_name, $data) {
 				$loglevel = @($dns_config['disable_bind_log'] === 'y') ? LOGLEVEL_DEBUG : LOGLEVEL_WARN;
 				$app->log("Writing BIND domain file failed: ".$filename." ".implode(' ', $out), $loglevel);
 				if(is_array($out) && !empty($out)){
-					$app->log('Reason for Bind zone check failure: '.implode("\n", $out), $loglevel);
+					$app->log('Reason for Bind restart failure: '.implode("\n", $out), $loglevel);
 					$app->dbmaster->datalogError(implode("\n", $out));
 				}
 				if ($old_zonefile != '') {
@@ -524,11 +524,6 @@ function rr_update($event_name, $data) {
 	function rr_delete($event_name, $data) {
 		global $app, $conf;
 
-		if (!empty($data['options']['deleting_dns_soa']) && $data['options']['deleting_dns_soa'] == TRUE) {
-			$app->log("Skipping zone update since it's alse being deleted", LOGLEVEL_DEBUG);
-			return;
-		}
-
 		//* Get the data of the soa and call soa_update
 		$tmp = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ?", $data['old']['zone']);
 		$data["new"] = $tmp;