From: Marcin Haba <marcin.haba@bacula.pl>
Date: Fri, 3 Feb 2023 09:46:30 +0000 (+0100)
Subject: baculum: Make show command output parser more accurate
X-Git-Tag: Release-13.0.3~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d0b97c2957ffa4dd89e8e53eb8cbaf53a6ad7b7;p=thirdparty%2Fbacula.git

baculum: Make show command output parser more accurate
---

diff --git a/gui/baculum/protected/API/Modules/ConsoleOutputShowPage.php b/gui/baculum/protected/API/Modules/ConsoleOutputShowPage.php
index fe2526d6f..a7e280568 100644
--- a/gui/baculum/protected/API/Modules/ConsoleOutputShowPage.php
+++ b/gui/baculum/protected/API/Modules/ConsoleOutputShowPage.php
@@ -40,6 +40,11 @@ abstract class ConsoleOutputShowPage extends ConsoleOutputPage {
 	protected function parseOutput(array $output) {
 		$ret = [];
 		for ($i = 0; $i < count($output); $i++) {
+			$acount = preg_match('/^\s+-->\s+(\w+):\s+name=(.+?)(?=\s+\w+=.+|$)/i', $output[$i], $match);
+			if ($acount === 1) {
+				$key = strtolower($match[1]);
+				$ret[$key] = $match[2];
+			}
 			$mcount = preg_match_all('/(?<=\s)\w+=.+?(?=\s+\w+=.+|$)/i', $output[$i], $matches);
 			if ($mcount === 0) {
 				continue;