give her a go

plugins/community.applications.plg

@@ -2,8 +2,8 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "community.applications">
 <!ENTITY author    "Andrew Zawadzki">
-<!ENTITY version   "2022.04.17">
-<!ENTITY md5       "bda5768c4ad8ae1c6771fa3a06887162">
+<!ENTITY version   "2022.05.08">
+<!ENTITY md5       "61ed2e70c65f9984ba8d3d358f6816b2">
 <!ENTITY launch    "Apps">
 <!ENTITY plugdir   "/usr/local/emhttp/plugins/&name;">
 <!ENTITY github    "Squidly271/community.applications">
@@ -13,6 +13,22 @@
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" min="6.9.0" support="https://lime-technology.com/forums/topic/38582-plug-in-community-applications/" icon="users">
 
 <CHANGES>
+###2022.05.08
+- Added: Action Centre
+- Fixed: Blacklisted Apps wouldn't appear within Installed Apps
+- Fixed: Allow non-CA apps to appear within Installed / Previous Apps
+- Added: Infrastructure to still know if an app is blacklisted even if its no longer within the appfeed
+- Fixed: 6.10.0-RC series - Headers already sent error when updating a container within CA
+- Fixed: Updated flag wouldn't always disappear from sidebar after updating
+- Removed: Extraneous warning icon for deprecated / blacklisted on the cards
+- Fixed: Improper IconURL was being added to dockerHub conversions
+- Fixed: Extra sessions were being created by a background process
+- Changed: Uninstalling no longer automatically goes to Installed Apps after completion
+- Fixed: Prevent a background process from being spawned multiple times if it takes longer than 60 minutes to complete
+- Fixed: Selected apps in Previous Apps would get cleared when page switching, deleting a template via actions etc
+- Fixed: Sidebar wouldn't allow a deprecated app (in previous apps) to be reinstalled
+- Changed: Installed flag takes precedence of deprecated / blacklisted flags
+
 ###2022.04.17
 - Fixed: Don't allow renamed containers to be pinned
 - Fixed: If pinned apps comes up with No Matching Content Found (due to all pinned apps being incompatible etc) then disable the button

source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5

@@ -2,8 +2,8 @@ c553881600c51459abaa336c920cd923  ./Apps.page
 4e55f7483b661af21a25b677179baffe  ./CA_notices.page
 42a1658a916a3a3eed2a9f2af80603c4  ./ca_settings.page
 e718d7825dbdc96a17a915079222b098  ./default.cfg
-5225ce65e180f34f1dd810c0f35f6945  ./include/exec.php
-d5ba81dbd93c7b149dec96def31107e9  ./include/helpers.php
+b0e3515243219ff430d6744485b35a06  ./include/exec.php
+1acc7a5c3489b25a895b5decac043dee  ./include/helpers.php
 fc87642746ba4f324537bc381b78e982  ./include/paths.php
 532fffdf939594c143e679da02bd841e  ./javascript/libraries.js
 71f911a818d88d3d567f8a2898094ee2  ./README.md
@@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9  ./scripts/showStatistics.php
 34554a56611dfe625889c82afd5138de  ./scripts/updatePluginSupport.php
 ce8e45452d3b63b5943b6f39c817bbf9  ./skins/Narrow/css.php
 c4d6ce8de3baff1c9de2b7f348b2f340  ./skins/Narrow/skin.html
-3267c8bca2f623796576e11dd9fcb86a  ./skins/Narrow/skin.php
+c1d402b8dfb27331924ed655416c379f  ./skins/Narrow/skin.php

source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php

@@ -300,8 +300,8 @@ function DownloadApplicationFeed() {
 		if ( ! $o ) continue;
 
 		if ( is_array($o['trends']) && count($o['trends']) > 1 ) {
-			$o['trendDelta'] = end($o['trends']) - $o['trends'][0];
-			$o['trendAverage'] = array_sum($o['trends'])/count($o['trends']);
+			$o['trendDelta'] = round(end($o['trends']) - $o['trends'][0],4);
+			$o['trendAverage'] = round(array_sum($o['trends'])/count($o['trends']),4);
 		}
 
 		$o['Category'] = str_replace("Status:Beta","",$o['Category']);    # undo changes LT made to my xml schema for no good reason
@@ -1065,7 +1065,7 @@ function previous_apps() {
 							$tmpRepo = strpos($o['Repository'],":") ? $o['Repository'] : $o['Repository'].":latest";
 							
 							if ( $dockerUpdateStatus[$tmpRepo]['status'] == "false" )
-								$o['actionCenter'] = true;
+								$o['actionCentre'] = true;
 							
 							if ( ! $o['Blacklist'] && ! $o['Deprecated'] ) {
 								if ( $extraBlacklist[$o['Repository']] ) {
@@ -1078,11 +1078,11 @@ function previous_apps() {
 								}
 							}
 							
-							if ( !$o['Blacklist'] && !$o['Deprecated'] && !$o['actionCenter']  )
+							if ( !$o['Blacklist'] && !$o['Deprecated'] && !$o['actionCentre']  )
 								continue;
 						}
 						if ( $installed == "action" )
-							$o['actionCenter'] = true;
+							$o['actionCentre'] = true;
 						
 						$displayed[] = $o;
 					}
@@ -1157,14 +1157,14 @@ function previous_apps() {
 					
 					if ( $installed == "action" && $template['PluginURL'] ) {
 							if ( ( strcmp(plugin("version","/var/log/plugins/$filename"),$template['pluginVersion']) < 0 || $template['UpdateAvailable']) && $template['Name'] !== "Community Applications") {
-								$template['actionCenter'] = true;
+								$template['actionCentre'] = true;
 							}
 					}
 
-					if ( $installed == "action" && !$template['Blacklist'] && !$template['Deprecated'] && !$template['actionCenter'] )
+					if ( $installed == "action" && !$template['Blacklist'] && !$template['Deprecated'] && !$template['actionCentre'] )
 						continue;
 					if ( $installed == "action" )
-						$template['actionCenter'] = true;
+						$template['actionCentre'] = true;
 					$displayed[] = $template;
 				}
 			}
@@ -2303,7 +2303,7 @@ function enableActionCentre() {
 				$tmpRepo = strpos($o['Repository'],":") ? $o['Repository'] : $o['Repository'].":latest";
 				
 				if ( $dockerUpdateStatus[$tmpRepo]['status'] == "false" )
-					$o['actionCenter'] = true;
+					$o['actionCentre'] = true;
 				
 				if ( ! $o['Blacklist'] && ! $o['Deprecated'] ) {
 					if ( $extraBlacklist[$o['Repository']] ) {
@@ -2316,7 +2316,7 @@ function enableActionCentre() {
 					}
 				}
 				
-				if ( !$o['Blacklist'] && !$o['Deprecated'] && !$o['actionCenter']  )
+				if ( !$o['Blacklist'] && !$o['Deprecated'] && !$o['actionCentre']  )
 					continue;
 				
 				$displayed[] = $o;
@@ -2335,11 +2335,11 @@ function enableActionCentre() {
 			
 			if ( $template['PluginURL'] ) {
 				if ( ( strcmp(plugin("version","/var/log/plugins/$filename"),$template['pluginVersion']) < 0 || $template['UpdateAvailable']) && $template['Name'] !== "Community Applications") {
-					$template['actionCenter'] = true;
+					$template['actionCentre'] = true;
 				}
 			}
 
-			if ( !$template['Blacklist'] && !$template['Deprecated'] && !$template['actionCenter'] )
+			if ( !$template['Blacklist'] && !$template['Deprecated'] && !$template['actionCentre'] )
 				continue;
 			$displayed[] = $template;
 		}

source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php

@@ -147,16 +147,19 @@ function last_str_replace($haystack, $needle, $replace) {
 #######################
 function mySort($a, $b) {
 	global $sortOrder;
+	
+	debug("sort order: {$sortOrder['sortBy']}");
 
 	if ( $sortOrder['sortBy'] == "Name" )
 		$sortOrder['sortBy'] = "SortName";
-	if ( $sortOrder['sortBy'] != "downloads" ) {
+	if ( $sortOrder['sortBy'] != "downloads" && $sortOrder['sortBy'] != "trendDelta") {
 		$c = strtolower($a[$sortOrder['sortBy']]);
 		$d = strtolower($b[$sortOrder['sortBy']]);
 	} else {
 		$c = $a[$sortOrder['sortBy']];
 		$d = $b[$sortOrder['sortBy']];
 	}
+	
 	$return1 = ($sortOrder['sortDir'] == "Down") ? -1 : 1;
 	$return2 = ($sortOrder['sortDir'] == "Down") ? 1 : -1;
 

source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php

@@ -1198,7 +1198,7 @@ function displayCard($template) {
 		$flagTextStart = " ";
 		$flagTextEnd = " ";
 	}
-	if ( ($Installed || $Uninstall) && !$actionCenter) {
+	if ( ($Installed || $Uninstall) && !$actionCentre) {
 		 $card .= "
 			 <div class='installedCardBackground'>
 			   <div class='installedCardText ca_center'>".tr("INSTALLED")."</div>