mirrors
/
community.applications
mirror of https://github.com/Squidly271/community.applications.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

action centre not picking up deprecated / blacklist outside of CA control

pull/11/head
Squidly271 2022-04-19 15:11:34 -04:00
parent 486534b8f5
commit d486c60211
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2022.04.19-x86_64-1.txz
View File

Binary file not shown.

2
source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5
View File

@ -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

15
source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
View File

@ -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;
}