Fix random replacement of http with https in resources (issue #3599)

dnnsoftware · Jun 5, 2020 · f978d2c · f978d2c
1 parent 76fc4be
commit f978d2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/DNN Platform/Library/Entities/Portals/PortalSettings.cs b/DNN Platform/Library/Entities/Portals/PortalSettings.cs
@@ -699,15 +699,19 @@ public string GetProperty(string propertyName, string format, CultureInfo format
             var isPublic = true;
             switch (lowerPropertyName)
             {
+                case "scheme":
+                    propertyNotFound = false;
+                    result = SSLEnabled ? "https" : "http";
+                    break;
                 case "url":
                     propertyNotFound = false;
                     result = PropertyAccess.FormatString(PortalAlias.HTTPAlias, format);
                     break;
-                case "fullurl": //return portal alias with protocol
+                case "fullurl": //return portal alias with protocol - note this depends on HttpContext
                     propertyNotFound = false;
                     result = PropertyAccess.FormatString(Globals.AddHTTP(PortalAlias.HTTPAlias), format);
                     break;
-                case "passwordreminderurl": //if regsiter page defined in portal settings, then get that page url, otherwise return home page.
+                case "passwordreminderurl": //if regsiter page defined in portal settings, then get that page url, otherwise return home page. - note this depends on HttpContext
                     propertyNotFound = false;
                     var reminderUrl = Globals.AddHTTP(PortalAlias.HTTPAlias);
                     if (RegisterTabId > Null.NullInteger)

diff --git a/DNN Platform/Library/Services/Localization/LocalizationProvider.cs b/DNN Platform/Library/Services/Localization/LocalizationProvider.cs
@@ -80,18 +80,7 @@ public string GetString(string key, string resourceFileRoot, string language, Po
                 Logger.WarnFormat("Missing localization key. key:{0} resFileRoot:{1} threadCulture:{2} userlan:{3}", key, resourceFileRoot, Thread.CurrentThread.CurrentUICulture, language);
             }
 
-            return string.IsNullOrEmpty(resourceValue) ? string.Empty : RemoveHttpUrlsIfSiteisSSLEnabled(portalSettings, resourceValue);
-        }
-
-        private string RemoveHttpUrlsIfSiteisSSLEnabled(PortalSettings portalSettings, string resourceValue)
-        {
-
-            if (portalSettings != null && (portalSettings.SSLEnabled || portalSettings.SSLEnforced))
-            {
-                resourceValue = resourceValue.Replace(@"http:", @"https:");
-            }
-
-            return resourceValue;
+            return string.IsNullOrEmpty(resourceValue) ? string.Empty : resourceValue;
         }
 
         /// <summary>