This commit is contained in:
Squidly271 2022-12-03 09:40:04 -05:00
parent a625afef6f
commit b5fdde49c8
6 changed files with 9 additions and 21 deletions

Binary file not shown.

View File

@ -5,7 +5,6 @@ Tabs="true"
Code="f0db" Code="f0db"
--- ---
<? <?
error_reporting(E_ALL);
############################################################### ###############################################################
# # # #
# Community Applications copyright 2015-2022, Andrew Zawadzki # # Community Applications copyright 2015-2022, Andrew Zawadzki #

View File

@ -1,8 +1,8 @@
429ac013f77b536a5fed42665792c9aa ./Apps.page 55b88a5b18fb009fa94bf27e0504dd20 ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page
4c5d4598e1bafa46bd90c27cbe302122 ./ca_settings.page 4c5d4598e1bafa46bd90c27cbe302122 ./ca_settings.page
e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
505b0ebade8543bcec94e40a638965a7 ./include/exec.php 69ab8fcb35d59d712aed59b50932efeb ./include/exec.php
2f4e1cd95fd00cc9bfe47514a4fe2212 ./include/helpers.php 2f4e1cd95fd00cc9bfe47514a4fe2212 ./include/helpers.php
116042a918060278e77379b0dd73482c ./include/paths.php 116042a918060278e77379b0dd73482c ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js 532fffdf939594c143e679da02bd841e ./javascript/libraries.js
@ -10,7 +10,7 @@ e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
ebb6450725d05c53116c3c996b6abac1 ./scripts/checkForUpdates.php ebb6450725d05c53116c3c996b6abac1 ./scripts/checkForUpdates.php
99a9d58a49a7f6812f18bd4be2b563b9 ./scripts/checkForUpdates.sh 99a9d58a49a7f6812f18bd4be2b563b9 ./scripts/checkForUpdates.sh
677ac9a29993ec57e09ec6a1856f1a11 ./scripts/dockerConvert.php 677ac9a29993ec57e09ec6a1856f1a11 ./scripts/dockerConvert.php
fd90eddf802e73550e891d474e556561 ./scripts/installMulti.php 8eb6e62a41113a3bff297bb930d66139 ./scripts/installMulti.php
e54e7ec1cbc312c11900977181b71380 ./scripts/installMultiPlugin.php e54e7ec1cbc312c11900977181b71380 ./scripts/installMultiPlugin.php
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh 524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
25b6119a7ce9330fe8a16f4eb969512d ./scripts/installUpdate.php 25b6119a7ce9330fe8a16f4eb969512d ./scripts/installUpdate.php
@ -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
8899126b72149ff7064cab07f790290b ./skins/Narrow/skin.php dccf3c2eed22091d749bbf7f2e33a791 ./skins/Narrow/skin.php

View File

@ -6,9 +6,6 @@
# # # #
############################################################### ###############################################################
error_reporting(E_ALL);
ini_set('error_reporting', E_ALL);
$unRaidSettings = parse_ini_file("/etc/unraid-version"); $unRaidSettings = parse_ini_file("/etc/unraid-version");
### Translations section has to be first so that nothing else winds up caching the file(s) ### Translations section has to be first so that nothing else winds up caching the file(s)

View File

@ -41,7 +41,7 @@ $javascript = file_get_contents("/usr/local/emhttp/plugins/dynamix/javascript/dy
echo "<script>$javascript</script>"; echo "<script>$javascript</script>";
if ( $_GET['docker'] ) { if ( $_GET['docker'] ) {
/* echo "<div id='output'>"; echo "<div id='output'>";
$dockers = explode(",",$_GET['docker']); $dockers = explode(",",$_GET['docker']);
echo sprintf(tr("Installing docker applications %s"),str_replace(",",", ",$_GET['docker']))."<br>"; echo sprintf(tr("Installing docker applications %s"),str_replace(",",", ",$_GET['docker']))."<br>";
$_GET['updateContainer'] = true; $_GET['updateContainer'] = true;
@ -49,17 +49,7 @@ if ( $_GET['docker'] ) {
$_GET['communityApplications'] = true; $_GET['communityApplications'] = true;
$_GET['mute'] = false; $_GET['mute'] = false;
@include($exeFile); # under new GUI, this line returns a duplicated session_start() error. @include($exeFile); # under new GUI, this line returns a duplicated session_start() error.
echo "</div>"; */ echo "</div>";
$dockers = explode(",",$_GET['docker']);
foreach ( $dockers as $docker ) {
if ( !$docker )
continue;
$_GET['docker'] = $docker;
include "/usr/local/emhttp/plugins/community.applications/scripts/installUpdate.php";
}
}
?> ?>
<script> <script>

View File

@ -63,7 +63,9 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$displayHeader = "<script>addDockerWarning($dockerNotEnabled);var dockerNotEnabled = $dockerWarningFlag;</script>"; $displayHeader = "<script>addDockerWarning($dockerNotEnabled);var dockerNotEnabled = $dockerWarningFlag;</script>";
$pinnedApps = readJsonFile($caPaths['pinnedV2']); $pinnedApps = readJsonFile($caPaths['pinnedV2']);
$selectedApps['docker'] = $selectedApps['docker'] ?? [];
$selectedApps['plugin'] = $selectedApps['plugin'] ?? [];
$checkedOffApps = arrayEntriesToObject(@array_merge(@array_values($selectedApps['docker']),@array_values($selectedApps['plugin']))); $checkedOffApps = arrayEntriesToObject(@array_merge(@array_values($selectedApps['docker']),@array_values($selectedApps['plugin'])));
$columnNumber = 0; $columnNumber = 0;