mirrors
/
community.applications
mirror of https://github.com/Squidly271/community.applications.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

optimization

master
Squidly271 2024-01-14 14:12:00 -05:00
parent 3d61ebe74d
commit 3d56484ae5
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2024.01.14-x86_64-1.txz 100644
View File

Binary file not shown.

2
source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5
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
08612fbd2095dcf84d451416e6f409a3 ./include/exec.php 78c8c71467756add9d5d7678bae6aa11 ./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

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

@ -1170,10 +1170,8 @@ function previous_apps() {
$runningflag = false; $runningflag = false;
foreach ($info as $installedDocker) { foreach ($info as $installedDocker) {
$installedImage = str_replace("library/","",$installedDocker['Image']); // most apps reference short eg: mysql instead of library/mysql but docker always reports library/... if ( $$installedDocker['Name'] == $o['Name'] ) {
$installedName = $installedDocker['Name']; if ( startsWith(str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) {
if ( $installedName == $o['Name'] ) {
if ( startsWith($installedImage, $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) {
@ -1248,10 +1246,8 @@ function previous_apps() {
$flag = false; $flag = false;
foreach ($info as $installedDocker) { foreach ($info as $installedDocker) {
$installedImage = str_replace("library/","",$installedDocker['Image']); // most apps reference short eg: mysql instead of library/mysql but docker always reports library/... if ( startsWith($str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) {
$installedName = $installedDocker['Name']; if ( $$installedDocker['Name'] == $o['Name'] ) {
if ( startsWith($installedImage, $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) {
if ( $installedName == $o['Name'] ) {
$flag = true; $flag = true;
continue; continue;
} }
@ -2415,17 +2411,13 @@ function enableActionCentre() {
$runningflag = false; $runningflag = false;
foreach ($info as $installedDocker) { foreach ($info as $installedDocker) {
$installedImage = str_replace("library/","",$installedDocker['Image']); if ( $installedDocker['Name'] == $o['Name'] ) {
$installedName = $installedDocker['Name']; if ( startsWith($str_replace("library/","",$installedDocker['Image']), $o['Repository']) || startsWith($installedDocker['Image'],$o['Repository']) ) {
if ( $installedName == $o['Name'] ) {
if ( startsWith($installedImage, $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) {
$searchResult = searchArray($file,'Repository',explode(":",$o['Repository'])[0]); $searchResult = searchArray($file,'Repository',explode(":",$o['Repository'])[0]);
} }
if ( $searchResult !== false )
$o = $file[$searchResult];
if ( $searchResult === false ) { if ( $searchResult === false ) {
$runningFlag = true; $runningFlag = true;