diff --git a/archive/community.applications-2023.11.28-x86_64-1.txz b/archive/community.applications-2023.11.28-x86_64-1.txz new file mode 100644 index 00000000..eca6f99a Binary files /dev/null and b/archive/community.applications-2023.11.28-x86_64-1.txz differ diff --git a/plugins/community.applications.plg b/plugins/community.applications.plg index 7be0e741..9769a75c 100644 --- a/plugins/community.applications.plg +++ b/plugins/community.applications.plg @@ -2,8 +2,8 @@ - - + + @@ -13,6 +13,9 @@ +###2023.11.28 +- Fixed: Don't allow donation links for Official containers + ###2023.11.25 - Changed: Minimum requirements for Community Applications now 6.12.0 - Added: On feed download failure check date and time of server. If obviously wrong, display message stating to check date and time as this will preclude being able to successfully download the application feed 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 0382b13b..4af4cd92 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 @@ e23a1f42a98de86535c5c42c243a8893 ./Apps.page 0987a65d249dbec3267b0f4a02aa975a ./CA_notices.page 2c2a1b7d148fe51ee38813d1a0e71589 ./ca_settings.page 01ed7990078dee7cecfeda9a4e49377e ./default.cfg -0727e7d8314b167a751bb66a93e714ee ./include/exec.php +db2ed1db19cfe74d2c34f31af8e49099 ./include/exec.php 2549b355dfb0f77efa1235cad798cff4 ./include/helpers.php 343e1d26129551fc142b09b5d6e10503 ./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 168060fc..a89745d0 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 @@ -327,11 +327,15 @@ function DownloadApplicationFeed() { $o['Category'] = str_replace("Status:Stable","",$o['Category']); $myTemplates[$i] = $o; - if ( ! $o['DonateText'] && ($ApplicationFeed['repositories'][$o['RepoName']]['DonateText'] ?? false) ) - $o['DonateText'] = $ApplicationFeed['repositories'][$o['RepoName']]['DonateText']; - if ( ! $o['DonateLink'] && ($ApplicationFeed['repositories'][$o['RepoName']]['DonateLink'] ?? false) ) - $o['DonateLink'] = $ApplicationFeed['repositories'][$o['RepoName']]['DonateLink']; - + if ( ! $o['Official'] ) { + if ( ! $o['DonateText'] && ($ApplicationFeed['repositories'][$o['RepoName']]['DonateText'] ?? false) ) + $o['DonateText'] = $ApplicationFeed['repositories'][$o['RepoName']]['DonateText']; + if ( ! $o['DonateLink'] && ($ApplicationFeed['repositories'][$o['RepoName']]['DonateLink'] ?? false) ) + $o['DonateLink'] = $ApplicationFeed['repositories'][$o['RepoName']]['DonateLink']; + } else { + $o['DonateText'] = $o['OfficialDonateText'] ?? null; + $o['DonateLink'] = $o['OfficialDonateLink'] ?? null; + } $ApplicationFeed['repositories'][$o['RepoName']]['downloads'] = $ApplicationFeed['repositories'][$o['RepoName']]['downloads'] ?? 0; $ApplicationFeed['repositories'][$o['RepoName']]['trending'] = $ApplicationFeed['repositories'][$o['RepoName']]['trending'] ?? 0;