diff --git a/archive/community.applications-2022.05.17-x86_64-1.txz b/archive/community.applications-2022.05.17-x86_64-1.txz new file mode 100644 index 00000000..e5684a2c Binary files /dev/null and b/archive/community.applications-2022.05.17-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 b4c88581..e299aace 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 @@ c553881600c51459abaa336c920cd923 ./Apps.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page e718d7825dbdc96a17a915079222b098 ./default.cfg -30b69ec0b0fc6219d61f8114b3b70ad2 ./include/exec.php -1acc7a5c3489b25a895b5decac043dee ./include/helpers.php +084221f469c97f34ed4e8576730ead78 ./include/exec.php +fb690feab69575af4da39d58a9e51340 ./include/helpers.php fc87642746ba4f324537bc381b78e982 ./include/paths.php 532fffdf939594c143e679da02bd841e ./javascript/libraries.js 71f911a818d88d3d567f8a2898094ee2 ./README.md @@ -12,7 +12,7 @@ fc87642746ba4f324537bc381b78e982 ./include/paths.php 07684bde8ccd13523f62c69bb492fc27 ./scripts/installMulti.php be74e770cdc8938200fc29580be4e3a1 ./scripts/installMultiPlugin.php 524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh -afa5771f344d0600a7b3bbc40bd32d29 ./scripts/installUpdate.php +25b6119a7ce9330fe8a16f4eb969512d ./scripts/installUpdate.php 5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh 76d678b918109e2d7dad6c17c7a80881 ./scripts/notices.php a1401a0bed89c182b69f0c7508282c1f ./scripts/pluginInstall.php @@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php ce8e45452d3b63b5943b6f39c817bbf9 ./skins/Narrow/css.php c4d6ce8de3baff1c9de2b7f348b2f340 ./skins/Narrow/skin.html -49c6b9e4f5fab4c4ce299b8c65d56a15 ./skins/Narrow/skin.php +3ee5f4855b7eacfdcc9cf107d0af2428 ./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 f9583262..5b1363fc 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 @@ -2259,12 +2259,12 @@ function enableActionCentre() { $all_files = $all_files ?: array(); foreach ($all_files as $xmlfile) { $o = readXmlFile($xmlfile); - $o['Overview'] = fixDescription($o['Overview']); +/* $o['Overview'] = fixDescription($o['Overview']); $o['Description'] = $o['Overview']; $o['CardDescription'] = $o['Overview']; $o['InstallPath'] = $xmlfile; $o['UnknownCompatible'] = true; - $containerID = false; + $containerID = false; */ $runningflag = false; foreach ($info as $installedDocker) { @@ -2281,11 +2281,11 @@ function enableActionCentre() { $runningFlag = true; if ( $extraBlacklist[$o['Repository']] ) { $o['Blacklist'] = true; - $o['ModeratorComment'] = $extraBlacklist[$o['Repository']]; +// $o['ModeratorComment'] = $extraBlacklist[$o['Repository']]; } if ( $extraDeprecated[$o['Repository']] ) { $o['Deprecated'] = true; - $o['ModeratorComment'] = $extraDeprecated[$o['Deprecated']]; +// $o['ModeratorComment'] = $extraDeprecated[$o['Deprecated']]; } } /* if ( $searchResult === false ) { @@ -2308,9 +2308,9 @@ function enableActionCentre() { } } if ( $runningflag ) { - $o['Uninstall'] = true; +/* $o['Uninstall'] = true; $o['ID'] = $containerID; - + */ $tmpRepo = strpos($o['Repository'],":") ? $o['Repository'] : $o['Repository'].":latest"; if ( $dockerUpdateStatus[$tmpRepo]['status'] == "false" ) @@ -2319,11 +2319,11 @@ function enableActionCentre() { if ( ! $o['Blacklist'] && ! $o['Deprecated'] ) { if ( $extraBlacklist[$o['Repository']] ) { $o['Blacklist'] = true; - $o['ModeratorComment'] = $extraBlacklist[$o['Repository']]; +// $o['ModeratorComment'] = $extraBlacklist[$o['Repository']]; } if ( $extraDeprecated[$o['Repository']] ) { $o['Deprecated'] = true; - $o['ModeratorComment'] = $extraDeprecated[$o['Deprecated']]; +// $o['ModeratorComment'] = $extraDeprecated[$o['Deprecated']]; } } @@ -2331,6 +2331,7 @@ function enableActionCentre() { continue; $displayed[] = $o; + break; } } } @@ -2353,6 +2354,7 @@ function enableActionCentre() { if ( !$template['Blacklist'] && !$template['Deprecated'] && !$template['actionCentre'] ) continue; $displayed[] = $template; + break; } } $installedLanguages = array_diff(scandir($caPaths['languageInstalled']),array(".","..","en_US")); @@ -2366,6 +2368,7 @@ function enableActionCentre() { continue; $displayed[] = $tmpL; + break; } } 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 27290342..02a65e3d 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 @@ -77,8 +77,8 @@ function download_url($url, $path = "", $bg = false, $timeout = 45) { curl_setopt($ch,CURLOPT_TIMEOUT,$timeout); curl_setopt($ch,CURLOPT_ENCODING,""); curl_setopt($ch,CURLOPT_RETURNTRANSFER,true); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($ch, CURLOPT_FAILONERROR,true); + curl_setopt($ch,CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch,CURLOPT_FAILONERROR,true); if ( is_file("/boot/config/plugins/community.applications/proxy.cfg") ) { $proxyCFG = parse_ini_file("/boot/config/plugins/community.applications/proxy.cfg"); @@ -148,8 +148,6 @@ function last_str_replace($haystack, $needle, $replace) { function mySort($a, $b) { global $sortOrder; - debug("sort order: {$sortOrder['sortBy']}"); - if ( $sortOrder['sortBy'] == "Name" ) $sortOrder['sortBy'] = "SortName"; if ( $sortOrder['sortBy'] != "downloads" && $sortOrder['sortBy'] != "trendDelta") { diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installUpdate.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installUpdate.php index c45490a3..fab78002 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installUpdate.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installUpdate.php @@ -26,4 +26,5 @@ $_GET['mute'] = false; 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 0c90ba07..661ef473 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 @@ -377,7 +377,7 @@ function getPageNavigation($pageNumber,$totalApps,$dockerSearch,$displayCount = if ($startingPage < 3 ) $startingPage = 1; else - $o .= "1"; + $o .= "1"; $endingPage = $pageNumber + 5; if ( $endingPage > $totalPages ) @@ -388,7 +388,7 @@ function getPageNavigation($pageNumber,$totalApps,$dockerSearch,$displayCount = if ( $endingPage != $totalPages) { if ( ($totalPages - $pageNumber ) > 6) - $o .= ""; + $o .= ""; if ( ($totalPages - $pageNumber ) >5 ) $o .= "$totalPages";