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 5a15beba..9ffacb93 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 4680b0ba..de0ad9b0 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,9 +2,9 @@ 4e55f7483b661af21a25b677179baffe ./CA_notices.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page e718d7825dbdc96a17a915079222b098 ./default.cfg -774f6111b7adb6c4c5825a17fec7d57c ./include/exec.php +1838139b062f12f100847b2684a90b36 ./include/exec.php d5ba81dbd93c7b149dec96def31107e9 ./include/helpers.php -ff03c8ebd7f4acd3a664933cf6a1c20a ./include/paths.php +37de3a3070c32b3626315cdd67106f9b ./include/paths.php 532fffdf939594c143e679da02bd841e ./javascript/libraries.js 71f911a818d88d3d567f8a2898094ee2 ./README.md 79f3093f42415484944e6aa2863ee30a ./scripts/checkForUpdates.php @@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 0254b0a66007c3f6e32e7d259e8ee443 ./skins/Narrow/css.php 0bdefa4e915c02ed3310c39eb5a1cef5 ./skins/Narrow/skin.html -a076ff66153b8f8a90a5243870d79cae ./skins/Narrow/skin.php +db933417f8424e5bed789125837e0aee ./skins/Narrow/skin.php 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 f7cb9f01..5d2b0e38 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 @@ -378,6 +378,7 @@ function DownloadApplicationFeed() { writeJsonFile($caPaths['repositoryList'],$ApplicationFeed['repositories']); writeJsonFile($caPaths['extraBlacklist'],$ApplicationFeed['blacklisted']); + writeJsonFile($caPaths['extraDeprecated'],$ApplicationFeed['deprecated']); return true; } diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php index 7dea0d19..2dcbb754 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php @@ -27,6 +27,7 @@ $caPaths['appFeedDownloadError'] = $caPaths['tempFiles']."/downlo $caPaths['categoryList'] = $caPaths['tempFiles']."/categoryList.json"; $caPaths['repositoryList'] = $caPaths['tempFiles']."/repositoryList.json"; $caPaths['extraBlacklist'] = $caPaths['tempFiles']."/extraBlacklist.json"; +$caPaths['extraDeprecated'] = $caPaths['tempFiles']."/extraDeprecated.json"; $caPaths['sortOrder'] = $caPaths['tempFiles']."/sortOrder.json"; $caPaths['currentServer'] = $caPaths['tempFiles']."/currentServer.txt"; $caPaths['lastUpdated'] = $caPaths['tempFiles']."/lastUpdated.json"; diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php index 1078f677..d8774416 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php @@ -32,6 +32,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) $dockerUpdateStatus = readJsonFile($caPaths['dockerUpdateStatus']); $repositories = readJsonFile($caPaths['repositoryList']); $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")) ) { $caSettings['dockerRunning'] = "true"; @@ -90,6 +91,11 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) $template['ModeratorComment'] = $extraBlacklist[$template['Repository']]; } } + if ( ! $template['Deprecated'] && $extraDeprecated[$template['Repository']] ) { + $template['Deprecated'] = true; + $template['ModeratorComment'] = $extraDeprecated[$template['Repository']]; + } + if ( $template['RepositoryTemplate'] ) { $template['Icon'] = $template['icon'] ?: "/plugins/dynamix.docker.manager/images/question.png"; @@ -406,7 +412,8 @@ function getPopupDescriptionSkin($appNumber) { $allRepositories = readJsonFile($caPaths['repositoryList']); $extraBlacklist = readJsonFile($caPaths['extraBlacklist']); - + $extraDeprecated = readJsonFile($caPaths['extraDeprecated']); + $pinnedApps = readJsonFile($caPaths['pinnedV2']); if ( ! is_file($caPaths['statistics']) ) download_json($caPaths['statisticsURL'],$caPaths['statistics']); @@ -477,6 +484,11 @@ function getPopupDescriptionSkin($appNumber) { $template['ModeratorComment'] = $extraBlacklist[$template['Repository']]; } } + if ( ! $template['Deprecated'] && $extraDeprecated[$template['Repository']] ) { + $template['Deprecated'] = true; + $template['ModeratorComment'] = $extraDeprecated[$template['Repository']]; + } + $ID = $template['ID']; $template['Profile'] = $allRepositories[$template['RepoName']]['profile'];