Three more uses of running_on_master()

Author: helmo

server/lib/classes/aps_installer.inc.php

@@ -693,7 +693,7 @@ public function installHandler($instanceid, $type)
 		{
 			$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']);
 			}

server/plugins-available/powerdns_plugin.inc.php

@@ -649,7 +649,7 @@ function soa_dnssec_disable($data) {
 		$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 @@ function soa_dnssec_delete($data) {
 		$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']));