This commit is contained in:
Squidly271 2024-02-10 09:28:06 -05:00
parent 9443c14e92
commit 58be3767dc
7 changed files with 15 additions and 9 deletions

View File

@ -2,8 +2,8 @@
<!DOCTYPE PLUGIN [
<!ENTITY name "community.applications">
<!ENTITY author "Andrew Zawadzki">
<!ENTITY version "2024.02.10">
<!ENTITY md5 "39a283d1c41c4d7b661436091273e358">
<!ENTITY version "2024.02.10a">
<!ENTITY md5 "2de05c66856e9231d62b01f7424f38a9">
<!ENTITY launch "Apps">
<!ENTITY plugdir "/usr/local/emhttp/plugins/&name;">
<!ENTITY github "Squidly271/community.applications">

View File

@ -47,6 +47,7 @@ if ( ! is_file($caPaths['docker_cfg']) ) {
}
$unRaidSettings = parse_ini_file($caPaths['unRaidVersion']);
$phpErrors = @parse_ini_file($caPaths['phpErrorSettings']);
// Check md5's of files
exec("cd /usr/local/emhttp/plugins/$plugin/ && md5sum -c ca.md5",$output,$md5Error);
@ -270,7 +271,9 @@ $(function(){
<?if ( $caPaths['localONLY'] == true ):?>
addBannerWarning("*** LOCAL FEED RUNNING - DO NOT RELEASE ***",true,true);
<?endif;?>
<?if ( boolval($phpErrors['display_errors']??false) ):?>
addBannerWarning("PHP errors displayed in Tools-PHP Settings may impact operation of Community Applications");
<?endif;?>
context.init({preventDoubleContext:false,left:false,right:false,bottom:true,above:true});
$(".maxPerPage").html(sprintf("<?tr("Results Per Page: %s")?>","<?=$cfg['maxPerPage']?>"));

View File

@ -1,10 +1,10 @@
6f7d4940e351f2eb6bec5e7d6bb7ee30 ./Apps.page
4ed3ce5dc3607ace0de03ca1c54255e0 ./Apps.page
2defe45163697e40c813a57ae9a50231 ./CA_notices.page
a3cb6f32cb9453c058563b6860f70a31 ./ca_settings.page
01ed7990078dee7cecfeda9a4e49377e ./default.cfg
b16e4ff6edd19be8d0dfd3cf99b836e7 ./include/exec.php
7c89d4fe07eeeb8b8d7cfe404a048c1b ./include/exec.php
1d21e20284741127836e4acdafff3cb1 ./include/helpers.php
da69c4eaa9879a32152dc5fc3fedbcbf ./include/paths.php
590fb8b29aba360a56dd8338b022f9e0 ./include/paths.php
7234caf6800479df03abb222aaedaca5 ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md
d6d93feb1975100b513b15b31aa20068 ./scripts/checkForUpdates.php
@ -17,7 +17,7 @@ c46be2b7d91255130fc6d963deb48a42 ./scripts/installMulti.php
5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh
b5e2ca7fef2c4aa0b0d6910187b863f9 ./scripts/notices.php
8bc9cc6c58e482b4102c233ae316254c ./scripts/pluginInstall.php
1d1271823b55034669a34cc215600643 ./scripts/showStatistics.php
b9baec24ebd9083577a045f95495bd9e ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
7592f203dca78dce476051b85f7ca133 ./scripts/updatePluginSupport.php
35f936729fc2e906254b09de74f4ed2c ./skins/Narrow/css.php

View File

@ -1565,8 +1565,10 @@ function statistics() {
if ( $template['Blacklist']??false ) $statistics['blacklist']++;
if ( ($template['Private']??false) && ! ($template['Blacklist']??false)) {
if ( ! ($caSettings['hideDeprecated'] == 'true' && ($template['Deprecated']??false)) )
if ( ! ($caSettings['hideDeprecated'] == 'true' && ($template['Deprecated']??false)) ) {
$statistics['private']++;
continue;
}
}
if ( ($template['Official']??false) && ! ($template['Blacklist']??false) )

View File

@ -93,6 +93,7 @@ $caPaths['dockerSearchInstall'] = $caPaths['tempFiles']."/docker
$caPaths['dockerSearchActive'] = $caPaths['tempFiles']."/dockerSearchActive";
$caPaths['dockerConvertFlash'] = $dockerManPaths['templates-user']."/my-CA_TEST_CONTAINER_DOCKERHUB.xml";
$caPaths['pluginPending'] = "/tmp/plugins/pluginPending/";
$caPaths['phpErrorSettings'] = "/etc/php.d/errors-php.ini";
$dynamixSettings = parse_plugin_cfg("dynamix");
$caPaths['SpotlightIcon'] = "https://github.com/Squidly271/community.applications/raw/master/webImages/spotlight_{$dynamixSettings['theme']}.png";

View File

@ -115,7 +115,7 @@ switch ($_GET['arg1']) {
$template['Repository'] = str_replace(":latest","",$template['Repository']);
$count = 0;
foreach ($templates as $searchTemplates) {
if ( $template['Language'] ) continue;
if ( $template['Language'] ?? false) continue;
if ( (str_replace(["lscr.io/","ghcr.io/"],"",$template['Repository']) == str_replace(":latest","",str_replace(["lscr.io/","ghcr.io/"],"",$searchTemplates['Repository']))) ) {
if ( $searchTemplates['BranchName'] || $searchTemplates['Blacklist'] || $searchTemplates['Deprecated']) {
continue;