diff --git a/archive/community.applications-2024.05.12-x86_64-1.txz b/archive/community.applications-2024.05.12-x86_64-1.txz new file mode 100644 index 00000000..e2990a3a Binary files /dev/null and b/archive/community.applications-2024.05.12-x86_64-1.txz differ diff --git a/archive/community.applications-2024.06.08-x86_64-1.txz b/archive/community.applications-2024.06.08-x86_64-1.txz new file mode 100644 index 00000000..742f4ba9 Binary files /dev/null and b/archive/community.applications-2024.06.08-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 36e51f06..f4f98384 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,8 +2,8 @@ 2defe45163697e40c813a57ae9a50231 ./CA_notices.page c12622d8281346d37398e96cbb6b8b69 ./ca_settings.page 01ed7990078dee7cecfeda9a4e49377e ./default.cfg -e3301a1191f42a799769ef8266a78cf5 ./include/exec.php -cc2d19a7028adfcca362ca7fc2fefe3f ./include/helpers.php +c44760a75964777841ac685469001f98 ./include/exec.php +7f436c88f9b29ecee6bd8eb279f26e22 ./include/helpers.php 590fb8b29aba360a56dd8338b022f9e0 ./include/paths.php 7234caf6800479df03abb222aaedaca5 ./javascript/libraries.js 71f911a818d88d3d567f8a2898094ee2 ./README.md @@ -22,5 +22,5 @@ c11415ac49ba9cd6af2b5dc022aa3367 ./scripts/notices.php 7592f203dca78dce476051b85f7ca133 ./scripts/updatePluginSupport.php a84d40579c8f42498e34b15ff4e2d3b4 ./skins/Narrow/css.php f7d48fdb63e116ecc3ec49cbbf6b2dc2 ./skins/Narrow/skin.html -06cd05fd7478a8836ad519119cd0fbf1 ./skins/Narrow/skin.php +6230591d8cf47956420bd7ef6c380076 ./skins/Narrow/skin.php c26b187a50c966adff7bfb9cab6fca16 ./event/disks_mounted 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 881f0086..22627984 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 @@ -1041,7 +1041,7 @@ function force_update() { debug("old feed timestamp: ".($lastUpdatedOld['last_updated_timestamp'] ?? "")); @unlink($caPaths['lastUpdated']); $latestUpdate = download_json($caPaths['application-feed-last-updated'],$caPaths['lastUpdated'],"",5); - if ( ! $latestUpdate['last_updated_timestamp'] ?? false ) + if ( $latestUpdate === false || ! ($latestUpdate['last_updated_timestamp'] ?? false) ) $latestUpdate = download_json($caPaths['application-feed-last-updatedBackup'],$caPaths['lastUpdated'],"",5); debug("new appfeed timestamp: {$latestUpdate['last_updated_timestamp']}"); if ( ! isset($latestUpdate['last_updated_timestamp']) ) { @@ -2469,8 +2469,10 @@ function enableActionCentre() { $all_files = $all_files ?: []; foreach ($all_files as $xmlfile) { $o = readXmlFile($xmlfile); + if ( ! $o ) continue; $runningflag = false; + file_put_contents("/tmp/blah",print_r($info,true)); foreach ($info as $installedDocker) { if ( $installedDocker['Name'] == $o['Name'] ) { if ( startsWith(str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php index f8a40cfc..ea87a7ee 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php @@ -102,7 +102,7 @@ function download_url($url, $path = "", $bg = false, $timeout = 45) { } $out = curl_exec($ch); if ( curl_errno($ch) == 23 ) { - curl_setopt($ch,CURLOPT_ENCODING,"deflate"); + curl_setopt($ch,CURLOPT_ENCODING,null); $out = curl_exec($ch); } curl_close($ch); 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 ca3d20f6..a30f267a 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 @@ -170,13 +170,12 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) $template['Installed'] = $selected; if ( $selected ) { - $ind = searchArray($info,"Name",$name); if ( $info[$ind]['url'] && $info[$ind]['running'] ) { $actionsContext[] = ["icon"=>"ca_fa-globe","text"=>"WebUI","action"=>"openNewWindow('{$info[$ind]['url']}','_blank');"]; } - if ( $dockerUpdateStatus[$tmpRepo]['status'] == "false" ) { + if ( isset($dockerUpdateStatus[$tmpRepo]) && $dockerUpdateStatus[$tmpRepo]['status'] == "false" ) { $template['UpdateAvailable'] = true; $actionsContext[] = ["icon"=>"ca_fa-update","text"=>tr("Update"),"action"=>"updateDocker('$name');"]; } else {