From 942f6d0fb95e99eb7aa84f726beb564e2af04ce2 Mon Sep 17 00:00:00 2001 From: Marcin Haba Date: Mon, 28 Jun 2021 21:24:15 +0200 Subject: [PATCH] =?utf8?q?baculum:=20Fix=20problem=20with=20listing=20dire?= =?utf8?q?ctories=20in=20restore=20wizard=20-=20reported=20by=20Tomasz=20?= =?utf8?q?=C5=9Awiderski?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- gui/baculum/protected/API/Class/BVFS.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/baculum/protected/API/Class/BVFS.php b/gui/baculum/protected/API/Class/BVFS.php index f991b8acb..4290b3922 100644 --- a/gui/baculum/protected/API/Class/BVFS.php +++ b/gui/baculum/protected/API/Class/BVFS.php @@ -3,7 +3,7 @@ * Bacula(R) - The Network Backup Solution * Baculum - Bacula web interface * - * Copyright (C) 2013-2019 Kern Sibbald + * Copyright (C) 2013-2021 Kern Sibbald * * The main author of Baculum is Marcin Haba. * The original author of Bacula is Kern Sibbald, with contributions @@ -30,9 +30,9 @@ */ class BVFS extends APIModule { - const DIR_PATTERN = '/^(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P[a-zA-z0-9\+\/\ ]+)\t(?P(.*\/|\.{2}))$/'; + const DIR_PATTERN = '/^(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P[a-zA-z0-9\+\-\/\ ]+)\t(?P(.*\/|\.{2}))$/'; const FILE_PATTERN = '/^(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P[a-zA-z0-9\+\-\/\ ]+)\t(?P[^\/]+)$/'; - const VERSION_PATTERN = '/^(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P[a-zA-Z0-9\+\/\ ]+)\t(?P.+)\t(?P.+)\t(?P\d+)$/'; + const VERSION_PATTERN = '/^(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P\d+)\t(?P[a-zA-Z0-9\+\-\/\ ]+)\t(?P.+)\t(?P.+)\t(?P\d+)$/'; public function parseFileDirList($list) { $elements = array(); -- 2.47.3