Fixed exception when downloading mail attachment of a file that does not exist

mgesing · mgesing · commit 067d0eabf1f2 · 2016-04-25T14:06:20.000+02:00
diff --git a/src/Libraries/SmartStore.Data/Migrations/201603121451066_ThirdPartyEmailHandOver.cs b/src/Libraries/SmartStore.Data/Migrations/201603121451066_ThirdPartyEmailHandOver.cs
@@ -212,6 +212,8 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
 				"E-Mail Adressen an",
 				"Specifies the email addresses where to send the data.",
 				"Legt die E-Mail Adressen fest, an die die Daten verschickt werden soll.");
+
+			builder.AddOrUpdate("Admin.Common.FileNotFound", "File not found", "Datei nicht gefunden");
 		}
 	}
 }
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs
@@ -279,6 +279,18 @@ public ActionResult DownloadAttachment(int id)
 				{
 					path = CommonHelper.MapPath(VirtualPathUtility.ToAppRelative(path), false);
 				}
+
+				if (!System.IO.File.Exists(path))
+				{
+					NotifyError(string.Concat(T("Admin.Common.FileNotFound"), ": ", path));
+
+					var referrer = Services.WebHelper.GetUrlReferrer();
+					if (referrer.HasValue())
+						return Redirect(referrer);
+					
+					return RedirectToAction("List");
+				}
+
 				return File(path, qea.MimeType, qea.Name);
 			}
 
@@ -290,7 +302,6 @@ public ActionResult DownloadAttachment(int id)
 
 			NotifyError(T("Admin.System.QueuedEmails.CouldNotDownloadAttachment"));
 			return RedirectToAction("List");
-
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,8 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)`
`212`	`212`	`"E-Mail Adressen an",`
`213`	`213`	`"Specifies the email addresses where to send the data.",`
`214`	`214`	`"Legt die E-Mail Adressen fest, an die die Daten verschickt werden soll.");`
	`215`	`+`
	`216`	`+ builder.AddOrUpdate("Admin.Common.FileNotFound", "File not found", "Datei nicht gefunden");`
`215`	`217`	`}`
`216`	`218`	`}`
`217`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,18 @@ public ActionResult DownloadAttachment(int id)`
`279`	`279`	`{`
`280`	`280`	`path = CommonHelper.MapPath(VirtualPathUtility.ToAppRelative(path), false);`
`281`	`281`	`}`
	`282`	`+`
	`283`	`+ if (!System.IO.File.Exists(path))`
	`284`	`+ {`
	`285`	`+ NotifyError(string.Concat(T("Admin.Common.FileNotFound"), ": ", path));`
	`286`	`+`
	`287`	`+ var referrer = Services.WebHelper.GetUrlReferrer();`
	`288`	`+ if (referrer.HasValue())`
	`289`	`+ return Redirect(referrer);`
	`290`	`+`
	`291`	`+ return RedirectToAction("List");`
	`292`	`+ }`
	`293`	`+`
`282`	`294`	`return File(path, qea.MimeType, qea.Name);`
`283`	`295`	`}`
`284`	`296`
`@@ -290,7 +302,6 @@ public ActionResult DownloadAttachment(int id)`
`290`	`302`
`291`	`303`	`NotifyError(T("Admin.System.QueuedEmails.CouldNotDownloadAttachment"));`
`292`	`304`	`return RedirectToAction("List");`
`293`		`-`
`294`	`305`	`}`
`295`	`306`	`}`
`296`	`307`	`}`