diff --git a/archive/community.applications-2019.04.13-x86_64-1.txz b/archive/community.applications-2019.04.13-x86_64-1.txz index 69d9e578..98886f8b 100644 Binary files a/archive/community.applications-2019.04.13-x86_64-1.txz and b/archive/community.applications-2019.04.13-x86_64-1.txz differ diff --git a/archive/community.applications-2019.04.14-x86_64-1.txz b/archive/community.applications-2019.04.14-x86_64-1.txz new file mode 100644 index 00000000..e41065af Binary files /dev/null and b/archive/community.applications-2019.04.14-x86_64-1.txz differ diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page index c80d6f26..c06bdfa1 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page @@ -1256,6 +1256,7 @@ function addWarning(text) {

+
@@ -1266,4 +1267,3 @@ function addWarning(text) { -
diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php index 4d582745..94375c22 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php @@ -899,9 +899,9 @@ function DownloadApplicationFeed() { $o['RepoName'] = $o['Repo']; $o['SortAuthor'] = $o['Author']; $o['SortName'] = $o['Name']; - $o['CardDescription'] = (strlen($o['Description']) > 240) ? substr($o['Description'],0,240)." ..." : $o['Description']; + if ( $o['PluginURL'] ) { $o['Author'] = $o['PluginAuthor']; $o['Repository'] = $o['PluginURL']; diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/getPopupDescription.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/getPopupDescription.php index a58ef53d..6d06e8b7 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/getPopupDescription.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/getPopupDescription.php @@ -67,6 +67,12 @@ $template = $file[$index]; $Displayed = false; } +$currentServer = file_get_contents($communityPaths['currentServer']); + + # Create entries for skins. Note that MANY entries are not used in the current skins +if ( $currentServer == "Primary Server" && $template['IconHTTPS']) { + $template['Icon'] = $template['IconHTTPS']; +} $ID = $template['ID']; 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 885c4b51..dc2b6e7d 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 @@ -74,11 +74,15 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false) $ct .= $skin[$viewMode]['header']; $iconClass = "displayIcon"; + + $displayTemplate = $skin[$viewMode]['template']; + $currentServer = file_get_contents($communityPaths['currentServer']); # Create entries for skins. Note that MANY entries are not used in the current skins foreach ($displayedTemplates as $template) { - $displayTemplate = $skin[$viewMode]['template']; - + if ( $currentServer == "Primary Server" && $template['IconHTTPS']) { + $template['Icon'] = $template['IconHTTPS']; + } $name = $template['SortName']; $appName = str_replace(" ","",$template['SortName']); $ID = $template['ID'];