Squidly271/community.applications
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unraid version could be wrong in debugging

Browse Source
This commit is contained in:
Squidly271 2022-12-07 05:45:57 -05:00
parent f193dd545d
commit 6164ecd3d7
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2022.12.07-x86_64-1.txz Normal file
View File

Binary file not shown.

1
source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page
View File

@ -17,6 +17,7 @@ $plugin = "community.applications";
$cfg = parse_plugin_cfg($plugin); $cfg = parse_plugin_cfg($plugin);
$cfg['dockerSearch'] = "yes"; $cfg['dockerSearch'] = "yes";
$cfg['unRaidVersion'] = $var['version'];
$caSettings = $cfg; $caSettings = $cfg;
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php"; require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";

6
source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5
View File

@ -1,8 +1,8 @@
bbfb490b1b8b411551c175e6de15bceb ./Apps.page 253bc8277a96c67716a1376e047570ef ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page
4c5d4598e1bafa46bd90c27cbe302122 ./ca_settings.page 4c5d4598e1bafa46bd90c27cbe302122 ./ca_settings.page
e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
29f110f50c87f9e8285aca289bce6e57 ./include/exec.php 760c68135855d31e82e59667242fec6c ./include/exec.php
e63cfb7150febb21ac4e04b783d36c24 ./include/helpers.php e63cfb7150febb21ac4e04b783d36c24 ./include/helpers.php
116042a918060278e77379b0dd73482c ./include/paths.php 116042a918060278e77379b0dd73482c ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js 532fffdf939594c143e679da02bd841e ./javascript/libraries.js
@ -22,4 +22,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
25bdaed6f62ac73f9ef7c3ce0c125ef7 ./skins/Narrow/css.php 25bdaed6f62ac73f9ef7c3ce0c125ef7 ./skins/Narrow/css.php
7eb021a105e2f7a15675ec8a14e6f05e ./skins/Narrow/skin.html 7eb021a105e2f7a15675ec8a14e6f05e ./skins/Narrow/skin.html
f5a56fc6208d45d75069aafe734596f0 ./skins/Narrow/skin.php e1d3af6149e614fd83b15fb3e803059d ./skins/Narrow/skin.php

10
source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
View File

@ -240,7 +240,7 @@ function DownloadApplicationFeed() {
$invalidXML[] = $o; $invalidXML[] = $o;
continue; continue;
} }
$o = addMissingVars($o); $o = $o;
if ( $o['CategoryList'] ) { if ( $o['CategoryList'] ) {
foreach ($o['CategoryList'] as $cat) { foreach ($o['CategoryList'] as $cat) {
@ -470,7 +470,7 @@ function getConvertedTemplates() {
$privateTemplates = glob($caPaths['convertedTemplates']."*/*.xml"); $privateTemplates = glob($caPaths['convertedTemplates']."*/*.xml");
foreach ($privateTemplates as $template) { foreach ($privateTemplates as $template) {
$o = addMissingVars(readXmlFile($template)); $o = readXmlFile($template);
if ( ! $o['Repository'] ) continue; if ( ! $o['Repository'] ) continue;
@ -655,13 +655,13 @@ function displayRepositories() {
$bio[$repoName]['RepositoryTemplate'] = true; $bio[$repoName]['RepositoryTemplate'] = true;
$bio[$repoName]['RepoName'] = $repoName; $bio[$repoName]['RepoName'] = $repoName;
$bio[$repoName]['SortName'] = $repoName; $bio[$repoName]['SortName'] = $repoName;
$bio[$repoName] = addMissingVars($bio[$repoName]); $bio[$repoName] = $bio[$repoName];
} else { } else {
$allRepos[$repoName] = $repositories[$repoName]; $allRepos[$repoName] = $repositories[$repoName];
$allRepos[$repoName]['RepositoryTemplate'] = true; $allRepos[$repoName]['RepositoryTemplate'] = true;
$allRepos[$repoName]['RepoName'] = $repoName; $allRepos[$repoName]['RepoName'] = $repoName;
$allRepos[$repoName]['SortName'] = $repoName; $allRepos[$repoName]['SortName'] = $repoName;
$allRepos[$repoName] = addMissingVars($allRepos[$repoName]); $allRepos[$repoName] = $allRepos[$repoName];
} }
} }
} }
@ -2244,7 +2244,7 @@ function search_dockerhub() {
$searchName = str_replace("docker-","",$o['Name']); $searchName = str_replace("docker-","",$o['Name']);
$searchName = str_replace("-docker","",$searchName); $searchName = str_replace("-docker","",$searchName);
$dockerResults[$i] = addMissingVars($o); $dockerResults[$i] = $o;
$i=++$i; $i=++$i;
} }
$dockerFile['num_pages'] = $num_pages; $dockerFile['num_pages'] = $num_pages;

4
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php
View File

@ -86,6 +86,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
# Create entries for skins. # Create entries for skins.
foreach ($displayedTemplates as $template) { foreach ($displayedTemplates as $template) {
$template = addMissingVars($template);
if ( ! $template['RepositoryTemplate'] ) { if ( ! $template['RepositoryTemplate'] ) {
if ( ! $template['Blacklist'] ) { if ( ! $template['Blacklist'] ) {
if ( isset($extraBlacklist[$template['Repository']]) ) { if ( isset($extraBlacklist[$template['Repository']]) ) {
@ -517,7 +518,7 @@ function getPopupDescriptionSkin($appNumber) {
$template = $file[$index]; $template = $file[$index];
} }
$currentServer = file_get_contents($caPaths['currentServer']); $currentServer = file_get_contents($caPaths['currentServer']);
$template = addMissingVars($template);
if ( ! $template['Blacklist'] ) { if ( ! $template['Blacklist'] ) {
if ( isset($extraBlacklist[$template['Repository']]) ) { if ( isset($extraBlacklist[$template['Repository']]) ) {
$template['Blacklist'] = true; $template['Blacklist'] = true;
@ -856,6 +857,7 @@ function getRepoDescriptionSkin($repository) {
$totalApps = $totalLanguage = $totalPlugins = $totalDocker = $totalDownloads = $downloadDockerCount = 0; $totalApps = $totalLanguage = $totalPlugins = $totalDocker = $totalDownloads = $downloadDockerCount = 0;
foreach ($templates as $template) { foreach ($templates as $template) {
$template = addMissingVars($template);
if ( $template['RepoName'] !== $repository ) continue; if ( $template['RepoName'] !== $repository ) continue;
if ( isset($template['BranchID']) ) continue; if ( isset($template['BranchID']) ) continue;