Use IconHTTPS if on primary server

Squidly271 · Apr 14, 2019 · 7562c30 · 7562c30
1 parent 037b8b2
commit 7562c30
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/archive/community.applications-2019.04.13-x86_64-1.txz b/archive/community.applications-2019.04.13-x86_64-1.txz
diff --git a/archive/community.applications-2019.04.14-x86_64-1.txz b/archive/community.applications-2019.04.14-x86_64-1.txz
diff --git a/...community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page b/...community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page
@@ -1256,6 +1256,7 @@ function addWarning(text) {
 <br>
 </span><br>
 <div class='mainArea'>
+<div class='spinner fixed'></div>
 <div class='multi_installDiv'><div class='ca_center'><input class='multi_install multi_installButton' type='button' value='Install Selected Applications' disabled><input type='button' class='multi_installClear' value='Clear Selected' disabled></div></div>
 <strong><font size='3'></strong></font>
 <div class='dockerSearch' style='display:none'><div class='ca_center'><i class='fa fa-docker initDockerSearch' style='font-size:5rem;color:DarkCyan;cursor:pointer;'></i><br><a class='initDockerSearch' style='cursor:pointer;'>Click Here To Get More Results From DockerHub</a></div></div>
@@ -1266,4 +1267,3 @@ function addWarning(text) {
 <span id='miscScript'></span><span id='awesomepleteScript'></span>
 <span id='sortorder' data-sortorder='' data-selected=''></span>
 <span id='debugging'></span>
-<div class='spinner fixed'></div>
diff --git a/...e/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php b/...e/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/...lications/usr/local/emhttp/plugins/community.applications/scripts/getPopupDescription.php b/...lications/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/...munity.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php b/...munity.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'];