diff --git a/archive/community.applications-2022.05.07-x86_64-1.txz b/archive/community.applications-2022.05.07-x86_64-1.txz new file mode 100644 index 00000000..75e5f47d Binary files /dev/null and b/archive/community.applications-2022.05.07-x86_64-1.txz differ diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page index a19cedb2..ceff9a7b 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page @@ -98,7 +98,7 @@ $dockerSearchActive = is_file($caPaths['dockerSearchActive']); exec("mkdir -p {$caPaths['tempFiles']}"); if ( ($cfg['updateCheck'] == "yes") && ( (time() - @filemtime($caPaths['updateTime']) ) > 3600 ) ) { touch($caPaths['updateTime']); - exec("echo '/usr/local/emhttp/plugins/community.applications/scripts/checkForUpdates.php >/dev/null 2>&1' | at now >/dev/null"); + exec("echo '/usr/local/emhttp/plugins/community.applications/scripts/checkForUpdates.php >/dev/null 2>&1' | at now -M >/dev/null"); } if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) { @@ -750,16 +750,7 @@ $(function(){ }); } - // set up action centre - run in background without tying anything up - $.post("/plugins/=$plugin?>/include/exec.php",{action:'enableActionCentre'},function(data) { - console.log("Action Centre"); - console.log(data); - var ret = JSON.parse(data); - if ( ret.status == "action" ) - $(".actionCentre").show(); - else - $(".actionCentre").hide(); - }); + setupActionCentre(); } }); @@ -1330,6 +1321,7 @@ function uninstallApp(application,humanName) { function postUninstallPlugin() { enableSearch(); $(".selectedMenu").trigger("click"); + setupActionCentre(); /* if ( $(".selectedMenu").data("category") == "action_centre" ) { actionCentre(); } else { @@ -2770,6 +2762,17 @@ function getPerPageOpts(value) { return maxPerPageOpts; } + +function setupActionCentre() { + // set up action centre - run in background without tying anything up + $.post("/plugins/=$plugin?>/include/exec.php",{action:'enableActionCentre'},function(data) { + var ret = JSON.parse(data); + if ( ret.status == "action" ) + $(".actionCentre").show(); + else + $(".actionCentre").hide(); + }); +} 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 1700dbd3..32dc5592 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 @@ -1,8 +1,8 @@ -0a73f51e10e69d62605e86966f1c3677 ./Apps.page +5be3aa6e039b55c585b9364c09a72a99 ./Apps.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page e718d7825dbdc96a17a915079222b098 ./default.cfg -7930be47328560e57c25b81b417eb315 ./include/exec.php +ac88336a82f361a128b5dd7e43237072 ./include/exec.php d5ba81dbd93c7b149dec96def31107e9 ./include/helpers.php fc87642746ba4f324537bc381b78e982 ./include/paths.php 532fffdf939594c143e679da02bd841e ./javascript/libraries.js @@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php ce8e45452d3b63b5943b6f39c817bbf9 ./skins/Narrow/css.php c4d6ce8de3baff1c9de2b7f348b2f340 ./skins/Narrow/skin.html -444485f96e18f42d42612efd4ba5066e ./skins/Narrow/skin.php +07b1886782ee6418f82e0724d6ba8f6f ./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 adf0a178..d6afc2db 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 @@ -956,7 +956,6 @@ function display_content() { $pageNumber = getPost("pageNumber","1"); $startup = getPost("startup",false); $selectedApps = json_decode(getPost("selected",false),true); - $o['display'] = ""; if ( file_exists($caPaths['community-templates-displayed']) || file_exists($caPaths['repositoriesDisplayed']) ) { $o['display'] = "