Merge pull request #639 from poppastring/fix-mail-exceptions

Fix for null reference exceptions Fix theme formatting
poppastring · Jun 28, 2022 · 173d6ea · 173d6ea
2 parents 1ea3622 + 6a19238
commit 173d6ea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/source/DasBlog.Web.Repositories/BlogManager.cs b/source/DasBlog.Web.Repositories/BlogManager.cs
@@ -466,10 +466,10 @@ private string GetFromEmail()
  {
  if (string.IsNullOrWhiteSpace(dasBlogSettings.SiteConfiguration.SmtpFromEmail))
  {
- return dasBlogSettings.SiteConfiguration.SmtpUserName;
+ return dasBlogSettings.SiteConfiguration.SmtpUserName?.Trim();
  }
 
- return dasBlogSettings.SiteConfiguration.SmtpFromEmail.Trim();
+ return dasBlogSettings.SiteConfiguration.SmtpFromEmail?.Trim();
  }
  public bool SendTestEmail()
  {

diff --git a/source/DasBlog.Web.UI/Themes/median/_Layout.cshtml b/source/DasBlog.Web.UI/Themes/median/_Layout.cshtml
@@ -20,7 +20,7 @@
 
  <div class="container-fluid" id="wrapper">
  <div class="row">
- <nav class="sidebar col-xs-12 col-sm-4 col-lg-3 col-xl-2">
+ <nav class="sidebar col-xs-12 col-sm-4 col-lg-3 col-xl-2 bg-faded sidebar-style-1">
 
  <a href="#menu-toggle" class="btn btn-default" id="menu-toggle"><em class="fa fa-bars"></em></a>
  <ul class="nav nav-pills flex-column sidebar-nav">
@@ -37,7 +37,8 @@
  <a dasblog-unauthorized class="logout-button" asp-controller="account" asp-action="login"><em class="fa fa-power-off"></em>Signin</a>
  <a dasblog-authorized class="logout-button" asp-controller="account" asp-action="logout"><em class="fa fa-power-off"></em>Signout</a>
  </nav>
- <main class="col-xs-12 col-sm-8 col-lg-9 col-xl-10 pt-3 pl-4 ml-auto">
+
+ <main class="col-xs-12 col-sm-8 offset-sm-4 col-lg-9 offset-lg-3 col-xl-10 offset-xl-2 pt-3 pl-4">
  <header class="page-header row justify-center">
  <div class="col-md-6 col-lg-8">
  <h1 class="site-title"> <site-title-link css="fa fa-rocket" /> </h1>

diff --git a/source/DasBlog.Web.UI/Views/Shared/_BlogItems.cshtml b/source/DasBlog.Web.UI/Views/Shared/_BlogItems.cshtml
@@ -1,7 +1,7 @@
 @model ListPostsViewModel
 
 
-@if (Model.Posts.Count > 0)
+@if (Model?.Posts?.Count > 0)
 {
  foreach (var post in Model.Posts)
  {

diff --git a/source/DasBlog.Web.UI/Views/Shared/_BlogItemsSummary.cshtml b/source/DasBlog.Web.UI/Views/Shared/_BlogItemsSummary.cshtml
@@ -1,7 +1,7 @@
 @model ListPostsViewModel
 
 
-@if (Model.Posts.Count > 0)
+@if (Model?.Posts?.Count > 0)
 {
  int order = 0;