diff --git a/src/include/ABHelper.php b/src/include/ABHelper.php index cd37ad3..0cda25a 100644 --- a/src/include/ABHelper.php +++ b/src/include/ABHelper.php @@ -499,7 +499,7 @@ public static function abortRequested() { * @param $container * @return array */ - public static function getContainerVolumes($container) { + public static function getContainerVolumes($container, $skipExclusionCheck = false) { global $abSettings; $volumes = []; @@ -510,11 +510,13 @@ public static function getContainerVolumes($container) { continue; } - $containerSettings = $abSettings->getContainerSpecificSettings($container['Name']); + if (!$skipExclusionCheck) { + $containerSettings = $abSettings->getContainerSpecificSettings($container['Name']); - if (in_array($hostPath, $containerSettings['exclude'])) { - self::backupLog("Ignoring '$hostPath' because its listed in containers exclusions list!", self::LOGLEVEL_DEBUG); - continue; + if (in_array($hostPath, $containerSettings['exclude'])) { + self::backupLog("Ignoring '$hostPath' because its listed in containers exclusions list!", self::LOGLEVEL_DEBUG); + continue; + } } if (!file_exists($hostPath)) { diff --git a/src/pages/content/settings.php b/src/pages/content/settings.php index ee7cb5e..208cbca 100644 --- a/src/pages/content/settings.php +++ b/src/pages/content/settings.php @@ -575,20 +575,20 @@ class="fa fa-clock-o title">Notifications and scheduling } $image = empty($container['Icon']) ? '/plugins/dynamix.docker.manager/images/question.png' : $container['Icon']; - $volumes = ABHelper::getContainerVolumes($container); + $volumes = ABHelper::getContainerVolumes($container, true); + $containerSetting = $abSettings->getContainerSpecificSettings($container['Name'], false); + $realContainerSetting = print_r($abSettings->getContainerSpecificSettings($container['Name']), true); if (empty($volumes)) { $volumes = "No volumes - container will NOT being backed up!"; } else { foreach ($volumes as $index => $volume) { - $volumes[$index] = ' ' . $volume . ''; + $excluded = in_array($volume, $containerSetting['exclude']) ? ' - EXCLUDED! ' : ''; + $volumes[$index] = ' ' . $volume . '' . $excluded . ''; } $volumes = implode('
', $volumes); } - $containerSetting = $abSettings->getContainerSpecificSettings($container['Name'], false); - $realContainerSetting = print_r($abSettings->getContainerSpecificSettings($container['Name']), true); - $containerExcludes = implode("\r\n", $containerSetting['exclude']); echo <<