diff --git a/archive/community.applications-2022.04.19-x86_64-1.txz b/archive/community.applications-2022.04.19-x86_64-1.txz index 37b5c235..496c9f9d 100644 Binary files a/archive/community.applications-2022.04.19-x86_64-1.txz and b/archive/community.applications-2022.04.19-x86_64-1.txz differ diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 index 67ace301..2b3964ad 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 @@ -2,7 +2,7 @@ 4e55f7483b661af21a25b677179baffe ./CA_notices.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page e718d7825dbdc96a17a915079222b098 ./default.cfg -592e877e6bce65502e4df515466f7e74 ./include/exec.php +8cc4f4ed87800d8249b35309fdeec2c0 ./include/exec.php d5ba81dbd93c7b149dec96def31107e9 ./include/helpers.php 37de3a3070c32b3626315cdd67106f9b ./include/paths.php 532fffdf939594c143e679da02bd841e ./javascript/libraries.js diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php index 5d2a2c7c..a1afda4a 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php @@ -998,6 +998,8 @@ function previous_apps() { @unlink($caPaths['dockerSearchActive']); $file = readJsonFile($caPaths['community-templates-info']); + $extraBlacklist = readJsonFile($caPaths['extraBlacklist']); + $extraDeprecated = readJsonFile($caPaths['extraDeprecated']); if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) { $dockerUpdateStatus = readJsonFile($caPaths['dockerUpdateStatus']); @@ -1062,7 +1064,18 @@ function previous_apps() { if ( $dockerUpdateStatus[$tmpRepo]['status'] == "false" ) $o['UpdateAvailable'] = true; - + + if ( ! $o['Blacklist'] && ! $o['Deprecated'] ) { + if ( $extraBlacklist[$o['Repository']] ) { + $o['Blacklist'] = true; + $o['ModeratorComment'] = $extraBlacklist[$o['Repository']]; + } + if ( $extraDeprecated[$o['Repository']] ) { + $o['Deprecated'] = true; + $o['ModeratorComment'] = $extraDeprecated[$o['Deprecated']]; + } + } + if ( !$o['Blacklist'] && !$o['Deprecated'] && !$o['UpdateAvailable'] ) continue; }