From d31fcf6353675faea58bc7b966cc43fef635ac44 Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sat, 3 Dec 2022 17:47:34 -0500 Subject: [PATCH] More tom --- .../usr/local/emhttp/plugins/community.applications/ca.md5 | 4 ++-- .../emhttp/plugins/community.applications/include/exec.php | 5 +++-- .../plugins/community.applications/skins/Narrow/skin.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) 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 32c8078e..c9dae593 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 @@ 4e55f7483b661af21a25b677179baffe ./CA_notices.page 4c5d4598e1bafa46bd90c27cbe302122 ./ca_settings.page e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg -2ea430441b1f4e63a6e7eab4dd39ba9b ./include/exec.php +6b8927322c6c479d9422c4818c8c5f3e ./include/exec.php 9441e82a241d88d6cdbee4e910a5cdda ./include/helpers.php 116042a918060278e77379b0dd73482c ./include/paths.php 532fffdf939594c143e679da02bd841e ./javascript/libraries.js @@ -22,4 +22,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 25bdaed6f62ac73f9ef7c3ce0c125ef7 ./skins/Narrow/css.php 7eb021a105e2f7a15675ec8a14e6f05e ./skins/Narrow/skin.html -614f249640c329d4167a72a3f6fda0c5 ./skins/Narrow/skin.php +941350e2736b01f31f5c64a30f124e36 ./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 8548bbed..7c708ec8 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 @@ -644,7 +644,6 @@ function displayRepositories() { $templates = $temp['community']; } if ( is_file($caPaths['startupDisplayed']) ) { -// $templates = readJsonFile($caPaths['community-templates-info']); $templates = &$GLOBALS['templates']; } $templates = $templates ?: []; @@ -668,11 +667,13 @@ function displayRepositories() { $bio[$repoName]['RepositoryTemplate'] = true; $bio[$repoName]['RepoName'] = $repoName; $bio[$repoName]['SortName'] = $repoName; + $bio[$repoName] = addMissingVars($bio[$repoName]); } else { $allRepos[$repoName] = $repositories[$repoName]; $allRepos[$repoName]['RepositoryTemplate'] = true; $allRepos[$repoName]['RepoName'] = $repoName; $allRepos[$repoName]['SortName'] = $repoName; + $allRepos[$repoName] = addMissingVars($allRepos[$repoName]); } } } @@ -681,7 +682,7 @@ function displayRepositories() { $allRepos = array_merge($bio,$allRepos); if ( isset($fav) ) array_unshift($allRepos,$fav); - $file['community'] = addMissingVars($allRepos); + $file['community'] = $allRepos; writeJsonFile($caPaths['repositoriesDisplayed'],$file); } 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 bf6b0c59..f7f4dbb6 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 @@ -101,7 +101,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) if ( $template['RepositoryTemplate'] ) { $template['Icon'] = $template['icon'] ?? "/plugins/dynamix.docker.manager/images/question.png"; - if ( ! $template['bio'] ) + if ( ! isset($template['bio']) ) $template['CardDescription'] = tr("No description present"); else { $template['bio'] = strip_tags(markdown($template['bio']));