PHP 8 compatibility

pull/11/head
Squidly271 2022-12-02 11:13:44 -05:00
parent 0b88a33120
commit a625afef6f
6 changed files with 17 additions and 9 deletions

View File

@ -5,6 +5,7 @@ Tabs="true"
Code="f0db"
---
<?
error_reporting(E_ALL);
###############################################################
# #
# Community Applications copyright 2015-2022, Andrew Zawadzki #
@ -15,9 +16,14 @@ Code="f0db"
$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
$plugin = "community.applications";
$cfg = parse_plugin_cfg($plugin);
$cfg['dockerSearch'] = "yes";
$caSettings = $cfg;
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
require_once "$docroot/plugins/$plugin/include/paths.php";
require_once "$docroot/plugins/$plugin/include/helpers.php";
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
$DockerClient = new DockerClient();
$DockerTemplates = new DockerTemplates();
@ -30,8 +36,7 @@ exec("rm $docroot/CA-Logging*.zip");
$diagnosticsFile = htmlspecialchars(str_replace(' ','_',strtolower($var['NAME'])));
$cfg = parse_plugin_cfg($plugin);
$cfg['dockerSearch'] = "yes";
if ( $cfg['maxPerPage'] < 24 ) $cfg['maxPerPage'] = 24;

View File

@ -1,9 +1,9 @@
bc3e0df80e3e3f5c46d912cf70edf141 ./Apps.page
429ac013f77b536a5fed42665792c9aa ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page
4c5d4598e1bafa46bd90c27cbe302122 ./ca_settings.page
e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
69ab8fcb35d59d712aed59b50932efeb ./include/exec.php
c9b1893164fc80a4cf241fd518a9d75d ./include/helpers.php
505b0ebade8543bcec94e40a638965a7 ./include/exec.php
2f4e1cd95fd00cc9bfe47514a4fe2212 ./include/helpers.php
116042a918060278e77379b0dd73482c ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md

View File

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

View File

@ -636,9 +636,9 @@ function getAllInfo($force=false) {
$info = $DockerTemplates->getAllInfo(false,true,true);
$containers = $DockerClient->getDockerContainers();
foreach ($containers as &$container) {
$container['running'] = $info[$container['Name']]['running'];
$container['url'] = $info[$container['Name']]['url'];
$container['template'] = $info[$container['Name']]['template'];
$container['running'] = $info[$container['Name']]['running'] ?? null;
$container['url'] = $info[$container['Name']]['url'] ?? null;
$container['template'] = $info[$container['Name']]['template'] ?? null;
}
}
debug("Forced info update");