This commit is contained in:
Squidly271 2024-01-14 14:23:13 -05:00
parent 3d56484ae5
commit 084b8171ee
3 changed files with 7 additions and 7 deletions

View File

@ -2,7 +2,7 @@
2defe45163697e40c813a57ae9a50231 ./CA_notices.page 2defe45163697e40c813a57ae9a50231 ./CA_notices.page
fc664dd4cf65ab02d828a5ae76f263ac ./ca_settings.page fc664dd4cf65ab02d828a5ae76f263ac ./ca_settings.page
01ed7990078dee7cecfeda9a4e49377e ./default.cfg 01ed7990078dee7cecfeda9a4e49377e ./default.cfg
78c8c71467756add9d5d7678bae6aa11 ./include/exec.php 2b21c03aaa5e8bb2427c1a763238d55b ./include/exec.php
bff4d4568073244b2ae9a0cad219f392 ./include/helpers.php bff4d4568073244b2ae9a0cad219f392 ./include/helpers.php
024499c59dcea65a8cf1f224e2bd36e7 ./include/paths.php 024499c59dcea65a8cf1f224e2bd36e7 ./include/paths.php
7234caf6800479df03abb222aaedaca5 ./javascript/libraries.js 7234caf6800479df03abb222aaedaca5 ./javascript/libraries.js

View File

@ -1170,7 +1170,7 @@ function previous_apps() {
$runningflag = false; $runningflag = false;
foreach ($info as $installedDocker) { foreach ($info as $installedDocker) {
if ( $$installedDocker['Name'] == $o['Name'] ) { if ( $installedDocker['Name'] == $o['Name'] ) {
if ( startsWith(str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { if ( startsWith(str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) {
$runningflag = true; $runningflag = true;
$searchResult = searchArray($file,'Repository',$o['Repository']); $searchResult = searchArray($file,'Repository',$o['Repository']);
@ -1182,11 +1182,11 @@ function previous_apps() {
$containerID = $file[$searchResult]['ID']; $containerID = $file[$searchResult]['ID'];
$tmpOvr = $o['Overview']; $tmpOvr = $o['Overview'];
$o = $file[$searchResult]; $o = $file[$searchResult];
$o['Name'] = $installedName; $o['Name'] = $installedDocker['Name'];
$o['Overview'] = $tmpOvr; $o['Overview'] = $tmpOvr;
$o['CardDescription'] = $tmpOvr; $o['CardDescription'] = $tmpOvr;
$o['InstallPath'] = $tempPath; $o['InstallPath'] = $tempPath;
$o['SortName'] = str_replace("-"," ",$installedName); $o['SortName'] = str_replace("-"," ",$o['Name']);
if ( $installedName !== $file[$searchResult]['Name'] ) if ( $installedName !== $file[$searchResult]['Name'] )
$o['NoPin'] = true; # This is renamed and effectively outside of CA's control $o['NoPin'] = true; # This is renamed and effectively outside of CA's control
} else { } else {
@ -1246,8 +1246,8 @@ function previous_apps() {
$flag = false; $flag = false;
foreach ($info as $installedDocker) { foreach ($info as $installedDocker) {
if ( startsWith($str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { if ( startsWith(str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) {
if ( $$installedDocker['Name'] == $o['Name'] ) { if ( $installedDocker['Name'] == $o['Name'] ) {
$flag = true; $flag = true;
continue; continue;
} }
@ -2412,7 +2412,7 @@ function enableActionCentre() {
$runningflag = false; $runningflag = false;
foreach ($info as $installedDocker) { foreach ($info as $installedDocker) {
if ( $installedDocker['Name'] == $o['Name'] ) { if ( $installedDocker['Name'] == $o['Name'] ) {
if ( startsWith($str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) { if ( startsWith(str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) {
$runningflag = true; $runningflag = true;
$searchResult = searchArray($file,'Repository',$o['Repository']); $searchResult = searchArray($file,'Repository',$o['Repository']);
if ( $searchResult === false) { if ( $searchResult === false) {