From: Marcin Haba <marcin.haba@bacula.pl>
Date: Fri, 4 Oct 2019 06:31:39 +0000 (+0200)
Subject: baculum: Fix PHP error on running job status page and client status page
X-Git-Tag: Release-9.6.0~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e467eefac2f1c4fbebccb62f47b76a70bfbd9bf;p=thirdparty%2Fbacula.git

baculum: Fix PHP error on running job status page and client status page
---

diff --git a/gui/baculum/protected/Web/Pages/ClientView.php b/gui/baculum/protected/Web/Pages/ClientView.php
index bbe6a753d..2dc030432 100644
--- a/gui/baculum/protected/Web/Pages/ClientView.php
+++ b/gui/baculum/protected/Web/Pages/ClientView.php
@@ -127,7 +127,7 @@ class ClientView extends BaculumWebPage {
 
 		$query_str = '?name=' . rawurlencode($this->getClientName()) . '&type=header';
 		$graph_status = $this->getModule('api')->get(
-			array('status', 'client', $query_str),
+			array('status', 'client', $query_str)
 		);
 		$client_status = array(
 			'header' => array(),
@@ -147,7 +147,7 @@ class ClientView extends BaculumWebPage {
 
 		$query_str = '?name=' . rawurlencode($this->getClientName()) . '&type=running';
 		$graph_status = $this->getModule('api')->get(
-			array('status', 'client', $query_str),
+			array('status', 'client', $query_str)
 		);
 		if ($graph_status->error === 0) {
 			$client_status['running'] = $graph_status->output;
@@ -155,7 +155,7 @@ class ClientView extends BaculumWebPage {
 
 		$query_str = '?output=json';
 		$show = $this->getModule('api')->get(
-			array('clients', $this->getClientId(), 'show', $query_str),
+			array('clients', $this->getClientId(), 'show', $query_str)
 		);
 		if ($show->error === 0) {
 			$client_status['show'] = $show->output;
diff --git a/gui/baculum/protected/Web/Pages/JobHistoryView.php b/gui/baculum/protected/Web/Pages/JobHistoryView.php
index f0fd56f86..108346d5b 100644
--- a/gui/baculum/protected/Web/Pages/JobHistoryView.php
+++ b/gui/baculum/protected/Web/Pages/JobHistoryView.php
@@ -87,7 +87,7 @@ class JobHistoryView extends BaculumWebPage {
 	public function getRunningJobStatus($clientid) {
 		$client_name = null;
 		$client = $this->getModule('api')->get(
-			array('clients', $clientid),
+			array('clients', $clientid)
 		);
 		if ($client->error === 0) {
 			$client_name = $client->output->name;
@@ -101,7 +101,7 @@ class JobHistoryView extends BaculumWebPage {
 		if (is_string($client_name)) {
 			$query_str = '?name=' . rawurlencode($client_name) . '&type=header';
 			$graph_status = $this->getModule('api')->get(
-				array('status', 'client', $query_str),
+				array('status', 'client', $query_str)
 			);
 
 			if ($graph_status->error === 0) {
@@ -110,7 +110,7 @@ class JobHistoryView extends BaculumWebPage {
 
 			$query_str = '?name=' . rawurlencode($client_name) . '&type=running';
 			$graph_status = $this->getModule('api')->get(
-				array('status', 'client', $query_str),
+				array('status', 'client', $query_str)
 			);
 			if ($graph_status->error === 0) {
 				$jobid = $this->getJobId();