Merge

--HG--
branch : dev

ClickToRunAzureInDevFabric.cmd

@@ -0,0 +1,5 @@
+SET CDIR = %CD%
+call "%ProgramFiles%\Windows Azure SDK\v1.3\bin\setenv.cmd"
+csrun /devstore 
+csrun /run:"%CDIR %\build\Compile\Orchard.Azure.CloudService.csx";"%CDIR %\src\Orchard.Azure\Orchard.Azure.CloudService\ServiceConfiguration.cscfg" /launchbrowser 
+pause

src/Orchard.Azure/Environment/Configuration/AzureShellSettingsManager.cs

@@ -83,32 +83,27 @@ namespace Orchard.Azure.Environment.Configuration {
             }
         }
 
-        class Content {
+        static ShellSettings ParseSettings(string text)
-            public string Name { get; set; }
+        {
-            public string DataProvider { get; set; }
-            public string DataConnectionString { get; set; }
-            public string DataPrefix { get; set; }
-            public string RequestUrlHost { get; set; }
-            public string RequestUrlPrefix { get; set; }
-            public string State { get; set; }
-        }
-
-        static ShellSettings ParseSettings(string text) {
             var shellSettings = new ShellSettings();
-            if ( String.IsNullOrEmpty(text) )
+            if (String.IsNullOrEmpty(text))
                 return shellSettings;
 
             string[] settings = text.Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
-            foreach ( var setting in settings ) {
+            foreach (var setting in settings)
+            {
                 string[] settingFields = setting.Split(new[] { ":" }, StringSplitOptions.RemoveEmptyEntries);
                 int fieldsLength = settingFields.Length;
-                if ( fieldsLength != 2 )
+                if (fieldsLength != 2)
                     continue;
-                for ( int i = 0; i < fieldsLength; i++ ) {
+                for (int i = 0; i < fieldsLength; i++)
+                {
                     settingFields[i] = settingFields[i].Trim();
                 }
-                if ( settingFields[1] != "null" ) {
+                if (settingFields[1] != "null")
-                    switch ( settingFields[0] ) {
+                {
+                    switch (settingFields[0])
+                    {
                         case "Name":
                             shellSettings.Name = settingFields[1];
                             break;
@@ -130,24 +125,38 @@ namespace Orchard.Azure.Environment.Configuration {
                         case "RequestUrlPrefix":
                             shellSettings.RequestUrlPrefix = settingFields[1];
                             break;
+                        case "EncryptionAlgorithm":
+                            shellSettings.EncryptionAlgorithm = settingFields[1];
+                            break;
+                        case "EncryptionKey":
+                            shellSettings.EncryptionKey = settingFields[1];
+                            break;
+                        case "EncryptionIV":
+                            shellSettings.EncryptionIV = settingFields[1];
+                            break;
                     }
                 }
             }
             return shellSettings;
         }
 
-        static string ComposeSettings(ShellSettings settings) {
+        static string ComposeSettings(ShellSettings settings)
-            if ( settings == null )
+        {
+            if (settings == null)
                 return "";
 
-            return string.Format("Name: {0}\r\nDataProvider: {1}\r\nDataConnectionString: {2}\r\nDataPrefix: {3}\r\nRequestUrlHost: {4}\r\nRequestUrlPrefix: {5}\r\nState: {6}\r\n",
+            return string.Format("Name: {0}\r\nDataProvider: {1}\r\nDataConnectionString: {2}\r\nDataPrefix: {3}\r\nRequestUrlHost: {4}\r\nRequestUrlPrefix: {5}\r\nState: {6}\r\nEncryptionAlgorithm: {7}\r\nEncryptionKey: {8}\r\nEncryptionIV: {9}\r\n",
                      settings.Name,
                      settings.DataProvider,
                      settings.DataConnectionString ?? "null",
                      settings.DataTablePrefix ?? "null",
                      settings.RequestUrlHost ?? "null",
                      settings.RequestUrlPrefix ?? "null",
-                     settings.State != null ? settings.State.ToString() : String.Empty);
+                     settings.State != null ? settings.State.ToString() : String.Empty,
+                     settings.EncryptionAlgorithm ?? "null",
+                     settings.EncryptionKey ?? "null",
+                     settings.EncryptionIV ?? "null"
+                     );
         }
     }
 }

src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef

@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition">
   <WebRole name="Orchard.Azure.Web">
-    <Sites>
-      <Site name="Web">
-        <Bindings>
-          <Binding name="HttpIn" endpointName="HttpIn" />
-        </Bindings>
-      </Site>
-    </Sites>
     <ConfigurationSettings>
       <Setting name="DiagnosticsConnectionString" />
       <Setting name="DataConnectionString" />

src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj

@@ -75,8 +75,9 @@
     <Reference Include="System.Data.DataSetExtensions">
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, PublicKeyToken=89845dcd8080cc91">
+    <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\sqlce\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.ApplicationServices">
       <Private>False</Private>

src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs

@@ -60,6 +60,11 @@ namespace Orchard.Tests.Stubs {
                     get { throw new NotImplementedException(); }
                     set { throw new NotImplementedException(); }
                 }
+
+                public int PageSize {
+                    get { throw new NotImplementedException(); }
+                    set { throw new NotImplementedException(); }
+                }
             }
 
             public class StubUser : IUser {

src/Orchard.Web/Core/Containers/Controllers/ItemController.cs

@@ -11,20 +11,29 @@ using Orchard.Themes;
 using Orchard.UI.Navigation;
 
 namespace Orchard.Core.Containers.Controllers {
+    using Orchard.Settings;
+
     public class ItemController : Controller {
         private readonly IContentManager _contentManager;
         private readonly IContainersPathConstraint _containersPathConstraint;
+        private readonly ISiteService _siteService;
+
+        public ItemController(
+            IContentManager contentManager, 
+            IContainersPathConstraint containersPathConstraint, 
+            IShapeFactory shapeFactory,
+            ISiteService siteService) {
 
-        public ItemController(IContentManager contentManager, IContainersPathConstraint containersPathConstraint, IShapeFactory shapeFactory) {
             _contentManager = contentManager;
             _containersPathConstraint = containersPathConstraint;
+            _siteService = siteService;
             Shape = shapeFactory;
         }
 
         dynamic Shape { get; set; }
 
         [Themed]
-        public ActionResult Display(string path, Pager pager) {
+        public ActionResult Display(string path, PagerParameters pagerParameters) {
             var matchedPath = _containersPathConstraint.FindPath(path);
             if (string.IsNullOrEmpty(matchedPath)) {
                 throw new ApplicationException("404 - should not have passed path constraint");
@@ -51,7 +60,8 @@ namespace Orchard.Core.Containers.Controllers {
             var descendingOrder = container.As<ContainerPart>().Record.OrderByDirection == (int) OrderByDirection.Descending;
             query = query.OrderBy(container.As<ContainerPart>().Record.OrderByProperty, descendingOrder);
 
-            pager.PageSize = pager.PageSize != Pager.PageSizeDefault && container.As<ContainerPart>().Record.Paginated
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
+            pager.PageSize = pagerParameters.PageSize != null && container.As<ContainerPart>().Record.Paginated
                                ? pager.PageSize
                                : container.As<ContainerPart>().Record.PageSize;
             var pagerShape = Shape.Pager(pager).TotalItemCount(query.Count());

src/Orchard.Web/Core/Contents/Controllers/AdminController.cs

@@ -17,6 +17,7 @@ using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.UI.Navigation;
 using Orchard.UI.Notify;
+using Orchard.Settings;
 
 namespace Orchard.Core.Contents.Controllers {
     [ValidateInput(false)]
@@ -24,17 +25,20 @@ namespace Orchard.Core.Contents.Controllers {
         private readonly IContentManager _contentManager;
         private readonly IContentDefinitionManager _contentDefinitionManager;
         private readonly ITransactionManager _transactionManager;
+        private readonly ISiteService _siteService;
 
         public AdminController(
             IOrchardServices orchardServices,
             IContentManager contentManager,
             IContentDefinitionManager contentDefinitionManager,
             ITransactionManager transactionManager,
+            ISiteService siteService,
             IShapeFactory shapeFactory) {
             Services = orchardServices;
             _contentManager = contentManager;
             _contentDefinitionManager = contentDefinitionManager;
             _transactionManager = transactionManager;
+            _siteService = siteService;
             T = NullLocalizer.Instance;
             Logger = NullLogger.Instance;
             Shape = shapeFactory;
@@ -45,7 +49,8 @@ namespace Orchard.Core.Contents.Controllers {
         public Localizer T { get; set; }
         public ILogger Logger { get; set; }
 
-        public ActionResult List(ListContentsViewModel model, Pager pager) {
+        public ActionResult List(ListContentsViewModel model, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
             if (model.ContainerId != null && _contentManager.GetLatest((int)model.ContainerId) == null)
                 return HttpNotFound();
 

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -104,6 +104,7 @@
     <Compile Include="Contents\Shapes.cs" />
     <Compile Include="Contents\ViewModels\PublishContentViewModel.cs" />
     <Compile Include="Navigation\Services\MainMenuNavigationProvider.cs" />
+    <Compile Include="Routable\Events\ISlugEventHandler.cs" />
     <Compile Include="Routable\ResourceManifest.cs" />
     <Compile Include="Routable\Services\RoutableHomePageProvider.cs" />
     <Compile Include="Contents\ViewModels\ListContentsViewModel.cs" />

src/Orchard.Web/Core/Routable/Events/ISlugEventHandler.cs

@@ -0,0 +1,17 @@
+using Orchard.Events;
+
+namespace Orchard.Core.Routable.Events {
+    public interface ISlugEventHandler : IEventHandler {
+        void FillingSlugFromTitle(FillSlugContext context);
+        void FilledSlugFromTitle(FillSlugContext context);
+    }
+
+    public class FillSlugContext {
+        public FillSlugContext(string slug) {
+            Slug = slug;
+        }
+
+        public string Slug { get; set; }
+        public bool Adjusted { get; set; }
+    }
+}

src/Orchard.Web/Core/Routable/Services/RoutableService.cs

@@ -1,18 +1,23 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.Core.Common.Models;
+using Orchard.Core.Routable.Events;
 using Orchard.Core.Routable.Models;
 
 namespace Orchard.Core.Routable.Services {
     public class RoutableService : IRoutableService {
         private readonly IContentManager _contentManager;
+        private readonly IEnumerable<ISlugEventHandler> _slugEventHandlers;
 
-        public RoutableService(IContentManager contentManager) {
+        public RoutableService(IContentManager contentManager, IEnumerable<ISlugEventHandler> slugEventHandlers) {
             _contentManager = contentManager;
+            _slugEventHandlers = slugEventHandlers;
         }
 
         public void FixContainedPaths(IRoutableAspect part) {
@@ -27,23 +32,47 @@ namespace Orchard.Core.Routable.Services {
             }
         }
 
+        public static string RemoveDiacritics(string slug) {
+            string stFormD = slug.Normalize(NormalizationForm.FormD);
+            StringBuilder sb = new StringBuilder();
+
+            for (int ich = 0; ich < stFormD.Length; ich++) {
+                UnicodeCategory uc = CharUnicodeInfo.GetUnicodeCategory(stFormD[ich]);
+                if (uc != UnicodeCategory.NonSpacingMark) {
+                    sb.Append(stFormD[ich]);
+                }
+            }
+
+            return (sb.ToString().Normalize(NormalizationForm.FormC));
+        }
+
         public void FillSlugFromTitle<TModel>(TModel model) where TModel : IRoutableAspect {
             if (!string.IsNullOrEmpty(model.Slug) || string.IsNullOrEmpty(model.Title))
                 return;
 
-            var slug = model.Title;
+            FillSlugContext slugContext = new FillSlugContext(model.Title);
-            var dissallowed = new Regex(@"[/:?#\[\]@!$&'()*+,;=\s\""\<\>]+");
 
-            slug = dissallowed.Replace(slug, "-");
+            foreach(ISlugEventHandler slugEventHandler in _slugEventHandlers) {
-            slug = slug.Trim('-');
+                slugEventHandler.FillingSlugFromTitle(slugContext);
+            }
 
-            if (slug.Length > 1000)
+            if (!slugContext.Adjusted) {
-                slug = slug.Substring(0, 1000);
+                var disallowed = new Regex(@"[/:?#\[\]@!$&'()*+,;=\s\""\<\>]+");
 
-            // dots are not allowed at the begin and the end of routes
+                slugContext.Slug = disallowed.Replace(slugContext.Slug, "-").Trim('-');
-            slug = slug.Trim('.');
 
-            model.Slug = slug.ToLowerInvariant();
+                if (slugContext.Slug.Length > 1000)
+                    slugContext.Slug = slugContext.Slug.Substring(0, 1000);
+
+                // dots are not allowed at the begin and the end of routes
+                slugContext.Slug = RemoveDiacritics(slugContext.Slug.Trim('.').ToLower());
+            }
+
+            foreach (ISlugEventHandler slugEventHandler in _slugEventHandlers) {
+                slugEventHandler.FilledSlugFromTitle(slugContext);
+            }
+
+            model.Slug = slugContext.Slug;
         }
 
         public string GenerateUniqueSlug(IRoutableAspect part, IEnumerable<string> existingPaths) {

src/Orchard.Web/Core/Settings/Migrations.cs

@@ -90,6 +90,7 @@ namespace Orchard.Core.Settings {
                     .Column<string>("HomePage")
                     .Column<string>("SiteCulture")
                     .Column<string>("ResourceDebugMode", c => c.WithDefault("FromAppSetting"))
+                    .Column<int>("PageSize")
                 );
 
             return 1;

src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs

@@ -8,28 +8,39 @@ namespace Orchard.Core.Settings.Models {
             get { return Record.PageTitleSeparator; }
             set { Record.PageTitleSeparator = value; }
         }
+
         public string SiteName {
             get { return Record.SiteName; }
             set { Record.SiteName = value; }
         }
+
         public string SiteSalt {
             get { return Record.SiteSalt; }
         }
+
         public string SuperUser {
             get { return Record.SuperUser; }
             set { Record.SuperUser = value; }
         }
+
         public string HomePage {
             get { return Record.HomePage; }
             set { Record.HomePage = value; }
         }
+
         public string SiteCulture {
             get { return Record.SiteCulture; }
             set { Record.SiteCulture = value; }
         }
+
         public ResourceDebugMode ResourceDebugMode {
             get { return Record.ResourceDebugMode; }
             set { Record.ResourceDebugMode = value; }
         }
+
+        public int PageSize {
+            get { return Record.PageSize; }
+            set { Record.PageSize = value; }
+        }
     }
 }

src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs

@@ -3,12 +3,26 @@ using Orchard.Settings;
 
 namespace Orchard.Core.Settings.Models {
     public class SiteSettingsPartRecord : ContentPartRecord {
+        public const int DefaultPageSize = 10;
+
+        public SiteSettingsPartRecord() {
+            PageSize = DefaultPageSize;
+        }
+
         public virtual string SiteSalt { get; set; }
+
         public virtual string SiteName { get; set; }
+
         public virtual string SuperUser { get; set; }
+
         public virtual string PageTitleSeparator { get; set; }
+
         public virtual string HomePage { get; set; }
+
         public virtual string SiteCulture { get; set; }
+
         public virtual ResourceDebugMode ResourceDebugMode { get; set; }
+
+        public virtual int PageSize { get; set; }
     }
 }

src/Orchard.Web/Core/Settings/ViewModels/SiteSettingsPartViewModel.cs

@@ -15,8 +15,7 @@ namespace Orchard.Core.Settings.ViewModels {
             get { return Site.ContentItem.Id; }
         }
 
-        public string PageTitleSeparator
+        public string PageTitleSeparator {
-        {
             get { return Site.Record.PageTitleSeparator; }
             set { Site.Record.PageTitleSeparator = value; }
         }
@@ -40,5 +39,10 @@ namespace Orchard.Core.Settings.ViewModels {
             get { return Site.As<SiteSettingsPart>().ResourceDebugMode; }
             set { Site.As<SiteSettingsPart>().ResourceDebugMode = value; }
         }
+
+        public int PageSize {
+            get { return Site.As<SiteSettingsPart>().PageSize; }
+            set { Site.As<SiteSettingsPart>().PageSize = value; }
+        }
     }
 }

src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml

@@ -36,4 +36,9 @@
         @Html.DropDownList("ResourceDebugMode", resourceDebugMode)
         <span class="hint">@T("Determines whether scripts and stylesheets load in their debuggable or minified form.")</span>
     </div>
+    <div>
+        <label for="DefaultPageSize">@T("Default number of items per page")</label>
+        @Html.TextBoxFor(m => m.PageSize, new { @class = "textMedium" })
+        <span class="hint">@T("Determines the default number of items that are shown per page.")</span>
+    </div>
 </fieldset>

src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs

@@ -25,7 +25,7 @@ namespace Orchard.Blogs {
             var singleBlog = blogCount == 1 ? blogs.ElementAt(0) : null;
 
             if (blogCount > 0 && singleBlog == null) {
-                menu.Add(T("List"), "3",
+                menu.Add(T("Manage Blogs"), "3",
                          item => item.Action("List", "BlogAdmin", new {area = "Orchard.Blogs"}).Permission(Permissions.MetaListOwnBlogs));
             }
             else if (singleBlog != null)

src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs

@@ -15,6 +15,8 @@ using Orchard.UI.Navigation;
 using Orchard.UI.Notify;
 
 namespace Orchard.Blogs.Controllers {
+    using Orchard.Settings;
+
     [ValidateInput(false), Admin]
     public class BlogAdminController : Controller, IUpdateModel {
         private readonly IBlogService _blogService;
@@ -22,6 +24,7 @@ namespace Orchard.Blogs.Controllers {
         private readonly IContentManager _contentManager;
         private readonly ITransactionManager _transactionManager;
         private readonly IBlogSlugConstraint _blogSlugConstraint;
+        private readonly ISiteService _siteService;
 
         public BlogAdminController(
             IOrchardServices services,
@@ -30,6 +33,7 @@ namespace Orchard.Blogs.Controllers {
             IContentManager contentManager,
             ITransactionManager transactionManager,
             IBlogSlugConstraint blogSlugConstraint,
+            ISiteService siteService,
             IShapeFactory shapeFactory) {
             Services = services;
             _blogService = blogService;
@@ -37,6 +41,7 @@ namespace Orchard.Blogs.Controllers {
             _contentManager = contentManager;
             _transactionManager = transactionManager;
             _blogSlugConstraint = blogSlugConstraint;
+            _siteService = siteService;
             T = NullLocalizer.Instance;
             Shape = shapeFactory;
         }
@@ -147,7 +152,8 @@ namespace Orchard.Blogs.Controllers {
             return View((object)viewModel);
         }
 
-        public ActionResult Item(int blogId, Pager pager) {
+        public ActionResult Item(int blogId, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
             BlogPart blogPart = _blogService.Get(blogId, VersionOptions.Latest).As<BlogPart>();
 
             if (blogPart == null)

src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs

@@ -13,6 +13,8 @@ using Orchard.Themes;
 using Orchard.UI.Navigation;
 
 namespace Orchard.Blogs.Controllers {
+    using Orchard.Settings;
+
     [Themed]
     public class BlogController : Controller {
         private readonly IOrchardServices _services;
@@ -22,6 +24,7 @@ namespace Orchard.Blogs.Controllers {
         private readonly IFeedManager _feedManager;
         private readonly IWorkContextAccessor _workContextAccessor;
         private readonly IHomePageProvider _routableHomePageProvider;
+        private readonly ISiteService _siteService;
 
         public BlogController(
             IOrchardServices services, 
@@ -31,13 +34,15 @@ namespace Orchard.Blogs.Controllers {
             IFeedManager feedManager, 
             IShapeFactory shapeFactory,
             IWorkContextAccessor workContextAccessor,
-            IEnumerable<IHomePageProvider> homePageProviders) {
+            IEnumerable<IHomePageProvider> homePageProviders,
+            ISiteService siteService) {
             _services = services;
             _blogService = blogService;
             _blogPostService = blogPostService;
             _blogSlugConstraint = blogSlugConstraint;
             _feedManager = feedManager;
             _workContextAccessor = workContextAccessor;
+            _siteService = siteService;
             _routableHomePageProvider = homePageProviders.SingleOrDefault(p => p.GetProviderName() == RoutableHomePageProvider.Name);
             Logger = NullLogger.Instance;
             Shape = shapeFactory;
@@ -59,7 +64,8 @@ namespace Orchard.Blogs.Controllers {
             return View((object)viewModel);
         }
 
-        public ActionResult Item(string blogSlug, Pager pager) {
+        public ActionResult Item(string blogSlug, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
             var correctedSlug = _blogSlugConstraint.FindSlug(blogSlug);
             if (correctedSlug == null)
                 return HttpNotFound();

src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs

@@ -123,7 +123,7 @@ namespace Orchard.Blogs.Services {
             string password) {
 
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(Permissions.EditOthersBlogPost, user, null);
 
             var array = new XRpcArray();
             foreach (var blog in _blogService.Get()) {
@@ -144,7 +144,7 @@ namespace Orchard.Blogs.Services {
             int numberOfPosts) {
 
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(Permissions.EditOthersBlogPost, user, null);
 
             var blog = _contentManager.Get<BlogPart>(Convert.ToInt32(blogId));
             if (blog == null)
@@ -166,7 +166,7 @@ namespace Orchard.Blogs.Services {
             IEnumerable<IXmlRpcDriver> drivers) {
 
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(Permissions.EditOwnBlogPost, user, null);
+            _authorizationService.CheckAccess(publish ? Permissions.PublishOthersBlogPost : Permissions.EditOthersBlogPost, user, null);
 
             var blog = _contentManager.Get<BlogPart>(Convert.ToInt32(blogId));
             if (blog == null)
@@ -216,7 +216,7 @@ namespace Orchard.Blogs.Services {
             IEnumerable<IXmlRpcDriver> drivers) {
 
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(Permissions.EditOthersBlogPost, user, null);
 
             var blogPost = _blogPostService.Get(postId, VersionOptions.Latest);
             if (blogPost == null)
@@ -231,15 +231,13 @@ namespace Orchard.Blogs.Services {
         }
 
         private bool MetaWeblogEditPost(int postId, string userName, string password, XRpcStruct content, bool publish, IEnumerable<IXmlRpcDriver> drivers) {
-
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(publish ? Permissions.PublishOthersBlogPost : Permissions.EditOthersBlogPost, user, null);
 
             var blogPost = _blogPostService.Get(postId, VersionOptions.DraftRequired);
             if (blogPost == null)
                 throw new ArgumentException();
 
-
             var title = content.Optional<string>("title");
             var description = content.Optional<string>("description");
             var slug = content.Optional<string>("wp_slug");
@@ -259,7 +257,7 @@ namespace Orchard.Blogs.Services {
 
         private bool MetaWeblogDeletePost(string appkey, string postId, string userName, string password, bool publish, IEnumerable<IXmlRpcDriver> drivers) {
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(Permissions.DeleteOthersBlogPost, user, null);
 
             var blogPost = _blogPostService.Get(Convert.ToInt32(postId), VersionOptions.Latest);
             if (blogPost == null)

src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs

@@ -14,12 +14,20 @@ using Orchard.Comments.ViewModels;
 using Orchard.Comments.Services;
 
 namespace Orchard.Comments.Controllers {
+    using Orchard.Settings;
+
     [ValidateInput(false)]
     public class AdminController : Controller {
         private readonly ICommentService _commentService;
+        private readonly ISiteService _siteService;
 
-        public AdminController(IOrchardServices services, ICommentService commentService, IShapeFactory shapeFactory) {
+        public AdminController(
+            IOrchardServices services, 
+            ICommentService commentService, 
+            ISiteService siteService,
+            IShapeFactory shapeFactory) {
             _commentService = commentService;
+            _siteService = siteService;
             Services = services;
             Logger = NullLogger.Instance;
             T = NullLocalizer.Instance;
@@ -31,7 +39,9 @@ namespace Orchard.Comments.Controllers {
         public Localizer T { get; set; }
         dynamic Shape { get; set; }
 
-        public ActionResult Index(CommentIndexOptions options, Pager pager) {
+        public ActionResult Index(CommentIndexOptions options, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
+
             // Default options
             if (options == null)
                 options = new CommentIndexOptions();

src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs

@@ -1,6 +1,7 @@
 using Orchard.Environment.Extensions;
 using Orchard.Localization;
 using Orchard.UI.Navigation;
+using Orchard.Security;
 
 namespace Orchard.Packaging {
     [OrchardFeature("Gallery")]
@@ -12,11 +13,14 @@ namespace Orchard.Packaging {
         public void GetNavigation(NavigationBuilder builder) {
             builder.Add(T("Gallery"), "30", menu => menu
                         .Add(T("Modules"), "1.0", item => item
-                             .Action("Modules", "Gallery", new { area = "Orchard.Packaging" }))
+                             .Action("Modules", "Gallery", new { area = "Orchard.Packaging" })
+                             .Permission(StandardPermissions.SiteOwner))
                         .Add(T("Themes"), "2.0", item => item
-                             .Action("Themes", "Gallery", new { area = "Orchard.Packaging" }))
+                             .Action("Themes", "Gallery", new { area = "Orchard.Packaging" })
+                             .Permission(StandardPermissions.SiteOwner))
                         .Add(T("Feeds"), "3.0", item => item
-                             .Action("Sources", "Gallery", new { area = "Orchard.Packaging" })));
+                             .Action("Sources", "Gallery", new { area = "Orchard.Packaging" })
+                             .Permission(StandardPermissions.SiteOwner)));
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs

@@ -9,6 +9,7 @@ using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.Packaging.Services;
 using Orchard.Packaging.ViewModels;
+using Orchard.Security;
 using Orchard.Themes;
 using Orchard.UI.Admin;
 using Orchard.UI.Notify;
@@ -26,36 +27,51 @@ namespace Orchard.Packaging.Controllers {
         public GalleryController(
             IPackageManager packageManager,
             IPackagingSourceManager packagingSourceManager,
-            INotifier notifier) {
+            INotifier notifier,
+            IOrchardServices services) {
             _packageManager = packageManager;
             _packagingSourceManager = packagingSourceManager;
             _notifier = notifier;
+            Services = services;
 
             T = NullLocalizer.Instance;
             Logger = NullLogger.Instance;
         }
 
+        public IOrchardServices Services { get; set; }
         public Localizer T { get; set; }
         public ILogger Logger { get; set; }
 
         public ActionResult Sources() {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list sources")))
+                return new HttpUnauthorizedResult();
+
             return View(new PackagingSourcesViewModel {
                 Sources = _packagingSourceManager.GetSources(),
             });
         }
 
         public ActionResult Remove(int id) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to remove sources")))
+                return new HttpUnauthorizedResult();
+
             _packagingSourceManager.RemoveSource(id);
             _notifier.Information(T("The feed has been removed successfully."));
             return RedirectToAction("Sources");
         }
 
         public ActionResult AddSource() {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add sources")))
+                return new HttpUnauthorizedResult();
+
             return View(new PackagingAddSourceViewModel());
         }
 
         [HttpPost]
         public ActionResult AddSource(string url) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add sources")))
+                return new HttpUnauthorizedResult();
+
             try {
                 if (!String.IsNullOrEmpty(url)) {
                     if (!url.StartsWith("http")) {
@@ -96,6 +112,9 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public ActionResult Modules(int? sourceId) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list modules")))
+                return new HttpUnauthorizedResult();
+
             var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault();
 
             var sources = selectedSource != null
@@ -123,6 +142,9 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public ActionResult Themes(int? sourceId) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list themes")))
+                return new HttpUnauthorizedResult();
+
             var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault();
 
             var sources = selectedSource != null
@@ -138,6 +160,9 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public ActionResult Install(string packageId, string version, int sourceId, string redirectTo) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to install packages")))
+                return new HttpUnauthorizedResult();
+
             var source = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault();
 
             if (source == null) {

src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs

@@ -8,6 +8,7 @@ using Orchard.Environment.Extensions;
 using Orchard.FileSystems.AppData;
 using Orchard.Localization;
 using Orchard.Packaging.Services;
+using Orchard.Security;
 using Orchard.Themes;
 using Orchard.UI.Admin;
 using Orchard.UI.Notify;
@@ -25,7 +26,8 @@ namespace Orchard.Packaging.Controllers {
         public PackagingServicesController(
             IPackageManager packageManager,
             INotifier notifier,
-            IAppDataFolderRoot appDataFolderRoot) {
+            IAppDataFolderRoot appDataFolderRoot,
+            IOrchardServices services) {
             _packageManager = packageManager;
             _notifier = notifier;
             _appDataFolderRoot = appDataFolderRoot;
@@ -34,31 +36,50 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public Localizer T { get; set; }
+        public IOrchardServices Services { get; set; }
 
         public ActionResult AddTheme(string returnUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add themes")))
+                return new HttpUnauthorizedResult();
+
             return View();
         }
 
         [HttpPost, ActionName("AddTheme")]
         public ActionResult AddThemePOST(string returnUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add themes")))
+                return new HttpUnauthorizedResult();
+
             return InstallPackage(returnUrl, Request.RawUrl);
         }
 
         [HttpPost, ActionName("RemoveTheme")]
         public ActionResult RemoveThemePOST(string themeId, string returnUrl, string retryUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to remove themes")))
+                return new HttpUnauthorizedResult();
+
             return UninstallPackage(PackagingSourceManager.ThemesPrefix + themeId, returnUrl, retryUrl);
         }
 
         public ActionResult AddModule(string returnUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add modules")))
+                return new HttpUnauthorizedResult();
+
             return View();
         }
 
         [HttpPost, ActionName("AddModule")]
         public ActionResult AddModulePOST(string returnUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add modules")))
+                return new HttpUnauthorizedResult();
+
             return InstallPackage(returnUrl, Request.RawUrl);
         }
 
         public ActionResult InstallPackage(string returnUrl, string retryUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to install packages")))
+                return new HttpUnauthorizedResult();
+
             try {
                 if (Request.Files != null &&
                     Request.Files.Count > 0 &&
@@ -90,6 +111,9 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public ActionResult UninstallPackage(string id, string returnUrl, string retryUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to uninstall packages")))
+                return new HttpUnauthorizedResult();
+
             try {
                 _packageManager.Uninstall(id, HostingEnvironment.MapPath("~/"));
 

src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs

@@ -15,19 +15,24 @@ using Orchard.Collections;
 using Orchard.Themes;
 
 namespace Orchard.Search.Controllers {
+    using Orchard.Settings;
+
     [ValidateInput(false), Themed]
     public class SearchController : Controller {
         private readonly ISearchService _searchService;
         private readonly IContentManager _contentManager;
+        private readonly ISiteService _siteService;
 
         public SearchController(
             IOrchardServices services,
             ISearchService searchService,
             IContentManager contentManager,
+            ISiteService siteService,
             IShapeFactory shapeFactory) {
              Services = services;
             _searchService = searchService;
             _contentManager = contentManager;
+            _siteService = siteService;
 
             T = NullLocalizer.Instance;
             Logger = NullLogger.Instance;
@@ -39,7 +44,8 @@ namespace Orchard.Search.Controllers {
         public ILogger Logger { get; set; }
         dynamic Shape { get; set; }
 
-        public ActionResult Index(Pager pager, string q = "") {
+        public ActionResult Index(PagerParameters pagerParameters, string q = "") {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
             var searchFields = Services.WorkContext.CurrentSite.As<SearchSettingsPart>().SearchedFields;
 
             IPageOfItems<ISearchHit> searchHits = new PageOfItems<ISearchHit>(new ISearchHit[] { });

src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs

@@ -8,6 +8,7 @@ using Orchard.Commands.Builtin;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
 using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.Core.Settings.Models;
 using Orchard.Data.Migration.Interpreters;
 using Orchard.Data.Providers;
 using Orchard.Data.Migration;
@@ -172,6 +173,11 @@ namespace Orchard.Setup {
                 get { return ResourceDebugMode.FromAppSetting; }
                 set { throw new NotImplementedException(); }
             }
+
+            public int PageSize {
+                get { return SiteSettingsPartRecord.DefaultPageSize; }
+                set { throw new NotImplementedException(); }
+            }
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs

@@ -4,6 +4,7 @@ using Orchard.ContentManagement;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
 using Orchard.Logging;
+using Orchard.Settings;
 using Orchard.Tags.Services;
 using Orchard.Tags.ViewModels;
 using Orchard.Themes;
@@ -14,14 +15,17 @@ namespace Orchard.Tags.Controllers {
     public class HomeController : Controller {
         private readonly ITagService _tagService;
         private readonly IContentManager _contentManager;
+        private readonly ISiteService _siteService;
         private readonly dynamic _shapeFactory;
 
         public HomeController(
             ITagService tagService,
             IContentManager contentManager,
+            ISiteService siteService,
             IShapeFactory shapeFactory) {
             _tagService = tagService;
             _contentManager = contentManager;
+            _siteService = siteService;
             _shapeFactory = shapeFactory;
             T = NullLocalizer.Instance;
         }
@@ -35,7 +39,9 @@ namespace Orchard.Tags.Controllers {
             return View(model);
         }
 
-        public ActionResult Search(string tagName, Pager pager) {
+        public ActionResult Search(string tagName, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
+
             var tag = _tagService.GetTagByName(tagName);
 
             if (tag == null) {

src/Orchard/Data/Providers/SqlServerDataServicesProvider.cs

@@ -18,7 +18,7 @@ namespace Orchard.Data.Providers {
         public override IPersistenceConfigurer GetPersistenceConfigurer(bool createDatabase) {
             var persistence = MsSqlConfiguration.MsSql2008;
             if (string.IsNullOrEmpty(_connectionString)) {
-                throw new NotImplementedException();
+                throw new ArgumentException("The connection string is empty");
             }
             persistence = persistence.ConnectionString(_connectionString);
             return persistence;

src/Orchard/Orchard.Framework.csproj

@@ -188,6 +188,7 @@
     <Compile Include="Themes\ThemeManager.cs" />
     <Compile Include="UI\FlatPositionComparer.cs" />
     <Compile Include="UI\Navigation\Pager.cs" />
+    <Compile Include="UI\Navigation\PagerParameters.cs" />
     <Compile Include="UI\Resources\IResourceManifestProvider.cs" />
     <Compile Include="UI\Resources\ResourceManifestBuilder.cs" />
     <Compile Include="UI\Zones\LayoutWorkContext.cs" />

src/Orchard/Settings/ISite.cs

@@ -12,5 +12,6 @@ namespace Orchard.Settings {
         string HomePage { get; set; }
         string SiteCulture { get; set; }
         ResourceDebugMode ResourceDebugMode { get; set; }
+        int PageSize { get; set; }
     }
 }

src/Orchard/UI/Navigation/Pager.cs

@@ -1,22 +1,49 @@
-namespace Orchard.UI.Navigation {
+using Orchard.Settings;
+
+namespace Orchard.UI.Navigation {
     public class Pager {
-        private const int PageDefault = 1;
+        /// <summary>
-        public const int PageSizeDefault = 10;
+        /// The default page number.
-        private int _pageSize;
+        /// </summary>
-        private int _size;
+        public const int PageDefault = 1;
 
-        public int Page {
+        /// <summary>
-            get { return _pageSize > 0 ? _pageSize : PageDefault; }
+        /// Constructs a new pager.
-            set { _pageSize = value; }
+        /// </summary>
+        /// <param name="site">The site settings.</param>
+        /// <param name="pagerParameters">The pager parameters.</param>
+        public Pager(ISite site, PagerParameters pagerParameters) 
+            : this(site, pagerParameters.Page, pagerParameters.PageSize) {
         }
 
-        public int PageSize {
+        /// <summary>
-            get { return _size > 0 ? _size : PageSizeDefault; }
+        /// Constructs a new pager.
-            set { _size = value; }
+        /// </summary>
+        /// <param name="site">The site settings.</param>
+        /// <param name="page">The page parameter.</param>
+        /// <param name="pageSize">The page size parameter.</param>
+        public Pager(ISite site, int? page, int? pageSize) {
+            Page = (int) (page != null ? (page > 0 ? page : PageDefault) : PageDefault);
+            PageSize = pageSize ?? site.PageSize;
         }
 
+        /// <summary>
+        /// Gets or sets the current page number or the default page number if none is specified.
+        /// </summary>
+        public int Page { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current page size or the site default size if none is specified.
+        /// </summary>
+        public int PageSize { get; set; }
+
+        /// <summary>
+        /// Gets the current page start index.
+        /// </summary>
+        /// <param name="page">The current page number.</param>
+        /// <returns>The index in which the page starts.</returns>
         public int GetStartIndex(int? page = null) {
-            return ((page ?? Page) - 1)*PageSize;
+            return ((page ?? Page) - PageDefault) * PageSize;
         }
     }
 }

src/Orchard/UI/Navigation/PagerParameters.cs

@@ -0,0 +1,13 @@
+namespace Orchard.UI.Navigation {
+    public class PagerParameters {
+        /// <summary>
+        /// Gets or sets the current page number or null if none specified.
+        /// </summary>
+        public int? Page { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current page size or null if none specified.
+        /// </summary>
+        public int? PageSize { get; set; }
+    }
+}