fatal flash wouldn't appear

This commit is contained in:
Squidly271 2022-06-12 16:10:55 -04:00
parent b95ecbc15d
commit 5d6d009915
4 changed files with 6 additions and 13 deletions

View File

@ -108,7 +108,8 @@ if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var
unset($caSettings['dockerRunning']);
}
getAllInfo(true);
if ( is_file($caPaths['docker_cfg']) )
getAllInfo(true);
function tr($string,$ret=false) {
@ -197,7 +198,7 @@ $(function(){
}
});
return;
<?endif;?>
<?else:?>
// don't run this through the wrapper so that if it hangs up it won't delay anything else
$.post("/plugins/<?=$plugin?>/include/exec.php",{action:'getPortsInUse'},function(data) {
var ret = JSON.parse(data);
@ -771,7 +772,7 @@ $(function(){
setupActionCentre();
}
});
<?endif;?>
function disableSort() {
hideSortIcons();
}
@ -2937,7 +2938,6 @@ function setupActionCentre() {
}
function postCheckForUpdates() {
alert("got here");
setupActionCentre();
refreshDisplay();
}

View File

@ -1,4 +1,4 @@
2faae5a00e9cbfb73002febd04a1b0d0 ./Apps.page
d8a6a51040dda9a918fa40fcfc2aaa84 ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg
@ -22,4 +22,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
25bdaed6f62ac73f9ef7c3ce0c125ef7 ./skins/Narrow/css.php
7c7e02f401265315151e9fb3fcf1bd7d ./skins/Narrow/skin.html
3533816a231404b73a69fd712363620f ./skins/Narrow/skin.php
3a6512556984cbc315bee35d4fb26b54 ./skins/Narrow/skin.php

View File

@ -73,9 +73,6 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$displayedTemplates = array();
foreach ($file as $template) {
/* if ( $template['Blacklist'] && ! $template['NoInstall'] )
continue; */
$startingAppCounter++;
if ( $startingAppCounter < $startingApp ) continue;
$displayedTemplates[] = $template;
@ -478,10 +475,6 @@ function getPopupDescriptionSkin($appNumber) {
}
$currentServer = file_get_contents($caPaths['currentServer']);
/* if ( $currentServer == "Primary Server" && $template['IconHTTPS'])
$template['Icon'] = $template['IconHTTPS'];
*/
if ( ! $template['Blacklist'] ) {
if ( $extraBlacklist[$template['Repository']] ) {
$template['Blacklist'] = true;