Improvements to last commit

mgesing · mgesing · commit a18abd6593a3 · 2016-05-19T12:48:20.000+02:00
diff --git a/src/Libraries/SmartStore.Data/Migrations/201605111140288_ImportExtraData.cs b/src/Libraries/SmartStore.Data/Migrations/201605111140288_ImportExtraData.cs
@@ -63,6 +63,10 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
 			builder.AddOrUpdate("Admin.Common.HttpStatus",
 				"HTTP status {0} ({1}).",
 				"HTTP-Status {0} ({1}).");
+
+			builder.AddOrUpdate("Admin.System.Warnings.SitemapReachable.MethodNotAllowed",
+				"The reachability of the sitemap could not be validated.",
+				"Die Erreichbarkeit der Sitemap konnte nicht �berpr�ft werden.");
 		}
 	}
 }
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs
@@ -519,7 +519,6 @@ public ActionResult Warnings()
 			}
 
 			// sitemap reachability
-			HttpStatusCode? sitemapStatusCode = null;
 			string sitemapUrl = null;
 			try
 			{
@@ -530,35 +529,37 @@ public ActionResult Warnings()
 
 				using (var response = (HttpWebResponse)request.GetResponse())
 				{
-					sitemapStatusCode = response.StatusCode;
+					var status = response.StatusCode;
+					var warningModel = new SystemWarningModel();
+					warningModel.Level = (status == HttpStatusCode.OK ? SystemWarningLevel.Pass : SystemWarningLevel.Warning);
+
+					switch (status)
+					{
+						case HttpStatusCode.OK:
+							warningModel.Text = T("Admin.System.Warnings.SitemapReachable.OK");
+							break;
+						default:
+							if (status == HttpStatusCode.MethodNotAllowed)
+								warningModel.Text = T("Admin.System.Warnings.SitemapReachable.MethodNotAllowed");
+							else
+								warningModel.Text = T("Admin.System.Warnings.SitemapReachable.Wrong");
+
+							warningModel.Text = string.Concat(warningModel.Text, " ", T("Admin.Common.HttpStatus", (int)status, status.ToString()));
+							break;
+					}
+
+					model.Add(warningModel);
 				}
 			}
 			catch (WebException exception)
 			{
-				Logger.Warning(sitemapUrl.IsEmpty() ? "SitemapSEO" : sitemapUrl, exception);
-			}
-
-			if (sitemapStatusCode.HasValue && sitemapStatusCode.Value == HttpStatusCode.OK)
-			{
-				model.Add(new SystemWarningModel
-				{
-					Level = SystemWarningLevel.Pass,
-					Text = T("Admin.System.Warnings.SitemapReachable.OK")
-				});
-			}
-			else
-			{
-				var warningText = T("Admin.System.Warnings.SitemapReachable.Wrong");
-				if (sitemapStatusCode.HasValue)
-				{
-					warningText = string.Concat(warningText, " ", T("Admin.Common.HttpStatus", (int)sitemapStatusCode.Value, sitemapStatusCode.Value.ToString()));
-				}
-
 				model.Add(new SystemWarningModel
 				{
 					Level = SystemWarningLevel.Warning,
-					Text = warningText
+					Text = T("Admin.System.Warnings.SitemapReachable.Wrong")
 				});
+
+				Logger.Warning(sitemapUrl.IsEmpty() ? "SitemapSEO" : sitemapUrl, exception);
 			}
 
             //primary exchange rate currency

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)`
`63`	`63`	`builder.AddOrUpdate("Admin.Common.HttpStatus",`
`64`	`64`	`"HTTP status {0} ({1}).",`
`65`	`65`	`"HTTP-Status {0} ({1}).");`
	`66`	`+`
	`67`	`+ builder.AddOrUpdate("Admin.System.Warnings.SitemapReachable.MethodNotAllowed",`
	`68`	`+ "The reachability of the sitemap could not be validated.",`
	`69`	`+ "Die Erreichbarkeit der Sitemap konnte nicht überprüft werden.");`
`66`	`70`	`}`
`67`	`71`	`}`
`68`	`72`	`}`