From 62e0c62531e64a21e9296a5845f7bd94c5082739 Mon Sep 17 00:00:00 2001
From: Gheorghe Bulicanu <gicu@live.com>
Date: Fri, 15 May 2020 17:04:12 +0300
Subject: [PATCH] Fix logo/icon upload in site setting for #3722 (#3769)

* Fix logo/icon upload in site setting for #3722

* Remove unrelated code for #3722
---
 .../ClientSide/Dnn.React.Common/src/FileUpload/index.jsx       | 3 +++
 .../SiteSettings.Web/src/components/basicSettings/index.jsx    | 2 ++
 .../Services/SiteSettingsController.cs                         | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/FileUpload/index.jsx b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/FileUpload/index.jsx
index 2752acc9c28..28112c92948 100644
--- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/FileUpload/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/FileUpload/index.jsx
@@ -263,6 +263,9 @@ export default class FileUpload extends Component {
         if (this.props.folderName && typeof this.props.folderName === "string") {
             formData.append("folder", this.props.folderName);
         }
+        if (this.props.validationCode && typeof this.props.validationCode === "string") {
+            formData.append("validationCode", this.props.validationCode);
+        }
         sf.postfile(`UploadFromLocal${this.props.portalId === -1 ? "" : "?portalId=" + this.props.portalId}` , formData, this.uploadComplete.bind(this), this.handleError.bind(this));
         this.setState({ uploading: true, uploadComplete: false });
 
diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/basicSettings/index.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/basicSettings/index.jsx
index a76e3f6111f..f310fd52a8b 100644
--- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/basicSettings/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/basicSettings/index.jsx
@@ -253,6 +253,7 @@ class BasicSettingsPanelBody extends Component {
                         portalId={props.portalId}
                         selectedFile={state.basicSettings.LogoFile}
                         folderName={state.basicSettings.LogoFile ? state.basicSettings.LogoFile.FolderName : null}
+                        validationCode={state.basicSettings.ValidationCode}
                         onSelectFile={this.onSettingChange.bind(this, "LogoFile") }
                         fileFormats={["image/png", "image/jpg", "image/jpeg", "image/bmp", "image/gif", "image/jpeg", "image/svg+xml"]}
                         browseButtonText={resx.get("BrowseButton")}
@@ -289,6 +290,7 @@ class BasicSettingsPanelBody extends Component {
                         portalId={props.portalId}
                         selectedFile={state.basicSettings.FavIcon}
                         folderName={state.basicSettings.FavIcon ? state.basicSettings.FavIcon.FolderName : null}
+                        validationCode={state.basicSettings.ValidationCode}
                         onSelectFile={this.onSettingChange.bind(this, "FavIcon") }
                         fileFormats={["image/x-icon", "image/ico"]}
                         browseButtonText={resx.get("BrowseButton")}
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
index e5836015e3b..c07d1bd1168 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
@@ -29,6 +29,7 @@
 using DotNetNuke.UI.Internals;
 using DotNetNuke.UI.Skins;
 using DotNetNuke.Web.Api;
+using DotNetNuke.Web.UI.WebControls;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -139,6 +140,7 @@ public HttpResponseMessage GetPortalSettings(int? portalId, string cultureCode)
                         fileId = favIcon.FileId,
                         folderId = favIcon.FolderId
                     } : null,
+                    new DnnFileUploadOptions().ValidationCode,
                     IconSet = PortalController.GetPortalSetting("DefaultIconLocation", pid, "Sigma", cultureCode).Replace("icons/", "")
                 };
                 return Request.CreateResponse(HttpStatusCode.OK, new