diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index b6adb3a1027c40e0a18a47bf496f3def0835ffa0..870b6fece33a5aa89b74c532206fa9e00398b4c2 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -354,6 +354,16 @@ class app {
 		$this->log($msg, 3);	// isn't this supposed to be error code 2? (gwyneth 20220315)
 		die($msg);
 	}
+
+	/**
+	 * Determin if the current process is running on the master or a slave server.
+	 *
+	 * @return boolean
+	 */
+	function running_on_master() {
+
+		return $this->dbmaster == $this->db;
+	}
 }
 
 /**
diff --git a/server/lib/classes/cron.d/200-logfiles.inc.php b/server/lib/classes/cron.d/200-logfiles.inc.php
index ef0bbb1201b0bf35a67d77e96fc6b3d4c1e1a408..abc4af68bdb2e5c0d32f93b7e8be44361f93fb79 100644
--- a/server/lib/classes/cron.d/200-logfiles.inc.php
+++ b/server/lib/classes/cron.d/200-logfiles.inc.php
@@ -226,7 +226,7 @@ class cronjob_logfiles extends cronjob {
 		// Cleanup logs in master database (only the "master-server")
 		//######################################################################################################
 
-		if ($app->dbmaster == $app->db) {
+		if ($app->running_on_master()) {
 			/** 7 days */
 
 
diff --git a/server/lib/classes/cron.d/300-quota_notify.inc.php b/server/lib/classes/cron.d/300-quota_notify.inc.php
index 2d8ddc5b86354555c23cde3c15fdbf5150df5dc6..a616047b1903ca850a0c2aa0f9b35d4978619a22 100644
--- a/server/lib/classes/cron.d/300-quota_notify.inc.php
+++ b/server/lib/classes/cron.d/300-quota_notify.inc.php
@@ -75,7 +75,7 @@ class cronjob_quota_notify extends cronjob {
 		// enforce traffic quota (run only on the "master-server")
 		//######################################################################################################
 
-		if ($app->dbmaster == $app->db) {
+		if ($app->running_on_master()) {
 
 			$global_config = $app->getconf->get_global_config('mail');
 
@@ -159,7 +159,7 @@ class cronjob_quota_notify extends cronjob {
 		// send website quota warnings by email
 		//######################################################################################################
 
-		if ($app->dbmaster == $app->db) {
+		if ($app->running_on_master()) {
 
 			$global_config = $app->getconf->get_global_config('mail');
 
@@ -315,7 +315,7 @@ class cronjob_quota_notify extends cronjob {
 		// send mail quota warnings by email
 		//######################################################################################################
 
-		if ($app->dbmaster == $app->db) {
+		if ($app->running_on_master()) {
 
 			$global_config = $app->getconf->get_global_config('mail');
 			$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
@@ -453,7 +453,7 @@ class cronjob_quota_notify extends cronjob {
 		// send database quota warnings by email
 		//######################################################################################################
 
-		if ($app->dbmaster == $app->db) {
+		if ($app->running_on_master()) {
 
 			$global_config = $app->getconf->get_global_config('mail');
 
diff --git a/server/lib/classes/cron.d/400-openvz.inc.php b/server/lib/classes/cron.d/400-openvz.inc.php
index c88e0e608f9fcd690937a8205a72abab845d9ece..75a1a333f9c5739d859c438c6649cdf50f8ca597 100644
--- a/server/lib/classes/cron.d/400-openvz.inc.php
+++ b/server/lib/classes/cron.d/400-openvz.inc.php
@@ -54,7 +54,7 @@ class cronjob_openvz extends cronjob {
 		// deactivate virtual servers (run only on the "master-server")
 		//######################################################################################################
 
-		if ($app->dbmaster == $app->db) {
+		if ($app->running_on_master()) {
 			//* Check which virtual machines have to be deactivated
 			$sql = "SELECT * FROM openvz_vm WHERE active = 'y' AND active_until_date IS NOT NULL AND active_until_date < CURDATE()";
 			$records = $app->db->queryAllRecords($sql);
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index 2a5ccca269472bdce970bfda505ef7e3bcfcadee..0952f40f2b447f7554c40972bb70c8129a2f2764 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -189,7 +189,7 @@ class bind_plugin {
 			}
 		}
 
-		if ($app->dbmaster !== $app->db) $app->dbmaster->query('UPDATE dns_soa SET dnssec_info=?, dnssec_initialized=\'Y\', dnssec_last_signed=? WHERE id=?', $dnssecdata, intval(time()), intval($data['new']['id']));
+		if (!$app->running_on_master()) $app->dbmaster->query('UPDATE dns_soa SET dnssec_info=?, dnssec_initialized=\'Y\', dnssec_last_signed=? WHERE id=?', $dnssecdata, intval(time()), intval($data['new']['id']));
 		$app->db->query('UPDATE dns_soa SET dnssec_info=?, dnssec_initialized=\'Y\', dnssec_last_signed=? WHERE id=?', $dnssecdata, intval(time()), intval($data['new']['id']));
 	}
 
@@ -244,7 +244,7 @@ class bind_plugin {
 		unlink($dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_masterprefix'].$domain.'.signed');
 		unlink($dns_config['bind_keyfiles_dir'].'/dsset-'.$domain.'.');
 
-		if ($app->dbmaster !== $app->db) $app->dbmaster->query('UPDATE dns_soa SET dnssec_info=\'\', dnssec_initialized=\'N\' WHERE id=?', intval($data['new']['id']));
+		if (!$app->running_on_master()) $app->dbmaster->query('UPDATE dns_soa SET dnssec_info=\'\', dnssec_initialized=\'N\' WHERE id=?', intval($data['new']['id']));
 		$app->db->query('UPDATE dns_soa SET dnssec_info=\'\', dnssec_initialized=\'N\' WHERE id=?', intval($data['new']['id']));
 	}
 
diff --git a/server/plugins-available/powerdns_plugin.inc.php b/server/plugins-available/powerdns_plugin.inc.php
index 82240f106dd157ffac5cff394752d787d94b4276..1221c3bc5658c44b5222f56a5c4d133de30dbe13 100644
--- a/server/plugins-available/powerdns_plugin.inc.php
+++ b/server/plugins-available/powerdns_plugin.inc.php
@@ -546,7 +546,7 @@ class powerdns_plugin {
 		$dnssec_info = array_merge($this->format_dnssec_pubkeys($pubkeys), 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, 'Y', intval($data['new']['id']));
 		}
 		$app->db->query('UPDATE dns_soa SET dnssec_info=?, dnssec_initialized=? WHERE id=?', $dnssec_info, 'Y', intval($data['new']['id']));