From fde6eef6b9f081effb2bbda9ac3b17826be9c40e Mon Sep 17 00:00:00 2001 From: Andrew Ma Date: Mon, 5 Apr 2010 22:36:30 -0700 Subject: [PATCH 1/8] Fix for issue [workitem:16371] Removing FollowReturnUrl filter because it always gets executed and does not allow actions to return other view or redirect to other locations. Replacing filter with a Controller extension method called ReturnUrlRedirect which parses the ReturnUrl in the querystring and returns a RedirectFilter action with that Url. --- .../Controllers/BlogPostAdminController.cs | 3 +- .../Controllers/AdminController.cs | 3 +- .../Controllers/AccountController.cs | 9 ++-- .../Mvc/Extensions/ControllerExtensions.cs | 39 +++++++++++++++++ .../FollowReturnUrlAttribute.cs | 8 ---- .../FollowReturnUrl/FollowReturnUrlFilter.cs | 42 ------------------- src/Orchard/Orchard.csproj | 4 +- 7 files changed, 47 insertions(+), 61 deletions(-) create mode 100644 src/Orchard/Mvc/Extensions/ControllerExtensions.cs delete mode 100644 src/Orchard/Mvc/FollowReturnUrl/FollowReturnUrlAttribute.cs delete mode 100644 src/Orchard/Mvc/FollowReturnUrl/FollowReturnUrlFilter.cs diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs index 81e476a89..ade28607a 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs @@ -7,7 +7,6 @@ using Orchard.Blogs.ViewModels; using Orchard.ContentManagement; using Orchard.Localization; using Orchard.Mvc.AntiForgery; -using Orchard.Mvc.FollowReturnUrl; using Orchard.Mvc.Results; using Orchard.UI.Admin; using Orchard.UI.Notify; @@ -101,7 +100,7 @@ namespace Orchard.Blogs.Controllers { return View(model); } - [HttpPost, ActionName("Edit"), FollowReturnUrl] + [HttpPost, ActionName("Edit")] public ActionResult EditPOST(string blogSlug, int postId) { if (!Services.Authorizer.Authorize(Permissions.EditBlogPost, T("Couldn't edit blog post"))) return new HttpUnauthorizedResult(); diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs index dc5a3b9c2..f9969f0da 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs @@ -7,7 +7,6 @@ using JetBrains.Annotations; using Orchard.Localization; using Orchard.ContentManagement; using Orchard.Mvc.AntiForgery; -using Orchard.Mvc.FollowReturnUrl; using Orchard.Mvc.Results; using Orchard.Pages.Drivers; using Orchard.Pages.Models; @@ -174,7 +173,7 @@ namespace Orchard.Pages.Controllers { return View(model); } - [HttpPost, ActionName("Edit"), FollowReturnUrl] + [HttpPost, ActionName("Edit")] public ActionResult EditPOST(int id) { var page = _pageService.GetPageOrDraft(id); if (page == null) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs index ee32a9988..5975abe20 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs @@ -5,7 +5,7 @@ using System.Security.Principal; using System.Web.Mvc; using System.Web.Security; using Orchard.Logging; -using Orchard.Mvc.FollowReturnUrl; +using Orchard.Mvc.Extensions; using Orchard.Mvc.ViewModels; using Orchard.Security; using Orchard.Users.Services; @@ -52,7 +52,7 @@ namespace Orchard.Users.Controllers { return View("LogOn", new LogOnViewModel {Title = "Log On"}); } - [HttpPost, FollowReturnUrl] + [HttpPost] [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", Justification = "Needs to take same parameter type as Controller.Redirect()")] public ActionResult LogOn(string userName, string password, bool rememberMe) { @@ -63,14 +63,13 @@ namespace Orchard.Users.Controllers { _authenticationService.SignIn(user, rememberMe); - return Redirect("~/"); + return this.ReturnUrlRedirect(); } - [FollowReturnUrl] public ActionResult LogOff() { _authenticationService.SignOut(); - return Redirect("~/"); + return this.ReturnUrlRedirect(); } int MinPasswordLength { diff --git a/src/Orchard/Mvc/Extensions/ControllerExtensions.cs b/src/Orchard/Mvc/Extensions/ControllerExtensions.cs new file mode 100644 index 000000000..3110612a4 --- /dev/null +++ b/src/Orchard/Mvc/Extensions/ControllerExtensions.cs @@ -0,0 +1,39 @@ +using System; +using System.Web.Mvc; +using Orchard.Mvc.Results; + +namespace Orchard.Mvc.Extensions { + public static class ControllerExtensions { + public static RedirectResult ReturnUrlRedirect(this Controller controller) { + var request = controller.HttpContext.Request; + Uri returnUrl = null; + try + { + returnUrl = new Uri(request.QueryString["ReturnUrl"]); + } + catch + { + try + { + returnUrl = + new Uri(string.Format("{0}://{1}{2}{3}", request.Url.Scheme, request.Url.Host, + request.Url.Port != 80 ? ":" + request.Url.Port : "", + request.QueryString["ReturnUrl"])); + } + catch { } + } + + if (returnUrl != null && + returnUrl.Scheme == request.Url.Scheme && + returnUrl.Port == request.Url.Port && + returnUrl.Host == request.Url.Host) + { + return new RedirectResult(returnUrl.ToString()); + } + else + { + return new RedirectResult("~/"); + } + } + } +} diff --git a/src/Orchard/Mvc/FollowReturnUrl/FollowReturnUrlAttribute.cs b/src/Orchard/Mvc/FollowReturnUrl/FollowReturnUrlAttribute.cs deleted file mode 100644 index 98c6860a7..000000000 --- a/src/Orchard/Mvc/FollowReturnUrl/FollowReturnUrlAttribute.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; -using System.Web.Mvc; - -namespace Orchard.Mvc.FollowReturnUrl { - [AttributeUsage(AttributeTargets.Method)] - public class FollowReturnUrlAttribute : FilterAttribute { - } -} \ No newline at end of file diff --git a/src/Orchard/Mvc/FollowReturnUrl/FollowReturnUrlFilter.cs b/src/Orchard/Mvc/FollowReturnUrl/FollowReturnUrlFilter.cs deleted file mode 100644 index cd5bb31a5..000000000 --- a/src/Orchard/Mvc/FollowReturnUrl/FollowReturnUrlFilter.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Web.Mvc; -using Orchard.Mvc.Filters; - -namespace Orchard.Mvc.FollowReturnUrl { - public class FollowReturnUrlFilter : FilterProvider, IActionFilter { - public void OnActionExecuting(ActionExecutingContext filterContext) { - } - - public void OnActionExecuted(ActionExecutedContext filterContext) { - var attributes = - (FollowReturnUrlAttribute[]) - filterContext.ActionDescriptor.GetCustomAttributes(typeof (FollowReturnUrlAttribute), false); - - if (attributes.Length <= 0) { - return; - } - - var request = filterContext.HttpContext.Request; - Uri returnUrl = null; - try { - returnUrl = new Uri(request.QueryString["ReturnUrl"]); - } - catch { - try { - returnUrl = - new Uri(string.Format("{0}://{1}{2}{3}", request.Url.Scheme, request.Url.Host, - request.Url.Port != 80 ? ":" + request.Url.Port : "", - request.QueryString["ReturnUrl"])); - } - catch {} - } - - if (returnUrl != null && - returnUrl.Scheme == request.Url.Scheme && - returnUrl.Port == request.Url.Port && - returnUrl.Host == request.Url.Host) { - filterContext.Result = new RedirectResult(returnUrl.ToString()); - } - } - } -} \ No newline at end of file diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj index f20ebe744..be6263833 100644 --- a/src/Orchard/Orchard.csproj +++ b/src/Orchard/Orchard.csproj @@ -156,10 +156,9 @@ - + - ASPXCodeBehind @@ -366,6 +365,7 @@ + From 4a88a8bf10fc04639aba24b1de71f2009ee461e5 Mon Sep 17 00:00:00 2001 From: smwhit Date: Tue, 6 Apr 2010 17:17:39 +0100 Subject: [PATCH 2/8] Fix for issue 16353 --- src/Orchard/Mvc/Html/HtmlHelperExtensions.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs index 3031adc76..2925a5d44 100644 --- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs +++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs @@ -187,10 +187,8 @@ namespace Orchard.Mvc.Html { public static string Link(this HtmlHelper htmlHelper, string linkContents, string href, IDictionary htmlAttributes) { - TagBuilder tagBuilder = new TagBuilder("a") - { - InnerHtml = linkContents - }; + TagBuilder tagBuilder = new TagBuilder("a") + { InnerHtml = htmlHelper.Encode(linkContents) }; tagBuilder.MergeAttributes(htmlAttributes); tagBuilder.MergeAttribute("href", href); return tagBuilder.ToString(TagRenderMode.Normal); From 7fd128d2f3e890bd8690b3fe50104947fcbca927 Mon Sep 17 00:00:00 2001 From: Simon Whittemore Date: Tue, 6 Apr 2010 19:40:51 +0100 Subject: [PATCH 3/8] fix for issue --- src/Orchard/Mvc/Html/HtmlHelperExtensions.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs index 3031adc76..3980e9c82 100644 --- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs +++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs @@ -187,14 +187,15 @@ namespace Orchard.Mvc.Html { public static string Link(this HtmlHelper htmlHelper, string linkContents, string href, IDictionary htmlAttributes) { - TagBuilder tagBuilder = new TagBuilder("a") - { - InnerHtml = linkContents - }; - tagBuilder.MergeAttributes(htmlAttributes); - tagBuilder.MergeAttribute("href", href); - return tagBuilder.ToString(TagRenderMode.Normal); - } + TagBuilder tagBuilder = new TagBuilder("a") + { + InnerHtml = htmlHelper.Encode(linkContents) + }; + + tagBuilder.MergeAttributes(htmlAttributes); + tagBuilder.MergeAttribute("href", href); + return tagBuilder.ToString(TagRenderMode.Normal); + } #endregion From 76b5297713b22a2723453cdd16b59242c32efde2 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Tue, 6 Apr 2010 13:23:59 -0700 Subject: [PATCH 4/8] - Fixing build break due to missing file. - Code convention enforcement to previous contribution. --- .../Mvc/Extensions/ControllerExtensions.cs | 18 +++++------------- src/Orchard/Orchard.csproj | 1 - 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/Orchard/Mvc/Extensions/ControllerExtensions.cs b/src/Orchard/Mvc/Extensions/ControllerExtensions.cs index 3110612a4..db4e2c201 100644 --- a/src/Orchard/Mvc/Extensions/ControllerExtensions.cs +++ b/src/Orchard/Mvc/Extensions/ControllerExtensions.cs @@ -1,20 +1,16 @@ using System; using System.Web.Mvc; -using Orchard.Mvc.Results; namespace Orchard.Mvc.Extensions { public static class ControllerExtensions { public static RedirectResult ReturnUrlRedirect(this Controller controller) { var request = controller.HttpContext.Request; Uri returnUrl = null; - try - { + try { returnUrl = new Uri(request.QueryString["ReturnUrl"]); } - catch - { - try - { + catch { + try { returnUrl = new Uri(string.Format("{0}://{1}{2}{3}", request.Url.Scheme, request.Url.Host, request.Url.Port != 80 ? ":" + request.Url.Port : "", @@ -26,14 +22,10 @@ namespace Orchard.Mvc.Extensions { if (returnUrl != null && returnUrl.Scheme == request.Url.Scheme && returnUrl.Port == request.Url.Port && - returnUrl.Host == request.Url.Host) - { + returnUrl.Host == request.Url.Host) { return new RedirectResult(returnUrl.ToString()); } - else - { - return new RedirectResult("~/"); - } + return new RedirectResult("~/"); } } } diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj index be6263833..26feb9232 100644 --- a/src/Orchard/Orchard.csproj +++ b/src/Orchard/Orchard.csproj @@ -365,7 +365,6 @@ - From 8fcbea38c24cbe97904adabd571a91317573ca1d Mon Sep 17 00:00:00 2001 From: smwhit Date: Wed, 7 Apr 2010 15:31:16 +0100 Subject: [PATCH 5/8] Issue 16229. Validation for empty filenames when uploading media --- ...NullOrEmptyTrimmedStringExtensionsTests.cs | 33 +++++++++++++++++++ src/Orchard.Tests/Orchard.Tests.csproj | 1 + .../Controllers/AdminController.cs | 20 ++++++++--- src/Orchard/Extensions/StringExtensions.cs | 6 ++++ 4 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 src/Orchard.Tests/Extensions/NullOrEmptyTrimmedStringExtensionsTests.cs diff --git a/src/Orchard.Tests/Extensions/NullOrEmptyTrimmedStringExtensionsTests.cs b/src/Orchard.Tests/Extensions/NullOrEmptyTrimmedStringExtensionsTests.cs new file mode 100644 index 000000000..97cfce108 --- /dev/null +++ b/src/Orchard.Tests/Extensions/NullOrEmptyTrimmedStringExtensionsTests.cs @@ -0,0 +1,33 @@ +using NUnit.Framework; +using Orchard.Extensions; + +namespace Orchard.Tests.Extensions +{ + [TestFixture] + public class NullOrEmptyTrimmedStringExtensionsTests + { + [Test] + public void Trimmed_EmptyStringReturnsTrue() { + const string testString = ""; + Assert.AreEqual(true, testString.IsNullOrEmptyTrimmed()); + } + + [Test] + public void NullStringReturnsTrue() { + const string testString = null; + Assert.AreEqual(true, testString.IsNullOrEmptyTrimmed()); + } + + [Test] + public void SpacedStringReturnsTrue() { + const string testString = " "; + Assert.AreEqual(true, testString.IsNullOrEmptyTrimmed()); + } + + [Test] + public void ActualStringReturnsFalse() { + const string testString = "testString"; + Assert.AreEqual(false, testString.IsNullOrEmptyTrimmed()); + } + } +} diff --git a/src/Orchard.Tests/Orchard.Tests.csproj b/src/Orchard.Tests/Orchard.Tests.csproj index add8e6b0a..172a324d3 100644 --- a/src/Orchard.Tests/Orchard.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Tests.csproj @@ -148,6 +148,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs index 02f8ec885..05032585b 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs @@ -4,6 +4,7 @@ using System.IO; using System.Text; using System.Web; using System.Web.Mvc; +using Orchard.Extensions; using Orchard.Localization; using Orchard.Media.Models; using Orchard.Media.Services; @@ -139,21 +140,32 @@ namespace Orchard.Media.Controllers { } [HttpPost] - public ActionResult Add() { + public ActionResult Add() + { var viewModel = new MediaItemAddViewModel(); - try { + try + { UpdateModel(viewModel); if (!Services.Authorizer.Authorize(Permissions.UploadMediaFiles, T("Couldn't upload media file"))) return new HttpUnauthorizedResult(); - foreach (string fileName in Request.Files) { + if(Request.Files[0].FileName.IsNullOrEmptyTrimmed()) { + ModelState.AddModelError("File", "Select a file to upload"); + } + + if (!ModelState.IsValid) + return View(viewModel); + + foreach (string fileName in Request.Files) + { HttpPostedFileBase file = Request.Files[fileName]; _mediaService.UploadMediaFile(viewModel.MediaPath, file); } return RedirectToAction("Edit", new { name = viewModel.FolderName, mediaPath = viewModel.MediaPath }); } - catch (Exception exception) { + catch (Exception exception) + { Services.Notifier.Error("Uploading media file failed: " + exception.Message); return View(viewModel); } diff --git a/src/Orchard/Extensions/StringExtensions.cs b/src/Orchard/Extensions/StringExtensions.cs index 398530049..cee1eb40c 100644 --- a/src/Orchard/Extensions/StringExtensions.cs +++ b/src/Orchard/Extensions/StringExtensions.cs @@ -15,5 +15,11 @@ namespace Orchard.Extensions { return cleanTailRegex.Replace(text.Substring(0, characterCount + 1), "") + ellipsis; } + + public static bool IsNullOrEmptyTrimmed(this string text) + { + if(text == null) return true; + return string.IsNullOrEmpty(text.Trim()); + } } } \ No newline at end of file From c26b03d046090b362ff7fbcd65d858f8a31078d2 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Wed, 7 Apr 2010 11:36:43 -0700 Subject: [PATCH 6/8] - Making some adjustments to the previous contributions. - Unit tests for StringExtensions belongs to the Utility\ folder. - Unit tests files are named after classes. - Use localizedstrings via the T localizer injected as a controller property instead of plain strings. --- src/Orchard.Tests/Orchard.Tests.csproj | 2 +- .../Extensions/StringExtensionsTests.cs} | 14 ++++++-------- .../Orchard.Media/Controllers/AdminController.cs | 15 +++++---------- src/Orchard/Extensions/StringExtensions.cs | 6 ++---- 4 files changed, 14 insertions(+), 23 deletions(-) rename src/Orchard.Tests/{Extensions/NullOrEmptyTrimmedStringExtensionsTests.cs => Utility/Extensions/StringExtensionsTests.cs} (62%) diff --git a/src/Orchard.Tests/Orchard.Tests.csproj b/src/Orchard.Tests/Orchard.Tests.csproj index 172a324d3..59fa4e417 100644 --- a/src/Orchard.Tests/Orchard.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Tests.csproj @@ -148,7 +148,6 @@ - @@ -176,6 +175,7 @@ + diff --git a/src/Orchard.Tests/Extensions/NullOrEmptyTrimmedStringExtensionsTests.cs b/src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs similarity index 62% rename from src/Orchard.Tests/Extensions/NullOrEmptyTrimmedStringExtensionsTests.cs rename to src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs index 97cfce108..50eb8621b 100644 --- a/src/Orchard.Tests/Extensions/NullOrEmptyTrimmedStringExtensionsTests.cs +++ b/src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs @@ -1,31 +1,29 @@ using NUnit.Framework; using Orchard.Extensions; -namespace Orchard.Tests.Extensions -{ +namespace Orchard.Tests.Utility.Extensions { [TestFixture] - public class NullOrEmptyTrimmedStringExtensionsTests - { + public class StringExtensionsTests { [Test] - public void Trimmed_EmptyStringReturnsTrue() { + public void IsNullOrEmptyTrimmed_EmptyStringReturnsTrue() { const string testString = ""; Assert.AreEqual(true, testString.IsNullOrEmptyTrimmed()); } [Test] - public void NullStringReturnsTrue() { + public void IsNullOrEmptyTrimmed_NullStringReturnsTrue() { const string testString = null; Assert.AreEqual(true, testString.IsNullOrEmptyTrimmed()); } [Test] - public void SpacedStringReturnsTrue() { + public void IsNullOrEmptyTrimmed_SpacedStringReturnsTrue() { const string testString = " "; Assert.AreEqual(true, testString.IsNullOrEmptyTrimmed()); } [Test] - public void ActualStringReturnsFalse() { + public void IsNullOrEmptyTrimmed_ActualStringReturnsFalse() { const string testString = "testString"; Assert.AreEqual(false, testString.IsNullOrEmptyTrimmed()); } diff --git a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs index 05032585b..672898a31 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Text; using System.Web; using System.Web.Mvc; using Orchard.Extensions; @@ -140,32 +139,28 @@ namespace Orchard.Media.Controllers { } [HttpPost] - public ActionResult Add() - { + public ActionResult Add() { var viewModel = new MediaItemAddViewModel(); - try - { + try { UpdateModel(viewModel); if (!Services.Authorizer.Authorize(Permissions.UploadMediaFiles, T("Couldn't upload media file"))) return new HttpUnauthorizedResult(); if(Request.Files[0].FileName.IsNullOrEmptyTrimmed()) { - ModelState.AddModelError("File", "Select a file to upload"); + ModelState.AddModelError("File", T("Select a file to upload").ToString()); } if (!ModelState.IsValid) return View(viewModel); - foreach (string fileName in Request.Files) - { + foreach (string fileName in Request.Files) { HttpPostedFileBase file = Request.Files[fileName]; _mediaService.UploadMediaFile(viewModel.MediaPath, file); } return RedirectToAction("Edit", new { name = viewModel.FolderName, mediaPath = viewModel.MediaPath }); } - catch (Exception exception) - { + catch (Exception exception) { Services.Notifier.Error("Uploading media file failed: " + exception.Message); return View(viewModel); } diff --git a/src/Orchard/Extensions/StringExtensions.cs b/src/Orchard/Extensions/StringExtensions.cs index cee1eb40c..adf83fd56 100644 --- a/src/Orchard/Extensions/StringExtensions.cs +++ b/src/Orchard/Extensions/StringExtensions.cs @@ -1,5 +1,4 @@ -using System.Linq; -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; namespace Orchard.Extensions { public static class StringExtensions { @@ -16,8 +15,7 @@ namespace Orchard.Extensions { return cleanTailRegex.Replace(text.Substring(0, characterCount + 1), "") + ellipsis; } - public static bool IsNullOrEmptyTrimmed(this string text) - { + public static bool IsNullOrEmptyTrimmed(this string text) { if(text == null) return true; return string.IsNullOrEmpty(text.Trim()); } From 4b96ede0beb027750968d063185f9039a1d23f67 Mon Sep 17 00:00:00 2001 From: Anthony Steele Date: Wed, 7 Apr 2010 21:40:16 +0100 Subject: [PATCH 7/8] Removed unneeded project references and using statements --- .../Feeds/Controllers/FeedControllerTests.cs | 1 - src/Orchard.Core.Tests/Orchard.Core.Tests.csproj | 6 +----- src/Orchard.Core.Tests/Properties/AssemblyInfo.cs | 1 - .../Scheduling/ScheduledTaskManagerTests.cs | 1 - .../Orchard.Tests.Modules.csproj | 3 --- src/Orchard.Web.Tests/Orchard.Web.Tests.csproj | 1 - src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs | 3 +-- src/Orchard.Web/Core/Common/Permissions.cs | 3 +-- .../Core/Feeds/Controllers/FeedController.cs | 1 - src/Orchard.Web/Core/Feeds/IFeedItemBuilder.cs | 6 +----- src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs | 4 +--- .../Core/Navigation/Controllers/AdminController.cs | 3 +-- src/Orchard.Web/Core/Orchard.Core.csproj | 8 -------- src/Orchard.Web/Core/Properties/AssemblyInfo.cs | 1 - src/Orchard.Web/Core/Themes/Permissions.cs | 1 - .../Core/Themes/ViewModels/PreviewViewModel.cs | 5 +---- .../Core/XmlRpc/Controllers/HomeController.cs | 4 +--- .../XmlRpc/Controllers/LiveWriterController.cs | 5 +---- .../Core/XmlRpc/Models/ModelBinderProvider.cs | 5 +---- .../Modules/Futures.Widgets/Futures.Widgets.csproj | 14 -------------- .../Futures.Widgets/Properties/AssemblyInfo.cs | 1 - .../Modules/Futures.Widgets/WidgetFilter.cs | 4 +--- .../Modules/Orchard.Media/Permissions.cs | 1 - src/Orchard/ContentManagement/ContentModule.cs | 6 +----- src/Orchard/ContentManagement/ContentType.cs | 7 +------ .../Handlers/BuildDisplayModelContext.cs | 1 - .../Handlers/BuildEditorModelContext.cs | 1 - .../Handlers/ContentItemBuilder.cs | 4 +--- .../Handlers/TemplateFilterForRecord.cs | 1 - .../ContentManagement/Records/ContentItemRecord.cs | 2 -- src/Orchard/ContentManagement/Records/Utility.cs | 3 --- src/Orchard/Data/TransactionManager.cs | 3 --- .../Environment/Configuration/AppDataFolder.cs | 3 +-- .../Configuration/ShellSettingsLoader.cs | 1 - src/Orchard/Environment/DefaultOrchardHost.cs | 1 - src/Orchard/Environment/HostContext.cs | 1 - src/Orchard/Environment/OrchardStarter.cs | 2 -- src/Orchard/Environment/ServiceLocator.cs | 3 --- src/Orchard/Extensions/ExtensionManager.cs | 1 - src/Orchard/IOrchardServices.cs | 6 +----- src/Orchard/Localization/LocalizationModule.cs | 3 --- src/Orchard/Localization/LocalizationUtilities.cs | 6 +----- src/Orchard/Mvc/Routes/DefaultRouteProvider.cs | 2 -- src/Orchard/Mvc/Routes/RouteExtensions.cs | 7 +------ src/Orchard/Mvc/ViewEngines/LayoutView.cs | 9 +-------- src/Orchard/Mvc/ViewEngines/LayoutViewContext.cs | 5 +---- src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs | 1 - src/Orchard/Orchard.csproj | 10 ---------- .../Security/IAuthorizationServiceEvents.cs | 1 - src/Orchard/Security/Permissions/Permission.cs | 3 +-- src/Orchard/Security/SecurityFilter.cs | 4 +--- src/Orchard/Security/SecurityModule.cs | 1 - src/Orchard/Security/StandardPermissions.cs | 1 - src/Orchard/Services/Clock.cs | 3 --- src/Orchard/Settings/SettingsModule.cs | 1 - src/Orchard/UI/Notify/NotifierExtensions.cs | 1 - src/Orchard/Utility/Reflect.cs | 1 - .../MSBuild.Orchard.Tasks.csproj | 3 --- 58 files changed, 22 insertions(+), 168 deletions(-) diff --git a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs index c448f8f90..b7489c938 100644 --- a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs +++ b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Web.Mvc; using System.Web.Routing; using System.Xml.Linq; diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index fbc741551..ae8d0f188 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -67,14 +67,10 @@ 3.5 + 3.5 - - 3.5 - - - diff --git a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs b/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs index 6f19864ea..18a11c9ab 100644 --- a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs +++ b/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs index 48d3658ae..5587a4655 100644 --- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs +++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs @@ -9,7 +9,6 @@ using Orchard.ContentManagement.Records; using Orchard.Core.Scheduling.Models; using Orchard.Core.Scheduling.Services; using Orchard.Data; -using Orchard.Tasks; using Orchard.Tasks.Scheduling; using Orchard.Tests.Modules; diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 1f4405293..8dbf5124c 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -78,9 +78,6 @@ 3.5 - - 3.5 - diff --git a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj index 036d7fe46..f96fab8ee 100644 --- a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj +++ b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj @@ -39,7 +39,6 @@ False ..\..\lib\nunit\nunit.framework.dll - diff --git a/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs b/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs index e4dc6f79f..04d56dc88 100644 --- a/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs +++ b/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs @@ -1,5 +1,4 @@ -using System; -using System.Text.RegularExpressions; +using System.Text.RegularExpressions; using JetBrains.Annotations; using Orchard.ContentManagement; using Orchard.ContentManagement.Aspects; diff --git a/src/Orchard.Web/Core/Common/Permissions.cs b/src/Orchard.Web/Core/Common/Permissions.cs index 14a1014b3..b20fb866c 100644 --- a/src/Orchard.Web/Core/Common/Permissions.cs +++ b/src/Orchard.Web/Core/Common/Permissions.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Orchard.Security.Permissions; namespace Orchard.Core.Common { diff --git a/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs b/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs index 7639e9200..9004cb077 100644 --- a/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs +++ b/src/Orchard.Web/Core/Feeds/Controllers/FeedController.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using System.Web.Mvc; -using JetBrains.Annotations; using Orchard.Core.Feeds.Models; using Orchard.Logging; using Orchard.Mvc.Results; diff --git a/src/Orchard.Web/Core/Feeds/IFeedItemBuilder.cs b/src/Orchard.Web/Core/Feeds/IFeedItemBuilder.cs index 4f0603df0..d0c5abed2 100644 --- a/src/Orchard.Web/Core/Feeds/IFeedItemBuilder.cs +++ b/src/Orchard.Web/Core/Feeds/IFeedItemBuilder.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Orchard.Core.Feeds.Models; +using Orchard.Core.Feeds.Models; namespace Orchard.Core.Feeds { public interface IFeedItemBuilder : IEvents { diff --git a/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs b/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs index 49015335f..6320c5c62 100644 --- a/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs +++ b/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; -using Orchard.ContentManagement; -using Orchard.Core.Feeds.Models; +using Orchard.Core.Feeds.Models; namespace Orchard.Core.Feeds { public interface IFeedQueryProvider : IEvents { diff --git a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs index 3c41ffe1a..d5c5fa2e4 100644 --- a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Web.Mvc; using Orchard.ContentManagement; diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 6ff844442..1f09c8fbd 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -32,16 +32,12 @@ - 3.5 3.5 - - 3.5 - False ..\..\..\lib\aspnetmvc\System.Web.Mvc.dll @@ -49,16 +45,12 @@ 3.5 - - - - diff --git a/src/Orchard.Web/Core/Properties/AssemblyInfo.cs b/src/Orchard.Web/Core/Properties/AssemblyInfo.cs index 8120f0ccd..6ad81af5b 100644 --- a/src/Orchard.Web/Core/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Core/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Orchard.Web/Core/Themes/Permissions.cs b/src/Orchard.Web/Core/Themes/Permissions.cs index e5656fe5f..8d6432c9f 100644 --- a/src/Orchard.Web/Core/Themes/Permissions.cs +++ b/src/Orchard.Web/Core/Themes/Permissions.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; using Orchard.Security.Permissions; namespace Orchard.Core.Themes { diff --git a/src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs b/src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs index 480a771e9..952eca8c7 100644 --- a/src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs +++ b/src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +using System.Collections.Generic; using System.Web.Mvc; namespace Orchard.Core.Themes.ViewModels { diff --git a/src/Orchard.Web/Core/XmlRpc/Controllers/HomeController.cs b/src/Orchard.Web/Core/XmlRpc/Controllers/HomeController.cs index 632b304f6..5f72dc423 100644 --- a/src/Orchard.Web/Core/XmlRpc/Controllers/HomeController.cs +++ b/src/Orchard.Web/Core/XmlRpc/Controllers/HomeController.cs @@ -1,8 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Web; using System.Web.Mvc; -using System.Xml; using System.Xml.Linq; using Orchard.Core.XmlRpc.Models; using Orchard.Logging; diff --git a/src/Orchard.Web/Core/XmlRpc/Controllers/LiveWriterController.cs b/src/Orchard.Web/Core/XmlRpc/Controllers/LiveWriterController.cs index f05d5ab48..c498ae11b 100644 --- a/src/Orchard.Web/Core/XmlRpc/Controllers/LiveWriterController.cs +++ b/src/Orchard.Web/Core/XmlRpc/Controllers/LiveWriterController.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +using System.Web; using System.Web.Mvc; using System.Xml.Linq; using Orchard.Logging; diff --git a/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs b/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs index b15926792..968ac9dc1 100644 --- a/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs +++ b/src/Orchard.Web/Core/XmlRpc/Models/ModelBinderProvider.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +using System.Collections.Generic; using System.Web.Mvc; using System.Xml; using System.Xml.Linq; diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj index 547e232f9..c60ae40fe 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj +++ b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj @@ -32,32 +32,18 @@ - - - 3.5 - 3.5 - - 3.5 - False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - - - - diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs index b0a50137d..f0a63b82e 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/Futures.Widgets/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs b/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs index dd6f14fc3..91aeb82af 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs +++ b/src/Orchard.Web/Modules/Futures.Widgets/WidgetFilter.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using System.Web.Mvc; +using System.Web.Mvc; using Futures.Widgets.Models; using Orchard.ContentManagement; using Orchard.Mvc.Filters; diff --git a/src/Orchard.Web/Modules/Orchard.Media/Permissions.cs b/src/Orchard.Web/Modules/Orchard.Media/Permissions.cs index e8f8ece17..8f30785f0 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Permissions.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/Permissions.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; using Orchard.Security.Permissions; namespace Orchard.Media { diff --git a/src/Orchard/ContentManagement/ContentModule.cs b/src/Orchard/ContentManagement/ContentModule.cs index 6b7e15f4d..f4e355478 100644 --- a/src/Orchard/ContentManagement/ContentModule.cs +++ b/src/Orchard/ContentManagement/ContentModule.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Autofac.Builder; +using Autofac.Builder; namespace Orchard.ContentManagement { public class ContentModule : Module { diff --git a/src/Orchard/ContentManagement/ContentType.cs b/src/Orchard/ContentManagement/ContentType.cs index af888d428..acf310bfd 100644 --- a/src/Orchard/ContentManagement/ContentType.cs +++ b/src/Orchard/ContentManagement/ContentType.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Orchard.ContentManagement { +namespace Orchard.ContentManagement { public class ContentType { public string Name { get; set; } public string DisplayName { get; set; } diff --git a/src/Orchard/ContentManagement/Handlers/BuildDisplayModelContext.cs b/src/Orchard/ContentManagement/Handlers/BuildDisplayModelContext.cs index 1b530d9ce..04f55305d 100644 --- a/src/Orchard/ContentManagement/Handlers/BuildDisplayModelContext.cs +++ b/src/Orchard/ContentManagement/Handlers/BuildDisplayModelContext.cs @@ -1,4 +1,3 @@ -using System.Linq; using Orchard.ContentManagement.ViewModels; using Orchard.Mvc.ViewModels; diff --git a/src/Orchard/ContentManagement/Handlers/BuildEditorModelContext.cs b/src/Orchard/ContentManagement/Handlers/BuildEditorModelContext.cs index 5c948065f..a31cc1811 100644 --- a/src/Orchard/ContentManagement/Handlers/BuildEditorModelContext.cs +++ b/src/Orchard/ContentManagement/Handlers/BuildEditorModelContext.cs @@ -1,4 +1,3 @@ -using System.Linq; using Orchard.ContentManagement.ViewModels; using Orchard.Mvc.ViewModels; diff --git a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs index 3ec2bbb59..4c6960eed 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs @@ -1,6 +1,4 @@ -using System; - -namespace Orchard.ContentManagement.Handlers { +namespace Orchard.ContentManagement.Handlers { public class ContentItemBuilder { private readonly ContentItem _item; diff --git a/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs b/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs index 1048db5aa..7e6d74347 100644 --- a/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs +++ b/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs @@ -1,5 +1,4 @@ using Orchard.ContentManagement.Records; -using Orchard.ContentManagement.ViewModels; namespace Orchard.ContentManagement.Handlers { public class TemplateFilterForRecord : TemplateFilterBase> where TRecord : ContentPartRecord, new() { diff --git a/src/Orchard/ContentManagement/Records/ContentItemRecord.cs b/src/Orchard/ContentManagement/Records/ContentItemRecord.cs index 2cae18525..6b0d82d04 100644 --- a/src/Orchard/ContentManagement/Records/ContentItemRecord.cs +++ b/src/Orchard/ContentManagement/Records/ContentItemRecord.cs @@ -1,6 +1,4 @@ -using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; namespace Orchard.ContentManagement.Records { public class ContentItemRecord { diff --git a/src/Orchard/ContentManagement/Records/Utility.cs b/src/Orchard/ContentManagement/Records/Utility.cs index b2ed2fbf7..f461aabcd 100644 --- a/src/Orchard/ContentManagement/Records/Utility.cs +++ b/src/Orchard/ContentManagement/Records/Utility.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Orchard.ContentManagement.Records { public static class Utility { diff --git a/src/Orchard/Data/TransactionManager.cs b/src/Orchard/Data/TransactionManager.cs index 5a3a131ad..d39b9f6fa 100644 --- a/src/Orchard/Data/TransactionManager.cs +++ b/src/Orchard/Data/TransactionManager.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Transactions; using System.Web.Mvc; using Orchard.Logging; diff --git a/src/Orchard/Environment/Configuration/AppDataFolder.cs b/src/Orchard/Environment/Configuration/AppDataFolder.cs index fd235f784..1a07caa84 100644 --- a/src/Orchard/Environment/Configuration/AppDataFolder.cs +++ b/src/Orchard/Environment/Configuration/AppDataFolder.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Web.Hosting; diff --git a/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs b/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs index 81a7a8091..ffca3df37 100644 --- a/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs +++ b/src/Orchard/Environment/Configuration/ShellSettingsLoader.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using System.Web.Hosting; using Orchard.Localization; using Yaml.Grammar; diff --git a/src/Orchard/Environment/DefaultOrchardHost.cs b/src/Orchard/Environment/DefaultOrchardHost.cs index d63ee1f85..1920db0a3 100644 --- a/src/Orchard/Environment/DefaultOrchardHost.cs +++ b/src/Orchard/Environment/DefaultOrchardHost.cs @@ -1,4 +1,3 @@ -using System; using System.Linq; using System.Web.Mvc; using Autofac; diff --git a/src/Orchard/Environment/HostContext.cs b/src/Orchard/Environment/HostContext.cs index 71dbfccdc..c3d519690 100644 --- a/src/Orchard/Environment/HostContext.cs +++ b/src/Orchard/Environment/HostContext.cs @@ -1,4 +1,3 @@ -using System.Web; using System.Web.Mvc; using System.Web.Routing; diff --git a/src/Orchard/Environment/OrchardStarter.cs b/src/Orchard/Environment/OrchardStarter.cs index 60712d41d..e31677d95 100644 --- a/src/Orchard/Environment/OrchardStarter.cs +++ b/src/Orchard/Environment/OrchardStarter.cs @@ -1,10 +1,8 @@ using System; -using System.Diagnostics; using Autofac; using Autofac.Builder; using Autofac.Integration.Web; using Autofac.Modules; -using AutofacContrib.DynamicProxy2; using Orchard.Environment.Configuration; using Orchard.Environment.ShellBuilders; using Orchard.Extensions; diff --git a/src/Orchard/Environment/ServiceLocator.cs b/src/Orchard/Environment/ServiceLocator.cs index 8575503ac..d0dd2bfe4 100644 --- a/src/Orchard/Environment/ServiceLocator.cs +++ b/src/Orchard/Environment/ServiceLocator.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Orchard.Environment { public static class ServiceLocator { diff --git a/src/Orchard/Extensions/ExtensionManager.cs b/src/Orchard/Extensions/ExtensionManager.cs index 5c030f89d..f777662f4 100644 --- a/src/Orchard/Extensions/ExtensionManager.cs +++ b/src/Orchard/Extensions/ExtensionManager.cs @@ -7,7 +7,6 @@ using Orchard.Extensions.Helpers; using Orchard.Extensions.Loaders; using Orchard.Localization; using Orchard.Logging; -using Orchard.Utility; using Yaml.Grammar; using System.Web; diff --git a/src/Orchard/IOrchardServices.cs b/src/Orchard/IOrchardServices.cs index 908ed4392..39082e03d 100644 --- a/src/Orchard/IOrchardServices.cs +++ b/src/Orchard/IOrchardServices.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Orchard.Data; +using Orchard.Data; using Orchard.ContentManagement; using Orchard.Security; using Orchard.UI.Notify; diff --git a/src/Orchard/Localization/LocalizationModule.cs b/src/Orchard/Localization/LocalizationModule.cs index a012ed9e2..ddb27ea2c 100644 --- a/src/Orchard/Localization/LocalizationModule.cs +++ b/src/Orchard/Localization/LocalizationModule.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Reflection; -using System.Text; using Module = Autofac.Builder.Module; namespace Orchard.Localization { diff --git a/src/Orchard/Localization/LocalizationUtilities.cs b/src/Orchard/Localization/LocalizationUtilities.cs index cd9abce9c..df706fb29 100644 --- a/src/Orchard/Localization/LocalizationUtilities.cs +++ b/src/Orchard/Localization/LocalizationUtilities.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.Mvc; +using System.Web.Mvc; using Autofac; using Orchard.Mvc; diff --git a/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs b/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs index 12d53dd67..5a087e396 100644 --- a/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs +++ b/src/Orchard/Mvc/Routes/DefaultRouteProvider.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Web; using System.Web.Mvc; using System.Web.Routing; diff --git a/src/Orchard/Mvc/Routes/RouteExtensions.cs b/src/Orchard/Mvc/Routes/RouteExtensions.cs index 4258172cd..a55bef517 100644 --- a/src/Orchard/Mvc/Routes/RouteExtensions.cs +++ b/src/Orchard/Mvc/Routes/RouteExtensions.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Orchard.Mvc.Routes { +namespace Orchard.Mvc.Routes { public static class RouteExtensions { } diff --git a/src/Orchard/Mvc/ViewEngines/LayoutView.cs b/src/Orchard/Mvc/ViewEngines/LayoutView.cs index 9997229fa..640f299c9 100644 --- a/src/Orchard/Mvc/ViewEngines/LayoutView.cs +++ b/src/Orchard/Mvc/ViewEngines/LayoutView.cs @@ -1,13 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; +using System.IO; using System.Web.Mvc; using Orchard.Mvc.ViewModels; -using Orchard.Security; -using Orchard.UI.Navigation; -using Orchard.UI.Notify; -using Orchard.UI.Zones; namespace Orchard.Mvc.ViewEngines { public class LayoutView : IView { diff --git a/src/Orchard/Mvc/ViewEngines/LayoutViewContext.cs b/src/Orchard/Mvc/ViewEngines/LayoutViewContext.cs index 7724e4ea0..c63bee87c 100644 --- a/src/Orchard/Mvc/ViewEngines/LayoutViewContext.cs +++ b/src/Orchard/Mvc/ViewEngines/LayoutViewContext.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; -using System.Text; using System.Web; using System.Web.Mvc; -using System.Web.UI; namespace Orchard.Mvc.ViewEngines { public class LayoutViewContext { diff --git a/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs b/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs index c5d3e8186..8ce81a97e 100644 --- a/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs +++ b/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using System.Web.Mvc; -using Orchard.Mvc.ViewModels; using Orchard.Themes; namespace Orchard.Mvc.ViewEngines { diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj index 26feb9232..4bc73b0fd 100644 --- a/src/Orchard/Orchard.csproj +++ b/src/Orchard/Orchard.csproj @@ -55,8 +55,6 @@ False ..\..\lib\sharpziplib\ICSharpCode.SharpZipLib.dll - - False ..\..\lib\fluentnhibernate\NHibernate.dll @@ -85,14 +83,6 @@ 3.5 - - 3.5 - - - 3.5 - - - False ..\..\lib\yaml\Yaml.dll diff --git a/src/Orchard/Security/IAuthorizationServiceEvents.cs b/src/Orchard/Security/IAuthorizationServiceEvents.cs index 472ac325d..def7998ae 100644 --- a/src/Orchard/Security/IAuthorizationServiceEvents.cs +++ b/src/Orchard/Security/IAuthorizationServiceEvents.cs @@ -1,4 +1,3 @@ -using System; using Orchard.ContentManagement; using Orchard.Security.Permissions; diff --git a/src/Orchard/Security/Permissions/Permission.cs b/src/Orchard/Security/Permissions/Permission.cs index 200fe8f8f..ce7da2984 100644 --- a/src/Orchard/Security/Permissions/Permission.cs +++ b/src/Orchard/Security/Permissions/Permission.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace Orchard.Security.Permissions { public class Permission { diff --git a/src/Orchard/Security/SecurityFilter.cs b/src/Orchard/Security/SecurityFilter.cs index 79a3030fc..8457b276a 100644 --- a/src/Orchard/Security/SecurityFilter.cs +++ b/src/Orchard/Security/SecurityFilter.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using System.Web.Mvc; +using System.Web.Mvc; using JetBrains.Annotations; using Orchard.Logging; using Orchard.Mvc.Filters; diff --git a/src/Orchard/Security/SecurityModule.cs b/src/Orchard/Security/SecurityModule.cs index f9f844c03..43cb074a9 100644 --- a/src/Orchard/Security/SecurityModule.cs +++ b/src/Orchard/Security/SecurityModule.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; using Autofac; using AutofacContrib.DynamicProxy2; diff --git a/src/Orchard/Security/StandardPermissions.cs b/src/Orchard/Security/StandardPermissions.cs index f36b68f8c..b73f937a2 100644 --- a/src/Orchard/Security/StandardPermissions.cs +++ b/src/Orchard/Security/StandardPermissions.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; using Orchard.Security.Permissions; namespace Orchard.Security { diff --git a/src/Orchard/Services/Clock.cs b/src/Orchard/Services/Clock.cs index 5a2a551b7..038865060 100644 --- a/src/Orchard/Services/Clock.cs +++ b/src/Orchard/Services/Clock.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Orchard.Services { public interface IClock : IDependency { diff --git a/src/Orchard/Settings/SettingsModule.cs b/src/Orchard/Settings/SettingsModule.cs index c026c3605..ddc8d67b2 100644 --- a/src/Orchard/Settings/SettingsModule.cs +++ b/src/Orchard/Settings/SettingsModule.cs @@ -4,7 +4,6 @@ using System.Reflection; using Autofac; using AutofacContrib.DynamicProxy2; using Castle.Core.Interceptor; -using Orchard.Security; using Module = Autofac.Builder.Module; namespace Orchard.Settings { diff --git a/src/Orchard/UI/Notify/NotifierExtensions.cs b/src/Orchard/UI/Notify/NotifierExtensions.cs index 425aab2e9..2290d9be4 100644 --- a/src/Orchard/UI/Notify/NotifierExtensions.cs +++ b/src/Orchard/UI/Notify/NotifierExtensions.cs @@ -1,4 +1,3 @@ -using System.Web.Mvc; using Orchard.Localization; namespace Orchard.UI.Notify { diff --git a/src/Orchard/Utility/Reflect.cs b/src/Orchard/Utility/Reflect.cs index 0c6bc0641..643a08d14 100644 --- a/src/Orchard/Utility/Reflect.cs +++ b/src/Orchard/Utility/Reflect.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Linq.Expressions; using System.Reflection; using System.Text; diff --git a/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj b/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj index 06cb2ebfb..769c71b5e 100644 --- a/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj +++ b/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj @@ -42,9 +42,6 @@ 3.5 - - 3.5 - From c9a3913dbf7f60a4637958216b8498acdc38d588 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Thu, 8 Apr 2010 12:23:30 -0700 Subject: [PATCH 8/8] - Importing patch from smwhit for issue 16373 --- .../Modules/Orchard.Comments/Models/CommentRecord.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentRecord.cs b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentRecord.cs index c1d18ad41..6de01664b 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentRecord.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentRecord.cs @@ -1,5 +1,6 @@ using System; using Orchard.ContentManagement.Records; +using Orchard.Data.Conventions; namespace Orchard.Comments.Models { public class CommentRecord : ContentPartRecord { @@ -9,6 +10,7 @@ namespace Orchard.Comments.Models { public virtual string Email { get; set; } public virtual CommentStatus Status { get; set; } public virtual DateTime? CommentDateUtc { get; set; } + [StringLengthMax] public virtual string CommentText { get; set; } public virtual int CommentedOn { get; set; } public virtual int CommentedOnContainer { get; set; }