Rename running_on_master to running_on_masterserver

Author: helmo

server/lib/app.inc.php

@@ -360,7 +360,7 @@ function error($msg) {
 	 *
 	 * @return boolean
 	 */
-	function running_on_master() {
+	function running_on_masterserver() {
 
 		return $this->dbmaster == $this->db;
 	}

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->running_on_master()) {
+			if (!$app->running_on_masterserver()) {
 				$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/lib/classes/cron.d/200-logfiles.inc.php

@@ -226,7 +226,7 @@ public function onRunJob() {
 		// Cleanup logs in master database (only the "master-server")
 		//######################################################################################################
 
-		if ($app->running_on_master()) {
+		if ($app->running_on_masterserver()) {
 			/** 7 days */
 
 

server/lib/classes/cron.d/300-quota_notify.inc.php

@@ -75,7 +75,7 @@ public function onRunJob() {
 		// enforce traffic quota (run only on the "master-server")
 		//######################################################################################################
 
-		if ($app->running_on_master()) {
+		if ($app->running_on_masterserver()) {
 
 			$global_config = $app->getconf->get_global_config('mail');
 
@@ -159,7 +159,7 @@ public function onRunJob() {
 		// send website quota warnings by email
 		//######################################################################################################
 
-		if ($app->running_on_master()) {
+		if ($app->running_on_masterserver()) {
 
 			$global_config = $app->getconf->get_global_config('mail');
 
@@ -315,7 +315,7 @@ public function onRunJob() {
 		// send mail quota warnings by email
 		//######################################################################################################
 
-		if ($app->running_on_master()) {
+		if ($app->running_on_masterserver()) {
 
 			$global_config = $app->getconf->get_global_config('mail');
 			$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
@@ -453,7 +453,7 @@ public function onRunJob() {
 		// send database quota warnings by email
 		//######################################################################################################
 
-		if ($app->running_on_master()) {
+		if ($app->running_on_masterserver()) {
 
 			$global_config = $app->getconf->get_global_config('mail');
 

server/lib/classes/cron.d/400-openvz.inc.php

@@ -54,7 +54,7 @@ public function onRunJob() {
 		// deactivate virtual servers (run only on the "master-server")
 		//######################################################################################################
 
-		if ($app->running_on_master()) {
+		if ($app->running_on_masterserver()) {
 			//* 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);

server/lib/classes/modules.inc.php

@@ -100,7 +100,7 @@ function processDatalog() {
 		global $app, $conf;
 
 		//* If its a multiserver setup
-		if($app->running_on_slaveserver() || ($app->running_on_master() && $app->db->dbName != $app->dbmaster->dbName)) {
+		if($app->running_on_slaveserver() || ($app->running_on_masterserver() && $app->db->dbName != $app->dbmaster->dbName)) {
 			if($conf['mirror_server_id'] > 0) {
 				$sql = "SELECT * FROM sys_datalog WHERE datalog_id > ? AND (server_id = ? OR server_id = ? OR server_id = 0) ORDER BY datalog_id LIMIT 0,1000";
 			} else {