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

action center

Browse Source
This commit is contained in:
Squidly271 2022-04-30 14:49:35 -04:00
parent e2470d6f1d
commit 1958e98a47
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

@ -97,12 +97,11 @@ $dockerSearchActive = is_file($caPaths['dockerSearchActive']);
// Only check for updates to containers / plugins max once per hour
exec("mkdir -p {$caPaths['tempFiles']}");
if ( $cfg['updateCheck'] == "yes" ) {
if ( ( time() - @filemtime($caPaths['updateTime']) ) > 3600 ) {
touch($caPaths['updateTime']);
exec("echo '/usr/local/emhttp/plugins/community.applications/scripts/checkForUpdates.php >/dev/null 2>&1' | at now >/dev/null");
}
if ( ($cfg['updateCheck'] == "yes") && ( (time() - @filemtime($caPaths['updateTime']) ) > 3600 ) ) {
touch($caPaths['updateTime']);
exec("echo '/usr/local/emhttp/plugins/community.applications/scripts/checkForUpdates.php >/dev/null 2>&1' | at now >/dev/null");
}
if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) {
$caSettings['dockerRunning'] = true;
} else {

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

@ -1,8 +1,8 @@
46544f7997558130ef3868ef397f688c ./Apps.page
b5db55deb1e41caab4e3aa5c5e91185d ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg
b5fb14bf729d1473d735fb3d6987ecef ./include/exec.php
11cc3efbeb502ffd5079ae68b55f417d ./include/exec.php
d5ba81dbd93c7b149dec96def31107e9 ./include/helpers.php
37de3a3070c32b3626315cdd67106f9b ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
@ -14,7 +14,7 @@ be74e770cdc8938200fc29580be4e3a1 ./scripts/installMultiPlugin.php
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
afa5771f344d0600a7b3bbc40bd32d29 ./scripts/installUpdate.php
5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh
d4770cba925e913500e0085b79267d3e ./scripts/notices.php
76d678b918109e2d7dad6c17c7a80881 ./scripts/notices.php
a1401a0bed89c182b69f0c7508282c1f ./scripts/pluginInstall.php
da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh

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

@ -1063,7 +1063,7 @@ function previous_apps() {
$tmpRepo = strpos($o['Repository'],":") ? $o['Repository'] : $o['Repository'].":latest";
if ( $dockerUpdateStatus[$tmpRepo]['status'] == "false" )
$o['UpdateAvailable'] = true;
$o['actionCenter'] = true;
if ( ! $o['Blacklist'] && ! $o['Deprecated'] ) {
if ( $extraBlacklist[$o['Repository']] ) {
@ -1076,7 +1076,7 @@ function previous_apps() {
}
}
if ( !$o['Blacklist'] && !$o['Deprecated'] && !$o['UpdateAvailable'] )
if ( !$o['Blacklist'] && !$o['Deprecated'] && !$o['actionCenter'] )
continue;
}
$displayed[] = $o;
@ -1150,10 +1150,13 @@ function previous_apps() {
$template['InstallPath'] = "/var/log/plugins/$filename";
$template['Uninstall'] = true;
if ( $installed == "action" && $template['PluginURL'] )
$template['UpdateAvailable'] = checkPluginUpdate(basename($template['PluginURL']));
if ( $installed == "action" && $template['PluginURL'] ) {
if ( ( strcmp(plugin("version","/var/log/plugins/$filename"),$template['pluginVersion']) < 0 || $template['UpdateAvailable']) && $template['Name'] !== "Community Applications") {
$template['actionCenter'] = true;
}
}
if ( $installed == "action" && !$template['Blacklist'] && !$template['Deprecated'] && !$template['UpdateAvailable'] )
if ( $installed == "action" && !$template['Blacklist'] && !$template['Deprecated'] && !$template['actionCenter'] )
continue;
$displayed[] = $template;
}

2
source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/notices.php
View File

@ -7,6 +7,8 @@
###############################################################
$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
$login_locale = true;
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
require_once "$docroot/plugins/dynamix/include/Wrappers.php";