Skip to content

Commit 129e156

Browse files
rxturrxtur
committed
Cleanup - quick notes removed (3.2.1.0)
1 parent d15fc16 commit 129e156

32 files changed

Lines changed: 5 additions & 1443 deletions

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,6 @@
230230
<Compile Include="Services\FileSystem\Image.cs" />
231231
<Compile Include="Services\FileSystem\FileSystemUtilities.cs" />
232232
<Compile Include="Data\Models\Settings.cs" />
233-
<Compile Include="Services\Notes\QuickNote.cs" />
234-
<Compile Include="Services\Notes\QuickNotes.cs" />
235-
<Compile Include="Services\Notes\QuickSetting.cs" />
236-
<Compile Include="Services\Notes\QuickSettings.cs" />
237233
<Compile Include="Services\Packaging\Constants.cs" />
238234
<Compile Include="Services\Packaging\GalleryData.cs" />
239235
<Compile Include="Services\Packaging\FileSystem.cs" />
@@ -258,7 +254,6 @@
258254
<Compile Include="Providers\XmlProvider\Blogs.cs" />
259255
<Compile Include="Providers\XmlProvider\CustomFields.cs" />
260256
<Compile Include="Providers\XmlProvider\Packaging.cs" />
261-
<Compile Include="Providers\XmlProvider\QuickNotes.cs" />
262257
<Compile Include="Providers\XmlProvider\Rights.cs" />
263258
<Compile Include="Providers\FileSystemProviders\XmlFileSystemProvider.cs" />
264259
<Compile Include="RemoteFile.cs" />

‎BlogEngine/BlogEngine.Core/BlogSettings.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,16 +1097,6 @@ public DateTime FromUtc(DateTime ? serverTime = null)
10971097

10981098
#endregion
10991099

1100-
#region EnableQuickNotes
1101-
1102-
/// <summary>
1103-
/// Gets or sets a value indicating if QuickNotes module is enabled
1104-
/// </summary>
1105-
/// <value><b>true</b> if QuickNotes is enabled, otherwise returns <b>false</b>.</value>
1106-
public bool EnableQuickNotes { get; set; }
1107-
1108-
#endregion
1109-
11101100
#region RemoveExtensionsFromUrls
11111101

11121102
/// <summary>

‎BlogEngine/BlogEngine.Core/Data/ViewModels/DashboardVM.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using BlogEngine.Core.Data.Models;
22
using BlogEngine.Core.Data.Services;
3-
using BlogEngine.Core.Notes;
43
using System.Collections.Generic;
54
using System.IO;
65
using System.Linq;
@@ -90,16 +89,6 @@ public List<CommentItem> Comments
9089
/// </summary>
9190
public List<TrashItem> Trash { get; set; }
9291
/// <summary>
93-
/// Quick notes counter
94-
/// </summary>
95-
public List<QuickNote> Notes
96-
{
97-
get
98-
{
99-
return new QuickNotes(Security.CurrentUser.Identity.Name).Notes;
100-
}
101-
}
102-
/// <summary>
10392
/// Log items counter
10493
/// </summary>
10594
public string Logs

‎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.2.0.9")]
22+
[assembly: AssemblyVersion("3.2.1.0")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

‎BlogEngine/BlogEngine.Core/Providers/BlogProvider.cs‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
using DataStore;
99
using Packaging;
10-
using Notes;
1110

1211
/// <summary>
1312
/// A base class for all custom providers to inherit from.
@@ -422,36 +421,6 @@ public abstract class BlogProvider : ProviderBase
422421

423422
#endregion
424423

425-
#region QuickNotes
426-
/// <summary>
427-
/// Save quick note
428-
/// </summary>
429-
/// <param name="note">Quick note</param>
430-
public abstract void SaveQuickNote(QuickNote note);
431-
/// <summary>
432-
/// Save quick setting
433-
/// </summary>
434-
/// <param name="setting">Quick setting</param>
435-
public abstract void SaveQuickSetting(QuickSetting setting);
436-
/// <summary>
437-
/// Fill quick notes
438-
/// </summary>
439-
/// <param name="userId">User ID</param>
440-
/// <returns>List of user notes</returns>
441-
public abstract List<QuickNote> FillQuickNotes(string userId);
442-
/// <summary>
443-
/// Fill quick settings
444-
/// </summary>
445-
/// <param name="userId">User ID</param>
446-
/// <returns>List of user settings</returns>
447-
public abstract List<QuickSetting> FillQuickSettings(string userId);
448-
/// <summary>
449-
/// Delete quick note
450-
/// </summary>
451-
/// <param name="noteId">Note ID</param>
452-
public abstract void DeleteQuickNote(Guid noteId);
453-
#endregion
454-
455424
#region CustomFields
456425

457426
/// <summary>

‎BlogEngine/BlogEngine.Core/Providers/BlogService.cs‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ namespace BlogEngine.Core.Providers
1010

1111
using BlogEngine.Core.DataStore;
1212
using BlogEngine.Core.FileSystem;
13-
using Notes;
1413

1514
/// <summary>
1615
/// The proxy class for communication between
@@ -871,55 +870,6 @@ public static void DeletePackage(string packageId)
871870

872871
#endregion
873872

874-
#region QuickNotes
875-
/// <summary>
876-
/// Saves a QuickNote.
877-
/// </summary>
878-
/// <param name="note">The QuickNote to save.</param>
879-
public static void SaveQuickNote(QuickNote note)
880-
{
881-
Provider.SaveQuickNote(note);
882-
}
883-
884-
/// <summary>
885-
/// Saves a QuickSetting.
886-
/// </summary>
887-
/// <param name="setting">The QuickSetting to save.</param>
888-
public static void SaveQuickSetting(QuickSetting setting)
889-
{
890-
Provider.SaveQuickSetting(setting);
891-
}
892-
893-
/// <summary>
894-
/// Returns a list of QuickNotes belonging to the given user.
895-
/// </summary>
896-
/// <param name="userId">The user whose QuickNotes we're retrieving.</param>
897-
/// <returns>A list of the user's QuickNotes.</returns>
898-
public static List<QuickNote> FillQuickNotes(string userId)
899-
{
900-
return Provider.FillQuickNotes(userId);
901-
}
902-
903-
/// <summary>
904-
/// Returns a list of QuickSettings belonging to the given user.
905-
/// </summary>
906-
/// <param name="userId">The user whose QuickSettings we're retrieving.</param>
907-
/// <returns>A list of the user's QuickSettings.</returns>
908-
public static List<QuickSetting> FillQuickSettings(string userId)
909-
{
910-
return Provider.FillQuickSettings(userId);
911-
}
912-
913-
/// <summary>
914-
/// Deletes the specified QuickNote.
915-
/// </summary>
916-
/// <param name="noteId">The QuickNote to delete.</param>
917-
public static void DeleteQuickNote(Guid noteId)
918-
{
919-
Provider.DeleteQuickNote(noteId);
920-
}
921-
#endregion
922-
923873
#region Custom fields
924874

925875
/// <summary>

‎BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs‎

Lines changed: 0 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
using BlogEngine.Core.DataStore;
1313
using BlogEngine.Core.Packaging;
14-
using BlogEngine.Core.Notes;
1514
using BlogEngine.Core.Data.Models;
1615

1716
namespace BlogEngine.Core.Providers
@@ -2826,174 +2825,6 @@ public override void DeletePackage(string packageId)
28262825

28272826
#endregion
28282827

2829-
#region QuickNotes
2830-
/// <summary>
2831-
/// Save quick note
2832-
/// </summary>
2833-
/// <param name="note">Quick note</param>
2834-
public override void SaveQuickNote(QuickNote note)
2835-
{
2836-
using (var conn = this.CreateConnection())
2837-
{
2838-
if (conn.HasConnection)
2839-
{
2840-
var sqlQuery = string.Format("select count(*) from {0}QuickNotes where NoteId = {1}noteid", this.tablePrefix, this.parmPrefix);
2841-
object cnt;
2842-
2843-
using (var cmd = conn.CreateTextCommand(sqlQuery))
2844-
{
2845-
var p = cmd.Parameters;
2846-
p.Add(conn.CreateParameter(FormatParamName("noteid"), note.Id));
2847-
cnt = cmd.ExecuteScalar();
2848-
}
2849-
2850-
if (int.Parse(cnt.ToString()) > 0)
2851-
sqlQuery = string.Format("update {0}QuickNotes set Note = {1}note, updated = {1}updated where NoteId = {1}noteid", this.tablePrefix, this.parmPrefix);
2852-
else
2853-
sqlQuery = string.Format("insert into {0}QuickNotes (NoteId, BlogId, UserName, Note, Updated) values ({1}noteid, {1}blogid, {1}username, {1}note, {1}updated)", this.tablePrefix, this.parmPrefix);
2854-
2855-
using (var cmd = conn.CreateTextCommand(sqlQuery))
2856-
{
2857-
2858-
var p = cmd.Parameters;
2859-
2860-
p.Add(conn.CreateParameter(FormatParamName("noteid"), note.Id));
2861-
p.Add(conn.CreateParameter(FormatParamName("blogid"), Blog.CurrentInstance.Id.ToString()));
2862-
p.Add(conn.CreateParameter(FormatParamName("username"), note.Author));
2863-
p.Add(conn.CreateParameter(FormatParamName("note"), note.Note));
2864-
p.Add(conn.CreateParameter(FormatParamName("updated"), DateTime.Now));
2865-
2866-
cmd.ExecuteNonQuery();
2867-
}
2868-
}
2869-
}
2870-
}
2871-
/// <summary>
2872-
/// Save quick setting
2873-
/// </summary>
2874-
/// <param name="setting">Quick setting</param>
2875-
public override void SaveQuickSetting(QuickSetting setting)
2876-
{
2877-
using (var conn = this.CreateConnection())
2878-
{
2879-
if (conn.HasConnection)
2880-
{
2881-
var sqlQuery = string.Format("select count(*) from {0}QuickSettings where BlogId = {1}blogid and UserName = {1}username and SettingName = {1}settingname", this.tablePrefix, this.parmPrefix);
2882-
object cnt;
2883-
2884-
using (var cmd = conn.CreateTextCommand(sqlQuery))
2885-
{
2886-
var p = cmd.Parameters;
2887-
p.Add(conn.CreateParameter(FormatParamName("settingname"), setting.SettingName));
2888-
p.Add(conn.CreateParameter(FormatParamName("blogid"), Blog.CurrentInstance.Id.ToString()));
2889-
p.Add(conn.CreateParameter(FormatParamName("username"), setting.Author));
2890-
cnt = cmd.ExecuteScalar();
2891-
}
2892-
2893-
if (int.Parse(cnt.ToString()) > 0)
2894-
sqlQuery = string.Format("update {0}QuickSettings set SettingValue = {1}settingvalue where BlogId = {1}blogid and UserName = {1}username and SettingName = {1}settingname", this.tablePrefix, this.parmPrefix);
2895-
else
2896-
sqlQuery = string.Format("insert into {0}QuickSettings (BlogId, UserName, SettingName, SettingValue) values ({1}blogid, {1}username, {1}settingname, {1}settingvalue)", this.tablePrefix, this.parmPrefix);
2897-
2898-
using (var cmd = conn.CreateTextCommand(sqlQuery))
2899-
{
2900-
var p = cmd.Parameters;
2901-
p.Add(conn.CreateParameter(FormatParamName("blogid"), Blog.CurrentInstance.Id.ToString()));
2902-
p.Add(conn.CreateParameter(FormatParamName("username"), setting.Author));
2903-
p.Add(conn.CreateParameter(FormatParamName("settingname"), setting.SettingName));
2904-
p.Add(conn.CreateParameter(FormatParamName("settingvalue"), setting.SettingValue));
2905-
cmd.ExecuteNonQuery();
2906-
}
2907-
}
2908-
}
2909-
}
2910-
/// <summary>
2911-
/// Fill quick notes
2912-
/// </summary>
2913-
/// <param name="userId">User ID</param>
2914-
/// <returns>List of user notes</returns>
2915-
public override List<QuickNote> FillQuickNotes(string userId)
2916-
{
2917-
var notes = new List<QuickNote>();
2918-
using (var conn = this.CreateConnection())
2919-
{
2920-
if (conn.HasConnection)
2921-
{
2922-
using (var cmd = conn.CreateTextCommand(string.Format("SELECT NoteId, Note, Updated FROM {0}QuickNotes where UserName = '{1}' and BlogId = '{2}' order by Updated desc", tablePrefix, userId, Blog.CurrentInstance.Id.ToString())))
2923-
{
2924-
using (var rdr = cmd.ExecuteReader())
2925-
{
2926-
while (rdr.Read())
2927-
{
2928-
var n = new QuickNote()
2929-
{
2930-
Id = rdr.GetGuid(0),
2931-
Author = userId,
2932-
Note = rdr.GetString(1),
2933-
Updated = BlogSettings.Instance.FromUtc(rdr.GetDateTime(2))
2934-
};
2935-
notes.Add(n);
2936-
}
2937-
}
2938-
}
2939-
}
2940-
}
2941-
return notes;
2942-
}
2943-
/// <summary>
2944-
/// Fill quick settings
2945-
/// </summary>
2946-
/// <param name="userId">User ID</param>
2947-
/// <returns>List of user settings</returns>
2948-
public override List<QuickSetting> FillQuickSettings(string userId)
2949-
{
2950-
var settings = new List<QuickSetting>();
2951-
using (var conn = this.CreateConnection())
2952-
{
2953-
if (conn.HasConnection)
2954-
{
2955-
using (var cmd = conn.CreateTextCommand(string.Format("SELECT SettingName, SettingValue FROM {0}QuickSettings where UserName = '{1}' and BlogId = '{2}'", tablePrefix, userId, Blog.CurrentInstance.Id.ToString())))
2956-
{
2957-
using (var rdr = cmd.ExecuteReader())
2958-
{
2959-
while (rdr.Read())
2960-
{
2961-
var s = new QuickSetting()
2962-
{
2963-
SettingName = rdr.GetString(0),
2964-
SettingValue = rdr.GetString(1)
2965-
};
2966-
settings.Add(s);
2967-
}
2968-
}
2969-
}
2970-
}
2971-
}
2972-
return settings;
2973-
}
2974-
/// <summary>
2975-
/// Delete quick note
2976-
/// </summary>
2977-
/// <param name="noteId">Note ID</param>
2978-
public override void DeleteQuickNote(Guid noteId)
2979-
{
2980-
using (var conn = this.CreateConnection())
2981-
{
2982-
if (conn.HasConnection)
2983-
{
2984-
var sqlQuery = string.Format("delete from {0}QuickNotes where NoteId = {1}noteid", this.tablePrefix, this.parmPrefix);
2985-
2986-
using (var cmd = conn.CreateTextCommand(sqlQuery))
2987-
{
2988-
var p = cmd.Parameters;
2989-
p.Add(conn.CreateParameter(FormatParamName("noteid"), noteId.ToString()));
2990-
cmd.ExecuteNonQuery();
2991-
}
2992-
}
2993-
}
2994-
}
2995-
#endregion
2996-
29972828
#region Custom fields
29982829

29992830
/// <summary>

0 commit comments

Comments
 (0)