Allow searches for incompatible featured apps

master
Squidly271 2023-04-12 09:15:17 -04:00
parent 86bf355325
commit f7eafd386e
5 changed files with 12 additions and 12 deletions

View File

@ -2,7 +2,7 @@
106b521c1feebda4d7b3f558cc016cda ./CA_notices.page
eb1f0ee4148747c0473e73e4e973994f ./ca_settings.page
e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
945036a5672dbad805d8507ff349d316 ./include/exec.php
ee1b1255bbbf1da98ccf792e0d1b3113 ./include/exec.php
1182f793790a06f0d8ac38674904ec76 ./include/helpers.php
7cc3e1ffd81120a1cf407857225db275 ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
@ -20,6 +20,6 @@ ed42a35b3524b55e2024cdd56a795733 ./scripts/pluginInstall.php
f2a86fd875cb73bb095388e69ca035fd ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
5c088a7cf82229cb64edfd4c415a84a0 ./scripts/updatePluginSupport.php
ba9fd42364af5a2f50958a638e82376f ./skins/Narrow/css.php
6ce9a893a9d7cef5a0bc2cd4afa5a801 ./skins/Narrow/css.php
d642a25efb891e51471fc4c7636da885 ./skins/Narrow/skin.html
f06e9629ae3ef7028fbea384f91f0638 ./skins/Narrow/skin.php
f0aea086e9625ac894e8947c59c3e7bf ./skins/Narrow/skin.php

View File

@ -600,10 +600,10 @@ function appOfDay($file) {
foreach($file as $template) {
if ( ! isset($template['Featured'] ) )
break;
if ( ! $template['PluginURL'] == "https://unraid-dl.sfo2.cdn.digitaloceanspaces.com/unraid-api/dynamix.unraid.net.plg" ) {
/* if ( ! $template['PluginURL'] == "https://unraid-dl.sfo2.cdn.digitaloceanspaces.com/unraid-api/dynamix.unraid.net.plg" ) {
if ( ! checkRandomApp($template) )
continue;
}
} */
// Don't show it if the plugin is installed
if ( $template['PluginURL'] && is_file("/var/log/plugins/".basename($template['PluginURL'])) )
continue;
@ -902,7 +902,7 @@ function get_content() {
if ( ($caSettings['hideDeprecated'] == "true") && ($template['Deprecated'] && ! $displayDeprecated) ) continue;
if ( $displayDeprecated && ! $template['Deprecated'] ) continue;
if ( ! $template['Displayable'] ) continue;
if ( $caSettings['hideIncompatible'] == "true" && ! $template['Compatible'] && ! $displayIncompatible) continue;
if ( $caSettings['hideIncompatible'] == "true" && ! $template['Compatible'] && ! $displayIncompatible && ! $template['Featured']) continue;
if ( $template['Blacklist'] ) continue;
$name = $template['Name'];
@ -1718,7 +1718,7 @@ function populateAutoComplete() {
foreach ($templates as $template) {
if ( $template['RepoTemplate'] )
continue;
if ( ! $template['Blacklist'] && ! ($template['Deprecated'] && $caSettings['hideDeprecated'] == "true") && ($template['Compatible'] || $caSettings['hideIncompatible'] != "true") ) {
if ( ! $template['Blacklist'] && ! ($template['Deprecated'] && $caSettings['hideDeprecated'] == "true") && ($template['Compatible'] || $caSettings['hideIncompatible'] != "true") || $template['Featured'] ) {
if ( $template['Language'] && $template['LanguageLocal'] ) {
$autoComplete[strtolower($template['Language'])] = $template['Language'];
$autoComplete[strtolower($template['LanguageLocal'])] = $template['LanguageLocal'];

View File

@ -417,7 +417,7 @@ a.popup-donate:hover{color:<?=$donateText?>;background-color:<?=$unRaid66color?>
.spotlightPopupBackground{clip-path: polygon(0 0,100% 0, 100% 100%);background-color: #009900;top:<?=$betaPopupOffset?>;height:9rem;width:9rem;position: absolute;right: 0;}
.spotlightHeader{font-size:2rem;}
.spotlightIconArea{display:inline-block;float:left;width:10rem;}
.spotlightIcon{height:15rem;margin-bottom:-2.5rem;margin-left:-3rem;margin-top:-2rem;}
.spotlightIcon{height:15rem;margin-bottom:-2.5rem;margin-left:-2rem;margin-top:-3rem;}
.spotlightInfoArea{margin-left:2rem;padding-left:10rem;margin-top:2rem;}
.spotlightPopup{display:inline-block;}
.spotlightPopupText{position:absolute;color:white;font-size:2rem;position:absolute;top:1.2rem;right:2rem;}

View File

@ -1298,8 +1298,8 @@ function displayCard($template) {
$ovr = str_replace("\n","<br>",$ovr);
$Overview = strip_tags(str_replace("<br>"," ",$ovr));
if ( ! $Compatible && $homeScreen )
$Overview = "<span style='color:#FF8C2F'>Recommended to upgrade the OS to enjoy the additional features of MyServers</span>&nbsp;&nbsp;$Overview";
if ( ! $Compatible && $Featured )
$Overview = "<span style='color:#FF8C2F'>Recommended to upgrade the OS to enjoy the additional features of $Name</span>&nbsp;&nbsp;$Overview";
$descClass= $RepositoryTemplate ? "cardDescriptionRepo" : "cardDescription";
$card .= "<div class='$descClass $backgroundClickable'><div class='cardDesc'>$Overview</div></div>";
@ -1456,8 +1456,8 @@ function displayPopup($template) {
if ( $Language && $LanguagePack !== "en_US" ) {
$ModeratorComment .= "<a href='$disclaimLineLink' target='_blank'>$disclaimLine1</a>";
}
if ( !$Compatible && $PluginURL == "https://unraid-dl.sfo2.cdn.digitaloceanspaces.com/unraid-api/dynamix.unraid.net.plg" )
$ModeratorComment = "Recommended to upgrade the OS to enjoy the additional features of MyServers";
if ( !$Compatible && $Featured )
$ModeratorComment = "Recommended to upgrade the OS to enjoy the additional features of $Name";
if ( $ModeratorComment ) {
$card .= "<div class='modComment'><div class='moderatorCommentHeader'> ".tr("Attention:")."</div><div class='moderatorComment'>$ModeratorComment</div></div>";