From 6f88a7ca87b7c1133da9385cbe0f1bb52f75936a Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sun, 23 May 2021 14:33:36 -0400 Subject: [PATCH 1/5] dockerMan: remove HTML in descriptions --- plugins/dynamix.docker.manager/include/CreateDocker.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index cce40f8605..fcdd4c19a4 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -223,6 +223,8 @@ function cpu_pinning() { $arrConfig['Name'] = 'AppData Config Path'; } } + $arrConfig['Name'] = strip_tags($arrConfig['Name']); + $arrConfig['Description'] = strip_tags($arrConfig['Description']); } } if (!empty($dockercfg['DOCKER_APP_UNRAID_PATH']) && file_exists($dockercfg['DOCKER_APP_UNRAID_PATH'])) { @@ -252,7 +254,8 @@ function cpu_pinning() { } } } - $xml['Description'] = str_replace(['[', ']'], ['<', '>'], $xml['Overview']); + $xml['Overview'] = str_replace(['[', ']'], ['<', '>'], $xml['Overview']); + $xml['Description'] = $xml['Overview'] = strip_tags(str_replace("
","\n", $xml['Overview'])); echo ""; } } From 427dfae36c1e27a674000c45cc5e6f48848c4051 Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sun, 23 May 2021 16:24:00 -0400 Subject: [PATCH 2/5] Create CreateDocker.php --- .../include/CreateDocker.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index fcdd4c19a4..21f4ac3b2d 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -223,8 +223,8 @@ function cpu_pinning() { $arrConfig['Name'] = 'AppData Config Path'; } } - $arrConfig['Name'] = strip_tags($arrConfig['Name']); - $arrConfig['Description'] = strip_tags($arrConfig['Description']); + $arrConfig['Name'] = strip_tags($arrConfig['Name']); + $arrConfig['Description'] = strip_tags($arrConfig['Description']); } } if (!empty($dockercfg['DOCKER_APP_UNRAID_PATH']) && file_exists($dockercfg['DOCKER_APP_UNRAID_PATH'])) { @@ -254,7 +254,7 @@ function cpu_pinning() { } } } - $xml['Overview'] = str_replace(['[', ']'], ['<', '>'], $xml['Overview']); + $xml['Overview'] = str_replace(['[', ']'], ['<', '>'], $xml['Overview']); $xml['Description'] = $xml['Overview'] = strip_tags(str_replace("
","\n", $xml['Overview'])); echo ""; } @@ -1046,14 +1046,10 @@ function toggleAllocations() { function load_contOverview() { var new_overview = $("textarea[name='contOverview']").val(); - new_overview = new_overview.replaceAll("[","<").replaceAll("]",">"); - // if no html tags are present, treat the overview as Markdown - if ( stripTags(new_overview) == new_overview ) { - // Handle code block being created by authors indenting (manually editing the xml and spacing) - new_overview = new_overview.replaceAll(" ","    "); - new_overview = marked(new_overview); - } else - new_overview = new_overview.replaceAll("\n",""); + new_overview = new_overview.replaceAll("[","<").replaceAll("]",">").replaceAll("\n","
"); + // Handle code block being created by authors indenting (manually editing the xml and spacing) + new_overview = new_overview.replaceAll(" ","    "); + new_overview = marked(new_overview); $("#contDescription").html(new_overview); } From 78a0bebefe644a55e49824591167982c5d92cf80 Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sun, 23 May 2021 16:28:24 -0400 Subject: [PATCH 3/5] Enhancements --- plugins/dynamix.docker.manager/include/CreateDocker.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index 21f4ac3b2d..e1c9c5cc54 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -1046,10 +1046,12 @@ function toggleAllocations() { function load_contOverview() { var new_overview = $("textarea[name='contOverview']").val(); - new_overview = new_overview.replaceAll("[","<").replaceAll("]",">").replaceAll("\n","
"); + new_overview = new_overview.replaceAll("[","<").replaceAll("]",">"); // Handle code block being created by authors indenting (manually editing the xml and spacing) new_overview = new_overview.replaceAll(" ","    "); new_overview = marked(new_overview); + new_overview = new_overview.replaceAll("\n","
"); // has to be after marked + $("#contDescription").html(new_overview); } From f2d65f0d23303f91fab3d07ae74a9b58473f4cec Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sun, 23 May 2021 16:29:28 -0400 Subject: [PATCH 4/5] Spaces --- plugins/dynamix.docker.manager/include/CreateDocker.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index e1c9c5cc54..fffdc122ab 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -223,8 +223,8 @@ function cpu_pinning() { $arrConfig['Name'] = 'AppData Config Path'; } } - $arrConfig['Name'] = strip_tags($arrConfig['Name']); - $arrConfig['Description'] = strip_tags($arrConfig['Description']); + $arrConfig['Name'] = strip_tags($arrConfig['Name']); + $arrConfig['Description'] = strip_tags($arrConfig['Description']); } } if (!empty($dockercfg['DOCKER_APP_UNRAID_PATH']) && file_exists($dockercfg['DOCKER_APP_UNRAID_PATH'])) { @@ -254,7 +254,7 @@ function cpu_pinning() { } } } - $xml['Overview'] = str_replace(['[', ']'], ['<', '>'], $xml['Overview']); + $xml['Overview'] = str_replace(['[', ']'], ['<', '>'], $xml['Overview']); $xml['Description'] = $xml['Overview'] = strip_tags(str_replace("
","\n", $xml['Overview'])); echo ""; } @@ -1050,7 +1050,7 @@ function load_contOverview() { // Handle code block being created by authors indenting (manually editing the xml and spacing) new_overview = new_overview.replaceAll(" ","    "); new_overview = marked(new_overview); - new_overview = new_overview.replaceAll("\n","
"); // has to be after marked + new_overview = new_overview.replaceAll("\n","
"); // has to be after marked $("#contDescription").html(new_overview); } From 7933ad8ea8b4367ce9f2e6e917f4cac70a7fd1e6 Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Tue, 25 May 2021 06:08:23 -0400 Subject: [PATCH 5/5] Resolve conflict --- .../dynamix.docker.manager/include/CreateDocker.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index fffdc122ab..07ff03630e 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -224,7 +224,7 @@ function cpu_pinning() { } } $arrConfig['Name'] = strip_tags($arrConfig['Name']); - $arrConfig['Description'] = strip_tags($arrConfig['Description']); + $arrConfig['Description'] = strip_tags($arrConfig['Description']); } } if (!empty($dockercfg['DOCKER_APP_UNRAID_PATH']) && file_exists($dockercfg['DOCKER_APP_UNRAID_PATH'])) { @@ -310,11 +310,6 @@ function cpu_pinning() { return this.replace(new RegExp(str1.replace(/([\/\,\!\\\^\$\{\}\[\]\(\)\.\*\+\?\|\<\>\-\&])/g,"\\$&"),(ignore?"gi":"g")),(typeof(str2)=="string")?str2.replace(/\$/g,"$$$$"):str2); }; } -function simplef() { - var text = arguments[0]; - for (var i=1,arg; arg=arguments[i]; i++) text = text.replace('%s',arg); - return _(text); -} // Create config nodes using templateDisplayConfig function makeConfig(opts) { confNum += 1; @@ -332,7 +327,7 @@ function makeConfig(opts) { escapeQuote(opts.Value), opts.Buttons, opts.Required=='true' ? 'required' : '', - simplef('Container %s',opts.Type) + sprintf('Container %s',opts.Type) ); newConfig = "
"+newConfig+"
"; newConfig = $($.parseHTML(newConfig)); @@ -1051,7 +1046,6 @@ function load_contOverview() { new_overview = new_overview.replaceAll(" ","    "); new_overview = marked(new_overview); new_overview = new_overview.replaceAll("\n","
"); // has to be after marked - $("#contDescription").html(new_overview); }