lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 19:44:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactoring ErrorController to return a HttpNotFound result, which will be

Browse Source 
intercepted by the UnhandledExceptionFilter, in order to remove code ducplication.

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-02-23 14:29:37 -08:00
parent 5c3f281d44
commit 3d1018c866
1 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Orchard.Web/Core/Common/Controllers/ErrorController.cs
View File

@@ -1,36 +1,12 @@
using System.Net;
using System.Web.Mvc;
using Orchard.Mvc;
using System.Web.Mvc;
using Orchard.Themes;
namespace Orchard.Core.Common.Controllers {
[Themed]
public class ErrorController : Controller {
private readonly IOrchardServices _orchardServices;
public ErrorController(IOrchardServices orchardServices) {
_orchardServices = orchardServices;
}
public ActionResult NotFound(string url) {
Response.StatusCode = (int)HttpStatusCode.NotFound;
var model = _orchardServices.New.NotFound();
if(url == null) {
url = Request.Url.OriginalString;
}
// If the url is relative then replace with Requested path
model.RequestedUrl = Request.Url.OriginalString.Contains(url) & Request.Url.OriginalString != url ?
Request.Url.OriginalString : url;
// Dont get the user stuck in a 'retry loop' by
// allowing the Referrer to be the same as the Request
model.ReferrerUrl = Request.UrlReferrer != null &&
Request.UrlReferrer.OriginalString != model.RequestedUrl ?
Request.UrlReferrer.OriginalString : null;
return new ShapeResult(this, model);
return HttpNotFound();
}
}
}