wheel, php

plugins/community.applications.plg

@@ -2081,6 +2081,7 @@ THIS IS A REQUIRED UPDATE
 
 	echo "Fixing pinned apps\n";
 	if ( is_file("/boot/config/plugins/community.applications/pinned_appsV2.json") ) {
+	  $pin = [];
 	  $original = json_decode(file_get_contents("/boot/config/plugins/community.applications/pinned_appsV2.json"),true);
 		if ( is_array($original) ) {
 			foreach ($original as $app) {

source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page

@@ -184,6 +184,9 @@ var resizeTimer;
 var portsInUse = [];
 var startupSearch = "<?=$_GET['search'] ?? ""?>";
 var iconHoverTimer;
+	var wheelActive = false;
+	var swipeBounce = false;
+
 
 $(function(){
 	window.onerror = function(msg,url,lineNo,columnNo, error) {
@@ -724,6 +727,56 @@ $(function(){
 		removeApp(path,name);
 	});
 
+	addEventListener("wheel",swipePage);
+
+	
+	function swipePage(event) {
+		console.log(event.deltaX);
+		if (wheelActive)
+			return;
+		if ( $(".sidebar").is(":visible") )
+			return;
+	 if ($("body").width() < 1260 ) return; // dynamix coding
+		event.stopPropagation();
+		event.preventDefault();
+/* 		if (event.deltaX < 100 && event.deltaX > -100) {
+			setTimeout(function() {
+				wheelActive = false;
+			},200);
+			return;
+		} */
+
+
+		if ( $(".pageRight").is(":visible") ) {
+
+			if (event.deltaX >50) {
+				if ( !$(".pageRight").hasClass("pageNavNoClick")) {
+					wheelActive = true;
+					setTimeout(function() {
+						wheelActive = false;
+					},1000);				
+					$(".pageRight").click();
+				}
+				
+			}
+			if (event.deltaX < -50) {
+				if (! $(".pageLeft").hasClass("pageNavNoClick")) {
+					wheelActive = true;
+
+					setTimeout(function() {
+						wheelActive = false;
+					},1000);
+					$(".pageLeft").click();
+				}
+			}
+
+		} else 
+			wheelActive = false;
+
+
+	}
+	
+
 	<? if ($cfg['sidebarOpen'] == "yes"):?>
 		$("body").on("mouseover",".ca_displayIcon,.infoButton,.displayIcon,.card_readmore",function() {
 			var icon = this;
@@ -3047,6 +3100,7 @@ function dockerSearch(pageNumber) {
 }
 
 function dockerConvert(dockerID) {
+	saveState();
 	swal({
 		title: "<?tr("Determine configuration?")?>",
 		text: '<?tr('Would you like CA to attempt to determine any applicable paths, ports, and variables for the template?  This will entail performing a test installation of the container.  It will be automatically deleted after processing.  The container will not be started.')?>',

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

@@ -1,15 +1,15 @@
-f1e084500dd635a56910895207120dc0  ./Apps.page
+649eb1afe81b06e1d93b7431bcc71687  ./Apps.page
 106b521c1feebda4d7b3f558cc016cda  ./CA_notices.page
 eb1f0ee4148747c0473e73e4e973994f  ./ca_settings.page
 e8d29607ec792ddf9f6832b10ee70fdc  ./default.cfg
 7e22b781295bbf10fe0089378b9ba76b  ./include/exec.php
 6315b71595f089a310861ef2e1954d84  ./include/helpers.php
 3f6ae4c4fef3077dd2ca45117f780846  ./include/paths.php
-532fffdf939594c143e679da02bd841e  ./javascript/libraries.js
+12d7ee42aadd961dbbc436ae2fd73d9a  ./javascript/libraries.js
 71f911a818d88d3d567f8a2898094ee2  ./README.md
 ec075d8b9758ba00bda9b02c4692f972  ./scripts/checkForUpdates.php
 99a9d58a49a7f6812f18bd4be2b563b9  ./scripts/checkForUpdates.sh
-28f1447a5053df2f62ae1d6eb5870169  ./scripts/dockerConvert.php
+d4a279514f1adc0e4e2bbfbab5a82a61  ./scripts/dockerConvert.php
 6ee3b2cdf12209893af916ab0b42152a  ./scripts/installMulti.php
 e549862bcbeed9843b6bdcdb83e1bf3f  ./scripts/installMultiPlugin.php
 524afab04ca930f59117a846f819fb2f  ./scripts/installPluginUpdate.sh
@@ -20,6 +20,6 @@ ed42a35b3524b55e2024cdd56a795733  ./scripts/pluginInstall.php
 f2a86fd875cb73bb095388e69ca035fd  ./scripts/showStatistics.php
 4425f8fd4ef662a7dc65cee01de3e419  ./scripts/updatePLG.sh
 5c088a7cf82229cb64edfd4c415a84a0  ./scripts/updatePluginSupport.php
-59010944c6b3ddf9f71b4ba369029421  ./skins/Narrow/css.php
+c91992cf753a12f379773603c800958c  ./skins/Narrow/css.php
 d642a25efb891e51471fc4c7636da885  ./skins/Narrow/skin.html
 5446bc6588094f9a81c23dcfe6c30266  ./skins/Narrow/skin.php

source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/dockerConvert.php

@@ -19,6 +19,7 @@ require_once "$docroot/plugins/community.applications/include/paths.php";
 require_once "$docroot/plugins/dynamix/include/Wrappers.php";
 require_once "$docroot/plugins/community.applications/include/helpers.php";
 
+$caSettings = parse_plugin_cfg("community.applications");
 $unRaidVersion = parse_ini_file($caPaths['unRaidVersion']);
 $unRaid69 = version_compare($unRaidVersion['version'],"6.9.9","<=");
 $exeFile = "/usr/local/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php";
@@ -48,7 +49,7 @@ if ( $_GET['ID'] !== false) {
 	
 	echo "<div id='output'>";
 	$dockers = ["CA_TEST_CONTAINER_DOCKERHUB"];
-	echo sprintf(tr("Installing test container"),str_replace(",",", ",$_GET['docker']))."<br>";
+	echo sprintf(tr("Installing test container"),str_replace(",",", ",$_GET['docker'] ?? ""))."<br>";
 	$_GET['updateContainer'] = true;
 	$_GET['ct'] = $dockers;
 	$_GET['communityApplications'] = true;
@@ -88,7 +89,7 @@ function addLog(logLine) {
 	}
 }
 function addCloseButton() {
-	addLog("<p class='centered'><button class='logLine' type='button' onclick='" + (top.Shadowbox ? "top.Shadowbox" : "window") + ".close()'><?=tr("Done")?></button></p>");
+	addLog("<p class='centered'><button class='logLine' type='button' onclick='" + (parent.Shadowbox ? "parent.Shadowbox" : "window") + ".close()'><?=tr("Done")?></button></p>");
 }
 </script>
 <?
@@ -106,6 +107,7 @@ function addCloseButton() {
 		$vars = isset($json[0]['Config']['Env']) ? $json[0]['Config']['Env'] : [];
 		
 		$count = 1;
+		$Config = [];
 		foreach ($paths as $path) {
 			$p = ["Name"=>"Container Path $count",'Type'=>"Path","Target"=>$path['Destination'],"Default"=>"","Mode"=>"rw","Display"=>"always","Required"=>"false","Mask"=>"false"];
 			if ( $unRaid69 ) $p['Description'] = "Container Path: {$path['Destination']}";
@@ -120,10 +122,11 @@ function addCloseButton() {
 			$Config[]['@attributes'] = $p;
 			$count++;
 		}
+		$textvars = "";
 		foreach ($vars as $var) {
 			$textvars .= "$var\n";
 		}
-		$testvars = parse_ini_string($textvars);
+		$testvars = @parse_ini_string($textvars) ?: [];
 		$defaultvars = ["HOST_HOSTNAME","HOST_OS","HOST_CONTAINERNAME","TZ","PATH"];
 		$count = 1;
 		foreach ($testvars as $var => $varcont) {
@@ -137,7 +140,7 @@ function addCloseButton() {
 		}
 		$Config[]['@attributes'] = ["Name"=>"Community Applications Conversion",'Target'=>"Community_Applications_Conversion","Type"=>"Variable","Default"=>"true","Description"=>"","Required"=>"false","Mask"=>"false","Display"=>"always"];
 
-		if ( $Config )
+		if ( !empty($Config) )
 			$dockerfile['Config'] = $Config;
 	} else {
 		$error = tr("An error occurred - Could not determine configuration");

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

@@ -419,7 +419,7 @@ a.popup-donate:hover{color:<?=$donateText?>;background-color:<?=$unRaid66color?>
 .spotlightIconArea{display:inline-block;float:left;width:10rem;}
 .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;}
+.spotlightPopup{display:inline-block;margin-top:0.75rem;}
 .spotlightPopupText{position:absolute;color:white;font-size:2rem;position:absolute;top:1.2rem;right:2rem;}
 .spotlightPopupText::after{content:"\f005";font-family:fontAwesome;}
 .spotlightWho{font-style:italic;}