From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 27 Jun 2020 20:11:27 +0000 (+0200)
Subject: baculum: Fix configure Bacula hosts page to work with PHP 7.4
X-Git-Tag: Release-9.6.6~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0488b066d51eaa6f672902afa88bc93b397def2b;p=thirdparty%2Fbacula.git

baculum: Fix configure Bacula hosts page to work with PHP 7.4
---

diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.php b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.php
index b622cfcc6..05ba7a9a2 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.php
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.php
@@ -72,6 +72,10 @@ class BaculaConfigComponents extends ComponentListTemplate {
 	}
 
 	public function createComponentListElement($sender, $param) {
+		if (!is_array($param->Item->Data)) {
+			// skip parent repeater items
+			return;
+		}
 		$conts = array(self::MENU_CONTROL, self::ACTIONS_CONTROL);
 		for ($i = 0; $i < count($conts); $i++) {
 			$controls = array(self::CHILD_CONTROL, $conts[$i]);
diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl
index 2bf3db738..18ea121f6 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl
@@ -12,7 +12,7 @@
 							ClientSide.OnLoading="BaculaConfig.loader_start(sender.options.ID);"
 							ClientSide.OnComplete="BaculaConfig.set_config_items(sender.options.ID);"
 							Attributes.onclick="return BaculaConfig.unset_config_items(this.id);"
-							Text="<strong><%=$this->Data['label']%></strong>: <%=$this->Data['component_name']%>"
+							Text="<strong><%#$this->Data['label']%></strong>: <%#$this->Data['component_name']%>"
 							Style="text-decoration: none"
 						/>
 							<i class="fa fa-sync w3-spin" style="display: none"><i/>
diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigResources.php b/gui/baculum/protected/Web/Portlets/BaculaConfigResources.php
index b4fc2517e..91412cba1 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigResources.php
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigResources.php
@@ -75,6 +75,10 @@ class BaculaConfigResources extends ResourceListTemplate {
 	}
 
 	public function createResourceListElement($sender, $param) {
+		if (!is_array($param->Item->Data)) {
+			// skip parent repeater items
+			return;
+		}
 		$control = $this->getChildControl($param->Item, self::CHILD_CONTROL);
 		if (is_object($control)) {
 			$control->setHost($param->Item->Data['host']);
diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
index 397d1c161..f70e65145 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
@@ -18,8 +18,8 @@
 					var t = event.target || event.srcElement;
 					var nn = t.nodeName.toUpperCase();
 					var cmsg = '<%[ Are you sure that you want to remove %s resource "%s"? ]%>';
-					cmsg = cmsg.replace('%s', '<%=$this->Data['resource_type']%>');
-					cmsg = cmsg.replace('%s', '<%=$this->Data['resource_name']%>');
+					cmsg = cmsg.replace('%s', '<%#$this->Data['resource_type']%>');
+					cmsg = cmsg.replace('%s', '<%#$this->Data['resource_name']%>');
 					if ((/^<%=$this->RemoveResource->ClientID%>/.test(t.id) || nn == 'I') && confirm(cmsg)) {
 						return true;
 					}
@@ -35,7 +35,7 @@
 							ClientSide.OnLoading="BaculaConfig.loader_start(sender.options.ID);"
 							ClientSide.OnComplete="BaculaConfig.set_config_items(sender.options.ID);"
 							Attributes.onclick="return BaculaConfig.unset_config_items(this.id);"
-							Text="<strong><%=$this->Data['resource_type']%></strong>: <%=$this->Data['resource_name']%>"
+							Text="<strong><%#$this->Data['resource_type']%></strong>: <%#$this->Data['resource_name']%>"
 							Style="text-decoration: none"
 						/>
 							<i class="fa fa-sync w3-spin" style="display: none"></i>
diff --git a/gui/baculum/protected/Web/Portlets/BaculaHosts.tpl b/gui/baculum/protected/Web/Portlets/BaculaHosts.tpl
index 3857baa81..9426f065d 100644
--- a/gui/baculum/protected/Web/Portlets/BaculaHosts.tpl
+++ b/gui/baculum/protected/Web/Portlets/BaculaHosts.tpl
@@ -21,8 +21,8 @@
 						</com:TActiveLinkButton>
 							<i class="fa fa-sync w3-spin" style="display: none"><i/>
 						</td>
-						<td style="width: 45%"><%[ IP Address/Hostname: ]%><strong> <%=$this->getParent()->getParent()->config[$this->Data]['address']%></strong></td>
-						<td style="width: 10%"><%[ Port: ]%><strong> <%=$this->getParent()->getParent()->config[$this->Data]['port']%></strong>
+						<td style="width: 45%"><%[ IP Address/Hostname: ]%><strong> <%#$this->getParent()->getParent()->config[$this->Data]['address']%></strong></td>
+						<td style="width: 10%"><%[ Port: ]%><strong> <%#$this->getParent()->getParent()->config[$this->Data]['port']%></strong>
 						</td>
 						<td style="width: 15%"><com:TActiveLinkButton
 							ID="RemoveHost"
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveMessages.php b/gui/baculum/protected/Web/Portlets/DirectiveMessages.php
index 01c145f5c..73ee332f3 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveMessages.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveMessages.php
@@ -177,6 +177,10 @@ class DirectiveMessages extends DirectiveListTemplate {
 	}
 
 	public function createDirectiveListElement($sender, $param) {
+		if (!is_array($param->Item->Data)) {
+			// skip parent repeater items
+			return;
+		}
 		for ($i = 0; $i < count($this->directive_types); $i++) {
 			$control = $this->getChildControl($param->Item, $this->directive_types[$i]);
 			if (is_object($control)) {
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveMessages.tpl b/gui/baculum/protected/Web/Portlets/DirectiveMessages.tpl
index b0158f2e5..fbb39cff8 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveMessages.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveMessages.tpl
@@ -12,7 +12,7 @@
 			>
 				<i class="fa fa-trash-alt"></i> &nbsp;<%[ Remove ]%>
 			</com:TActiveLinkButton>
-			<h2><%=$this->Data['directive_name']%></h2>
+			<h2><%#$this->Data['directive_name']%></h2>
 			<com:Application.Web.Portlets.DirectiveTextBox />
 			<com:Application.Web.Portlets.MessageTypes ID="Types" />
 		</div>
diff --git a/gui/baculum/protected/Web/Portlets/MessageTypes.php b/gui/baculum/protected/Web/Portlets/MessageTypes.php
index eb7951869..017b65241 100644
--- a/gui/baculum/protected/Web/Portlets/MessageTypes.php
+++ b/gui/baculum/protected/Web/Portlets/MessageTypes.php
@@ -58,6 +58,10 @@ class MessageTypes extends DirectiveListTemplate {
 	}
 
 	public function createTypeListElement($sender, $param) {
+		if (!is_array($param->Item->Data)) {
+			// skip parent repeater items
+			return;
+		}
 		$control = $this->getChildControl($param->Item, 'DirectiveCheckBox');
 		if (is_object($control)) {
 			$control->setHost($param->Item->Data['host']);