diff --git a/archive/community.applications-2024.01.14-x86_64-1.txz b/archive/community.applications-2024.01.14-x86_64-1.txz new file mode 100644 index 00000000..3e22cc64 Binary files /dev/null and b/archive/community.applications-2024.01.14-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 70085e0a..94fed6e0 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 @@ 2defe45163697e40c813a57ae9a50231 ./CA_notices.page fc664dd4cf65ab02d828a5ae76f263ac ./ca_settings.page 01ed7990078dee7cecfeda9a4e49377e ./default.cfg -08612fbd2095dcf84d451416e6f409a3 ./include/exec.php +78c8c71467756add9d5d7678bae6aa11 ./include/exec.php bff4d4568073244b2ae9a0cad219f392 ./include/helpers.php 024499c59dcea65a8cf1f224e2bd36e7 ./include/paths.php 7234caf6800479df03abb222aaedaca5 ./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 87f224d5..121e0a62 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 @@ -1170,10 +1170,8 @@ function previous_apps() { $runningflag = false; foreach ($info as $installedDocker) { - $installedImage = str_replace("library/","",$installedDocker['Image']); // most apps reference short eg: mysql instead of library/mysql but docker always reports library/... - $installedName = $installedDocker['Name']; - if ( $installedName == $o['Name'] ) { - if ( startsWith($installedImage, $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { + if ( $$installedDocker['Name'] == $o['Name'] ) { + if ( startsWith(str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { $runningflag = true; $searchResult = searchArray($file,'Repository',$o['Repository']); if ( $searchResult === false) { @@ -1248,10 +1246,8 @@ function previous_apps() { $flag = false; foreach ($info as $installedDocker) { - $installedImage = str_replace("library/","",$installedDocker['Image']); // most apps reference short eg: mysql instead of library/mysql but docker always reports library/... - $installedName = $installedDocker['Name']; - if ( startsWith($installedImage, $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { - if ( $installedName == $o['Name'] ) { + if ( startsWith($str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { + if ( $$installedDocker['Name'] == $o['Name'] ) { $flag = true; continue; } @@ -2415,18 +2411,14 @@ function enableActionCentre() { $runningflag = false; foreach ($info as $installedDocker) { - $installedImage = str_replace("library/","",$installedDocker['Image']); - $installedName = $installedDocker['Name']; - if ( $installedName == $o['Name'] ) { - if ( startsWith($installedImage, $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { + if ( $installedDocker['Name'] == $o['Name'] ) { + if ( startsWith($str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { $runningflag = true; $searchResult = searchArray($file,'Repository',$o['Repository']); if ( $searchResult === false) { $searchResult = searchArray($file,'Repository',explode(":",$o['Repository'])[0]); } - if ( $searchResult !== false ) - $o = $file[$searchResult]; - + if ( $searchResult === false ) { $runningFlag = true; if ( $extraBlacklist[$o['Repository']] ?? false ) {