diff --git a/archive/community.applications-2022.05.15-x86_64-1.txz b/archive/community.applications-2022.05.15-x86_64-1.txz new file mode 100644 index 00000000..f365dc20 Binary files /dev/null and b/archive/community.applications-2022.05.15-x86_64-1.txz differ diff --git a/plugins/community.applications.plg b/plugins/community.applications.plg index 0ea7a023..56f513ad 100644 --- a/plugins/community.applications.plg +++ b/plugins/community.applications.plg @@ -2,8 +2,8 @@ - - + + @@ -13,6 +13,9 @@ +###2022.08.15 +- Fixed: Action centre would appear even if nothing was present if templates outside of CA's control were installed + ###2022.05.08 - Added: Action Centre - Fixed: Blacklisted Apps wouldn't appear within Installed Apps 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 4efe2746..b4c88581 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 @@ c553881600c51459abaa336c920cd923 ./Apps.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page e718d7825dbdc96a17a915079222b098 ./default.cfg -4f8579964345b5eacc82d932364b9a62 ./include/exec.php +30b69ec0b0fc6219d61f8114b3b70ad2 ./include/exec.php 1acc7a5c3489b25a895b5decac043dee ./include/helpers.php fc87642746ba4f324537bc381b78e982 ./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 4ce4e491..f9583262 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 @@ -2278,6 +2278,17 @@ function enableActionCentre() { $searchResult = searchArray($file,'Repository',explode(":",$o['Repository'])[0]); } if ( $searchResult === false ) { + $runningFlag = true; + 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 ( $searchResult === false ) { $tempPath = $o['InstallPath']; $containerID = $file[$searchResult]['ID']; $tmpOvr = $o['Overview']; @@ -2291,7 +2302,7 @@ function enableActionCentre() { $o['NoPin'] = true; # This is renamed and effectively outside of CA's control } else { $runningFlag = true; - } + } */ break; } } @@ -2358,7 +2369,6 @@ function enableActionCentre() { } } -// file_put_contents("/tmp/blah",print_r($displayed,true)); if ( isset($displayed) ) { debug("action center enabled"); postReturn(['status'=>"action"]);