This commit is contained in:
Squidly271 2024-01-27 13:38:45 -05:00
parent 843918abe7
commit 4eb3f9227b
3 changed files with 8 additions and 7 deletions

View File

@ -22,5 +22,5 @@ b5e2ca7fef2c4aa0b0d6910187b863f9 ./scripts/notices.php
7592f203dca78dce476051b85f7ca133 ./scripts/updatePluginSupport.php
9573b641d5e9933801e9e7f9c86a56e9 ./skins/Narrow/css.php
77ce10dbd0860f9546ed726fe940ffb6 ./skins/Narrow/skin.html
70a26b0673a4e879408dbbe92dd40826 ./skins/Narrow/skin.php
e12761b999db5beb3fd35b4eee37258d ./skins/Narrow/skin.php
c26b187a50c966adff7bfb9cab6fca16 ./event/disks_mounted

View File

@ -201,7 +201,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$actionsContext[] = ["divider"=>true];
$actionsContext[] = ["icon"=>"ca_fa-money","text"=>tr("Donate"),"action"=>"openNewWindow('".addslashes($template['DonateLink'])."','_blank');"];
}
} elseif ( ! $template['Blacklist'] || ! $template['Compatible']) {
} elseif ( ! ($template['Blacklist']??false) || ! ($template['Compatible']??false) ) {
if ( $template['InstallPath'] ) {
$userTemplate = readXmlFile($template['InstallPath'],false,false);
if ( ! $template['Blacklist'] ) {
@ -560,7 +560,7 @@ function getPopupDescriptionSkin($appNumber) {
$template['ModeratorComment'] = isset($extraDeprecated[$template['Repository']]);
}
$ID = $template['ID'];
$ID = $template['ID']??false;
$template['Profile'] = $allRepositories[$template['RepoName']]['profile'] ?? "";
$template['ProfileIcon'] = $allRepositories[$template['RepoName']]['icon'] ?? "";
@ -818,7 +818,7 @@ function getPopupDescriptionSkin($appNumber) {
if ( $template['Discord'] )
$supportContext[] = ["icon"=>"ca_discord","link"=>$template['Discord'],"text"=>tr("Discord")];
elseif ( isset($allRepositories[$template['Repo']]['Discord']) )
elseif ( isset($template['Repo']) && isset($allRepositories[$template['Repo']]['Discord']) )
$supportContext[] = ["icon"=>"ca_discord","link"=>$allRepositories[$template['Repo']]['Discord'],"text"=>tr("Discord")];
if ( $template['Facebook'] )
@ -1444,7 +1444,8 @@ function displayPopup($template) {
extract($template);
if ( !$Private) {
$Repo = $Repo ?? "";
if ( !$Private ) {
$RepoName = str_replace("' Repository","",str_replace("'s Repository","",$Repo));
$RepoName = str_replace("Repository","",$RepoName);
} else {
@ -1497,7 +1498,7 @@ function displayPopup($template) {
if ( $Deprecated )
$ModeratorComment .= "<br>".tr("This application template has been deprecated");
if ( ! $Compatible && ! ($UnknownCompatible ?? false) )
if ( ! ($Compatible ?? false) && ! ($UnknownCompatible ?? false) )
$ModeratorComment .= $VerMessage ?? "<br>".tr("This application is not compatible with your version of Unraid.");
if ( $Blacklist )
$ModeratorComment .= "<br>".tr("This application template has been blacklisted.");
@ -1508,7 +1509,7 @@ function displayPopup($template) {
if ( $Language && $LanguagePack !== "en_US" ) {
$ModeratorComment .= "<a href='$disclaimLineLink' target='_blank'>$disclaimLine1</a>";
}
if ( (!$Compatible || ($UninstallOnly ?? false)) && $Featured )
if ( (!( $Compatible ?? false ) || ($UninstallOnly ?? false)) && ($Featured??false) )
$ModeratorComment = "<span class='featuredIncompatible'>".sprintf(tr("%s is incompatible with your OS version. Please update the OS to proceed"),$Name)."</span>";
if ( $ModeratorComment ) {