diff --git a/archive/community.applications-2022.04.19-x86_64-1.txz b/archive/community.applications-2022.04.19-x86_64-1.txz index 7afdf84d..0988a8ff 100644 Binary files a/archive/community.applications-2022.04.19-x86_64-1.txz and b/archive/community.applications-2022.04.19-x86_64-1.txz differ diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 index 0948bd30..3e477070 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 @@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 0254b0a66007c3f6e32e7d259e8ee443 ./skins/Narrow/css.php 0bdefa4e915c02ed3310c39eb5a1cef5 ./skins/Narrow/skin.html -505165ab6748f4ff5459c516d6572dd6 ./skins/Narrow/skin.php +6df7b43e58a2bfedc4ee7325859353f8 ./skins/Narrow/skin.php diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php index e87a5d15..3999d831 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php @@ -137,10 +137,12 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) $actionsContext[] = array("icon"=>"ca_fa-update","text"=>tr("Update"),"action"=>"updateDocker('$name');"); } if ( $caSettings['defaultReinstall'] == "true" && ! $template['Blacklist']) { - if ( $template['BranchID'] ) - $actionsContext[] = array("icon"=>"ca_fa-install","text"=>tr("Install second instance"),"action"=>"displayTags('{$template['ID']}',true,'".str_replace(" "," ",htmlspecialchars($installComment))."','".portsUsed($template)."');"); - else - $actionsContext[] = array("icon"=>"ca_fa-install","text"=>tr("Install second instance"),"action"=>"popupInstallXML('".addslashes($template['Path'])."','second','".str_replace(" "," ",htmlspecialchars($installComment))."','".portsUsed($template)."');"); + if ( $template['ID'] !== false ) { + if ( $template['BranchID'] ) + $actionsContext[] = array("icon"=>"ca_fa-install","text"=>tr("Install second instance"),"action"=>"displayTags('{$template['ID']}',true,'".str_replace(" "," ",htmlspecialchars($installComment))."','".portsUsed($template)."');"); + else + $actionsContext[] = array("icon"=>"ca_fa-install","text"=>tr("Install second instance"),"action"=>"popupInstallXML('".addslashes($template['Path'])."','second','".str_replace(" "," ",htmlspecialchars($installComment))."','".portsUsed($template)."');"); + } } $actionsContext[] = array("icon"=>"ca_fa-edit","text"=>tr("Edit"),"action"=>"popupInstallXML('".addslashes($info[$ind]['template'])."','edit');"); $actionsContext[] = array("divider"=>true); @@ -563,7 +565,7 @@ function getPopupDescriptionSkin($appNumber) { $template['UpdateAvailable'] = true; $actionsContext[] = array("icon"=>"ca_fa-update","text"=>tr("Update"),"action"=>"updateDocker('$name');"); } - if ( $caSettings['defaultReinstall'] == "true" && ! $template['Blacklist']) { + if ( $caSettings['defaultReinstall'] == "true" && ! $template['Blacklist'] && $template['ID'] !== false) { if ( $template['BranchID'] ) $actionsContext[] = array("icon"=>"ca_fa-install","text"=>tr("Install second instance"),"action"=>"displayTags('{$template['ID']}',true,'','".portsUsed($template)."');"); else