Fix IconURL being present in dockerHub conversions

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

@@ -121,7 +121,6 @@ function tr($string,$ret=false) {
 		echo $string;
 }
 
-
 ?>
 
 
@@ -132,12 +131,14 @@ function tr($string,$ret=false) {
 
 <script src='<?autov("/plugins/community.applications/javascript/libraries.js")?>'></script>
 <script src='<?autov("/plugins/dynamix.docker.manager/javascript/docker.js")?>'></script>
+
 <?if (!$unRaid610):?>
 <script>
 	/*! sprintf-js v1.1.2 | Copyright (c) 2007-present, Alexandru Mărășteanu <hello@alexei.ro> | BSD-3-Clause */
 	!function(){"use strict";var g={not_string:/[^s]/,not_bool:/[^t]/,not_type:/[^T]/,not_primitive:/[^v]/,number:/[diefg]/,numeric_arg:/[bcdiefguxX]/,json:/[j]/,not_json:/[^j]/,text:/^[^\x25]+/,modulo:/^\x25{2}/,placeholder:/^\x25(?:([1-9]\d*)\$|\(([^)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/,key:/^([a-z_][a-z_\d]*)/i,key_access:/^\.([a-z_][a-z_\d]*)/i,index_access:/^\[(\d+)\]/,sign:/^[+-]/};function y(e){return function(e,t){var r,n,i,s,a,o,p,c,l,u=1,f=e.length,d="";for(n=0;n<f;n++)if("string"==typeof e[n])d+=e[n];else if("object"==typeof e[n]){if((s=e[n]).keys)for(r=t[u],i=0;i<s.keys.length;i++){if(null==r)throw new Error(y('[sprintf] Cannot access property "%s" of undefined value "%s"',s.keys[i],s.keys[i-1]));r=r[s.keys[i]]}else r=s.param_no?t[s.param_no]:t[u++];if(g.not_type.test(s.type)&&g.not_primitive.test(s.type)&&r instanceof Function&&(r=r()),g.numeric_arg.test(s.type)&&"number"!=typeof r&&isNaN(r))throw new TypeError(y("[sprintf] expecting number but found %T",r));switch(g.number.test(s.type)&&(c=0<=r),s.type){case"b":r=parseInt(r,10).toString(2);break;case"c":r=String.fromCharCode(parseInt(r,10));break;case"d":case"i":r=parseInt(r,10);break;case"j":r=JSON.stringify(r,null,s.width?parseInt(s.width):0);break;case"e":r=s.precision?parseFloat(r).toExponential(s.precision):parseFloat(r).toExponential();break;case"f":r=s.precision?parseFloat(r).toFixed(s.precision):parseFloat(r);break;case"g":r=s.precision?String(Number(r.toPrecision(s.precision))):parseFloat(r);break;case"o":r=(parseInt(r,10)>>>0).toString(8);break;case"s":r=String(r),r=s.precision?r.substring(0,s.precision):r;break;case"t":r=String(!!r),r=s.precision?r.substring(0,s.precision):r;break;case"T":r=Object.prototype.toString.call(r).slice(8,-1).toLowerCase(),r=s.precision?r.substring(0,s.precision):r;break;case"u":r=parseInt(r,10)>>>0;break;case"v":r=r.valueOf(),r=s.precision?r.substring(0,s.precision):r;break;case"x":r=(parseInt(r,10)>>>0).toString(16);break;case"X":r=(parseInt(r,10)>>>0).toString(16).toUpperCase()}g.json.test(s.type)?d+=r:(!g.number.test(s.type)||c&&!s.sign?l="":(l=c?"+":"-",r=r.toString().replace(g.sign,"")),o=s.pad_char?"0"===s.pad_char?"0":s.pad_char.charAt(1):" ",p=s.width-(l+r).length,a=s.width&&0<p?o.repeat(p):"",d+=s.align?l+r+a:"0"===o?l+a+r:a+l+r)}return d}(function(e){if(p[e])return p[e];var t,r=e,n=[],i=0;for(;r;){if(null!==(t=g.text.exec(r)))n.push(t[0]);else if(null!==(t=g.modulo.exec(r)))n.push("%");else{if(null===(t=g.placeholder.exec(r)))throw new SyntaxError("[sprintf] unexpected placeholder");if(t[2]){i|=1;var s=[],a=t[2],o=[];if(null===(o=g.key.exec(a)))throw new SyntaxError("[sprintf] failed to parse named argument key");for(s.push(o[1]);""!==(a=a.substring(o[0].length));)if(null!==(o=g.key_access.exec(a)))s.push(o[1]);else{if(null===(o=g.index_access.exec(a)))throw new SyntaxError("[sprintf] failed to parse named argument key");s.push(o[1])}t[2]=s}else i|=2;if(3===i)throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported");n.push({placeholder:t[0],param_no:t[1],keys:t[2],sign:t[3],pad_char:t[4],align:t[5],width:t[6],precision:t[7],type:t[8]})}r=r.substring(t[0].length)}return p[e]=n}(e),arguments)}function e(e,t){return y.apply(null,[e].concat(t||[]))}var p=Object.create(null);"undefined"!=typeof exports&&(exports.sprintf=y,exports.vsprintf=e),"undefined"!=typeof window&&(window.sprintf=y,window.vsprintf=e,"function"==typeof define&&define.amd&&define(function(){return{sprintf:y,vsprintf:e}}))}();
 </script>
 <?endif;?>
+
 <script>
 var searchBoxInput;
 var searchBoxAwesomplete;
@@ -1802,7 +1803,7 @@ function saveState() {
 	$.cookie("ca_selectedMenu",selectedMenu,{path:"/;SameSite=Lax"});
 	$.cookie("ca_filter",$("#searchBox").val(),{path:"/;SameSite=Lax"});
 	$.cookie("ca_categoryName",$(".categoryMenuName").html(),{path:"/;SameSite=Lax"});
-	}
+}
 
 function restoreState() {
 	swalBackground("transparent");
@@ -2173,7 +2174,6 @@ function CAswitchLanguage(language) {
 }
 
 function installLanguage(languageURL,language) {
-
 	disableSearch();
 	openBox('/plugins/community.applications/scripts/languageInstall.sh&arg1=install&arg2='+languageURL,"<?tr('Install Language Pack')?>",600,900,true,"postLanguageRefresh");
 }
@@ -2201,7 +2201,6 @@ function postUpdateLanguage() {
 function removeLanguage(language) {
 	closeSidebar();
 	openBox('/plugins/community.applications/scripts/languageInstall.sh&arg1=remove&arg2='+language,"<?tr('Remove Language Pack')?>",600,900,true,"postLanguageRemove");
-
 }
 
 function postLanguageRefresh() {
@@ -2216,7 +2215,6 @@ function postLanguageRefresh() {
 function postLanguageRemove() {
 	var cat = $(".selectedMenu").data("category");
 	if ( cat == "installed_apps" || cat == "inst_plugins" || cat == "inst_docker" ) {
-
 		postUninstallPlugin();
 		return;
 	}

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

@@ -1,14 +1,14 @@
-9f00a3725c38810a7f375d6a7c47ce38  ./Apps.page
+46544f7997558130ef3868ef397f688c  ./Apps.page
 4e55f7483b661af21a25b677179baffe  ./CA_notices.page
 42a1658a916a3a3eed2a9f2af80603c4  ./ca_settings.page
 e718d7825dbdc96a17a915079222b098  ./default.cfg
-8cc4f4ed87800d8249b35309fdeec2c0  ./include/exec.php
+b5fb14bf729d1473d735fb3d6987ecef  ./include/exec.php
 d5ba81dbd93c7b149dec96def31107e9  ./include/helpers.php
 37de3a3070c32b3626315cdd67106f9b  ./include/paths.php
 532fffdf939594c143e679da02bd841e  ./javascript/libraries.js
 71f911a818d88d3d567f8a2898094ee2  ./README.md
 79f3093f42415484944e6aa2863ee30a  ./scripts/checkForUpdates.php
-08c5dc26cf812f7de7d28b26856b04b1  ./scripts/dockerConvert.php
+677ac9a29993ec57e09ec6a1856f1a11  ./scripts/dockerConvert.php
 07684bde8ccd13523f62c69bb492fc27  ./scripts/installMulti.php
 be74e770cdc8938200fc29580be4e3a1  ./scripts/installMultiPlugin.php
 524afab04ca930f59117a846f819fb2f  ./scripts/installPluginUpdate.sh

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

@@ -2062,7 +2062,6 @@ function convert_docker() {
 	$dockerfile['BindTime'] = "true";
 	$dockerfile['Privileged'] = "false";
 	$dockerfile['Networking']['Mode'] = "bridge";
-	$dockerfile['Icon'] = "/plugins/dynamix.docker.manager/images/question.png";
 
 	$existing_templates = array_diff(scandir($dockerManPaths['templates-user']),[".",".."]);
 	foreach ( $existing_templates as $template ) {

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

@@ -42,7 +42,6 @@ if ( $_GET['ID'] !== false) {
 	$dockerfile['BindTime'] = "true";
 	$dockerfile['Privileged'] = "false";
 	$dockerfile['Networking']['Mode'] = "bridge";
-	$dockerfile['Icon'] = "/plugins/dynamix.docker.manager/images/question.png";
 	$dockerXML = makeXML($dockerfile);
 	file_put_contents("/boot/config/plugins/dockerMan/templates-user/my-CA_TEST_CONTAINER_DOCKERHUB.xml",$dockerXML);