Skip to content

Commit 8aaedef

Browse files
rxturrxtur
committed
More cleanup and small updates in admin
1 parent 87e6cf9 commit 8aaedef

31 files changed

Lines changed: 46 additions & 246 deletions

‎BlogEngine/BlogEngine.Core/BlogEngine.Core.csproj‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@
234234
<Compile Include="Services\Packaging\PackageFile.cs" />
235235
<Compile Include="Services\Packaging\PackagingSource.cs" />
236236
<Compile Include="Services\Packaging\Pager.cs" />
237-
<Compile Include="Pager.cs" />
238-
<Compile Include="Services\Ping\Manager.cs" />
239-
<Compile Include="Services\Ping\Trackback.cs" />
240-
<Compile Include="Services\Ping\TrackbackMessage.cs" />
237+
<Compile Include="Helpers\Pager.cs" />
238+
<Compile Include="Services\Messaging\Ping\Manager.cs" />
239+
<Compile Include="Services\Messaging\Ping\Trackback.cs" />
240+
<Compile Include="Services\Messaging\Ping\TrackbackMessage.cs" />
241241
<Compile Include="Providers\FileSystemProviders\BlogFileSystemProvider.cs" />
242242
<Compile Include="Providers\FileSystemProviders\BlogFileSystemProviderCollection.cs" />
243243
<Compile Include="Providers\FileSystemProviders\BlogFileSystemProviderSection.cs" />
@@ -308,8 +308,8 @@
308308
<SubType>ASPXCodeBehind</SubType>
309309
</Compile>
310310
<Compile Include="Page.cs" />
311-
<Compile Include="Services\Ping\Pingback.cs" />
312-
<Compile Include="Services\Ping\PingService.cs" />
311+
<Compile Include="Services\Messaging\Ping\Pingback.cs" />
312+
<Compile Include="Services\Messaging\Ping\PingService.cs" />
313313
<Compile Include="Post.cs" />
314314
<Compile Include="Properties\AssemblyInfo.cs" />
315315
<Compile Include="Helpers\StateCollection.cs" />
@@ -321,8 +321,6 @@
321321
<Compile Include="Web\HttpModules\ReferrerModule.cs" />
322322
<Compile Include="Web\HttpModules\WwwSubDomainModule.cs" />
323323
<Compile Include="Web\HttpModules\UrlRewrite.cs" />
324-
<Compile Include="Web\Navigation\IPager.cs" />
325-
<Compile Include="Web\Navigation\Pager.cs" />
326324
<Compile Include="Web\Scripting\PageHeader.cs" />
327325
<Compile Include="Web\Scripting\Helpers.cs" />
328326
<Compile Include="Web\Scripting\JavascriptMinifier.cs" />
@@ -332,16 +330,16 @@
332330
</ItemGroup>
333331
<ItemGroup>
334332
<Compile Include="BlogRollItem.cs" />
335-
<Compile Include="Services\Messaging\CommentHandlers.cs" />
336-
<Compile Include="DataStore\ExtensionSettings.cs" />
337-
<Compile Include="DataStore\ExtensionSettingsBehavior.cs" />
338-
<Compile Include="DataStore\Interfaces.cs" />
339-
<Compile Include="DataStore\SerializableStringDictionary.cs" />
340-
<Compile Include="DataStore\SettingsBase.cs" />
341-
<Compile Include="DataStore\StringDictionaryBehavior.cs" />
342-
<Compile Include="DataStore\WidgetSettings.cs" />
343-
<Compile Include="DataStore\XMLDocumentBehavior.cs" />
344-
<Compile Include="Services\Messaging\ICustomFilter.cs" />
333+
<Compile Include="Services\Messaging\Protection\CommentHandlers.cs" />
334+
<Compile Include="Web\Extensions\DataStore\ExtensionSettings.cs" />
335+
<Compile Include="Web\Extensions\DataStore\ExtensionSettingsBehavior.cs" />
336+
<Compile Include="Web\Extensions\DataStore\Interfaces.cs" />
337+
<Compile Include="Web\Extensions\DataStore\SerializableStringDictionary.cs" />
338+
<Compile Include="Web\Extensions\DataStore\SettingsBase.cs" />
339+
<Compile Include="Web\Extensions\DataStore\StringDictionaryBehavior.cs" />
340+
<Compile Include="Web\Extensions\DataStore\WidgetSettings.cs" />
341+
<Compile Include="Web\Extensions\DataStore\XMLDocumentBehavior.cs" />
342+
<Compile Include="Services\Messaging\Protection\ICustomFilter.cs" />
345343
<Compile Include="IPublishable.cs" />
346344
<Compile Include="Providers\DbProvider\DbBlogProvider.cs" />
347345
<Compile Include="Providers\DbProvider\DbMembershipProvider.cs" />

‎BlogEngine/BlogEngine.Core/Data/TrashRepository.cs‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Linq.Dynamic;
5-
using System.Text;
6-
using System.Threading.Tasks;
75
using BlogEngine.Core.Data.Models;
8-
using BlogEngine.Core.Web.Navigation;
96
using BlogEngine.Core.Data.Contracts;
107

118
namespace BlogEngine.Core.Data
@@ -26,8 +23,8 @@ public class TrashRepository : ITrashRepository
2623
/// <returns></returns>
2724
public TrashVM GetTrash(TrashType trashType, int take = 10, int skip = 0, string filter = "1 == 1", string order = "DateCreated descending")
2825
{
29-
if (!Security.IsAuthorizedTo(BlogEngine.Core.Rights.AccessAdminPages))
30-
throw new System.UnauthorizedAccessException();
26+
if (!Security.IsAuthorizedTo(Rights.AccessAdminPages))
27+
throw new UnauthorizedAccessException();
3128

3229
var trash = new TrashVM();
3330
var comments = new List<Comment>();
@@ -43,7 +40,7 @@ public TrashVM GetTrash(TrashType trashType, int take = 10, int skip = 0, string
4340

4441
foreach (var p in Post.Posts)
4542
{
46-
if (!Security.IsAuthorizedTo(BlogEngine.Core.Rights.EditOtherUsersPosts))
43+
if (!Security.IsAuthorizedTo(Rights.EditOtherUsersPosts))
4744
if (p.Author.ToLower() != Security.CurrentUser.Identity.Name.ToLower())
4845
continue;
4946

@@ -78,7 +75,7 @@ public TrashVM GetTrash(TrashType trashType, int take = 10, int skip = 0, string
7875
{
7976
foreach (var p in posts)
8077
{
81-
if (!Security.IsAuthorizedTo(BlogEngine.Core.Rights.EditOtherUsersPosts))
78+
if (!Security.IsAuthorizedTo(Rights.EditOtherUsersPosts))
8279
if (p.Author.ToLower() != Security.CurrentUser.Identity.Name.ToLower())
8380
continue;
8481

@@ -138,7 +135,7 @@ public TrashVM GetTrash(TrashType trashType, int take = 10, int skip = 0, string
138135
/// <param name="id">Id</param>
139136
public bool Restore(string trashType, Guid id)
140137
{
141-
if (!Security.IsAuthorizedTo(BlogEngine.Core.Rights.AccessAdminPages))
138+
if (!Security.IsAuthorizedTo(Rights.AccessAdminPages))
142139
throw new System.UnauthorizedAccessException();
143140

144141
switch (trashType)
@@ -175,7 +172,7 @@ public bool Restore(string trashType, Guid id)
175172
/// <param name="id">Id</param>
176173
public bool Purge(string trashType, Guid id)
177174
{
178-
if (!Security.IsAuthorizedTo(BlogEngine.Core.Rights.AccessAdminPages))
175+
if (!Security.IsAuthorizedTo(Rights.AccessAdminPages))
179176
throw new System.UnauthorizedAccessException();
180177

181178
switch (trashType)
@@ -210,13 +207,13 @@ public bool Purge(string trashType, Guid id)
210207
/// </summary>
211208
public bool PurgeAll()
212209
{
213-
if (!Security.IsAuthorizedTo(BlogEngine.Core.Rights.AccessAdminPages))
210+
if (!Security.IsAuthorizedTo(Rights.AccessAdminPages))
214211
throw new System.UnauthorizedAccessException();
215212

216213
// remove deleted comments
217214
foreach (var p in Post.Posts.ToArray())
218215
{
219-
if (!Security.IsAuthorizedTo(BlogEngine.Core.Rights.EditOtherUsersPosts))
216+
if (!Security.IsAuthorizedTo(Rights.EditOtherUsersPosts))
220217
if (p.Author.ToLower() != Security.CurrentUser.Identity.Name.ToLower())
221218
continue;
222219

@@ -229,7 +226,7 @@ public bool PurgeAll()
229226
// remove deleted posts
230227
foreach (var p in Post.DeletedPosts.ToArray())
231228
{
232-
if (!Security.IsAuthorizedTo(BlogEngine.Core.Rights.EditOtherUsersPosts))
229+
if (!Security.IsAuthorizedTo(Rights.EditOtherUsersPosts))
233230
if (p.Author.ToLower() != Security.CurrentUser.Identity.Name.ToLower())
234231
continue;
235232

@@ -251,8 +248,8 @@ public bool PurgeAll()
251248
/// <returns></returns>
252249
public JsonResponse PurgeLogfile()
253250
{
254-
if (!Security.IsAuthorizedTo(BlogEngine.Core.Rights.AccessAdminPages))
255-
throw new System.UnauthorizedAccessException();
251+
if (!Security.IsAuthorizedTo(Rights.AccessAdminPages))
252+
throw new UnauthorizedAccessException();
256253

257254
string fileLocation = System.Web.Hosting.HostingEnvironment.MapPath(System.IO.Path.Combine(BlogConfig.StorageLocation, "logger.txt"));
258255
if (System.IO.File.Exists(fileLocation))

BlogEngine/BlogEngine.Core/Pager.cs renamed to BlogEngine/BlogEngine.Core/Helpers/Pager.cs

File renamed without changes.

‎BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
[assembly: CLSCompliant(false)]
2020
[assembly: ComVisible(false)]
2121
[assembly: AllowPartiallyTrustedCallers]
22-
[assembly: AssemblyVersion("3.1.2.1")]
22+
[assembly: AssemblyVersion("3.1.2.2")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

‎BlogEngine/BlogEngine.Core/Services/FileSystem/FileSystemUtilities.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using ICSharpCode.SharpZipLib.Zip;
6-
using ICSharpCode.SharpZipLib.GZip;
1+
using ICSharpCode.SharpZipLib.Zip;
72
using System.IO;
8-
using ICSharpCode.SharpZipLib.Tar;
93
using BlogEngine.Core.Providers;
104
using System.Web.Configuration;
115
using System.Configuration;
@@ -154,7 +148,7 @@ private void ExtractDirectory(string ArchiveOutputLocation)
154148
/// </summary>
155149
/// <param name="ProviderName">The blog provider to instantiate.</param>
156150
/// <returns>A BlogProvider instance.</returns>
157-
public static Providers.BlogProvider CreateProvider(string ProviderName)
151+
public static BlogProvider CreateProvider(string ProviderName)
158152
{
159153
var section = (BlogProviderSection)WebConfigurationManager.GetSection("BlogEngine/blogProvider");
160154
var _providers = new BlogProviderCollection();

BlogEngine/BlogEngine.Core/Services/Ping/Manager.cs renamed to BlogEngine/BlogEngine.Core/Services/Messaging/Ping/Manager.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/Services/Ping/PingService.cs renamed to BlogEngine/BlogEngine.Core/Services/Messaging/Ping/PingService.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/Services/Ping/Pingback.cs renamed to BlogEngine/BlogEngine.Core/Services/Messaging/Ping/Pingback.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/Services/Ping/Trackback.cs renamed to BlogEngine/BlogEngine.Core/Services/Messaging/Ping/Trackback.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/Services/Ping/TrackbackMessage.cs renamed to BlogEngine/BlogEngine.Core/Services/Messaging/Ping/TrackbackMessage.cs

File renamed without changes.

0 commit comments

Comments
 (0)