From 32719b7de91420dbef2dc47ab9be0560dc40ce3c Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sun, 7 May 2023 11:19:41 +0200
Subject: [PATCH] Three more uses of running_on_master()
---
server/lib/classes/aps_installer.inc.php | 2 +-
server/plugins-available/powerdns_plugin.inc.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php
index e50c601cec..7093b1657e 100644
--- a/server/lib/classes/aps_installer.inc.php
+++ b/server/lib/classes/aps_installer.inc.php
@@ -693,7 +693,7 @@ class ApsInstaller extends ApsBase
{
$app->db->query('DELETE FROM aps_instances WHERE id = ?', $task['instance_id']);
$app->db->query('DELETE FROM aps_instances_settings WHERE instance_id = ?', $task['instance_id']);
- if ($app->dbmaster != $app->db) {
+ if (!$app->running_on_master()) {
$app->dbmaster->query('DELETE FROM aps_instances WHERE id = ?', $task['instance_id']);
$app->dbmaster->query('DELETE FROM aps_instances_settings WHERE instance_id = ?', $task['instance_id']);
}
diff --git a/server/plugins-available/powerdns_plugin.inc.php b/server/plugins-available/powerdns_plugin.inc.php
index 1221c3bc56..618e00c2da 100644
--- a/server/plugins-available/powerdns_plugin.inc.php
+++ b/server/plugins-available/powerdns_plugin.inc.php
@@ -649,7 +649,7 @@ class powerdns_plugin {
$log[] = sprintf("\r\n%s %s", date('c'), 'Running disable-dnssec command...');
exec($cmd_disable_dnssec, $log);
- if ($app->dbmaster !== $app->db) {
+ if (!$app->running_on_master()) {
$app->dbmaster->query('UPDATE dns_soa SET dnssec_initialized=? WHERE id=?', 'N', intval($data['new']['id']));
}
$app->db->query('UPDATE dns_soa SET dnssec_initialized=? WHERE id=?', 'N', intval($data['new']['id']));
@@ -680,7 +680,7 @@ class powerdns_plugin {
$dnssec_info = array_merge(array('== Raw log ============================'), $log);
$dnssec_info = implode("\r\n", $dnssec_info);
- if ($app->dbmaster !== $app->db) {
+ if (!$app->running_on_master()) {
$app->dbmaster->query('UPDATE dns_soa SET dnssec_info=?, dnssec_initialized=? WHERE id=?', $dnssec_info, 'N', intval($data['new']['id']));
}
$app->db->query('UPDATE dns_soa SET dnssec_info=?, dnssec_initialized=? WHERE id=?', $dnssec_info, 'N', intval($data['new']['id']));
--
GitLab