From 77a8c7a270a1b2db32a18b13518d3171aa8f53a1 Mon Sep 17 00:00:00 2001 From: David Lee Date: Sun, 16 Jun 2024 15:03:20 +0200 Subject: [PATCH 1/4] DNNImageHandler - Add Option to prevent URL text from appearing as content. --- .../Library/Services/GeneratedImage/DnnImageHandler.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs b/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs index 06a70a31722..958ccb97d55 100644 --- a/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs +++ b/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs @@ -17,6 +17,7 @@ namespace DotNetNuke.Services.GeneratedImage using System.Web; using DotNetNuke.Common; + using DotNetNuke.Common.Utilities; using DotNetNuke.Entities.Portals; using DotNetNuke.Services.FileSystem; using DotNetNuke.Services.GeneratedImage.FilterTransform; @@ -177,7 +178,12 @@ public override ImageInfo GenerateImage(NameValueCollection parameters) if (!string.IsNullOrEmpty(parameters["Text"])) { - placeHolderTrans.Text = text; + bool dnnImagePlaceholder; + bool.TryParse(Config.GetSetting("DnnImagePlaceholder"), out dnnImagePlaceholder); + if (dnnImagePlaceholder) + { + placeHolderTrans.Text = text; + } } if (!string.IsNullOrEmpty(parameters["BackColor"])) From fa3c0a042d21e16ca72c32f9616447657714c879 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 16 Jun 2024 20:14:16 -0400 Subject: [PATCH 2/4] Added web.config merge to disable text display in imageHandler --- .../Website/DotNetNuke.Website.csproj | 1 + .../Website/Install/Config/09.13.04.config | 8 ++ DNN Platform/Website/development.config | 10 ++- DNN Platform/Website/release.config | 80 ++++++++++--------- 4 files changed, 56 insertions(+), 43 deletions(-) create mode 100644 DNN Platform/Website/Install/Config/09.13.04.config diff --git a/DNN Platform/Website/DotNetNuke.Website.csproj b/DNN Platform/Website/DotNetNuke.Website.csproj index 7247bf427b5..3dbad4ce0ac 100644 --- a/DNN Platform/Website/DotNetNuke.Website.csproj +++ b/DNN Platform/Website/DotNetNuke.Website.csproj @@ -1254,6 +1254,7 @@ + web.config diff --git a/DNN Platform/Website/Install/Config/09.13.04.config b/DNN Platform/Website/Install/Config/09.13.04.config new file mode 100644 index 00000000000..4ed4ae56dbd --- /dev/null +++ b/DNN Platform/Website/Install/Config/09.13.04.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/Website/development.config b/DNN Platform/Website/development.config index 6ab918f3fe6..cf4094173bc 100644 --- a/DNN Platform/Website/development.config +++ b/DNN Platform/Website/development.config @@ -37,8 +37,8 @@ - @@ -55,7 +55,7 @@ - @@ -64,7 +64,9 @@ - + + + diff --git a/DNN Platform/Website/release.config b/DNN Platform/Website/release.config index f8c8e9d6a34..8fefc458bf7 100644 --- a/DNN Platform/Website/release.config +++ b/DNN Platform/Website/release.config @@ -37,8 +37,8 @@ - @@ -55,7 +55,7 @@ - @@ -64,7 +64,9 @@ - + + + @@ -126,8 +128,8 @@ - @@ -149,19 +151,19 @@ - - @@ -193,33 +195,33 @@ - - @@ -440,8 +442,8 @@ - From 44b89e233c9769026aa6e63f5bed9847d5dce3ed Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 17 Jun 2024 01:26:12 -0400 Subject: [PATCH 3/4] Changed DnnImagePlaceholder to AllowDnnImagePlaceholderText --- .../GeneratedImage/DnnImageHandler.cs | 5 +- .../Website/Install/Config/09.13.04.config | 2 +- .../SqlDataProvider/09.13.04.SqlDataProvider | 9 +++ DNN Platform/Website/development.config | 68 +++++++++---------- DNN Platform/Website/release.config | 2 +- 5 files changed, 47 insertions(+), 39 deletions(-) create mode 100644 DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.04.SqlDataProvider diff --git a/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs b/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs index 958ccb97d55..6fbcb169e80 100644 --- a/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs +++ b/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs @@ -178,9 +178,8 @@ public override ImageInfo GenerateImage(NameValueCollection parameters) if (!string.IsNullOrEmpty(parameters["Text"])) { - bool dnnImagePlaceholder; - bool.TryParse(Config.GetSetting("DnnImagePlaceholder"), out dnnImagePlaceholder); - if (dnnImagePlaceholder) + bool.TryParse(Config.GetSetting("AllowDnnImagePlaceholderText"), out bool allowDnnImagePlaceholderText); + if (allowDnnImagePlaceholderText) { placeHolderTrans.Text = text; } diff --git a/DNN Platform/Website/Install/Config/09.13.04.config b/DNN Platform/Website/Install/Config/09.13.04.config index 4ed4ae56dbd..da8993ec14d 100644 --- a/DNN Platform/Website/Install/Config/09.13.04.config +++ b/DNN Platform/Website/Install/Config/09.13.04.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.04.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.04.SqlDataProvider new file mode 100644 index 00000000000..343b722cfe1 --- /dev/null +++ b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.13.04.SqlDataProvider @@ -0,0 +1,9 @@ +/************************************************************/ +/***** SqlDataProvider *****/ +/***** *****/ +/***** *****/ +/***** Note: To manually execute this script you must *****/ +/***** perform a search and replace operation *****/ +/***** for {databaseOwner} and {objectQualifier} *****/ +/***** *****/ +/************************************************************/ diff --git a/DNN Platform/Website/development.config b/DNN Platform/Website/development.config index cf4094173bc..6fd19300443 100644 --- a/DNN Platform/Website/development.config +++ b/DNN Platform/Website/development.config @@ -66,7 +66,7 @@ - + @@ -150,19 +150,19 @@ - - @@ -194,33 +194,33 @@ - - @@ -445,8 +445,8 @@ - diff --git a/DNN Platform/Website/release.config b/DNN Platform/Website/release.config index 8fefc458bf7..bcc0f65e542 100644 --- a/DNN Platform/Website/release.config +++ b/DNN Platform/Website/release.config @@ -66,7 +66,7 @@ - + From 8513ca92e3f7f89e423f709c64d6ef283b428d39 Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Tue, 16 Jul 2024 15:39:19 -0400 Subject: [PATCH 4/4] Update DnnImageHandler.cs Changed a whitespace to try and wakeup github --- DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs b/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs index 6fbcb169e80..4a25bda271a 100644 --- a/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs +++ b/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs @@ -270,7 +270,6 @@ public override ImageInfo GenerateImage(NameValueCollection parameters) break; default: - string imageTransformClass = ConfigurationManager.AppSettings["DnnImageHandler." + mode]; string[] imageTransformClassParts = imageTransformClass.Split(','); var asm = Assembly.LoadFrom(Globals.ApplicationMapPath + @"\bin\" +