Improve robustness of attribute lookup

dnnsoftware · Oct 6, 2020 · ed13b35 · ed13b35
1 parent 074a865
commit ed13b35
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj
@@ -728,6 +728,7 @@
       <HintPath>..\..\Packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\..\stylecop.json">

diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpAdminController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpAdminController.cs
@@ -13,7 +13,8 @@ namespace Dnn.PersonaBar.Servers.Services
 
     using Dnn.PersonaBar.Library;
     using Dnn.PersonaBar.Library.Attributes;
-    using Dnn.PersonaBar.Servers.Services.Dto;
+    using Dnn.PersonaBar.Servers.Services.Dto;
+    using DotNetNuke.Collections;
     using DotNetNuke.Common.Utilities;
     using DotNetNuke.Entities.Controllers;
     using DotNetNuke.Entities.Host;
@@ -51,7 +52,7 @@ public HttpResponseMessage GetSmtpSettings()
                         smtpPassword = PortalController.GetEncryptedString("SMTPPassword", portalId, Config.GetDecryptionkey())
                     },
                     portalName = PortalSettings.Current.PortalName,
-                    hideCoreSettings = bool.Parse(ProviderConfiguration.GetProviderConfiguration("mail").GetDefaultProvider().Attributes["hideCoreSettings"]),
+                    hideCoreSettings = ProviderConfiguration.GetProviderConfiguration("mail").GetDefaultProvider().Attributes.GetValueOrDefault("hideCoreSettings", false),
                 };
                 return this.Request.CreateResponse(HttpStatusCode.OK, smtpSettings);
             }

diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpHostController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpHostController.cs
@@ -12,7 +12,8 @@ namespace Dnn.PersonaBar.Servers.Services
 
     using Dnn.PersonaBar.Library;
     using Dnn.PersonaBar.Library.Attributes;
-    using Dnn.PersonaBar.Servers.Services.Dto;
+    using Dnn.PersonaBar.Servers.Services.Dto;
+    using DotNetNuke.Collections;
     using DotNetNuke.Common.Utilities;
     using DotNetNuke.Entities.Controllers;
     using DotNetNuke.Entities.Host;
@@ -61,7 +62,7 @@ public HttpResponseMessage GetSmtpSettings()
                         smtpPassword = PortalController.GetEncryptedString("SMTPPassword", portalId, Config.GetDecryptionkey())
                     },
                     portalName = PortalSettings.Current.PortalName,
-                    hideCoreSettings = bool.Parse(ProviderConfiguration.GetProviderConfiguration("mail").GetDefaultProvider().Attributes["hideCoreSettings"]),
+                    hideCoreSettings = ProviderConfiguration.GetProviderConfiguration("mail").GetDefaultProvider().Attributes.GetValueOrDefault("hideCoreSettings", false),
                 };
                 return this.Request.CreateResponse(HttpStatusCode.OK, smtpSettings);
             }