lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : perf
This commit is contained in:
Louis DeJardin
2010-11-04 20:38:41 -07:00
parent 7b508d72d2 1ce1cc9521
commit 452576b541
45 changed files with 318 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs
View File

@@ -21,6 +21,7 @@ using Orchard.DisplayManagement.Descriptors;
using Orchard.DisplayManagement.Implementation;
using Orchard.Environment;
using Orchard.Environment.Extensions;
using Orchard.Mvc;
using Orchard.Security;
using Orchard.Tests.Modules;
using System.Web.Mvc;
@@ -45,6 +46,8 @@ namespace Orchard.Core.Tests.Routable.Services {
builder.RegisterInstance(new Mock<IAuthorizer>().Object);
builder.RegisterInstance(new Mock<INotifier>().Object);
builder.RegisterInstance(new Mock<IContentDisplay>().Object);
builder.RegisterType<StubHttpContextAccessor>().As<IHttpContextAccessor>();
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<OrchardServices>().As<IOrchardServices>();
builder.RegisterType<ThingHandler>().As<IContentHandler>();

9
src/Orchard.Tests.Modules/Themes/Services/ThemeServiceTests.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using System.Xml.Linq;
using Autofac;
using Moq;
using NHibernate;
using NUnit.Framework;
using Orchard.Caching;
@@ -35,6 +36,7 @@ using Orchard.Security;
using Orchard.Security.Permissions;
using Orchard.Settings;
using Orchard.Tests.Stubs;
using Orchard.Tests.Utility;
using Orchard.Themes;
using Orchard.Themes.Handlers;
using Orchard.Themes.Models;
@@ -42,7 +44,7 @@ using Orchard.Themes.Services;
using Orchard.UI.Notify;
namespace Orchard.Tests.Modules.Themes.Services {
[TestFixture]
[TestFixture, Ignore]
public class ThemeServiceTests {
private IThemeService _themeService;
private ISiteThemeService _siteThemeService;
@@ -68,12 +70,11 @@ namespace Orchard.Tests.Modules.Themes.Services {
public void Init() {
var context = new DynamicProxyContext();
var builder = new ContainerBuilder();
builder.RegisterModule(new SettingsModule());
builder.RegisterType<StubWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<ThemeService>().EnableDynamicProxy(context).As<IThemeService>();
builder.RegisterType<SettingsModuleInterceptor>().As<ISettingsModuleInterceptor>();
builder.RegisterType<SiteService>().As<ISiteService>();
builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
builder.RegisterType<Orchard.Localization.Text>().As<IText>();
builder.RegisterType<DefaultContentManager>().As<IContentManager>();
builder.RegisterType<StubCacheManager>().As<ICacheManager>();
builder.RegisterType<ContentDefinitionManager>().As<IContentDefinitionManager>();
@@ -85,6 +86,7 @@ namespace Orchard.Tests.Modules.Themes.Services {
builder.RegisterType<SiteSettingsPartHandler>().As<IContentHandler>();
builder.RegisterType<ThemeSiteSettingsPartHandler>().As<IContentHandler>();
builder.RegisterType<ModuleService>().As<IModuleService>();
builder.RegisterType<ShellDescriptor>();
builder.RegisterType<OrchardServices>().As<IOrchardServices>();
builder.RegisterType<StubShellDescriptorManager>().As<IShellDescriptorManager>().InstancePerLifetimeScope();
builder.RegisterType<TransactionManager>().As<ITransactionManager>();
@@ -96,6 +98,7 @@ namespace Orchard.Tests.Modules.Themes.Services {
.As(typeof(IMapper<SettingsDictionary, XElement>));
_session = _sessionFactory.OpenSession();
builder.RegisterInstance(new TestSessionLocator(_session)).As<ISessionLocator>();
builder.RegisterAutoMocking(MockBehavior.Loose);
_container = builder.Build();
_themeService = _container.Resolve<IThemeService>();
_siteThemeService = _container.Resolve<ISiteThemeService>();

1
src/Orchard.Tests.Modules/Users/Controllers/AdminControllerTests.cs
View File

@@ -54,6 +54,7 @@ namespace Orchard.Tests.Modules.Users.Controllers {
builder.RegisterType<MembershipService>().As<IMembershipService>();
builder.RegisterType<UserService>().As<IUserService>();
builder.RegisterType<UserPartHandler>().As<IContentHandler>();
builder.RegisterType<StubWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<OrchardServices>().As<IOrchardServices>();
builder.RegisterType<TransactionManager>().As<ITransactionManager>();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();

5
src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
View File

@@ -17,11 +17,13 @@ using Orchard.ContentManagement.Records;
using Orchard.DisplayManagement;
using Orchard.DisplayManagement.Descriptors;
using Orchard.DisplayManagement.Implementation;
using Orchard.Environment;
using Orchard.Environment.Extensions;
using Orchard.Messaging.Events;
using Orchard.Messaging.Services;
using Orchard.Security;
using Orchard.Tests.Stubs;
using Orchard.Tests.Utility;
using Orchard.Users.Handlers;
using Orchard.Users.Models;
using Orchard.Users.Services;
@@ -76,6 +78,9 @@ namespace Orchard.Tests.Modules.Users.Services {
builder.RegisterType<ContentDefinitionManager>().As<IContentDefinitionManager>();
builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
builder.RegisterType<UserPartHandler>().As<IContentHandler>();
builder.RegisterType<StubWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<OrchardServices>().As<IOrchardServices>();
builder.RegisterAutoMocking(MockBehavior.Loose);
builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
builder.RegisterInstance(new Mock<IMessageEventHandler>().Object);
builder.RegisterType<DefaultMessageManager>().As<IMessageManager>();

23
src/Orchard.Tests/Localization/CultureManagerTests.cs
View File

@@ -4,13 +4,24 @@ using System.Globalization;
using System.IO;
using System.Web;
using Autofac;
using Moq;
using NHibernate;
using NUnit.Framework;
using Orchard.Caching;
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
using Orchard.Data;
using Orchard.DisplayManagement;
using Orchard.DisplayManagement.Descriptors;
using Orchard.DisplayManagement.Implementation;
using Orchard.Environment;
using Orchard.Localization.Records;
using Orchard.Localization.Services;
using Orchard.Mvc;
using Orchard.Security;
using Orchard.Tests.ContentManagement;
using Orchard.Tests.Stubs;
using Orchard.UI.Notify;
namespace Orchard.Tests.Localization {
[TestFixture]
@@ -32,6 +43,18 @@ namespace Orchard.Tests.Localization {
[SetUp]
public void Init() {
var builder = new ContainerBuilder();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
builder.RegisterInstance(new Mock<ITransactionManager>().Object);
builder.RegisterInstance(new Mock<IAuthorizer>().Object);
builder.RegisterInstance(new Mock<INotifier>().Object);
builder.RegisterInstance(new Mock<IContentDisplay>().Object);
builder.RegisterType<StubHttpContextAccessor>().As<IHttpContextAccessor>();
builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>();
builder.RegisterType<DefaultContentManager>().As<IContentManager>();
builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
builder.RegisterType<OrchardServices>().As<IOrchardServices>();
builder.RegisterType<TestCultureSelector>().As<ICultureSelector>();
builder.RegisterType<DefaultCultureManager>().As<ICultureManager>();
builder.RegisterType<Signals>().As<ISignals>();

98
src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs
View File

@@ -1,10 +1,104 @@
using System;
using System.Collections.Generic;
using System.Web;
using Autofac;
using Orchard.ContentManagement;
using Orchard.Security;
using Orchard.Settings;
namespace Orchard.Tests.Stubs {
public class StubWorkContextAccessor : IWorkContextAccessor {
private readonly ILifetimeScope _lifetimeScope;
private WorkContext _workContext;
public StubWorkContextAccessor(ILifetimeScope lifetimeScope) {
_lifetimeScope = lifetimeScope;
_workContext = new WorkContextImpl(_lifetimeScope);
}
public class WorkContextImpl : WorkContext {
private readonly ILifetimeScope _lifetimeScope;
private Dictionary<string, object> _contextDictonary;
public WorkContextImpl(ILifetimeScope lifetimeScope) {
_contextDictonary = new Dictionary<string, object>();
CurrentUser = new StubUser();
var ci = new ContentItem();
ci.Weld(new StubSite());
CurrentSite = ci.As<ISite>();
_lifetimeScope = lifetimeScope;
}
public class StubSite : ContentPart, ISite {
public string PageTitleSeparator {
get { throw new NotImplementedException(); }
}
public string SiteName {
get { throw new NotImplementedException(); }
}
public string SiteSalt {
get { throw new NotImplementedException(); }
}
public string SuperUser {
get { throw new NotImplementedException(); }
}
public string HomePage {
get { throw new NotImplementedException(); }
set { throw new NotImplementedException(); }
}
public string SiteCulture {
get { throw new NotImplementedException(); }
set { throw new NotImplementedException(); }
}
public ResourceDebugMode ResourceDebugMode {
get { throw new NotImplementedException(); }
set { throw new NotImplementedException(); }
}
}
public class StubUser : IUser {
public ContentItem ContentItem {
get { throw new NotImplementedException(); }
}
public int Id {
get { return 5; }
}
public string UserName {
get { return "Fake"; }
}
public string Email {
get { return "Fake@fake.com"; }
}
}
public override T Resolve<T>() {
return _lifetimeScope.Resolve<T>();
}
public override bool TryResolve<T>(out T service) {
return _lifetimeScope.TryResolve<T>(out service);
}
public override T GetState<T>(string name) {
return (T) _contextDictonary[name];
}
public override void SetState<T>(string name, T value) {
_contextDictonary[name] = value;
}
}
public WorkContext GetContext(HttpContextBase httpContext) {
throw new NotSupportedException();
return _workContext;
}
public IWorkContextScope CreateWorkContextScope(HttpContextBase httpContext) {
@@ -12,7 +106,7 @@ namespace Orchard.Tests.Stubs {
}
public WorkContext GetContext() {
return null;
return _workContext;
}
public IWorkContextScope CreateWorkContextScope() {

47
src/Orchard.Tests/UI/Navigation/NavigationManagerTests.cs
View File

@@ -1,20 +1,25 @@
using System.Linq;
using System;
using System.Linq;
using System.Web.Mvc;
using System.Web.Routing;
using Autofac;
using NUnit.Framework;
using Orchard.ContentManagement;
using Orchard.Data;
using Orchard.Localization;
using Orchard.Security;
using Orchard.Security.Permissions;
using Orchard.Settings;
using Orchard.Tests.Stubs;
using Orchard.UI.Navigation;
using Orchard.UI.Notify;
namespace Orchard.Tests.UI.Navigation {
[TestFixture]
public class NavigationManagerTests {
[Test]
public void EmptyMenuIfNameDoesntMatch() {
var manager = new NavigationManager(new[] { new StubProvider() }, new StubAuth(), new UrlHelper(new RequestContext(new StubHttpContext("~/"), new RouteData())));
var manager = new NavigationManager(new[] { new StubProvider() }, new StubAuth(), new UrlHelper(new RequestContext(new StubHttpContext("~/"), new RouteData())), new StubOrchardServices());
var menuItems = manager.BuildMenu("primary");
Assert.That(menuItems.Count(), Is.EqualTo(0));
@@ -31,7 +36,7 @@ namespace Orchard.Tests.UI.Navigation {
[Test]
public void NavigationManagerShouldUseProvidersToBuildNamedMenu() {
var manager = new NavigationManager(new[] { new StubProvider() }, new StubAuth(), new UrlHelper(new RequestContext(new StubHttpContext("~/"), new RouteData())));
var manager = new NavigationManager(new[] { new StubProvider() }, new StubAuth(), new UrlHelper(new RequestContext(new StubHttpContext("~/"), new RouteData())), new StubOrchardServices());
var menuItems = manager.BuildMenu("admin");
Assert.That(menuItems.Count(), Is.EqualTo(2));
@@ -43,7 +48,7 @@ namespace Orchard.Tests.UI.Navigation {
[Test]
public void NavigationManagerShouldMergeAndOrderNavigation() {
var manager = new NavigationManager(new INavigationProvider[] { new StubProvider(), new Stub2Provider() }, new StubAuth(), new UrlHelper(new RequestContext(new StubHttpContext("~/"), new RouteData())));
var manager = new NavigationManager(new INavigationProvider[] { new StubProvider(), new Stub2Provider() }, new StubAuth(), new UrlHelper(new RequestContext(new StubHttpContext("~/"), new RouteData())), new StubOrchardServices());
var menuItems = manager.BuildMenu("admin");
Assert.That(menuItems.Count(), Is.EqualTo(3));
@@ -90,4 +95,38 @@ namespace Orchard.Tests.UI.Navigation {
}
}
}
public class StubOrchardServices : IOrchardServices {
private readonly ILifetimeScope _lifetimeScope;
public StubOrchardServices() {}
public StubOrchardServices(ILifetimeScope lifetimeScope) {
_lifetimeScope = lifetimeScope;
}
public IContentManager ContentManager {
get { throw new NotImplementedException(); }
}
public ITransactionManager TransactionManager {
get { throw new NotImplementedException(); }
}
public IAuthorizer Authorizer {
get { throw new NotImplementedException(); }
}
public INotifier Notifier {
get { throw new NotImplementedException(); }
}
public dynamic New {
get { throw new NotImplementedException(); }
}
public WorkContext WorkContext {
get { return new StubWorkContextAccessor(_lifetimeScope).GetContext(); }
}
}
}

45
src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
View File

@@ -147,50 +147,5 @@ namespace Orchard.Core.Common.Handlers {
if (part.ContainerField.Value != null)
part.ContainerField.Value = part.ContainerField.Value;
}
//private void GetEditor(BuildEditorContext context, CommonPart instance) {
// var currentUser = _authenticationService.GetAuthenticatedUser();
// if (!_authorizationService.TryCheckAccess(Permissions.ChangeOwner, currentUser, instance)) {
// return;
// }
// var viewModel = new OwnerEditorViewModel();
// if (instance.Owner != null)
// viewModel.Owner = instance.Owner.UserName;
// context.AddEditor(new TemplateViewModel(viewModel, "CommonPart") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" });
//}
//private void UpdateEditor(UpdateEditorContext context, CommonPart instance) {
// // this event is hooked so the modified timestamp is changed when an edit-post occurs.
// // kind of a loose rule of thumb. may not be sufficient
// instance.ModifiedUtc = _clock.UtcNow;
// instance.VersionModifiedUtc = _clock.UtcNow;
// var currentUser = _authenticationService.GetAuthenticatedUser();
// if (!_authorizationService.TryCheckAccess(Permissions.ChangeOwner, currentUser, instance)) {
// return;
// }
// var viewModel = new OwnerEditorViewModel();
// if (instance.Owner != null)
// viewModel.Owner = instance.Owner.UserName;
// var priorOwner = viewModel.Owner;
// context.Updater.TryUpdateModel(viewModel, "CommonPart", null, null);
// if (viewModel.Owner != null && viewModel.Owner != priorOwner) {
// var newOwner = _membershipService.GetUser(viewModel.Owner);
// if (newOwner == null) {
// context.Updater.AddModelError("CommonPart.Owner", T("Invalid user name"));
// }
// else {
// instance.Owner = newOwner;
// }
// }
// context.AddEditor(new TemplateViewModel(viewModel, "CommonPart") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" });
//}
}
}

9
src/Orchard.Web/Core/HomePage/Controllers/HomeController.cs
View File

@@ -1,29 +1,28 @@
using System;
using System.Collections.Generic;
using System.Web.Mvc;
using JetBrains.Annotations;
using Orchard.Logging;
using Orchard.Services;
using Orchard.Settings;
using Orchard.Themes;
namespace Orchard.Core.HomePage.Controllers {
[HandleError]
public class HomeController : Controller {
private readonly IEnumerable<IHomePageProvider> _homePageProviders;
private readonly IOrchardServices _orchardServices;
public HomeController(IEnumerable<IHomePageProvider> homePageProviders) {
public HomeController(IEnumerable<IHomePageProvider> homePageProviders, IOrchardServices orchardServices) {
_homePageProviders = homePageProviders;
_orchardServices = orchardServices;
Logger = NullLogger.Instance;
}
public ILogger Logger { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
[Themed]
public ActionResult Index() {
try {
var homepage = CurrentSite.HomePage;
var homepage = _orchardServices.WorkContext.CurrentSite.HomePage;
if (String.IsNullOrEmpty(homepage))
return View();

10
src/Orchard.Web/Core/Messaging/Services/DefaultMessageManager.cs
View File

@@ -1,36 +1,36 @@
using System;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.Core.Messaging.Models;
using Orchard.Logging;
using Orchard.Messaging.Events;
using Orchard.Messaging.Models;
using Orchard.Messaging.Services;
using Orchard.Settings;
using Orchard.ContentManagement.Records;
namespace Orchard.Core.Messaging.Services {
public class DefaultMessageManager : IMessageManager {
private readonly IMessageEventHandler _messageEventHandler;
private readonly IEnumerable<IMessagingChannel> _channels;
private readonly IOrchardServices _orchardServices;
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ILogger Logger { get; set; }
public DefaultMessageManager(
IMessageEventHandler messageEventHandler,
IEnumerable<IMessagingChannel> channels) {
IEnumerable<IMessagingChannel> channels,
IOrchardServices orchardServices) {
_messageEventHandler = messageEventHandler;
_channels = channels;
_orchardServices = orchardServices;
}
public void Send(ContentItemRecord recipient, string type, string service = null, Dictionary<string, string> properties = null) {
if ( !HasChannels() )
return;
var messageSettings = CurrentSite.As<MessageSettingsPart>().Record;
var messageSettings = _orchardServices.WorkContext.CurrentSite.As<MessageSettingsPart>().Record;
if ( messageSettings == null || String.IsNullOrWhiteSpace(messageSettings.DefaultChannelService) ) {
return;

9
src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
View File

@@ -12,18 +12,19 @@ namespace Orchard.Core.Navigation.Drivers {
public class MenuPartDriver : ContentPartDriver<MenuPart> {
private readonly IAuthorizationService _authorizationService;
private readonly INavigationManager _navigationManager;
private readonly IOrchardServices _orchardServices;
public MenuPartDriver(IAuthorizationService authorizationService, INavigationManager navigationManager) {
public MenuPartDriver(IAuthorizationService authorizationService, INavigationManager navigationManager, IOrchardServices orchardServices) {
_authorizationService = authorizationService;
_navigationManager = navigationManager;
_orchardServices = orchardServices;
T = NullLocalizer.Instance;
}
public virtual IUser CurrentUser { get; set; }
public Localizer T { get; set; }
protected override DriverResult Editor(MenuPart part, dynamic shapeHelper) {
if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, part))
if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, _orchardServices.WorkContext.CurrentUser, part))
return null;
return ContentShape("Parts_Navigation_Menu_Edit",
@@ -31,7 +32,7 @@ namespace Orchard.Core.Navigation.Drivers {
}
protected override DriverResult Editor(MenuPart part, IUpdateModel updater, dynamic shapeHelper) {
if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, part))
if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, _orchardServices.WorkContext.CurrentUser, part))
return null;
if (string.IsNullOrEmpty(part.MenuPosition))

7
src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
using Orchard.ContentManagement.Drivers;
@@ -10,7 +9,6 @@ using Orchard.Core.Routable.Services;
using Orchard.Core.Routable.ViewModels;
using Orchard.Localization;
using Orchard.Services;
using Orchard.Settings;
using Orchard.UI.Notify;
namespace Orchard.Core.Routable.Drivers {
@@ -29,7 +27,6 @@ namespace Orchard.Core.Routable.Drivers {
private const string TemplateName = "Parts/Routable.RoutePart";
public Localizer T { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
protected override string Prefix {
get { return "Routable"; }
@@ -70,7 +67,7 @@ namespace Orchard.Core.Routable.Drivers {
: "";
}
model.PromoteToHomePage = model.Id != 0 && part.Path != null && _routableHomePageProvider != null && CurrentSite.HomePage == _routableHomePageProvider.GetSettingValue(model.Id);
model.PromoteToHomePage = model.Id != 0 && part.Path != null && _routableHomePageProvider != null && _services.WorkContext.CurrentSite.HomePage == _routableHomePageProvider.GetSettingValue(model.Id);
return ContentShape("Parts_Routable_Edit",
() => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
}
@@ -102,7 +99,7 @@ namespace Orchard.Core.Routable.Drivers {
part.Path = part.GetPathWithSlug(part.Slug);
if (part.ContentItem.Id != 0 && model.PromoteToHomePage && _routableHomePageProvider != null) {
CurrentSite.HomePage = _routableHomePageProvider.GetSettingValue(part.ContentItem.Id);
_services.WorkContext.CurrentSite.HomePage = _routableHomePageProvider.GetSettingValue(part.ContentItem.Id);
}
return Editor(part, shapeHelper);

7
src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
View File

@@ -3,14 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Web.Mvc;
using JetBrains.Annotations;
using Orchard.Comments.Models;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.Services;
using Orchard.Settings;
using Orchard.UI.Notify;
using Orchard.Security;
using Orchard.Comments.ViewModels;
using Orchard.Comments.Services;
@@ -26,9 +22,6 @@ namespace Orchard.Comments.Controllers {
T = NullLocalizer.Instance;
}
protected virtual IUser CurrentUser { get; [UsedImplicitly] private set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public IOrchardServices Services { get; set; }
public ILogger Logger { get; set; }
public Localizer T { get; set; }

15
src/Orchard.Web/Modules/Orchard.Comments/Controllers/CommentController.cs
View File

@@ -1,37 +1,26 @@
using System;
using System.Web.Mvc;
using JetBrains.Annotations;
using Orchard.Comments.Models;
using Orchard.Comments.Services;
using Orchard.Comments.ViewModels;
using Orchard.ContentManagement;
using Orchard.Localization;
using Orchard.Security;
using Orchard.Settings;
using Orchard.UI.Notify;
using Orchard.Utility.Extensions;
namespace Orchard.Comments.Controllers {
public class CommentController : Controller {
public IOrchardServices Services { get; set; }
private readonly IAuthorizer _authorizer;
private readonly ICommentService _commentService;
private readonly INotifier _notifier;
public CommentController(IOrchardServices services, ICommentService commentService, INotifier notifier, IAuthorizer authorizer) {
public CommentController(IOrchardServices services, ICommentService commentService, INotifier notifier) {
Services = services;
_commentService = commentService;
_notifier = notifier;
_authorizer = authorizer;
T = NullLocalizer.Instance;
}
protected virtual IUser CurrentUser { get; [UsedImplicitly]
private set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly]
private set; }
public Localizer T { get; set; }
[HttpPost]
@@ -61,7 +50,7 @@ namespace Orchard.Comments.Controllers {
CommentedOn = viewModel.CommentedOn
};
CommentPart commentPart = _commentService.CreateComment(context, CurrentSite.As<CommentSettingsPart>().Record.ModerateComments);
CommentPart commentPart = _commentService.CreateComment(context, Services.WorkContext.CurrentSite.As<CommentSettingsPart>().Record.ModerateComments);
if (commentPart.Record.Status == CommentStatus.Pending)
Services.Notifier.Information(T("Your comment will appear after the site administrator approves it."));

31
src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
View File

@@ -1,13 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using Orchard.Comments.Drivers;
using Orchard.Comments.Models;
using Orchard.ContentManagement.Aspects;
using Orchard.Data;
using Orchard.Logging;
using Orchard.ContentManagement;
using Orchard.Security;
using Orchard.Services;
namespace Orchard.Comments.Services {
@@ -16,44 +14,43 @@ namespace Orchard.Comments.Services {
private readonly IRepository<ClosedCommentsRecord> _closedCommentsRepository;
private readonly IClock _clock;
private readonly ICommentValidator _commentValidator;
private readonly IContentManager _contentManager;
private readonly IOrchardServices _orchardServices;
public CommentService(IRepository<ClosedCommentsRecord> closedCommentsRepository,
IClock clock,
ICommentValidator commentValidator,
IContentManager contentManager) {
IOrchardServices orchardServices) {
_closedCommentsRepository = closedCommentsRepository;
_clock = clock;
_commentValidator = commentValidator;
_contentManager = contentManager;
_orchardServices = orchardServices;
Logger = NullLogger.Instance;
}
public ILogger Logger { get; set; }
protected virtual IUser CurrentUser { get; [UsedImplicitly] private set; }
public IEnumerable<CommentPart> GetComments() {
return _contentManager
return _orchardServices.ContentManager
.Query<CommentPart, CommentPartRecord>()
.List();
}
public IEnumerable<CommentPart> GetComments(CommentStatus status) {
return _contentManager
return _orchardServices.ContentManager
.Query<CommentPart, CommentPartRecord>()
.Where(c => c.Status == status)
.List();
}
public IEnumerable<CommentPart> GetCommentsForCommentedContent(int id) {
return _contentManager
return _orchardServices.ContentManager
.Query<CommentPart, CommentPartRecord>()
.Where(c => c.CommentedOn == id || c.CommentedOnContainer == id)
.List();
}
public IEnumerable<CommentPart> GetCommentsForCommentedContent(int id, CommentStatus status) {
return _contentManager
return _orchardServices.ContentManager
.Query<CommentPart, CommentPartRecord>()
.Where(c => c.CommentedOn == id || c.CommentedOnContainer == id)
.Where(ctx => ctx.Status == status)
@@ -61,25 +58,25 @@ namespace Orchard.Comments.Services {
}
public CommentPart GetComment(int id) {
return _contentManager.Get<CommentPart>(id);
return _orchardServices.ContentManager.Get<CommentPart>(id);
}
public ContentItemMetadata GetDisplayForCommentedContent(int id) {
var content = _contentManager.Get(id);
var content = _orchardServices.ContentManager.Get(id);
if (content == null)
return null;
return _contentManager.GetItemMetadata(content);
return _orchardServices.ContentManager.GetItemMetadata(content);
}
public CommentPart CreateComment(CreateCommentContext context, bool moderateComments) {
var comment = _contentManager.Create<CommentPart>("Comment");
var comment = _orchardServices.ContentManager.Create<CommentPart>("Comment");
comment.Record.Author = context.Author;
comment.Record.CommentDateUtc = _clock.UtcNow;
comment.Record.CommentText = context.CommentText;
comment.Record.Email = context.Email;
comment.Record.SiteName = context.SiteName;
comment.Record.UserName = (CurrentUser == null ? context.Author : CurrentUser.UserName);
comment.Record.UserName = (_orchardServices.WorkContext.CurrentUser == null ? context.Author : _orchardServices.WorkContext.CurrentUser.UserName);
comment.Record.CommentedOn = context.CommentedOn;
comment.Record.Status = _commentValidator.ValidateComment(comment)
@@ -88,7 +85,7 @@ namespace Orchard.Comments.Services {
// store id of the next layer for large-grained operations, e.g. rss on blog
//TODO:(rpaquay) Get rid of this (comment aspect takes care of container)
var commentedOn = _contentManager.Get<ICommonPart>(comment.Record.CommentedOn);
var commentedOn = _orchardServices.ContentManager.Get<ICommonPart>(comment.Record.CommentedOn);
if (commentedOn != null && commentedOn.Container != null) {
comment.Record.CommentedOnContainer = commentedOn.Container.ContentItem.Id;
}
@@ -121,7 +118,7 @@ namespace Orchard.Comments.Services {
}
public void DeleteComment(int commentId) {
_contentManager.Remove(_contentManager.Get(commentId));
_orchardServices.ContentManager.Remove(_orchardServices.ContentManager.Get(commentId));
}
public bool CommentsClosedForCommentedContent(int id) {

11
src/Orchard.Web/Modules/Orchard.Comments/Services/CommentValidator.cs
View File

@@ -2,10 +2,9 @@
using System.Web;
using JetBrains.Annotations;
using Orchard.Comments.Models;
using Orchard.ContentManagement;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.ContentManagement;
using Orchard.Settings;
using Orchard.UI.Notify;
using Joel.Net;
@@ -15,18 +14,20 @@ namespace Orchard.Comments.Services {
[UsedImplicitly]
public class AkismetCommentValidator : ICommentValidator {
private readonly INotifier _notifer;
public AkismetCommentValidator(INotifier notifier) {
private readonly IOrchardServices _orchardServices;
public AkismetCommentValidator(INotifier notifier, IOrchardServices orchardServices) {
_notifer = notifier;
_orchardServices = orchardServices;
Logger = NullLogger.Instance;
T = NullLocalizer.Instance;
}
public ILogger Logger { get; set; }
public Localizer T { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public bool ValidateComment(CommentPart commentPart) {
CommentSettingsPartRecord commentSettingsPartRecord = CurrentSite.As<CommentSettingsPart>().Record;
CommentSettingsPartRecord commentSettingsPartRecord = _orchardServices.WorkContext.CurrentSite.As<CommentSettingsPart>().Record;
string akismetKey = commentSettingsPartRecord.AkismetKey;
string akismetUrl = commentSettingsPartRecord.AkismetUrl;
bool enableSpamProtection = commentSettingsPartRecord.EnableSpamProtection;

9
src/Orchard.Web/Modules/Orchard.Email/Services/EmailMessagingChannel.cs
View File

@@ -2,25 +2,24 @@
using System.Collections.Generic;
using System.Net;
using System.Net.Mail;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.Email.Models;
using Orchard.Settings;
using Orchard.Messaging.Services;
using Orchard.Messaging.Models;
namespace Orchard.Email.Services {
public class EmailMessagingChannel : IMessagingChannel {
private readonly IOrchardServices _orchardServices;
public const string EmailService = "Email";
public EmailMessagingChannel() {
public EmailMessagingChannel(IOrchardServices orchardServices) {
_orchardServices = orchardServices;
Logger = NullLogger.Instance;
}
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ILogger Logger { get; set; }
public Localizer T { get; set; }
@@ -28,7 +27,7 @@ namespace Orchard.Email.Services {
if ( !context.Service.Equals(EmailService, StringComparison.InvariantCultureIgnoreCase) )
return;
var smtpSettings = CurrentSite.As<SmtpSettingsPart>();
var smtpSettings = _orchardServices.WorkContext.CurrentSite.As<SmtpSettingsPart>();
// can't process emails if the Smtp settings have not yet been set
if ( smtpSettings == null || !smtpSettings.IsValid() ) {

11
src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs
View File

@@ -1,33 +1,32 @@
using System;
using System.Collections.Generic;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.Core.Messaging.Models;
using Orchard.Localization;
using Orchard.Email.Models;
using Orchard.Settings;
using Orchard.UI.Admin.Notification;
using Orchard.UI.Notify;
namespace Orchard.Email.Services {
public class MissingSettingsBanner: INotificationProvider {
private readonly IOrchardServices _orchardServices;
public MissingSettingsBanner() {
public MissingSettingsBanner(IOrchardServices orchardServices) {
_orchardServices = orchardServices;
T = NullLocalizer.Instance;
}
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public Localizer T { get; set; }
public IEnumerable<NotifyEntry> GetNotifications() {
var smtpSettings = CurrentSite.As<SmtpSettingsPart>();
var smtpSettings = _orchardServices.WorkContext.CurrentSite.As<SmtpSettingsPart>();
if ( smtpSettings == null || !smtpSettings.IsValid() ) {
yield return new NotifyEntry { Message = T("The SMTP settings needs to be configured." ), Type = NotifyType.Warning};
}
var messageSettings = CurrentSite.As<MessageSettingsPart>().Record;
var messageSettings = _orchardServices.WorkContext.CurrentSite.As<MessageSettingsPart>().Record;
if ( messageSettings == null || String.IsNullOrWhiteSpace(messageSettings.DefaultChannelService) ) {
yield return new NotifyEntry { Message = T("The default channel service needs to be configured."), Type = NotifyType.Warning };

10
src/Orchard.Web/Modules/Orchard.Roles/Services/RolesBasedAuthorizationService.cs
View File

@@ -8,18 +8,19 @@ using Orchard.ContentManagement;
using Orchard.Roles.Models;
using Orchard.Security;
using Orchard.Security.Permissions;
using Orchard.Settings;
namespace Orchard.Roles.Services {
[UsedImplicitly]
public class RolesBasedAuthorizationService : IAuthorizationService {
private readonly IRoleService _roleService;
private readonly IWorkContextAccessor _workContextAccessor;
private readonly IAuthorizationServiceEventHandler _authorizationServiceEventHandler;
private static readonly string[] AnonymousRole = new[] { "Anonymous" };
private static readonly string[] AuthenticatedRole = new[] { "Authenticated" };
public RolesBasedAuthorizationService(IRoleService roleService, IAuthorizationServiceEventHandler authorizationServiceEventHandler) {
public RolesBasedAuthorizationService(IRoleService roleService, IWorkContextAccessor workContextAccessor, IAuthorizationServiceEventHandler authorizationServiceEventHandler) {
_roleService = roleService;
_workContextAccessor = workContextAccessor;
_authorizationServiceEventHandler = authorizationServiceEventHandler;
T = NullLocalizer.Instance;
@@ -28,7 +29,6 @@ namespace Orchard.Roles.Services {
public Localizer T { get; set; }
public ILogger Logger { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public void CheckAccess(Permission permission, IUser user, IContent content) {
@@ -47,8 +47,8 @@ namespace Orchard.Roles.Services {
for (var adjustmentLimiter = 0; adjustmentLimiter != 3; ++adjustmentLimiter) {
if (!context.Granted && context.User != null) {
if (!String.IsNullOrEmpty(CurrentSite.SuperUser) &&
String.Equals(context.User.UserName, CurrentSite.SuperUser, StringComparison.OrdinalIgnoreCase)) {
if (!String.IsNullOrEmpty(_workContextAccessor.GetContext().CurrentSite.SuperUser) &&
String.Equals(context.User.UserName, _workContextAccessor.GetContext().CurrentSite.SuperUser, StringComparison.OrdinalIgnoreCase)) {
context.Granted = true;
}
}

9
src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
View File

@@ -1,12 +1,9 @@
using System.Web.Mvc;
using System.Web.Query.Dynamic;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.Indexing;
using Orchard.Localization;
using Orchard.Search.Services;
using Orchard.Search.ViewModels;
using Orchard.Settings;
using Orchard.Search.Models;
using Orchard.UI.Notify;
using System.Collections.Generic;
@@ -34,10 +31,8 @@ namespace Orchard.Search.Controllers {
private IOrchardServices Services { get; set; }
public Localizer T { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ActionResult Index(string q, int page = 1, int pageSize = 10) {
var searchFields = CurrentSite.As<SearchSettingsPart>().SearchedFields;
var searchFields = Services.WorkContext.CurrentSite.As<SearchSettingsPart>().SearchedFields;
IPageOfItems<ISearchHit> searchHits;
@@ -47,7 +42,7 @@ namespace Orchard.Search.Controllers {
}
else {
searchHits = _searchService.Query(q, page, pageSize,
CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
Services.WorkContext.CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
searchFields,
searchHit => searchHit);
}

3
src/Orchard.Web/Modules/Orchard.Tags/Controllers/AdminController.cs
View File

@@ -2,10 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
using JetBrains.Annotations;
using Orchard.Localization;
using Orchard.ContentManagement;
using Orchard.Settings;
using Orchard.Tags.Models;
using Orchard.Tags.ViewModels;
using Orchard.Tags.Services;
@@ -22,7 +20,6 @@ namespace Orchard.Tags.Controllers {
}
public IOrchardServices Services { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public Localizer T { get; set; }

6
src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
View File

@@ -1,13 +1,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.DisplayManagement;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.Security;
using Orchard.Settings;
using Orchard.Tags.Services;
using Orchard.Tags.ViewModels;
using Orchard.Themes;
@@ -29,8 +25,6 @@ namespace Orchard.Tags.Controllers {
T = NullLocalizer.Instance;
}
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ILogger Logger { get; set; }
public Localizer T { get; set; }

11
src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
View File

@@ -14,15 +14,16 @@ namespace Orchard.Tags.Drivers {
private const string TemplateName = "Parts/Tags";
private readonly ITagService _tagService;
private readonly IAuthorizationService _authorizationService;
private readonly IOrchardServices _orchardServices;
public TagsPartDriver(ITagService tagService,
IAuthorizationService authorizationService) {
IAuthorizationService authorizationService,
IOrchardServices orchardServices) {
_tagService = tagService;
_authorizationService = authorizationService;
_orchardServices = orchardServices;
}
public virtual IUser CurrentUser { get; set; }
protected override string Prefix {
get { return "Tags"; }
}
@@ -33,7 +34,7 @@ namespace Orchard.Tags.Drivers {
}
protected override DriverResult Editor(TagsPart part, dynamic shapeHelper) {
if (!_authorizationService.TryCheckAccess(Permissions.ApplyTag, CurrentUser, part))
if (!_authorizationService.TryCheckAccess(Permissions.ApplyTag, _orchardServices.WorkContext.CurrentUser, part))
return null;
return ContentShape("Parts_Tags_Edit",
@@ -41,7 +42,7 @@ namespace Orchard.Tags.Drivers {
}
protected override DriverResult Editor(TagsPart part, IUpdateModel updater, dynamic shapeHelper) {
if (!_authorizationService.TryCheckAccess(Permissions.ApplyTag, CurrentUser, part))
if (!_authorizationService.TryCheckAccess(Permissions.ApplyTag, _orchardServices.WorkContext.CurrentUser, part))
return null;
var model = new EditTagsViewModel();

19
src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs
View File

@@ -7,7 +7,6 @@ using Orchard.Localization;
using Orchard.Logging;
using Orchard.ContentManagement;
using Orchard.Security;
using Orchard.Settings;
using Orchard.Tags.Models;
using Orchard.UI.Notify;
@@ -16,27 +15,25 @@ namespace Orchard.Tags.Services {
public class TagService : ITagService {
private readonly IRepository<Tag> _tagRepository;
private readonly IRepository<TagsContentItems> _tagsContentItemsRepository;
private readonly IContentManager _contentManager;
private readonly INotifier _notifier;
private readonly IAuthorizationService _authorizationService;
private readonly IOrchardServices _orchardServices;
public TagService(IRepository<Tag> tagRepository,
IRepository<TagsContentItems> tagsContentItemsRepository,
IContentManager contentManager,
INotifier notifier,
IAuthorizationService authorizationService) {
IAuthorizationService authorizationService,
IOrchardServices orchardServices) {
_tagRepository = tagRepository;
_tagsContentItemsRepository = tagsContentItemsRepository;
_contentManager = contentManager;
_notifier = notifier;
_authorizationService = authorizationService;
_orchardServices = orchardServices;
Logger = NullLogger.Instance;
T = NullLocalizer.Instance;
}
public ILogger Logger { get; set; }
public virtual ISite CurrentSite { get; set; }
public virtual IUser CurrentUser { get; set; }
public Localizer T { get; set; }
public IEnumerable<Tag> GetTags() {
@@ -53,7 +50,7 @@ namespace Orchard.Tags.Services {
public void CreateTag(string tagName) {
if (_tagRepository.Get(x => x.TagName == tagName) == null) {
_authorizationService.CheckAccess(Permissions.CreateTag, CurrentUser, null);
_authorizationService.CheckAccess(Permissions.CreateTag, _orchardServices.WorkContext.CurrentUser, null);
Tag tag = new Tag { TagName = tagName };
_tagRepository.Create(tag);
@@ -104,7 +101,7 @@ namespace Orchard.Tags.Services {
public IEnumerable<IContent> GetTaggedContentItems(int id) {
return _tagsContentItemsRepository
.Fetch(x => x.TagId == id)
.Select(t =>_contentManager.Get(t.ContentItemId))
.Select(t =>_orchardServices.ContentManager.Get(t.ContentItemId))
.Where(c => c!= null);
}
@@ -133,7 +130,7 @@ namespace Orchard.Tags.Services {
foreach (var tagContentItem in currentTagsForContentItem) {
if (!newTagsForContentItem.Contains(tagContentItem.TagId)) {
_authorizationService.CheckAccess(Permissions.ApplyTag, CurrentUser, null);
_authorizationService.CheckAccess(Permissions.ApplyTag, _orchardServices.WorkContext.CurrentUser, null);
_tagsContentItemsRepository.Delete(tagContentItem);
}
@@ -143,7 +140,7 @@ namespace Orchard.Tags.Services {
}
foreach (var newTagForContentItem in newTagsForContentItem) {
_authorizationService.CheckAccess(Permissions.ApplyTag, CurrentUser, null);
_authorizationService.CheckAccess(Permissions.ApplyTag, _orchardServices.WorkContext.CurrentUser, null);
_tagsContentItemsRepository.Create(new TagsContentItems { ContentItemId = contentItemId, TagId = newTagForContentItem });
}

8
src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs
View File

@@ -6,17 +6,19 @@ using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Models;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.Settings;
using Orchard.Themes.Models;
namespace Orchard.Themes.Services {
[UsedImplicitly]
public class SiteThemeSelector : IThemeSelector {
private readonly IOrchardServices _orchardServices;
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public SiteThemeSelector(IOrchardServices orchardServices) {
_orchardServices = orchardServices;
}
public ThemeSelectorResult GetTheme(RequestContext context) {
string currentThemeName = CurrentSite.As<ThemeSiteSettingsPart>().Record.CurrentThemeName;
string currentThemeName = _orchardServices.WorkContext.CurrentSite.As<ThemeSiteSettingsPart>().Record.CurrentThemeName;
if (String.IsNullOrEmpty(currentThemeName)) {
return null;

7
src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
View File

@@ -12,7 +12,6 @@ using Orchard.Localization;
using Orchard.Logging;
using Orchard.ContentManagement;
using Orchard.Modules;
using Orchard.Settings;
using Orchard.Themes.Models;
namespace Orchard.Themes.Services {
@@ -23,6 +22,7 @@ namespace Orchard.Themes.Services {
private readonly IModuleService _moduleService;
private readonly IWorkContextAccessor _workContextAccessor;
private readonly ShellDescriptor _shellDescriptor;
private readonly IOrchardServices _orchardServices;
private readonly IShellDescriptorManager _shellDescriptorManager;
public ThemeService(
@@ -31,20 +31,21 @@ namespace Orchard.Themes.Services {
IEnumerable<IThemeSelector> themeSelectors,
IModuleService moduleService,
IWorkContextAccessor workContextAccessor,
ShellDescriptor shellDescriptor) {
ShellDescriptor shellDescriptor,
IOrchardServices orchardServices) {
_shellDescriptorManager = shellDescriptorManager;
_extensionManager = extensionManager;
_themeSelectors = themeSelectors;
_moduleService = moduleService;
_workContextAccessor = workContextAccessor;
_shellDescriptor = shellDescriptor;
_orchardServices = orchardServices;
Logger = NullLogger.Instance;
T = NullLocalizer.Instance;
}
public Localizer T { get; set; }
public ILogger Logger { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public void EnableTheme(string themeName) {
DoEnableTheme(themeName);

12
src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
View File

@@ -10,8 +10,6 @@ using Orchard.Security;
using Orchard.Themes;
using Orchard.Users.Services;
using Orchard.Users.ViewModels;
using Orchard.Settings;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.Users.Models;
@@ -21,21 +19,23 @@ namespace Orchard.Users.Controllers {
private readonly IAuthenticationService _authenticationService;
private readonly IMembershipService _membershipService;
private readonly IUserService _userService;
private readonly IOrchardServices _orchardServices;
public AccountController(
IAuthenticationService authenticationService,
IMembershipService membershipService,
IUserService userService) {
IUserService userService,
IOrchardServices orchardServices) {
_authenticationService = authenticationService;
_membershipService = membershipService;
_userService = userService;
_orchardServices = orchardServices;
Logger = NullLogger.Instance;
T = NullLocalizer.Instance;
}
public ILogger Logger { get; set; }
public Localizer T { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ActionResult AccessDenied() {
var returnUrl = Request.QueryString["ReturnUrl"];
@@ -93,7 +93,7 @@ namespace Orchard.Users.Controllers {
public ActionResult Register() {
// ensure users can register
var registrationSettings = CurrentSite.As<RegistrationSettingsPart>();
var registrationSettings = _orchardServices.WorkContext.CurrentSite.As<RegistrationSettingsPart>();
if ( !registrationSettings.UsersCanRegister ) {
return HttpNotFound();
}
@@ -106,7 +106,7 @@ namespace Orchard.Users.Controllers {
[HttpPost]
public ActionResult Register(string userName, string email, string password, string confirmPassword) {
// ensure users can register
var registrationSettings = CurrentSite.As<RegistrationSettingsPart>();
var registrationSettings = _orchardServices.WorkContext.CurrentSite.As<RegistrationSettingsPart>();
if ( !registrationSettings.UsersCanRegister ) {
return HttpNotFound();
}

5
src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
View File

@@ -1,11 +1,9 @@
using System.Linq;
using System.Web.Mvc;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.DisplayManagement;
using Orchard.Localization;
using Orchard.Security;
using Orchard.Settings;
using Orchard.UI.Notify;
using Orchard.Users.Models;
using Orchard.Users.Services;
@@ -33,7 +31,6 @@ namespace Orchard.Users.Controllers {
dynamic Shape { get; set; }
public IOrchardServices Services { get; set; }
public Localizer T { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public ActionResult Index() {
if (!Services.Authorizer.Authorize(Permissions.ManageUsers, T("Not authorized to list users")))
@@ -192,7 +189,7 @@ namespace Orchard.Users.Controllers {
var user = Services.ContentManager.Get(id);
if ( user != null ) {
if ( CurrentSite.SuperUser.Equals(user.As<UserPart>().UserName) ) {
if (Services.WorkContext.CurrentSite.SuperUser.Equals(user.As<UserPart>().UserName) ) {
Services.Notifier.Error(T("Super user can't be moderated"));
}
else {

22
src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
View File

@@ -11,7 +11,6 @@ using Orchard.ContentManagement;
using Orchard.Security;
using Orchard.Users.Events;
using Orchard.Users.Models;
using Orchard.Settings;
using Orchard.Messaging.Services;
using System.Collections.Generic;
@@ -19,19 +18,18 @@ namespace Orchard.Users.Services {
[UsedImplicitly]
public class MembershipService : IMembershipService {
private static readonly TimeSpan DelayToValidate = new TimeSpan(7, 0, 0, 0); // one week to validate email
private readonly IContentManager _contentManager;
private readonly IOrchardServices _orchardServices;
private readonly IMessageManager _messageManager;
private readonly IEnumerable<IUserEventHandler> _userEventHandlers;
public MembershipService(IContentManager contentManager, IMessageManager messageManager, IEnumerable<IUserEventHandler> userEventHandlers) {
_contentManager = contentManager;
public MembershipService(IOrchardServices orchardServices, IMessageManager messageManager, IEnumerable<IUserEventHandler> userEventHandlers) {
_orchardServices = orchardServices;
_messageManager = messageManager;
_userEventHandlers = userEventHandlers;
Logger = NullLogger.Instance;
}
public ILogger Logger { get; set; }
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public MembershipSettings GetSettings() {
var settings = new MembershipSettings();
@@ -42,9 +40,9 @@ namespace Orchard.Users.Services {
public IUser CreateUser(CreateUserParams createUserParams) {
Logger.Information("CreateUser {0} {1}", createUserParams.Username, createUserParams.Email);
var registrationSettings = CurrentSite.As<RegistrationSettingsPart>();
var registrationSettings = _orchardServices.WorkContext.CurrentSite.As<RegistrationSettingsPart>();
var user = _contentManager.New<UserPart>("User");
var user = _orchardServices.ContentManager.New<UserPart>("User");
user.Record.UserName = createUserParams.Username;
user.Record.Email = createUserParams.Email;
@@ -71,14 +69,14 @@ namespace Orchard.Users.Services {
return null;
}
_contentManager.Create(user);
_orchardServices.ContentManager.Create(user);
foreach ( var userEventHandler in _userEventHandlers ) {
userEventHandler.Created(userContext);
}
if ( registrationSettings != null && registrationSettings.UsersAreModerated && registrationSettings.NotifyModeration && !createUserParams.IsApproved ) {
var superUser = GetUser(CurrentSite.SuperUser);
var superUser = GetUser(_orchardServices.WorkContext.CurrentSite.SuperUser);
if(superUser != null)
_messageManager.Send(superUser.ContentItem.Record, MessageTypes.Moderation);
}
@@ -137,16 +135,16 @@ namespace Orchard.Users.Services {
public IUser GetUser(string username) {
var lowerName = username == null ? "" : username.ToLower();
return _contentManager.Query<UserPart, UserPartRecord>().Where(u => u.NormalizedUserName == lowerName).List().FirstOrDefault();
return _orchardServices.ContentManager.Query<UserPart, UserPartRecord>().Where(u => u.NormalizedUserName == lowerName).List().FirstOrDefault();
}
public IUser ValidateUser(string userNameOrEmail, string password) {
var lowerName = userNameOrEmail == null ? "" : userNameOrEmail.ToLower();
var user = _contentManager.Query<UserPart, UserPartRecord>().Where(u => u.NormalizedUserName == lowerName).List().FirstOrDefault();
var user = _orchardServices.ContentManager.Query<UserPart, UserPartRecord>().Where(u => u.NormalizedUserName == lowerName).List().FirstOrDefault();
if(user == null)
user = _contentManager.Query<UserPart, UserPartRecord>().Where(u => u.Email == lowerName).List().FirstOrDefault();
user = _orchardServices.ContentManager.Query<UserPart, UserPartRecord>().Where(u => u.Email == lowerName).List().FirstOrDefault();
if ( user == null || ValidatePassword(user.As<UserPart>().Record, password) == false )
return null;

3
src/Orchard/Data/Migration/DataMigrationManager.cs
View File

@@ -86,8 +86,7 @@ namespace Orchard.Data.Migration {
Logger.Information("Updating feature: {0}", feature);
// proceed with dependent features first, whatever the module it's in
var dependencies = ShellStateCoordinator.OrderByDependencies(_extensionManager.AvailableExtensions()
.SelectMany(ext => ext.Features))
var dependencies = _extensionManager.AvailableFeatures()
.Where(f => String.Equals(f.Name, feature, StringComparison.OrdinalIgnoreCase))
.Where(f => f.Dependencies != null)
.SelectMany( f => f.Dependencies )

3
src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs
View File

@@ -41,8 +41,7 @@ namespace Orchard.Data.Migration.Generator {
/// Generates SchemaCommand instances in order to create the schema for a specific feature
/// </summary>
public IEnumerable<SchemaCommand> GetCreateFeatureCommands(string feature, bool drop) {
var dependencies = ShellStateCoordinator.OrderByDependencies(_extensionManager.AvailableExtensions()
.SelectMany(ext => ext.Features))
var dependencies = _extensionManager.AvailableFeatures()
.Where(f => String.Equals(f.Name, feature, StringComparison.OrdinalIgnoreCase))
.Where(f => f.Dependencies != null)
.SelectMany(f => f.Dependencies)

1
src/Orchard/Environment/AutofacUtil/DynamicProxy2/ConstructorFinderWrapper.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Autofac.Core.Activators.Reflection;

10
src/Orchard/Environment/Extensions/ExtensionManager.cs
View File

@@ -4,7 +4,6 @@ using System.IO;
using System.Linq;
using System.Web;
using ICSharpCode.SharpZipLib.Zip;
using Orchard.Environment.Descriptor.Models;
using Orchard.Environment.Extensions.Folders;
using Orchard.Environment.Extensions.Helpers;
using Orchard.Environment.Extensions.Loaders;
@@ -18,6 +17,7 @@ namespace Orchard.Environment.Extensions {
public class ExtensionManager : IExtensionManager {
private readonly IEnumerable<IExtensionFolders> _folders;
private readonly IEnumerable<IExtensionLoader> _loaders;
private IEnumerable<FeatureDescriptor> _featureDescriptors;
public Localizer T { get; set; }
public ILogger Logger { get; set; }
@@ -36,9 +36,11 @@ namespace Orchard.Environment.Extensions {
}
public IEnumerable<FeatureDescriptor> AvailableFeatures() {
var featureDescriptors = AvailableExtensions().SelectMany(ext => ext.Features);
var featureDescriptorsOrdered = featureDescriptors.OrderByDependencies(HasDependency);
return featureDescriptorsOrdered.ToReadOnlyCollection();
if (_featureDescriptors == null || _featureDescriptors.Count() == 0) {
_featureDescriptors = AvailableExtensions().SelectMany(ext => ext.Features).OrderByDependencies(HasDependency).ToReadOnlyCollection();
return _featureDescriptors;
}
return _featureDescriptors;
}
/// <summary>

6
src/Orchard/Environment/OrchardServices.cs
View File

@@ -10,14 +10,17 @@ namespace Orchard.Environment {
[UsedImplicitly]
public class OrchardServices : IOrchardServices {
private readonly Lazy<IShapeFactory> _shapeFactory;
private readonly IWorkContextAccessor _workContextAccessor;
public OrchardServices(
IContentManager contentManager,
ITransactionManager transactionManager,
IAuthorizer authorizer,
INotifier notifier,
Lazy<IShapeFactory> shapeFactory) {
Lazy<IShapeFactory> shapeFactory,
IWorkContextAccessor workContextAccessor) {
_shapeFactory = shapeFactory;
_workContextAccessor = workContextAccessor;
ContentManager = contentManager;
TransactionManager = transactionManager;
Authorizer = authorizer;
@@ -29,5 +32,6 @@ namespace Orchard.Environment {
public IAuthorizer Authorizer { get; private set; }
public INotifier Notifier { get; private set; }
public dynamic New { get { return _shapeFactory.Value; } }
public WorkContext WorkContext { get { return _workContextAccessor.GetContext(); } }
}
}

1
src/Orchard/Environment/OrchardStarter.cs
View File

@@ -7,7 +7,6 @@ using System.Web.Mvc;
using Autofac;
using Autofac.Configuration;
using Orchard.Caching;
using Orchard.Environment.AutofacUtil;
using Orchard.Environment.Configuration;
using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Compilers;

13
src/Orchard/Environment/State/ShellStateCoordinator.cs
View File

@@ -7,7 +7,6 @@ using Orchard.Environment.Extensions.Models;
using Orchard.Environment.State.Models;
using Orchard.Environment.Descriptor;
using Orchard.Environment.Descriptor.Models;
using Orchard.Utility;
namespace Orchard.Environment.State {
public class ShellStateCoordinator : IShellStateManagerEventHandler, IShellDescriptorManagerEventHandler {
@@ -102,7 +101,7 @@ namespace Orchard.Environment.State {
var shellState = _stateManager.GetShellState();
// start with description of all declared features in order - order preserved with all merging
var orderedFeatureDescriptors = AllFeaturesInOrder();
var orderedFeatureDescriptors = _extensionManager.AvailableFeatures();
// merge feature state into ordered list
var orderedFeatureDescriptorsAndStates = orderedFeatureDescriptors
@@ -176,19 +175,9 @@ namespace Orchard.Environment.State {
FireApplyChangesIfNeeded();
}
private IEnumerable<FeatureDescriptor> AllFeaturesInOrder() {
return OrderByDependencies(_extensionManager.AvailableExtensions().SelectMany(ext => ext.Features));
}
static bool IsRising(ShellFeatureState state) {
return state.InstallState == ShellFeatureState.State.Rising ||
state.EnableState == ShellFeatureState.State.Rising;
}
public static IEnumerable<FeatureDescriptor> OrderByDependencies(IEnumerable<FeatureDescriptor> descriptors) {
return descriptors.OrderByDependencies((item, dep) =>
item.Dependencies != null &&
item.Dependencies.Any(x => StringComparer.OrdinalIgnoreCase.Equals(x, dep.Name)));
}
}
}

1
src/Orchard/IOrchardServices.cs
View File

@@ -10,5 +10,6 @@ namespace Orchard {
IAuthorizer Authorizer { get; }
INotifier Notifier { get; }
dynamic New { get; }
WorkContext WorkContext { get; }
}
}

12
src/Orchard/Localization/Commands/CultureCommands.cs
View File

@@ -1,17 +1,15 @@
using System.Linq;
using JetBrains.Annotations;
using Orchard.Commands;
using Orchard.Localization.Services;
using Orchard.Settings;
namespace Orchard.Localization.Commands {
public class CultureCommands : DefaultOrchardCommandHandler {
private readonly ICultureManager _cultureManager;
private readonly IOrchardServices _orchardServices;
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public CultureCommands(ICultureManager cultureManager) {
public CultureCommands(ICultureManager cultureManager, IOrchardServices orchardServices) {
_cultureManager = cultureManager;
_orchardServices = orchardServices;
}
[CommandHelp("cultures list \r\n\t" + "List site cultures")]
@@ -28,7 +26,7 @@ namespace Orchard.Localization.Commands {
[CommandHelp("cultures get site culture \r\n\t" + "Get culture for the site")]
[CommandName("cultures get site culture")]
public void GetSiteCulture() {
Context.Output.WriteLine(T("Site Culture is {0}", CurrentSite.SiteCulture));
Context.Output.WriteLine(T("Site Culture is {0}", _orchardServices.WorkContext.CurrentSite.SiteCulture));
}
[CommandHelp("cultures set site culture <culture-name> \r\n\t" + "Set culture for the site")]
@@ -40,7 +38,7 @@ namespace Orchard.Localization.Commands {
Context.Output.WriteLine(T("Supplied culture name {0} is not valid.", cultureName));
return;
}
CurrentSite.SiteCulture = cultureName;
_orchardServices.WorkContext.CurrentSite.SiteCulture = cultureName;
Context.Output.WriteLine(T("Site culture set to {0} successfully", cultureName));
}

13
src/Orchard/Localization/Services/DefaultCultureManager.cs
View File

@@ -3,26 +3,27 @@ using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using System.Web;
using JetBrains.Annotations;
using Orchard.Caching;
using Orchard.Data;
using Orchard.Localization.Records;
using Orchard.Settings;
namespace Orchard.Localization.Services {
public class DefaultCultureManager : ICultureManager {
private readonly IRepository<CultureRecord> _cultureRepository;
private readonly IEnumerable<ICultureSelector> _cultureSelectors;
private readonly ISignals _signals;
private readonly IOrchardServices _orchardServices;
public DefaultCultureManager(IRepository<CultureRecord> cultureRepository, IEnumerable<ICultureSelector> cultureSelectors, ISignals signals) {
public DefaultCultureManager(IRepository<CultureRecord> cultureRepository,
IEnumerable<ICultureSelector> cultureSelectors,
ISignals signals,
IOrchardServices orchardServices) {
_cultureRepository = cultureRepository;
_cultureSelectors = cultureSelectors;
_signals = signals;
_orchardServices = orchardServices;
}
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
public IEnumerable<string> ListCultures() {
var query = from culture in _cultureRepository.Table select culture.Culture;
return query.ToList();
@@ -75,7 +76,7 @@ namespace Orchard.Localization.Services {
}
public string GetSiteCulture() {
return CurrentSite == null ? null : CurrentSite.SiteCulture;
return _orchardServices.WorkContext.CurrentSite == null ? null : _orchardServices.WorkContext.CurrentSite.SiteCulture;
}
// "<languagecode2>" or

10
src/Orchard/Localization/Services/SiteCultureSelector.cs
View File

@@ -1,14 +1,16 @@
using System;
using System.Web;
using JetBrains.Annotations;
using Orchard.Settings;
namespace Orchard.Localization.Services {
public class SiteCultureSelector : ICultureSelector {
protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }
private readonly IOrchardServices _orchardServices;
public SiteCultureSelector(IOrchardServices orchardServices) {
_orchardServices = orchardServices;
}
public CultureSelectorResult GetCulture(HttpContextBase context) {
string currentCultureName = CurrentSite.SiteCulture;
string currentCultureName = _orchardServices.WorkContext.CurrentSite.SiteCulture;
if (String.IsNullOrEmpty(currentCultureName)) {
return null;

2
src/Orchard/Orchard.Framework.csproj
View File

@@ -773,10 +773,8 @@
<Compile Include="Security\Authorizer.cs" />
<Compile Include="Security\Providers\FormsAuthenticationService.cs" />
<Compile Include="Security\SecurityFilter.cs" />
<Compile Include="Security\SecurityModule.cs" />
<Compile Include="Settings\ISite.cs" />
<Compile Include="Settings\ISiteService.cs" />
<Compile Include="Settings\SettingsModule.cs" />
<Compile Include="Tasks\BackgroundService.cs" />
<Compile Include="Tasks\IBackgroundTask.cs" />
<Compile Include="Tasks\SweepGenerator.cs" />

15
src/Orchard/Security/Authorizer.cs
View File

@@ -1,5 +1,4 @@
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.ContentManagement;
using Orchard.Localization;
using Orchard.Security.Permissions;
using Orchard.UI.Notify;
@@ -14,16 +13,18 @@ namespace Orchard.Security {
public class Authorizer : IAuthorizer {
private readonly IAuthorizationService _authorizationService;
private readonly INotifier _notifier;
private readonly IWorkContextAccessor _workContextAccessor;
public Authorizer(
IAuthorizationService authorizationService,
INotifier notifier) {
INotifier notifier,
IWorkContextAccessor workContextAccessor) {
_authorizationService = authorizationService;
_notifier = notifier;
_workContextAccessor = workContextAccessor;
T = NullLocalizer.Instance;
}
protected virtual IUser CurrentUser { get; [UsedImplicitly] private set; }
public Localizer T { get; set; }
public bool Authorize(Permission permission) {
@@ -35,17 +36,17 @@ namespace Orchard.Security {
}
public bool Authorize(Permission permission, IContent content, LocalizedString message) {
if (_authorizationService.TryCheckAccess(permission, CurrentUser, content))
if (_authorizationService.TryCheckAccess(permission, _workContextAccessor.GetContext().CurrentUser, content))
return true;
if (message != null) {
if (CurrentUser == null) {
if (_workContextAccessor.GetContext().CurrentUser == null) {
_notifier.Error(T("{0}. Anonymous users do not have {1} permission.",
message, permission.Name));
}
else {
_notifier.Error(T("{0}. Current user, {2}, does not have {1} permission.",
message, permission.Name, CurrentUser.UserName));
message, permission.Name, _workContextAccessor.GetContext().CurrentUser.UserName));
}
}

49
src/Orchard/Security/SecurityModule.cs
View File

@@ -1,49 +0,0 @@
using System;
using System.Reflection;
using Autofac.Core;
using Castle.Core.Interceptor;
using Orchard.Environment.AutofacUtil.DynamicProxy2;
using Module = Autofac.Module;
namespace Orchard.Security {
public class SecurityModule : Module {
protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration) {
var implementationType = registration.Activator.LimitType;
var property = FindProperty(implementationType);
if (property != null) {
registration.InterceptedBy<ISecurityModuleInterceptor>();
}
}
private static PropertyInfo FindProperty(Type type) {
return type.GetProperty("CurrentUser",
BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
null,
typeof(IUser),
new Type[0],
null);
}
}
public interface ISecurityModuleInterceptor : IInterceptor, IDependency {
}
public class SecurityModuleInterceptor : ISecurityModuleInterceptor {
private readonly IAuthenticationService _authenticationService;
public SecurityModuleInterceptor(IAuthenticationService authenticationService) {
_authenticationService = authenticationService;
}
public void Intercept(IInvocation invocation) {
if (invocation.Method.ReturnType == typeof(IUser) && invocation.Method.Name == "get_CurrentUser") {
invocation.ReturnValue = _authenticationService.GetAuthenticatedUser();
}
else {
invocation.Proceed();
}
}
}
}

49
src/Orchard/Settings/SettingsModule.cs
View File

@@ -1,49 +0,0 @@
using System;
using System.Reflection;
using Autofac.Core;
using Castle.Core.Interceptor;
using Orchard.Environment.AutofacUtil.DynamicProxy2;
using Module = Autofac.Module;
namespace Orchard.Settings {
public class SettingsModule : Module {
protected override void AttachToComponentRegistration(IComponentRegistry componentRegistry, IComponentRegistration registration) {
var implementationType = registration.Activator.LimitType;
var property = FindProperty(implementationType);
if (property != null) {
registration.InterceptedBy<ISettingsModuleInterceptor>();
}
}
private static PropertyInfo FindProperty(Type type) {
return type.GetProperty("CurrentSite",
BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
null,
typeof(ISite),
new Type[0],
null);
}
}
public interface ISettingsModuleInterceptor : IInterceptor, IDependency {
}
public class SettingsModuleInterceptor : ISettingsModuleInterceptor {
private readonly ISiteService _siteService;
public SettingsModuleInterceptor(ISiteService siteService) {
_siteService = siteService;
}
public void Intercept(IInvocation invocation) {
if (invocation.Method.ReturnType == typeof(ISite) && invocation.Method.Name == "get_CurrentSite") {
invocation.ReturnValue = _siteService.GetSiteSettings();
}
else {
invocation.Proceed();
}
}
}
}

11
src/Orchard/UI/Navigation/NavigationManager.cs
View File

@@ -2,7 +2,6 @@
using System.Linq;
using System.Web.Mvc;
using System.Web.Routing;
using JetBrains.Annotations;
using Orchard.Security;
using Orchard.Security.Permissions;
@@ -11,15 +10,15 @@ namespace Orchard.UI.Navigation {
private readonly IEnumerable<INavigationProvider> _providers;
private readonly IAuthorizationService _authorizationService;
private readonly UrlHelper _urlHelper;
private readonly IOrchardServices _orchardServices;
public NavigationManager(IEnumerable<INavigationProvider> providers, IAuthorizationService authorizationService, UrlHelper urlHelper) {
public NavigationManager(IEnumerable<INavigationProvider> providers, IAuthorizationService authorizationService, UrlHelper urlHelper, IOrchardServices orchardServices) {
_providers = providers;
_authorizationService = authorizationService;
_urlHelper = urlHelper;
_orchardServices = orchardServices;
}
protected virtual IUser CurrentUser { get; [UsedImplicitly] private set; }
public IEnumerable<MenuItem> BuildMenu(string menuName) {
var sources = GetSources(menuName);
return FinishMenu(Crop(Reduce(Merge(sources))).ToArray());
@@ -62,11 +61,11 @@ namespace Orchard.UI.Navigation {
}
private IEnumerable<MenuItem> Reduce(IEnumerable<MenuItem> items) {
var hasDebugShowAllMenuItems = _authorizationService.TryCheckAccess(Permission.Named("DebugShowAllMenuItems"), CurrentUser, null);
var hasDebugShowAllMenuItems = _authorizationService.TryCheckAccess(Permission.Named("DebugShowAllMenuItems"), _orchardServices.WorkContext.CurrentUser, null);
foreach (var item in items) {
if (hasDebugShowAllMenuItems ||
!item.Permissions.Any() ||
item.Permissions.Any(x => _authorizationService.TryCheckAccess(x, CurrentUser, null))) {
item.Permissions.Any(x => _authorizationService.TryCheckAccess(x, _orchardServices.WorkContext.CurrentUser, null))) {
yield return new MenuItem {
Items = Reduce(item.Items),
Permissions = item.Permissions,