From 7922fe7b2cb9fc09b119a658f43d686a4fe16d7d Mon Sep 17 00:00:00 2001 From: Joe Brinkman Date: Tue, 12 May 2015 18:11:23 -0400 Subject: [PATCH] Refactoring to run in DNN Connect namespaces. --- .gitignore | 4 + 01.14.03.SqlDataProvider | 55 -- 02.00.00.Cleanup.txt | 27 - 02.00.00.SqlDataProvider | 31 - 02.00.09.SqlDataProvider | 3 - 02.01.00.SqlDataProvider | 108 --- 03.00.00.SqlDataProvider | 16 - Browser/Browser.aspx | 4 +- Browser/Browser.aspx.cs | 141 ++-- Browser/Browser.aspx.designer.cs | 4 +- Browser/Browser.comb.css | 6 +- Browser/Browser.css | 2 +- Browser/FileUploader.ashx | 2 +- Browser/FileUploader.ashx.cs | 39 +- Browser/ProcessImage.ashx | 2 +- Browser/ProcessImage.ashx.cs | 31 +- Browser/jquery.fileupload-ui.css | 2 +- BuildScripts/MSBuild.Community.Tasks.Targets | 104 +++ BuildScripts/Package.targets | 90 +++ CKEditorOptions.ascx | 6 +- CKEditorOptions.ascx.cs | 299 ++++---- CKEditorOptions.ascx.designer.cs | 12 +- CKHtmlEditorProvider.cs | 35 +- Constants/Browser.cs | 17 +- Constants/EnterModus.cs | 15 +- Constants/FileListView.cs | 15 +- Constants/LanguageDirection.cs | 14 +- Constants/LinkMode.cs | 15 +- Constants/LinkType.cs | 15 +- Constants/SettingConstants.cs | 2 +- Constants/SettingsMode.cs | 15 +- Constants/ToolBarLocation.cs | 15 +- Controls/HtmlGenericSelfClosing.cs | 21 +- Controls/Pager.cs | 21 +- Controls/UrlControl.cs | 37 +- ...proj => DNNConnect.CKEditorProvider.csproj | 118 +--- DNNConnect.CKEditorProvider.dnn | 100 +++ DNNConnect.CKEditorProvider.sln | 22 + Extensions/CustomAttributeExtensions.cs | 17 +- Install/01.00.00.SqlDataProvider | 152 +++++ .../CKEditorDefaultSettings.xml | 0 .../CKToolbarButtons.xml | 0 .../CKToolbarSets.xml | 0 Install/Uninstall.SqlDataProvider | 41 ++ license.txt => Install/license.txt | 4 +- releaseNotes.txt => Install/releaseNotes.txt | 0 Module/EditorConfigManager.ascx | 14 +- Module/EditorConfigManager.ascx.cs | 75 +- Module/EditorConfigManager.ascx.designer.cs | 2 +- Module/UpgradeController.cs | 37 +- Objects/CodeMirror.cs | 14 +- Objects/EditorConfig.cs | 27 +- Objects/EditorHostSetting.cs | 17 +- Objects/EditorProviderSettings.cs | 25 +- Objects/FileUploadStatus.cs | 15 +- Objects/LinkItem.cs | 15 +- Objects/SettingBase.cs | 29 +- Objects/Toolbar.cs | 15 +- Objects/ToolbarButton.cs | 15 +- Objects/ToolbarGroup.cs | 15 +- Objects/ToolbarRoles.cs | 15 +- Objects/ToolbarSet.cs | 15 +- Objects/UploadSizeRoles.cs | 15 +- Objects/WordCountConfig.cs | 17 +- Options.aspx | 2 +- Options.aspx.cs | 44 +- Options.aspx.designer.cs | 12 +- Tabs.ashx | 2 +- Tabs.ashx.cs | 38 +- Uninstall.SqlDataProvider | 44 -- UrlControl.ascx | 6 +- Utilities/AnchorFinder.cs | 26 +- Utilities/EditorController.cs | 127 ++++ Utilities/SettingsUtil.cs | 89 +-- Utilities/ToolbarUtil.cs | 39 +- Utilities/Utility.cs | 173 +---- WE-settings.xml | 48 -- WatchersNET.CKHtmlEditorProvider.dnn | 116 ---- Web/{CKEditorControl.cs => EditorControl.cs} | 642 +++++++++--------- css/Options.css | 2 +- 80 files changed, 1478 insertions(+), 1988 deletions(-) create mode 100644 .gitignore delete mode 100644 01.14.03.SqlDataProvider delete mode 100644 02.00.00.Cleanup.txt delete mode 100644 02.00.00.SqlDataProvider delete mode 100644 02.00.09.SqlDataProvider delete mode 100644 02.01.00.SqlDataProvider delete mode 100644 03.00.00.SqlDataProvider create mode 100644 BuildScripts/MSBuild.Community.Tasks.Targets create mode 100644 BuildScripts/Package.targets rename CKEditorProvider.csproj => DNNConnect.CKEditorProvider.csproj (72%) create mode 100644 DNNConnect.CKEditorProvider.dnn create mode 100644 DNNConnect.CKEditorProvider.sln create mode 100644 Install/01.00.00.SqlDataProvider rename CKEditorDefaultSettings.xml => Install/CKEditorDefaultSettings.xml (100%) rename CKToolbarButtons.xml => Install/CKToolbarButtons.xml (100%) rename CKToolbarSets.xml => Install/CKToolbarSets.xml (100%) create mode 100644 Install/Uninstall.SqlDataProvider rename license.txt => Install/license.txt (91%) rename releaseNotes.txt => Install/releaseNotes.txt (100%) delete mode 100644 Uninstall.SqlDataProvider create mode 100644 Utilities/EditorController.cs delete mode 100644 WE-settings.xml delete mode 100644 WatchersNET.CKHtmlEditorProvider.dnn rename Web/{CKEditorControl.cs => EditorControl.cs} (62%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..247685d --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.vs/ +obj/ +bin/ +Packages/ diff --git a/01.14.03.SqlDataProvider b/01.14.03.SqlDataProvider deleted file mode 100644 index ce1d865..0000000 --- a/01.14.03.SqlDataProvider +++ /dev/null @@ -1,55 +0,0 @@ -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteAllModuleSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllModuleSettings -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteAllPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllPageSettings -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteCurrentPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteCurrentPageSettings -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteAllPortalSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllPortalSettings -GO - -/** Create Stored Procedures **/ - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllModuleSettings - @PortalID varchar - AS - SET NOCOUNT ON - Delete ms - FROM {databaseOwner}{objectQualifier}ModuleSettings ms - INNER JOIN - {databaseOwner}{objectQualifier}Modules m ON m.PortalID = @PortalID - Where SettingName like 'DNNCKMI#%' AND ms.ModuleID = m.ModuleID -GO - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllPageSettings - @PortalID varchar - AS - SET NOCOUNT ON - DELETE hs - FROM {databaseOwner}{objectQualifier}HostSettings hs - INNER JOIN - {databaseOwner}{objectQualifier}Tabs t ON t.PortalID = @PortalID - Where SettingName like 'DNNCKT#%' AND t.TabID = t.TabID -GO - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteCurrentPageSettings - @TabID varchar - AS - SET NOCOUNT ON - delete from {databaseOwner}{objectQualifier}HostSettings where SettingName like 'DNNCKT#' + @TabID + '%' -GO - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllPortalSettings - @PortalID varchar - AS - SET NOCOUNT ON - delete from {databaseOwner}{objectQualifier}HostSettings where SettingName like 'DNNCKP#' + @PortalID + '%' -GO - - diff --git a/02.00.00.Cleanup.txt b/02.00.00.Cleanup.txt deleted file mode 100644 index d4e66ac..0000000 --- a/02.00.00.Cleanup.txt +++ /dev/null @@ -1,27 +0,0 @@ -Providers\HtmlEditorProviders\CKEditor\uniform.default.css -Providers\HtmlEditorProviders\CKEditor\jquery.uniform.min.js -Providers\HtmlEditorProviders\CKEditor\images\sprite.png -Providers\HtmlEditorProviders\CKEditor\ckeditor_basic_source.js -Providers\HtmlEditorProviders\CKEditor\ckeditor_source.js -Providers\HtmlEditorProviders\CKEditor\_source\ -Providers\HtmlEditorProviders\CKEditor\themes\ -Providers\HtmlEditorProviders\CKEditor\skins\office2003\ -Providers\HtmlEditorProviders\CKEditor\skins\BootstrapCK-Skin\ -Providers\HtmlEditorProviders\CKEditor\skins\chris\ -Providers\HtmlEditorProviders\CKEditor\skins\v2\ -Providers\HtmlEditorProviders\CKEditor\adapters\ -Providers\HtmlEditorProviders\CKEditor\Browser\Images\CreateFolder.gif -Providers\HtmlEditorProviders\CKEditor\Browser\Images\DeleteFile.gif -Providers\HtmlEditorProviders\CKEditor\Browser\Images\DownloadButton.gif -Providers\HtmlEditorProviders\CKEditor\Browser\Images\ResizeImage.gif -Providers\HtmlEditorProviders\CKEditor\Browser\Images\UploadButton.gif -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\css.png -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\images.png -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\info.png -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\js.png -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\midi.png -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\postscript.png -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\readme.png -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\templates.png -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\vcalendar.png -Providers\HtmlEditorProviders\CKEditor\Browser\Images\types\xml.png \ No newline at end of file diff --git a/02.00.00.SqlDataProvider b/02.00.00.SqlDataProvider deleted file mode 100644 index c811c2c..0000000 --- a/02.00.00.SqlDataProvider +++ /dev/null @@ -1,31 +0,0 @@ -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteAllChildPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllChildPageSettings -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteAllModuleSettingsByTab') and OBJECTPROPERTY(id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllModuleSettingsByTab -GO - -/** Create Stored Procedures **/ - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllChildPageSettings - @TabID int - AS - SET NOCOUNT ON - DELETE hs - FROM {databaseOwner}{objectQualifier}HostSettings hs - INNER JOIN - {databaseOwner}{objectQualifier}Tabs t ON t.ParentId = @TabID - Where SettingName like 'DNNCKT#%' AND t.TabID = t.TabID -GO - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllModuleSettingsByTab - @TabID int - AS - SET NOCOUNT ON - Delete ms - FROM {databaseOwner}{objectQualifier}ModuleSettings ms - INNER JOIN - {databaseOwner}{objectQualifier}TabModules tm ON tm.TabID = @TabID - Where SettingName like 'DNNCKMI#%' AND ms.ModuleID = tm.ModuleID -GO \ No newline at end of file diff --git a/02.00.09.SqlDataProvider b/02.00.09.SqlDataProvider deleted file mode 100644 index b8e895b..0000000 --- a/02.00.09.SqlDataProvider +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE {databaseOwner}{objectQualifier}Packages SET IconFile = N'~/Providers/HtmlEditorProviders/CKEditor/CKEditorConfig.png' -Where Name Like 'CKEditor.EditorConfigManager' and IconFile = '~/CKEditorConfig.png' -GO \ No newline at end of file diff --git a/02.01.00.SqlDataProvider b/02.01.00.SqlDataProvider deleted file mode 100644 index f602230..0000000 --- a/02.01.00.SqlDataProvider +++ /dev/null @@ -1,108 +0,0 @@ -if not exists (select top 1 1 from sys.objects where object_id = object_id(N'{databaseOwner}{objectQualifier}CKEditorProviderSettings') and OBJECTPROPERTY(object_id, N'IsTable') = 1) - CREATE TABLE {databaseOwner}{objectQualifier}CKEditorProviderSettings ( - [SettingName] [nvarchar] (300) NOT NULL, - [SettingValue] [ntext] NOT NULL - ) ON [PRIMARY] -GO - -ALTER TABLE {databaseOwner}[{objectQualifier}CKEditorProviderSettings] ADD CONSTRAINT [PK_{objectQualifier}CKEditorProviderSettings] PRIMARY KEY CLUSTERED ([SettingName]) -GO - -IF EXISTS (select top 1 1 from sys.objects where object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteAllChildPageSettings') and OBJECTPROPERTY(object_id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllChildPageSettings -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteAllPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllPageSettings -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteCurrentPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteCurrentPageSettings -GO - -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_DeleteAllPortalSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllPortalSettings -GO - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllChildPageSettings - @TabID int - AS - SET NOCOUNT ON - DELETE hs - FROM {databaseOwner}{objectQualifier}CKEditorProviderSettings hs - INNER JOIN - {databaseOwner}{objectQualifier}Tabs t ON t.ParentId = @TabID - Where SettingName like 'DNNCKT#%' AND t.TabID = t.TabID -GO - -/*** Migrate old settings from the HostSettings table to the new CKEditorProviderSettings table ***/ -insert into {databaseOwner}{objectQualifier}CKEditorProviderSettings(SettingName,SettingValue) -select SettingName, SettingValue -from {databaseOwner}{objectQualifier}HostSettings -where SettingName like 'DNNCK%' -go - -/*** Delete old Settings **/ -delete from {databaseOwner}{objectQualifier}HostSettings -where SettingName like 'DNNCK#%' -go - -IF EXISTS (select top 1 1 from sys.objects where object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_GetEditorHostSettings') and OBJECTPROPERTY(object_id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_GetEditorHostSettings -GO - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_GetEditorHostSettings - AS - SET NOCOUNT ON - SELECT SettingName, - SettingValue - FROM {databaseOwner}{objectQualifier}CKEditorProviderSettings -GO - -IF EXISTS (select top 1 1 from sys.objects where object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKEditor_AddOrUpdateEditorHostSetting') and OBJECTPROPERTY(object_id, N'IsProcedure') = 1) -DROP PROCEDURE {databaseOwner}{objectQualifier}CKEditor_AddOrUpdateEditorHostSetting -GO - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_AddOrUpdateEditorHostSetting - @SettingName nvarchar(300), - @SettingValue ntext -AS - if exists (select 1 from {databaseOwner}{objectQualifier}CKEditorProviderSettings where SettingName = @SettingName) - begin - update {databaseOwner}{objectQualifier}CKEditorProviderSettings - set - SettingValue = @SettingValue - where - SettingName = @SettingName - end - else - begin - insert into {databaseOwner}{objectQualifier}CKEditorProviderSettings (SettingName, SettingValue) - values (@SettingName,@SettingValue) - end -go - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllPageSettings - @PortalID varchar - AS - SET NOCOUNT ON - DELETE hs - FROM {databaseOwner}{objectQualifier}CKEditorProviderSettings hs - INNER JOIN - {databaseOwner}{objectQualifier}Tabs t ON t.PortalID = @PortalID - Where SettingName like 'DNNCKT#%' AND t.TabID = t.TabID -GO - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteCurrentPageSettings - @TabID varchar - AS - SET NOCOUNT ON - delete from {databaseOwner}{objectQualifier}CKEditorProviderSettings where SettingName like 'DNNCKT#' + @TabID + '%' -GO - -CREATE PROCEDURE {databaseOwner}{objectQualifier}CKEditor_DeleteAllPortalSettings - @PortalID varchar - AS - SET NOCOUNT ON - delete from {databaseOwner}{objectQualifier}CKEditorProviderSettings where SettingName like 'DNNCKP#' + @PortalID + '%' -GO diff --git a/03.00.00.SqlDataProvider b/03.00.00.SqlDataProvider deleted file mode 100644 index a2a0d16..0000000 --- a/03.00.00.SqlDataProvider +++ /dev/null @@ -1,16 +0,0 @@ -IF NOT EXISTS (SELECT 1 FROM {databaseOwner}[{objectQualifier}ModuleControls] WHERE ModuleDefID IS NULL AND ControlKey = 'CKEditorOptions') -BEGIN - EXEC {databaseOwner}[{objectQualifier}AddModuleControl] - @ModuleDefId=NULL, - @ControlKey='CKEditorOptions', - @ControlTitle='CKEditor Options', - @ControlSrc='Providers/HtmlEditorProviders/CKEditor/CKEditorOptions.ascx', - @IconFile='~/Providers/HtmlEditorProviders/CKEditor/LogoCKEditor.png', - @ControlType=-1, - @ViewOrder=NULL, - @HelpUrl=NULL, - @SupportsPartialRendering=0, - @SupportsPopUps=1, - @CreatedByUserID=-1; -END; -GO \ No newline at end of file diff --git a/Browser/Browser.aspx b/Browser/Browser.aspx index accb806..328ea39 100644 --- a/Browser/Browser.aspx +++ b/Browser/Browser.aspx @@ -1,6 +1,6 @@ -<%@ Page language="c#" Codebehind="Browser.aspx.cs" AutoEventWireup="True" Inherits="WatchersNET.CKEditor.Browser.Browser" %> +<%@ Page language="c#" Codebehind="Browser.aspx.cs" AutoEventWireup="True" Inherits="DNNConnect.CKEditorProvider.Browser.Browser" %> <%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls" %> -<%@ Register TagPrefix="wnet" Namespace="WatchersNET.CKEditor.Controls" Assembly="WatchersNET.CKEditor" %> +<%@ Register TagPrefix="wnet" Namespace="DNNConnect.CKEditorProvider.Controls" Assembly="DNNConnect.CKEditorProvider" %> diff --git a/Browser/Browser.aspx.cs b/Browser/Browser.aspx.cs index 7781d14..d1105bf 100644 --- a/Browser/Browser.aspx.cs +++ b/Browser/Browser.aspx.cs @@ -1,67 +1,52 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Browser +using System; +using System.Collections.Generic; +using System.Data; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Drawing.Imaging; +using System.IO; +using System.Linq; +using System.Net; +using System.Text; +using System.Text.RegularExpressions; +using System.Web; +using System.Web.Script.Services; +using System.Web.Services; +using System.Web.UI; +using System.Web.UI.HtmlControls; +using System.Web.UI.WebControls; + +using DotNetNuke.Common.Utilities; +using DotNetNuke.Entities.Controllers; +using DotNetNuke.Entities.Portals; +using DotNetNuke.Entities.Tabs; +using DotNetNuke.Entities.Users; +using DotNetNuke.Framework.Providers; +using DotNetNuke.Security.Permissions; +using DotNetNuke.Security.Roles; +using DotNetNuke.Services.FileSystem; +using DotNetNuke.Services.Localization; +using DotNetNuke.UI.Utilities; + +using Telerik.Web.UI; + +using DNNConnect.CKEditorProvider.Constants; +using DNNConnect.CKEditorProvider.Controls; +using DNNConnect.CKEditorProvider.Objects; +using DNNConnect.CKEditorProvider.Utilities; + +using Encoder = System.Drawing.Imaging.Encoder; +using Globals = DotNetNuke.Common.Globals; +using Image = System.Drawing.Image; + +namespace DNNConnect.CKEditorProvider.Browser { - #region - - using System; - using System.Collections.Generic; - using System.Data; - using System.Drawing; - using System.Drawing.Drawing2D; - using System.Drawing.Imaging; - using System.IO; - using System.Linq; - using System.Net; - using System.Text; - using System.Text.RegularExpressions; - using System.Web; - using System.Web.Script.Services; - using System.Web.Services; - using System.Web.UI; - using System.Web.UI.HtmlControls; - using System.Web.UI.WebControls; - - using DotNetNuke.Common.Utilities; - using DotNetNuke.Entities.Controllers; - using DotNetNuke.Entities.Portals; - using DotNetNuke.Entities.Tabs; - using DotNetNuke.Entities.Users; - using DotNetNuke.Framework.Providers; - using DotNetNuke.Security.Permissions; - using DotNetNuke.Security.Roles; - using DotNetNuke.Services.FileSystem; - using DotNetNuke.Services.Localization; - using DotNetNuke.UI.Utilities; - - using Telerik.Web.UI; - - using WatchersNET.CKEditor.Constants; - using WatchersNET.CKEditor.Controls; - using WatchersNET.CKEditor.Objects; - using WatchersNET.CKEditor.Utilities; - - using Encoder = System.Drawing.Imaging.Encoder; - using Globals = DotNetNuke.Common.Globals; - using Image = System.Drawing.Image; - - #endregion /// /// The browser. /// [ScriptService] - public partial class Browser : Page + public partial class Browser : Page { #region Constants and Fields @@ -699,7 +684,7 @@ protected void CmdCloseClick(object sender, EventArgs e) this.Response.Write(""); @@ -738,7 +723,7 @@ protected virtual string GetJavaScriptCode(string fileName, string fileUrl, bool { fileUrl = fileUrl.Replace("%3A", ":"); } - + if (fileUrl.Contains(".aspx%23")) { fileUrl = fileUrl.Replace("aspx%23", "aspx#"); @@ -880,7 +865,7 @@ protected void Page_Load(object sender, EventArgs e) ProviderConfiguration providerConfiguration = ProviderConfiguration.GetProviderConfiguration("htmlEditor"); Provider objProvider = (Provider)providerConfiguration.Providers[providerConfiguration.DefaultProvider]; - var settingsDictionary = Utility.GetEditorHostSettings(); + var settingsDictionary = EditorController.GetEditorHostSettings(); var portalRoles = new RoleController().GetPortalRoles(this._portalSettings.PortalId); switch (this.currentSettings.SettingMode) @@ -926,7 +911,7 @@ protected void Page_Load(object sender, EventArgs e) this._portalSettings, HttpContext.Current.Request); - if (this.currentSettings.BrowserMode.Equals(Constants.Browser.StandardBrowser) + if (this.currentSettings.BrowserMode.Equals(Constants.BrowserType.StandardBrowser) && HttpContext.Current.Request.IsAuthenticated) { string command = null; @@ -1047,8 +1032,8 @@ protected void Page_Load(object sender, EventArgs e) { if (!this.IsPostBack) { - this.OverrideFile.Checked = this.currentSettings.OverrideFileOnUpload; - + this.OverrideFile.Checked = this.currentSettings.OverrideFileOnUpload; + this.SetLanguage(); this.GetLanguageList(); @@ -2165,7 +2150,7 @@ private bool SelectFolderFile(string fileUrl) } var selectedDir = MapPath(fileUrl).Replace(fileName, string.Empty); - + if (!Directory.Exists(selectedDir)) { ckFileUrl = null; @@ -2315,33 +2300,33 @@ private void SetLanguage() this.Syncronize.ToolTip = Localization.GetString("Syncronize.Help", this.ResXFile, this.LanguageCode); this.cmdCreate.Text = string.Format( - "\"{0}\"", - Localization.GetString("cmdCreate.Text", this.ResXFile, this.LanguageCode), + "\"{0}\"", + Localization.GetString("cmdCreate.Text", this.ResXFile, this.LanguageCode), Localization.GetString("cmdCreate.Help", this.ResXFile, this.LanguageCode)); this.cmdCreate.ToolTip = Localization.GetString("cmdCreate.Help", this.ResXFile, this.LanguageCode); this.cmdDownload.Text = string.Format( - "\"{0}\"", - Localization.GetString("cmdDownload.Text", this.ResXFile, this.LanguageCode), + "\"{0}\"", + Localization.GetString("cmdDownload.Text", this.ResXFile, this.LanguageCode), Localization.GetString("cmdDownload.Help", this.ResXFile, this.LanguageCode)); this.cmdDownload.ToolTip = Localization.GetString("cmdDownload.Help", this.ResXFile, this.LanguageCode); this.cmdUpload.Text = string.Format( - "\"{0}\"", - Localization.GetString("cmdUpload.Text", this.ResXFile, this.LanguageCode), + "\"{0}\"", + Localization.GetString("cmdUpload.Text", this.ResXFile, this.LanguageCode), Localization.GetString("cmdUpload.Help", this.ResXFile, this.LanguageCode)); this.cmdUpload.ToolTip = Localization.GetString("cmdUpload.Help", this.ResXFile, this.LanguageCode); this.cmdDelete.Text = string.Format( - "\"{0}\"", - Localization.GetString("cmdDelete.Text", this.ResXFile, this.LanguageCode), + "\"{0}\"", + Localization.GetString("cmdDelete.Text", this.ResXFile, this.LanguageCode), Localization.GetString("cmdDelete.Help", this.ResXFile, this.LanguageCode)); this.cmdDelete.ToolTip = Localization.GetString("cmdDelete.Help", this.ResXFile, this.LanguageCode); this.cmdResizer.Text = string.Format( - "\"{0}\"", - Localization.GetString("cmdResizer.Text", this.ResXFile, this.LanguageCode), + "\"{0}\"", + Localization.GetString("cmdResizer.Text", this.ResXFile, this.LanguageCode), Localization.GetString("cmdResizer.Help", this.ResXFile, this.LanguageCode)); this.cmdResizer.ToolTip = Localization.GetString("cmdResizer.Help", this.ResXFile, this.LanguageCode); @@ -2474,7 +2459,7 @@ private void ShowFileHelpUrl(string fileName, IFileInfo fileInfo) case FolderController.StorageLocationTypes.DatabaseSecure: { isSecureFolder = true; - + this.cmdResizer.Enabled = false; this.cmdResizer.CssClass = "LinkDisabled"; @@ -3000,7 +2985,7 @@ private void ResizeNow_Click(object sender, EventArgs e) var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(imageFullPath); imageFullPath = Path.Combine( - this.lblCurrentDir.Text, + this.lblCurrentDir.Text, string.Format("{0}_{1}{2}", fileNameWithoutExtension, counter, Path.GetExtension(imageFullPath))); } @@ -3428,7 +3413,7 @@ private void BrowserMode_SelectedIndexChanged(object sender, EventArgs e) this.RenderTabs(); break; } - + this.title.InnerText = string.Format("{0} - WatchersNET.FileBrowser", this.lblModus.Text); this.SetDefaultLinkTypeText(); diff --git a/Browser/Browser.aspx.designer.cs b/Browser/Browser.aspx.designer.cs index 6a85226..2879137 100644 --- a/Browser/Browser.aspx.designer.cs +++ b/Browser/Browser.aspx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace WatchersNET.CKEditor.Browser { +namespace DNNConnect.CKEditorProvider.Browser { public partial class Browser { @@ -748,7 +748,7 @@ public partial class Browser { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WatchersNET.CKEditor.Controls.Pager PagerFileLinks; + protected global::DNNConnect.CKEditorProvider.Controls.Pager PagerFileLinks; /// /// panInfo control. diff --git a/Browser/Browser.comb.css b/Browser/Browser.comb.css index 6daa1be..210debe 100644 --- a/Browser/Browser.comb.css +++ b/Browser/Browser.comb.css @@ -330,7 +330,7 @@ img {border:0} .ModalFooter {float:right} -.LoadingContent h3 {background: url(Images/loading.gif) no-repeat 102px 5px;height:20px} +.LoadingContent h3 {background: url(../CKEditor/Images/loading.gif) no-repeat 102px 5px;height:20px} .LoadingMessage {text-align:center} #cmdCreate img, @@ -475,7 +475,7 @@ img {border:0} } .progress-animated .progress-bar, .progress-animated .bar { - background: url("Images/progressbar.gif") !important; + background: url("../CKEditor/Images/progressbar.gif") !important; filter: none; } .fileupload-process { @@ -487,7 +487,7 @@ img {border:0} display: block; width: 32px; height: 32px; - background: url("Images/loading.gif") center no-repeat; + background: url("../CKEditor/Images/loading.gif") center no-repeat; background-size: contain; } .files audio, diff --git a/Browser/Browser.css b/Browser/Browser.css index 9d2188e..9ce0bf5 100644 --- a/Browser/Browser.css +++ b/Browser/Browser.css @@ -330,7 +330,7 @@ img {border:0} .ModalFooter {float:right} -.LoadingContent h3 {background: url(Images/loading.gif) no-repeat 102px 5px;height:20px} +.LoadingContent h3 {background: url(../CKEditor/Images/loading.gif) no-repeat 102px 5px;height:20px} .LoadingMessage {text-align:center} #cmdCreate img, diff --git a/Browser/FileUploader.ashx b/Browser/FileUploader.ashx index 9127285..07acbe4 100644 --- a/Browser/FileUploader.ashx +++ b/Browser/FileUploader.ashx @@ -1 +1 @@ -<%@ WebHandler Language="C#" CodeBehind="FileUploader.ashx.cs" Class="WatchersNET.CKEditor.Browser.FileUploader" %> +<%@ WebHandler Language="C#" CodeBehind="FileUploader.ashx.cs" Class="DNNConnect.CKEditorProvider.Browser.FileUploader" %> diff --git a/Browser/FileUploader.ashx.cs b/Browser/FileUploader.ashx.cs index 6b83df5..9ee84db 100644 --- a/Browser/FileUploader.ashx.cs +++ b/Browser/FileUploader.ashx.cs @@ -1,29 +1,18 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Browser +using System; +using System.Collections.Generic; +using System.IO; +using System.Text.RegularExpressions; +using System.Web; +using System.Web.Script.Serialization; + +using DotNetNuke.Entities.Portals; +using DotNetNuke.Services.FileSystem; + +using DNNConnect.CKEditorProvider.Objects; +using DNNConnect.CKEditorProvider.Utilities; + +namespace DNNConnect.CKEditorProvider.Browser { - using System; - using System.Collections.Generic; - using System.IO; - using System.Text.RegularExpressions; - using System.Web; - using System.Web.Script.Serialization; - - using DotNetNuke.Entities.Portals; - using DotNetNuke.Services.FileSystem; - - using WatchersNET.CKEditor.Objects; - using WatchersNET.CKEditor.Utilities; /// /// The File Upload Handler diff --git a/Browser/ProcessImage.ashx b/Browser/ProcessImage.ashx index 0e69821..3d00cd7 100644 --- a/Browser/ProcessImage.ashx +++ b/Browser/ProcessImage.ashx @@ -1 +1 @@ -<%@ WebHandler Language="C#" CodeBehind="ProcessImage.ashx.cs" Class="WatchersNET.CKEditor.Browser.ProcessImage" %> +<%@ WebHandler Language="C#" CodeBehind="ProcessImage.ashx.cs" Class="DNNConnect.CKEditorProvider.Browser.ProcessImage" %> diff --git a/Browser/ProcessImage.ashx.cs b/Browser/ProcessImage.ashx.cs index e753dc4..a7da2a9 100644 --- a/Browser/ProcessImage.ashx.cs +++ b/Browser/ProcessImage.ashx.cs @@ -1,26 +1,11 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Browser -{ - #region - - using System; - using System.Drawing; - using System.Drawing.Imaging; - using System.IO; - using System.Web; +using System; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; +using System.Web; - #endregion +namespace DNNConnect.CKEditorProvider.Browser +{ /// /// The process image. @@ -193,7 +178,7 @@ private static string GenerateName(string sNewFileName, string sSourceFullPath) string sNewFilePath = !string.IsNullOrEmpty(sNewFileName) ? Path.Combine(sSourcePath, sNewFileName + sExtension) : Path.Combine( - sSourcePath, + sSourcePath, string.Format( "{0}_crop{1}", Path.GetFileNameWithoutExtension(sSourceFullPath), sExtension)); diff --git a/Browser/jquery.fileupload-ui.css b/Browser/jquery.fileupload-ui.css index 4d62398..9f0d796 100644 --- a/Browser/jquery.fileupload-ui.css +++ b/Browser/jquery.fileupload-ui.css @@ -28,7 +28,7 @@ display: block; width: 32px; height: 32px; - background: url("Images/loading.gif") center no-repeat; + background: url("../CKEditor/Images/loading.gif") center no-repeat; background-size: contain; } .files audio, diff --git a/BuildScripts/MSBuild.Community.Tasks.Targets b/BuildScripts/MSBuild.Community.Tasks.Targets new file mode 100644 index 0000000..284a039 --- /dev/null +++ b/BuildScripts/MSBuild.Community.Tasks.Targets @@ -0,0 +1,104 @@ + + + + + + $(MSBuildProjectDirectory)\..\..\..\..\BuildScripts + $(BuildScriptsPath)\MSBuild.Community.Tasks.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BuildScripts/Package.targets b/BuildScripts/Package.targets new file mode 100644 index 0000000..f9feb27 --- /dev/null +++ b/BuildScripts/Package.targets @@ -0,0 +1,90 @@ + + + + zip + DNNConnect.CKEditorProvider + DNNConnect.CKEditorProvider + $(MSBuildProjectDirectory)\BuildScripts + $(MSBuildProjectDirectory)\Packages + + + + $(BuildScriptsPath)\DotNetNuke.MSBuild.Tasks.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CKEditorOptions.ascx b/CKEditorOptions.ascx index ef3cef2..992b462 100644 --- a/CKEditorOptions.ascx +++ b/CKEditorOptions.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="c#" AutoEventWireup="True" Codebehind="CKEditorOptions.ascx.cs" Inherits="WatchersNET.CKEditor.CKEditorOptions" %> +<%@ Control Language="c#" AutoEventWireup="True" Codebehind="CKEditorOptions.ascx.cs" Inherits="DNNConnect.CKEditorProvider.CKEditorOptions" %> <%@ Import Namespace="DotNetNuke.Services.Localization" %> <%@ Register TagPrefix="dnn" TagName="URL" Src="UrlControl.ascx" %> <%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls"%> @@ -229,7 +229,7 @@
  • - <%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>  + <%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>  <%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>
    • @@ -260,7 +260,7 @@
  • - <%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>  + <%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>  <%# DataBinder.Eval(Container.DataItem, "Button").ToString()%>
    • diff --git a/CKEditorOptions.ascx.cs b/CKEditorOptions.ascx.cs index 4f3b409..2bd21d8 100644 --- a/CKEditorOptions.ascx.cs +++ b/CKEditorOptions.ascx.cs @@ -1,59 +1,44 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Web; +using System.Web.UI; +using System.Web.UI.HtmlControls; +using System.Web.UI.WebControls; +using System.Xml.Serialization; + +using DotNetNuke.Collections; +using DotNetNuke.Common.Utilities; +using DotNetNuke.Entities.Modules; +using DotNetNuke.Entities.Modules.Definitions; +using DotNetNuke.Entities.Portals; +using DotNetNuke.Entities.Tabs; +using DotNetNuke.Framework.JavaScriptLibraries; +using DotNetNuke.Framework.Providers; +using DotNetNuke.Security.Permissions; +using DotNetNuke.Security.Roles; +using DotNetNuke.Services.FileSystem; +using DotNetNuke.Services.Installer.Packages; +using DotNetNuke.Services.Localization; +using DotNetNuke.UI.Utilities; +using DotNetNuke.Web.Client.ClientResourceManagement; + +using DNNConnect.CKEditorProvider.Constants; +using DNNConnect.CKEditorProvider.Controls; +using DNNConnect.CKEditorProvider.Extensions; +using DNNConnect.CKEditorProvider.Objects; +using DNNConnect.CKEditorProvider.Utilities; + +using DataCache = DotNetNuke.Common.Utilities.DataCache; +using Globals = DotNetNuke.Common.Globals; + +namespace DNNConnect.CKEditorProvider { - #region - - using System; - using System.Collections.Generic; - using System.ComponentModel; - using System.Data; - using System.Globalization; - using System.IO; - using System.Linq; - using System.Reflection; - using System.Web; - using System.Web.UI; - using System.Web.UI.HtmlControls; - using System.Web.UI.WebControls; - using System.Xml.Serialization; - - using DotNetNuke.Collections; - using DotNetNuke.Common.Utilities; - using DotNetNuke.Entities.Modules; - using DotNetNuke.Entities.Modules.Definitions; - using DotNetNuke.Entities.Portals; - using DotNetNuke.Entities.Tabs; - using DotNetNuke.Framework.JavaScriptLibraries; - using DotNetNuke.Framework.Providers; - using DotNetNuke.Security.Permissions; - using DotNetNuke.Security.Roles; - using DotNetNuke.Services.FileSystem; - using DotNetNuke.Services.Installer.Packages; - using DotNetNuke.Services.Localization; - using DotNetNuke.UI.Utilities; - using DotNetNuke.Web.Client.ClientResourceManagement; - - using WatchersNET.CKEditor.Constants; - using WatchersNET.CKEditor.Controls; - using WatchersNET.CKEditor.Extensions; - using WatchersNET.CKEditor.Objects; - using WatchersNET.CKEditor.Utilities; - - using DataCache = DotNetNuke.Common.Utilities.DataCache; - using Globals = DotNetNuke.Common.Globals; - - #endregion /// /// The CKEditor options page. @@ -100,7 +85,7 @@ public partial class CKEditorOptions : PortalModuleBase /// /// The list of all available toolbar buttons. /// - private List listButtons; + private List listButtons; /// /// The module instance name @@ -165,7 +150,7 @@ public int CurrentOrSelectedTabId if (o != null) { return (int)o; - } + } return 1; } @@ -218,9 +203,9 @@ protected string LangCode { get { - return !string.IsNullOrEmpty(this.request.QueryString["langCode"]) - ? this.request.QueryString["langCode"] - : CultureInfo.CurrentCulture.Name; + return !string.IsNullOrEmpty(this.request.QueryString["langCode"]) + ? this.request.QueryString["langCode"] + : CultureInfo.CurrentCulture.Name; } } @@ -234,7 +219,7 @@ protected string ResXFile return this.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/{0}/Options.aspx.resx", + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/{0}/Options.aspx.resx", Localization.LocalResourceDirectory)); } } @@ -407,7 +392,7 @@ internal void BindOptionsData(bool reloadOptionsfromModule = false) } else { - var settingsDictionary = Utility.GetEditorHostSettings(); + var settingsDictionary = EditorController.GetEditorHostSettings(); this.LoadSettings(SettingsUtil.CheckExistsPortalOrPageSettings(settingsDictionary, pageKey) ? 1 : 0); } @@ -461,7 +446,7 @@ protected void Page_Load(object sender, EventArgs e) // Remove CKFinder from the Browser list if not installed if ( !File.Exists( - this.Context.Server.MapPath("~/Providers/HtmlEditorProviders/CKEditor/ckfinder/ckfinder.js"))) + this.Context.Server.MapPath("~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/ckfinder.js"))) { this.ddlBrowser.Items.RemoveAt(2); } @@ -487,11 +472,11 @@ private void AddJavaScripts() { ClientResourceManager.RegisterStyleSheet( this.Page, - this.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/css/jquery.notification.css")); + this.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/css/jquery.notification.css")); ClientResourceManager.RegisterStyleSheet( this.Page, - this.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/css/Options.css")); + this.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/css/Options.css")); JavaScript.RegisterClientReference(this.Page, ClientAPI.ClientNamespaceReferences.dnn_dom); JavaScript.RequestRegistration(CommonJs.jQuery); @@ -503,13 +488,13 @@ private void AddJavaScripts() this, typeof(Page), "jquery.notification", - this.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/js/jquery.notification.js")); + this.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/jquery.notification.js")); ScriptManager.RegisterClientScriptInclude( this, typeof(Page), "OptionsJs", - this.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/js/Options.js")); + this.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/Options.js")); } @@ -638,7 +623,7 @@ PropertyInfo info in SettingsUtil.GetEditorConfigProperties()) { object value = null; - + if (!info.Name.Equals("CodeMirror") && !info.Name.Equals("WordCount")) { value = info.GetValue(importedSettings.Config, null); @@ -744,42 +729,42 @@ var codeMirrorInfo in break; case "WordCount": { - foreach (var wordCountInfo in typeof(WordCountConfig).GetProperties()) - { - value = wordCountInfo.GetValue(importedSettings.Config.WordCount, null); - - if (value == null) - { - continue; - } - - switch (wordCountInfo.PropertyType.Name) - { - case "String": - { - var textBox = Utility.FindControl(this.EditorConfigHolder, wordCountInfo.Name); - - if (textBox != null) - { - textBox.Text = value.ToString(); - } - } - - break; - - case "Boolean": - { - var checkBox = Utility.FindControl(this.EditorConfigHolder, wordCountInfo.Name); - - if (checkBox != null) - { - checkBox.Checked = (bool)value; - } - } - - break; - } - } + foreach (var wordCountInfo in typeof(WordCountConfig).GetProperties()) + { + value = wordCountInfo.GetValue(importedSettings.Config.WordCount, null); + + if (value == null) + { + continue; + } + + switch (wordCountInfo.PropertyType.Name) + { + case "String": + { + var textBox = Utility.FindControl(this.EditorConfigHolder, wordCountInfo.Name); + + if (textBox != null) + { + textBox.Text = value.ToString(); + } + } + + break; + + case "Boolean": + { + var checkBox = Utility.FindControl(this.EditorConfigHolder, wordCountInfo.Name); + + if (checkBox != null) + { + checkBox.Checked = (bool)value; + } + } + + break; + } + } } break; @@ -791,7 +776,7 @@ var codeMirrorInfo in && this.ddlSkin.Items.FindByValue(importedSettings.Config.Skin) != null) { this.ddlSkin.ClearSelection(); - this.ddlSkin.SelectedValue = importedSettings.Config.Skin; + this.ddlSkin.SelectedValue = importedSettings.Config.Skin; } if (!string.IsNullOrEmpty(importedSettings.Config.CodeMirror.Theme) @@ -1282,7 +1267,7 @@ private void FillSkinList() this.ddlSkin.Items.Clear(); DirectoryInfo objDir = - new DirectoryInfo(this.MapPath(this.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/skins"))); + new DirectoryInfo(this.MapPath(this.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/skins"))); foreach (ListItem skinItem in objDir.GetDirectories().Select( @@ -1296,7 +1281,7 @@ private void FillSkinList() var themesFolder = new DirectoryInfo( - this.MapPath(this.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/plugins/codemirror/theme"))); + this.MapPath(this.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/plugins/codemirror/theme"))); // add default theme this.CodeMirrorTheme.Items.Add(new ListItem { Text = "default", Value = "default" }); @@ -1670,8 +1655,8 @@ private void InitializeComponent() this.rBlSetMode.SelectedIndexChanged += this.SetMode_SelectedIndexChanged; - this.ToolbarGroupsRepeater.ItemDataBound += this.ToolbarGroupsRepeater_ItemDataBound; - + this.ToolbarGroupsRepeater.ItemDataBound += this.ToolbarGroupsRepeater_ItemDataBound; + this.RenderEditorConfigSettings(); } catch (Exception ex) @@ -1954,7 +1939,7 @@ private void LoadSettings(int currentMode, bool changeMode = true) this.LoadDefaultSettings(); - var settingsDictionary = Utility.GetEditorHostSettings(); + var settingsDictionary = EditorController.GetEditorHostSettings(); var portalRoles = new RoleController().GetPortalRoles(this._portalSettings.PortalId); var portalKey = string.Format("DNNCKP#{0}#", this._portalSettings.PortalId); @@ -2235,7 +2220,7 @@ var codeMirrorInfo in .Where(codeMirrorInfo => !codeMirrorInfo.Name.Equals("Theme"))) { var codeMirrorDescription = codeMirrorInfo.GetCustomAttribute(true); - + var settingValueContainer2 = new HtmlGenericControl("div"); settingValueContainer2.Attributes.Add("class", "dnnFormItem"); @@ -2668,7 +2653,7 @@ private void SavePortalOrPageSettings(string key) if (textBox != null) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, info.Name), textBox.Text); } @@ -2681,7 +2666,7 @@ private void SavePortalOrPageSettings(string key) if (checkBox != null) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, info.Name), checkBox.Checked.ToString()); } @@ -2704,7 +2689,7 @@ private void SavePortalOrPageSettings(string key) { if (dropDownList.SelectedItem != null) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, info.Name), dropDownList.SelectedValue); } @@ -2728,7 +2713,7 @@ private void SavePortalOrPageSettings(string key) if (textBox != null) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, codeMirrorInfo.Name), textBox.Text); } @@ -2744,7 +2729,7 @@ private void SavePortalOrPageSettings(string key) if (checkBox != null) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, codeMirrorInfo.Name), checkBox.Checked.ToString()); } @@ -2770,7 +2755,7 @@ private void SavePortalOrPageSettings(string key) if (textBox != null) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, wordCountInfo.Name), textBox.Text); } @@ -2786,7 +2771,7 @@ private void SavePortalOrPageSettings(string key) if (checkBox != null) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, wordCountInfo.Name), checkBox.Checked.ToString()); } @@ -2802,91 +2787,91 @@ private void SavePortalOrPageSettings(string key) } /////////////////// - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.SKIN), this.ddlSkin.SelectedValue); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.CODEMIRRORTHEME), this.CodeMirrorTheme.SelectedValue); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.BROWSER), this.ddlBrowser.SelectedValue); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.FILELISTVIEWMODE), this.FileListViewMode.SelectedValue); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.DEFAULTLINKMODE), this.DefaultLinkMode.SelectedValue); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.USEANCHORSELECTOR), this.UseAnchorSelector.Checked.ToString()); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.SHOWPAGELINKSTABFIRST), this.ShowPageLinksTabFirst.Checked.ToString()); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.OVERRIDEFILEONUPLOAD), this.OverrideFileOnUpload.Checked.ToString()); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.SUBDIRS), this.cbBrowserDirs.Checked.ToString()); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.BROWSERROOTDIRID), this.BrowserRootDir.SelectedValue); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.UPLOADDIRID), this.UploadDir.SelectedValue); if (Utility.IsNumeric(this.FileListPageSize.Text)) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.FILELISTPAGESIZE), this.FileListPageSize.Text); } if (Utility.IsNumeric(this.txtResizeWidth.Text)) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.RESIZEWIDTH), this.txtResizeWidth.Text); } if (Utility.IsNumeric(this.txtResizeHeight.Text)) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.RESIZEHEIGHT), this.txtResizeHeight.Text); } - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}injectjs", key), this.InjectSyntaxJs.Checked.ToString()); if (Utility.IsUnit(this.txtWidth.Text)) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.WIDTH), this.txtWidth.Text); } if (Utility.IsUnit(this.txtHeight.Text)) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.HEIGHT), this.txtHeight.Text); } - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.BLANKTEXT), this.txtBlanktext.Text); - Utility.AddOrUpdateEditorHostSetting(string.Format("{0}{1}", key, SettingConstants.CSS), this.CssUrl.Url); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting(string.Format("{0}{1}", key, SettingConstants.CSS), this.CssUrl.Url); + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.TEMPLATEFILES), this.TemplUrl.Url); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.CUSTOMJSFILE), this.CustomJsFile.Url); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{1}", key, SettingConstants.CONFIG), this.ConfigUrl.Url); @@ -2896,7 +2881,7 @@ private void SavePortalOrPageSettings(string key) if (sRoles != string.Empty) { - Utility.AddOrUpdateEditorHostSetting(string.Format("{0}{1}", key, SettingConstants.ROLES), sRoles); + EditorController.AddOrUpdateEditorHostSetting(string.Format("{0}{1}", key, SettingConstants.ROLES), sRoles); } // Save Toolbar Setting for every Role @@ -2913,7 +2898,7 @@ private void SavePortalOrPageSettings(string key) if (label.Text.Equals("Unauthenticated Users")) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}toolb#{1}", key, "-1"), ddLToolB.SelectedValue); } @@ -2921,7 +2906,7 @@ private void SavePortalOrPageSettings(string key) { RoleInfo objRole = this.objRoleController.GetRoleByName(this._portalSettings.PortalId, label.Text); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}toolb#{1}", key, objRole.RoleID), ddLToolB.SelectedValue); } @@ -2941,7 +2926,7 @@ private void SavePortalOrPageSettings(string key) if (label.Text.Equals("Unauthenticated Users")) { - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{2}#{1}", key, "-1", SettingConstants.UPLOADFILELIMITS), sizeLimit.Text); } @@ -2949,13 +2934,13 @@ private void SavePortalOrPageSettings(string key) { RoleInfo objRole = this.objRoleController.GetRoleByName(this._portalSettings.PortalId, label.Text); - Utility.AddOrUpdateEditorHostSetting( + EditorController.AddOrUpdateEditorHostSetting( string.Format("{0}{2}#{1}", key, objRole.RoleID, SettingConstants.UPLOADFILELIMITS), sizeLimit.Text); } } } - + /// /// Save all Settings for the Current Selected Mode /// @@ -3021,8 +3006,8 @@ private void SetLanguage() this.lblSettings.Text = Localization.GetString("lblSettings.Text", this.ResXFile, this.LangCode); this.lblSetFor.Text = Localization.GetString("lblSetFor.Text", this.ResXFile, this.LangCode); this.lblBrowser.Text = Localization.GetString("lblBrowser.Text", this.ResXFile, this.LangCode); - - this.lblBlanktext.Text = Localization.GetString("lblBlanktext.Text", this.ResXFile, this.LangCode); + + this.lblBlanktext.Text = Localization.GetString("lblBlanktext.Text", this.ResXFile, this.LangCode); this.txtBlanktext.ToolTip = Localization.GetString("BlanktextTT.Text", this.ResXFile, this.LangCode); this.lblBrowsSec.Text = Localization.GetString("lblBrowsSec.Text", this.ResXFile, this.LangCode); @@ -3079,7 +3064,7 @@ private void SetLanguage() this.iBDelete.AlternateText = Localization.GetString("DeleteToolbar.Text", this.ResXFile, this.LangCode); this.iBDelete.ToolTip = Localization.GetString("DeleteToolbar.Text", this.ResXFile, this.LangCode); - + this.lblExport.Text = Localization.GetString("lnkExport.Text", this.ResXFile, this.LangCode); this.ExportNow.Text = Localization.GetString("ExportNow.Text", this.ResXFile, this.LangCode); @@ -3158,10 +3143,10 @@ private void Remove_Click(object sender, EventArgs e) switch (this.CurrentSettingsMode) { case SettingsMode.Portal: - Utility.DeleteAllPortalSettings(this._portalSettings.PortalId); + EditorController.DeleteAllPortalSettings(this._portalSettings.PortalId); break; case SettingsMode.Page: - Utility.DeleteCurrentPageSettings(this.CurrentOrSelectedTabId); + EditorController.DeleteCurrentPageSettings(this.CurrentOrSelectedTabId); break; case SettingsMode.ModuleInstance: this.DelModuleSettings(); @@ -3181,13 +3166,13 @@ private void RemoveAll_Click(object sender, EventArgs e) switch (this.CurrentSettingsMode) { case SettingsMode.Portal: - Utility.DeleteAllPortalSettings(this._portalSettings.PortalId); + EditorController.DeleteAllPortalSettings(this._portalSettings.PortalId); break; case SettingsMode.Page: - Utility.DeleteAllPageSettings(this._portalSettings.PortalId); + EditorController.DeleteAllPageSettings(this._portalSettings.PortalId); break; case SettingsMode.ModuleInstance: - Utility.DeleteAllModuleSettings(this._portalSettings.PortalId); + EditorController.DeleteAllModuleSettings(this._portalSettings.PortalId); break; } @@ -3206,14 +3191,14 @@ private void RemoveChild_Click(object sender, EventArgs e) case SettingsMode.Page: { // Delete all Page Setting for all Child Tabs - Utility.DeleteAllChildPageSettings(this.CurrentOrSelectedTabId); + EditorController.DeleteAllChildPageSettings(this.CurrentOrSelectedTabId); } break; case SettingsMode.ModuleInstance: { // Delete all Module Instance Settings for the Current Tab - Utility.DeleteAllModuleSettingsById(this.CurrentOrSelectedTabId); + EditorController.DeleteAllModuleSettingsById(this.CurrentOrSelectedTabId); } break; @@ -3274,7 +3259,7 @@ private void ShowNotification(string message, string type) "ShowNotificationBar('{0}','{1}','{2}');", message, type, - this.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/images/")), + this.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/images/")), true); } diff --git a/CKEditorOptions.ascx.designer.cs b/CKEditorOptions.ascx.designer.cs index 80e2e2a..7098fb8 100644 --- a/CKEditorOptions.ascx.designer.cs +++ b/CKEditorOptions.ascx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace WatchersNET.CKEditor { +namespace DNNConnect.CKEditorProvider { public partial class CKEditorOptions { @@ -226,7 +226,7 @@ public partial class CKEditorOptions { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WatchersNET.CKEditor.Controls.UrlControl ctlConfigUrl; + protected global::DNNConnect.CKEditorProvider.Controls.UrlControl ctlConfigUrl; /// /// CodeMirrorLabel control. @@ -280,7 +280,7 @@ public partial class CKEditorOptions { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WatchersNET.CKEditor.Controls.UrlControl ctlCssurl; + protected global::DNNConnect.CKEditorProvider.Controls.UrlControl ctlCssurl; /// /// lblTemplFiles control. @@ -298,7 +298,7 @@ public partial class CKEditorOptions { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WatchersNET.CKEditor.Controls.UrlControl ctlTemplUrl; + protected global::DNNConnect.CKEditorProvider.Controls.UrlControl ctlTemplUrl; /// /// CustomJsFileLabel control. @@ -316,7 +316,7 @@ public partial class CKEditorOptions { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WatchersNET.CKEditor.Controls.UrlControl ctlCustomJsFile; + protected global::DNNConnect.CKEditorProvider.Controls.UrlControl ctlCustomJsFile; /// /// lblBrowser control. @@ -946,7 +946,7 @@ public partial class CKEditorOptions { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WatchersNET.CKEditor.Controls.UrlControl ctlImportFile; + protected global::DNNConnect.CKEditorProvider.Controls.UrlControl ctlImportFile; /// /// lnkImportNow control. diff --git a/CKHtmlEditorProvider.cs b/CKHtmlEditorProvider.cs index 431e9fb..3bbd2fb 100644 --- a/CKHtmlEditorProvider.cs +++ b/CKHtmlEditorProvider.cs @@ -1,29 +1,14 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor -{ - #region - - using System.Collections; - using System.Web.UI; - using System.Web.UI.WebControls; +using System.Collections; +using System.Web.UI; +using System.Web.UI.WebControls; - using DotNetNuke.Common; - using DotNetNuke.Modules.HTMLEditorProvider; +using DotNetNuke.Common; +using DotNetNuke.Modules.HTMLEditorProvider; - using WatchersNET.CKEditor.Web; +using DNNConnect.CKEditorProvider.Web; - #endregion +namespace DNNConnect.CKEditorProvider +{ /// /// The CKEditor Provider. @@ -40,7 +25,7 @@ public class CKHtmlEditorProvider : HtmlEditorProvider /// /// The _html editor control. /// - private CKEditorControl htmlEditorControl; + private EditorControl htmlEditorControl; /// /// The _root image directory. @@ -172,7 +157,7 @@ public override void AddToolbar() /// public override void Initialize() { - this.htmlEditorControl = new CKEditorControl { ID = this.ControlID }; + this.htmlEditorControl = new EditorControl { ID = this.ControlID }; } #endregion diff --git a/Constants/Browser.cs b/Constants/Browser.cs index 74a517c..41b6239 100644 --- a/Constants/Browser.cs +++ b/Constants/Browser.cs @@ -1,21 +1,10 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Constants + +namespace DNNConnect.CKEditorProvider.Constants { /// /// Browser Mode /// - public enum Browser + public enum BrowserType { /// /// The none browser. diff --git a/Constants/EnterModus.cs b/Constants/EnterModus.cs index 235901a..b5d86cd 100644 --- a/Constants/EnterModus.cs +++ b/Constants/EnterModus.cs @@ -1,16 +1,5 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Constants + +namespace DNNConnect.CKEditorProvider.Constants { /// /// The Enter Modes diff --git a/Constants/FileListView.cs b/Constants/FileListView.cs index df08a1a..9b695a6 100644 --- a/Constants/FileListView.cs +++ b/Constants/FileListView.cs @@ -1,16 +1,5 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Constants + +namespace DNNConnect.CKEditorProvider.Constants { /// /// File List View Mode diff --git a/Constants/LanguageDirection.cs b/Constants/LanguageDirection.cs index e440df7..aaab375 100644 --- a/Constants/LanguageDirection.cs +++ b/Constants/LanguageDirection.cs @@ -1,16 +1,6 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ + -namespace WatchersNET.CKEditor.Constants +namespace DNNConnect.CKEditorProvider.Constants { /// /// The Language Direction diff --git a/Constants/LinkMode.cs b/Constants/LinkMode.cs index 22a653f..0c8332f 100644 --- a/Constants/LinkMode.cs +++ b/Constants/LinkMode.cs @@ -1,16 +1,5 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Constants + +namespace DNNConnect.CKEditorProvider.Constants { /// /// File Browser Link Modes diff --git a/Constants/LinkType.cs b/Constants/LinkType.cs index 45fdc5e..1972860 100644 --- a/Constants/LinkType.cs +++ b/Constants/LinkType.cs @@ -1,16 +1,5 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Constants + +namespace DNNConnect.CKEditorProvider.Constants { /// /// The Default Link Type diff --git a/Constants/SettingConstants.cs b/Constants/SettingConstants.cs index adab44f..74c9e71 100644 --- a/Constants/SettingConstants.cs +++ b/Constants/SettingConstants.cs @@ -10,7 +10,7 @@ * this file is part of the Source Code of the CKEditor Provider. */ -namespace WatchersNET.CKEditor.Constants +namespace DNNConnect.CKEditorProvider.Constants { using System; diff --git a/Constants/SettingsMode.cs b/Constants/SettingsMode.cs index 919872d..ccbd4b0 100644 --- a/Constants/SettingsMode.cs +++ b/Constants/SettingsMode.cs @@ -1,16 +1,5 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Constants + +namespace DNNConnect.CKEditorProvider.Constants { /// /// Settings Mode diff --git a/Constants/ToolBarLocation.cs b/Constants/ToolBarLocation.cs index 7d766db..0ce0429 100644 --- a/Constants/ToolBarLocation.cs +++ b/Constants/ToolBarLocation.cs @@ -1,16 +1,5 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Constants + +namespace DNNConnect.CKEditorProvider.Constants { /// /// The Toolbar Location diff --git a/Controls/HtmlGenericSelfClosing.cs b/Controls/HtmlGenericSelfClosing.cs index 92e5b6d..e264583 100644 --- a/Controls/HtmlGenericSelfClosing.cs +++ b/Controls/HtmlGenericSelfClosing.cs @@ -1,25 +1,10 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Controls -{ - #region - - using System; + using System; using System.Collections; using System.Web.UI; using System.Web.UI.HtmlControls; - #endregion +namespace DNNConnect.CKEditorProvider.Controls +{ /// /// The html generic self closing. diff --git a/Controls/Pager.cs b/Controls/Pager.cs index ba7fd4b..5ed1ef3 100644 --- a/Controls/Pager.cs +++ b/Controls/Pager.cs @@ -1,27 +1,12 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Controls -{ - #region - - using System; + using System; using System.Web.UI; using System.Web.UI.HtmlControls; using System.Web.UI.WebControls; using DotNetNuke.Services.Localization; - #endregion +namespace DNNConnect.CKEditorProvider.Controls +{ /// /// The html generic self closing. diff --git a/Controls/UrlControl.cs b/Controls/UrlControl.cs index c2fc01b..4f19fb9 100644 --- a/Controls/UrlControl.cs +++ b/Controls/UrlControl.cs @@ -1,27 +1,16 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Controls +using System; +using System.Collections; +using System.Linq; +using System.Web.UI; +using System.Web.UI.WebControls; + +using DotNetNuke.Common.Utilities; +using DotNetNuke.Services.Exceptions; +using DotNetNuke.Services.FileSystem; +using DotNetNuke.Services.Localization; + +namespace DNNConnect.CKEditorProvider.Controls { - using System; - using System.Collections; - using System.Linq; - using System.Web.UI; - using System.Web.UI.WebControls; - - using DotNetNuke.Common.Utilities; - using DotNetNuke.Services.Exceptions; - using DotNetNuke.Services.FileSystem; - using DotNetNuke.Services.Localization; /// /// The url control. @@ -264,7 +253,7 @@ public void BindData() if (_url.ToLower().StartsWith("fileid=")) { var objFile = FileManager.Instance.GetFile(int.Parse(_url.Substring(7))); - + if (objFile != null) { _url = objFile.Folder + objFile.FileName; diff --git a/CKEditorProvider.csproj b/DNNConnect.CKEditorProvider.csproj similarity index 72% rename from CKEditorProvider.csproj rename to DNNConnect.CKEditorProvider.csproj index 3bc149e..8320296 100644 --- a/CKEditorProvider.csproj +++ b/DNNConnect.CKEditorProvider.csproj @@ -62,6 +62,18 @@ AllRules.ruleset + + References\DotNetNuke.dll + + + References\DotNetNuke.Web.dll + + + References\DotNetNuke.Web.Client.dll + + + References\DotNetNuke.WebUtility.dll + @@ -74,8 +86,7 @@ - ..\..\..\Components\Telerik\bin\Telerik.Web.UI.dll - False + References\Telerik.Web.UI.dll @@ -155,10 +166,11 @@ + - + @@ -189,7 +201,6 @@ - ASPXCodeBehind @@ -203,7 +214,7 @@ - + ASPXCodeBehind @@ -216,10 +227,10 @@ ASPXCodeBehind - - - - + + + + @@ -258,43 +269,14 @@ - - - - - - - + + + Designer - - - {03e3afa5-ddc9-48fb-a839-ad4282ce237e} - DotNetNuke.Web.Client - - - {4912f062-f8a8-4f9d-8f8e-244ebee1acbd} - DotNetNuke.WebUtility - - - {ee1329fe-fd88-4e1a-968c-345e394ef080} - DotNetNuke.Web - - - {6b29aded-7b56-4484-bea5-c0e09079535b} - DotNetNuke.Library - - - 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -302,57 +284,6 @@ - - zip - WatchersNET.CKHtmlEditorProvider - CKEditor-Provider - /Providers - $(MSBuildProjectDirectory)\..\..\..\..\Build\BuildScripts - $(MSBuildProjectDirectory)\..\..\..\..\Website - $(WebsitePath)\Install\Provider - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -361,7 +292,7 @@ True 0 / - http://localhost:51101/ + http://localhost:33952/ False False @@ -371,4 +302,5 @@ + \ No newline at end of file diff --git a/DNNConnect.CKEditorProvider.dnn b/DNNConnect.CKEditorProvider.dnn new file mode 100644 index 0000000..ff63564 --- /dev/null +++ b/DNNConnect.CKEditorProvider.dnn @@ -0,0 +1,100 @@ + + + DNNConnect CKEditorProvider + CKEditor Provider for DNN + ~/Providers/HtmlEditorProviders/DNNConnect.CKE/LogoCKEditor.png + + + DNN Connect + http://dnn-connect.org/ + + + + + + 07.02.01 + + + + + + bin + DNNConnect.CKEditorProvider.dll + + + + + + Providers\HtmlEditorProviders\DNNConnect.CKE + + Resources.zip + + + + + + Providers\HtmlEditorProviders\DNNConnect.CKE\ + + + + + + + Portals\_default + + Install + CKEditorDefaultSettings.xml + + + Install + CKToolbarButtons.xml + + + Install + CKToolbarSets.xml + + + + + + Providers\HtmlEditorProviders\DNNConnect.CKE + + LogoCKEditor.png + LogoCKEditor.png + + + + + + web.config + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DNNConnect.CKEditorProvider.sln b/DNNConnect.CKEditorProvider.sln new file mode 100644 index 0000000..ba7953d --- /dev/null +++ b/DNNConnect.CKEditorProvider.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DNNConnect.CKEditorProvider", "DNNConnect.CKEditorProvider.csproj", "{AE7E021E-7C7B-4003-9BD6-5A04C781C277}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Extensions/CustomAttributeExtensions.cs b/Extensions/CustomAttributeExtensions.cs index 71bb0a6..6b55e20 100644 --- a/Extensions/CustomAttributeExtensions.cs +++ b/Extensions/CustomAttributeExtensions.cs @@ -1,19 +1,8 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ +using System; +using System.Reflection; -namespace WatchersNET.CKEditor.Extensions +namespace DNNConnect.CKEditorProvider.Extensions { - using System; - using System.Reflection; /// /// Custom Attribute Extensions diff --git a/Install/01.00.00.SqlDataProvider b/Install/01.00.00.SqlDataProvider new file mode 100644 index 0000000..3d1f07d --- /dev/null +++ b/Install/01.00.00.SqlDataProvider @@ -0,0 +1,152 @@ +/*************************************************** + * Settings Table + ***************************************************/ +if not exists (select top 1 1 from sys.objects where object_id = object_id(N'{databaseOwner}{objectQualifier}CKE_Settings') and OBJECTPROPERTY(object_id, N'IsTable') = 1) + CREATE TABLE {databaseOwner}{objectQualifier}CKE_Settings ( + [SettingName] [nvarchar] (300) NOT NULL, + [SettingValue] [ntext] NOT NULL + ) ON [PRIMARY] +GO + +ALTER TABLE {databaseOwner}[{objectQualifier}CKE_Settings] ADD CONSTRAINT [PK_{objectQualifier}CKE_Settings] PRIMARY KEY CLUSTERED ([SettingName]) +GO + +/*************************************************** + * Settings SPROCS + ***************************************************/ +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettingsByTab') and OBJECTPROPERTY(id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettingsByTab +GO + +CREATE PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettingsByTab + @TabID int + AS + SET NOCOUNT ON + Delete ms + FROM {databaseOwner}{objectQualifier}ModuleSettings ms + INNER JOIN + {databaseOwner}{objectQualifier}TabModules tm ON tm.TabID = @TabID + Where SettingName like 'DNNCKMI#%' AND ms.ModuleID = tm.ModuleID +GO + +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettings +GO + +CREATE PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettings + @PortalID varchar + AS + SET NOCOUNT ON + Delete ms + FROM {databaseOwner}{objectQualifier}ModuleSettings ms + INNER JOIN + {databaseOwner}{objectQualifier}Modules m ON m.PortalID = @PortalID + Where SettingName like 'DNNCKMI#%' AND ms.ModuleID = m.ModuleID +GO + +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) + DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllPageSettings +GO + +CREATE PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllPageSettings + @PortalID varchar + AS + SET NOCOUNT ON + DELETE hs + FROM {databaseOwner}{objectQualifier}CKE_Settings hs + INNER JOIN + {databaseOwner}{objectQualifier}Tabs t ON t.PortalID = @PortalID + Where SettingName like 'DNNCKT#%' AND t.TabID = t.TabID +GO + +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteCurrentPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) + DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteCurrentPageSettings +GO + +CREATE PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteCurrentPageSettings + @TabID varchar + AS + SET NOCOUNT ON + delete from {databaseOwner}{objectQualifier}CKE_Settings where SettingName like 'DNNCKT#' + @TabID + '%' +GO + +IF EXISTS (select top 1 1 from sys.objects where object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllChildPageSettings') and OBJECTPROPERTY(object_id, N'IsProcedure') = 1) + DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllChildPageSettings +GO + +CREATE PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllChildPageSettings + @TabID int + AS + SET NOCOUNT ON + DELETE hs + FROM {databaseOwner}{objectQualifier}CKE_Settings hs + INNER JOIN + {databaseOwner}{objectQualifier}Tabs t ON t.ParentId = @TabID + Where SettingName like 'DNNCKT#%' AND t.TabID = t.TabID +GO + +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllPortalSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) + DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllPortalSettings +GO + +CREATE PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllPortalSettings + @PortalID varchar + AS + SET NOCOUNT ON + delete from {databaseOwner}{objectQualifier}CKE_Settings where SettingName like 'DNNCKP#' + @PortalID + '%' +GO + +IF EXISTS (select top 1 1 from sys.objects where object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_GetEditorHostSettings') and OBJECTPROPERTY(object_id, N'IsProcedure') = 1) + DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_GetEditorHostSettings +GO + +CREATE PROCEDURE {databaseOwner}{objectQualifier}CKE_GetEditorHostSettings + AS + SET NOCOUNT ON + SELECT SettingName, + SettingValue + FROM {databaseOwner}{objectQualifier}CKE_Settings +GO + +IF EXISTS (select top 1 1 from sys.objects where object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_AddOrUpdateEditorHostSetting') and OBJECTPROPERTY(object_id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_AddOrUpdateEditorHostSetting +GO + +CREATE PROCEDURE {databaseOwner}{objectQualifier}CKE_AddOrUpdateEditorHostSetting + @SettingName nvarchar(300), + @SettingValue ntext +AS + if exists (select 1 from {databaseOwner}{objectQualifier}CKE_Settings where SettingName = @SettingName) + begin + update {databaseOwner}{objectQualifier}CKE_Settings + set + SettingValue = @SettingValue + where + SettingName = @SettingName + end + else + begin + insert into {databaseOwner}{objectQualifier}CKE_Settings (SettingName, SettingValue) + values (@SettingName,@SettingValue) + end +go + + +/***************************************************/ + +IF NOT EXISTS (SELECT 1 FROM {databaseOwner}[{objectQualifier}ModuleControls] WHERE ModuleDefID IS NULL AND ControlKey = 'CKEditorOptions') +BEGIN + EXEC {databaseOwner}[{objectQualifier}AddModuleControl] + @ModuleDefId=NULL, + @ControlKey='CKEditorOptions', + @ControlTitle='CKEditor Options', + @ControlSrc='Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditorOptions.ascx', + @IconFile='~/Providers/HtmlEditorProviders/DNNConnect.CKE/LogoCKEditor.png', + @ControlType=-1, + @ViewOrder=NULL, + @HelpUrl=NULL, + @SupportsPartialRendering=0, + @SupportsPopUps=1, + @CreatedByUserID=-1; +END; +GO \ No newline at end of file diff --git a/CKEditorDefaultSettings.xml b/Install/CKEditorDefaultSettings.xml similarity index 100% rename from CKEditorDefaultSettings.xml rename to Install/CKEditorDefaultSettings.xml diff --git a/CKToolbarButtons.xml b/Install/CKToolbarButtons.xml similarity index 100% rename from CKToolbarButtons.xml rename to Install/CKToolbarButtons.xml diff --git a/CKToolbarSets.xml b/Install/CKToolbarSets.xml similarity index 100% rename from CKToolbarSets.xml rename to Install/CKToolbarSets.xml diff --git a/Install/Uninstall.SqlDataProvider b/Install/Uninstall.SqlDataProvider new file mode 100644 index 0000000..83b9c06 --- /dev/null +++ b/Install/Uninstall.SqlDataProvider @@ -0,0 +1,41 @@ +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettings +GO + +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllPageSettings +GO + +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteCurrentPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteCurrentPageSettings +GO + +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllPortalSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllPortalSettings +GO + +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllChildPageSettings') and OBJECTPROPERTY(id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllChildPageSettings +GO + +IF EXISTS (select top 1 1 from sys.objects where object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_GetEditorHostSettings') and OBJECTPROPERTY(object_id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_GetEditorHostSettings +GO + +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettingsByTab') and OBJECTPROPERTY(id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_DeleteAllModuleSettingsByTab +GO + +IF EXISTS (select top 1 1 from sys.objects where object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}CKE_AddOrUpdateEditorHostSetting') and OBJECTPROPERTY(object_id, N'IsProcedure') = 1) +DROP PROCEDURE {databaseOwner}{objectQualifier}CKE_AddOrUpdateEditorHostSetting +GO + +/** Delete All settings **/ + + + +if exists (select top 1 1 from {databaseOwner}sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}CKE_Settings]') and OBJECTPROPERTY(id, N'IsUserTable') = 1) +DROP TABLE {databaseOwner}{objectQualifier}CKE_Settings +GO + +DELETE FROM {databaseOwner}[{objectQualifier}ModuleControls] WHERE ModuleDefID IS NULL AND ControlKey = 'CKEditorOptions' \ No newline at end of file diff --git a/license.txt b/Install/license.txt similarity index 91% rename from license.txt rename to Install/license.txt index 52992d5..d0b82fe 100644 --- a/license.txt +++ b/Install/license.txt @@ -9,7 +9,7 @@
    -

    CKEditor Editor Provider LICENSE

    +

    CKEditor Provider LICENSE

    @@ -24,7 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

    -

    Copyright (c) Ingo Herbote - http://dnnckeditor.codeplex.com/

    +

    Copyright (c) DNN-Connect - https://github.com/DNN-Connect/CKEditorProvider

    diff --git a/releaseNotes.txt b/Install/releaseNotes.txt similarity index 100% rename from releaseNotes.txt rename to Install/releaseNotes.txt diff --git a/Module/EditorConfigManager.ascx b/Module/EditorConfigManager.ascx index 04bfe49..afd89a5 100644 --- a/Module/EditorConfigManager.ascx +++ b/Module/EditorConfigManager.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="c#" AutoEventWireup="True" Codebehind="EditorConfigManager.ascx.cs" Inherits="WatchersNET.CKEditor.Module.EditorConfigManager" %> +<%@ Control Language="c#" AutoEventWireup="True" Codebehind="EditorConfigManager.ascx.cs" Inherits="DNNConnect.CKEditorProvider.Module.EditorConfigManager" %> - - - - - - - - - - Portals\_default - - CKEditorDefaultSettings.xml - CKEditorDefaultSettings.xml - - - CKToolbarButtons.xml - CKToolbarButtons.xml - - - CKToolbarSets.xml - CKToolbarSets.xml - - - - - - Providers\HtmlEditorProviders\CKEditor - - LogoCKEditor.png - LogoCKEditor.png - - - - - - web.config - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Web/CKEditorControl.cs b/Web/EditorControl.cs similarity index 62% rename from Web/CKEditorControl.cs rename to Web/EditorControl.cs index 06c514e..2df3f98 100644 --- a/Web/CKEditorControl.cs +++ b/Web/EditorControl.cs @@ -1,66 +1,46 @@ -/* - * CKEditor Html Editor Provider for DotNetNuke - * ======== - * http://dnnckeditor.codeplex.com/ - * Copyright (C) Ingo Herbote - * - * The software, this file and its contents are subject to the CKEditor Provider - * License. Please read the license.txt file before using, installing, copying, - * modifying or distribute this file or part of its contents. The contents of - * this file is part of the Source Code of the CKEditor Provider. - */ - -namespace WatchersNET.CKEditor.Web + +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.ComponentModel; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading; +using System.Web; +using System.Web.Script.Serialization; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Xml.Serialization; + +using DotNetNuke.Common; +using DotNetNuke.Common.Utilities; +using DotNetNuke.Entities.Modules; +using DotNetNuke.Entities.Portals; +using DotNetNuke.Framework; +using DotNetNuke.Framework.Providers; +using DotNetNuke.Security; +using DotNetNuke.Security.Roles; +using DotNetNuke.Services.FileSystem; +using DotNetNuke.Services.Localization; + +using DotNetNuke.Web.Client.ClientResourceManagement; +using DNNConnect.CKEditorProvider.Constants; +using DNNConnect.CKEditorProvider.Extensions; +using DNNConnect.CKEditorProvider.Objects; +using DNNConnect.CKEditorProvider.Utilities; + + +namespace DNNConnect.CKEditorProvider.Web { - #region - - using System; - using System.Collections; - using System.Collections.Generic; - using System.Collections.Specialized; - using System.ComponentModel; - using System.Globalization; - using System.IO; - using System.Linq; - using System.Reflection; - using System.Text; - using System.Threading; - using System.Web; - using System.Web.Script.Serialization; - using System.Web.UI; - using System.Web.UI.WebControls; - using System.Xml.Serialization; - - using DotNetNuke.Common; - using DotNetNuke.Common.Utilities; - using DotNetNuke.Entities.Controllers; - using DotNetNuke.Entities.Modules; - using DotNetNuke.Entities.Portals; - using DotNetNuke.Entities.Tabs; - using DotNetNuke.Framework; - using DotNetNuke.Framework.Providers; - using DotNetNuke.Security; - using DotNetNuke.Security.Roles; - using DotNetNuke.Services.FileSystem; - using DotNetNuke.Services.Installer.Packages; - using DotNetNuke.Services.Localization; - using DotNetNuke.UI.Skins; - using DotNetNuke.Web.Client; - - using WatchersNET.CKEditor.Constants; - using WatchersNET.CKEditor.Extensions; - using WatchersNET.CKEditor.Objects; - using WatchersNET.CKEditor.Utilities; - - using Assembly = System.Reflection.Assembly; - using DotNetNuke.Web.Client.ClientResourceManagement; - - #endregion + /// /// The CKEditor control. /// - public class CKEditorControl : WebControl, IPostBackDataHandler + public class EditorControl : WebControl, IPostBackDataHandler { #region Constants and Fields @@ -115,13 +95,13 @@ public class CKEditorControl : WebControl, IPostBackDataHandler #region Constructors and Destructors /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public CKEditorControl() + public EditorControl() { - this.LoadConfigSettings(); + LoadConfigSettings(); - this.Init += this.CKEditorInit; + Init += CKEditorInit; } #endregion @@ -140,15 +120,15 @@ public NameValueCollection Settings { get { - if (this.isMerged) + if (isMerged) { - return this._settings; + return _settings; } // Override local settings with attributes - foreach (string key in this.Attributes.Keys) + foreach (string key in Attributes.Keys) { - this._settings[key] = this.Attributes[key]; + _settings[key] = Attributes[key]; } // Inject all Editor Config @@ -161,12 +141,12 @@ PropertyInfo info in if (!info.Name.Equals("CodeMirror") && !info.Name.Equals("WordCount")) { - if (info.GetValue(this.currentSettings.Config, null) == null) + if (info.GetValue(currentSettings.Config, null) == null) { continue; } - var rawValue = info.GetValue(this.currentSettings.Config, null); + var rawValue = info.GetValue(currentSettings.Config, null); settingValue = info.PropertyType.Name.Equals("Double") ? Convert.ToDouble(rawValue) @@ -183,29 +163,29 @@ PropertyInfo info in if (info.PropertyType.Name == "Boolean") { - this._settings[xmlAttributeAttribute.AttributeName] = settingValue.ToLower(); + _settings[xmlAttributeAttribute.AttributeName] = settingValue.ToLower(); } else { switch (info.Name) { case "ToolbarLocation": - this._settings[xmlAttributeAttribute.AttributeName] = settingValue.ToLower(); + _settings[xmlAttributeAttribute.AttributeName] = settingValue.ToLower(); break; case "EnterMode": case "ShiftEnterMode": switch (settingValue) { case "P": - this._settings[xmlAttributeAttribute.AttributeName] = "1"; + _settings[xmlAttributeAttribute.AttributeName] = "1"; break; case "BR": - this._settings[xmlAttributeAttribute.AttributeName] = "2"; + _settings[xmlAttributeAttribute.AttributeName] = "2"; break; case "DIV": - this._settings[xmlAttributeAttribute.AttributeName] = "3"; + _settings[xmlAttributeAttribute.AttributeName] = "3"; break; - } + } break; case "ContentsLangDirection": @@ -213,15 +193,15 @@ PropertyInfo info in switch (settingValue) { case "LeftToRight": - this._settings[xmlAttributeAttribute.AttributeName] = "ltr"; + _settings[xmlAttributeAttribute.AttributeName] = "ltr"; break; case "RightToLeft": - this._settings[xmlAttributeAttribute.AttributeName] = "rtl"; + _settings[xmlAttributeAttribute.AttributeName] = "rtl"; break; default: - this._settings[xmlAttributeAttribute.AttributeName] = string.Empty; + _settings[xmlAttributeAttribute.AttributeName] = string.Empty; break; - } + } } break; @@ -235,7 +215,7 @@ PropertyInfo info in var xmlAttribute = codeMirrorInfo.GetCustomAttribute(true); var rawSettingValue = codeMirrorInfo.GetValue( - this.currentSettings.Config.CodeMirror, null); + currentSettings.Config.CodeMirror, null); var codeMirrorSettingValue = rawSettingValue.ToString(); @@ -243,7 +223,7 @@ PropertyInfo info in { continue; } - + switch (codeMirrorInfo.PropertyType.Name) { case "String": @@ -257,7 +237,7 @@ PropertyInfo info in var codemirrorSettings = codeMirrorArray.ToString(); - this._settings["codemirror"] = string.Format( + _settings["codemirror"] = string.Format( "{{ {0} }}", codemirrorSettings.Remove(codemirrorSettings.Length - 1, 1)); } @@ -272,7 +252,7 @@ PropertyInfo info in wordCountInfo.GetCustomAttribute(true); var rawSettingValue = - wordCountInfo.GetValue(this.currentSettings.Config.WordCount, null); + wordCountInfo.GetValue(currentSettings.Config.WordCount, null); var wordCountSettingValue = rawSettingValue.ToString(); @@ -294,13 +274,13 @@ PropertyInfo info in var wordcountSettings = wordcountArray.ToString(); - this._settings["wordcount"] = string.Format( + _settings["wordcount"] = string.Format( "{{ {0} }}", wordcountSettings.Remove(wordcountSettings.Length - 1, 1)); } break; default: - this._settings[xmlAttributeAttribute.AttributeName] = settingValue; + _settings[xmlAttributeAttribute.AttributeName] = settingValue; break; } } @@ -310,291 +290,291 @@ PropertyInfo info in { var currentCulture = Thread.CurrentThread.CurrentUICulture; - this._settings["language"] = currentCulture.Name.ToLowerInvariant(); + _settings["language"] = currentCulture.Name.ToLowerInvariant(); - if (string.IsNullOrEmpty(this.currentSettings.Config.Scayt_sLang)) + if (string.IsNullOrEmpty(currentSettings.Config.Scayt_sLang)) { - this._settings["scayt_sLang"] = currentCulture.Name.ToLowerInvariant(); + _settings["scayt_sLang"] = currentCulture.Name.ToLowerInvariant(); } } catch (Exception) { - this._settings["language"] = "en"; + _settings["language"] = "en"; } - if (!string.IsNullOrEmpty(this.currentSettings.Config.CustomConfig)) + if (!string.IsNullOrEmpty(currentSettings.Config.CustomConfig)) { - this._settings["customConfig"] = this.FormatUrl(this.currentSettings.Config.CustomConfig); + _settings["customConfig"] = FormatUrl(currentSettings.Config.CustomConfig); } else { - this._settings["customConfig"] = string.Empty; + _settings["customConfig"] = string.Empty; } - if (!string.IsNullOrEmpty(this.currentSettings.Config.Skin)) + if (!string.IsNullOrEmpty(currentSettings.Config.Skin)) { - if (this.currentSettings.Config.Skin.Equals("office2003") - || this.currentSettings.Config.Skin.Equals("BootstrapCK-Skin") - || this.currentSettings.Config.Skin.Equals("chris") - || this.currentSettings.Config.Skin.Equals("v2")) + if (currentSettings.Config.Skin.Equals("office2003") + || currentSettings.Config.Skin.Equals("BootstrapCK-Skin") + || currentSettings.Config.Skin.Equals("chris") + || currentSettings.Config.Skin.Equals("v2")) { - this._settings["skin"] = "moono"; + _settings["skin"] = "moono"; } else { - this._settings["skin"] = this.currentSettings.Config.Skin; + _settings["skin"] = currentSettings.Config.Skin; } } var cssFiles = new List(); - var skinSrc = this.GetSkinSource(); - var containerSrc = this.GetContainerSource(); + var skinSrc = GetSkinSource(); + var containerSrc = GetContainerSource(); cssFiles.Add("~/portals/_default/default.css"); cssFiles.Add(skinSrc.Replace(skinSrc.Substring(skinSrc.LastIndexOf('/'), skinSrc.Length - skinSrc.Substring(0, skinSrc.LastIndexOf('/')).Length), "/skin.css")); cssFiles.Add(containerSrc.Replace(containerSrc.Substring(containerSrc.LastIndexOf('/'), containerSrc.Length - containerSrc.Substring(0, containerSrc.LastIndexOf('/')).Length), "/container.css")); - cssFiles.Add("~/DesktopModules/" + this.myParModule.ModuleConfiguration.DesktopModule.FolderName + "/module.css"); - cssFiles.Add("~" + this._portalSettings.HomeDirectory + "portal.css"); + cssFiles.Add("~/DesktopModules/" + myParModule.ModuleConfiguration.DesktopModule.FolderName + "/module.css"); + cssFiles.Add("~" + _portalSettings.HomeDirectory + "portal.css"); - var resolvedCssFiles = cssFiles.Where(cssFile => File.Exists(this.MapPathSecure(cssFile))).Select(Globals.ResolveUrl).ToList(); + var resolvedCssFiles = cssFiles.Where(cssFile => File.Exists(MapPathSecure(cssFile))).Select(Globals.ResolveUrl).ToList(); - if (!string.IsNullOrEmpty(this.currentSettings.Config.ContentsCss)) + if (!string.IsNullOrEmpty(currentSettings.Config.ContentsCss)) { - var customCss = Globals.ResolveUrl(this.ReFormatURL(this.currentSettings.Config.ContentsCss)); + var customCss = Globals.ResolveUrl(ReFormatURL(currentSettings.Config.ContentsCss)); resolvedCssFiles.Add(customCss); } var serializer = new JavaScriptSerializer(); - this._settings["contentsCss"] = serializer.Serialize(resolvedCssFiles); + _settings["contentsCss"] = serializer.Serialize(resolvedCssFiles); - if (!string.IsNullOrEmpty(this.currentSettings.Config.Templates_Files)) + if (!string.IsNullOrEmpty(currentSettings.Config.Templates_Files)) { - var templateUrl = this.FormatUrl(this.currentSettings.Config.Templates_Files); + var templateUrl = FormatUrl(currentSettings.Config.Templates_Files); - this._settings["templates_files"] = string.Format( + _settings["templates_files"] = string.Format( "[ '{0}' ]", templateUrl.EndsWith(".xml") ? string.Format("xml:{0}", templateUrl) : templateUrl); } - if (!string.IsNullOrEmpty(this.toolBarNameOverride)) + if (!string.IsNullOrEmpty(toolBarNameOverride)) { - this._settings["toolbar"] = this.toolBarNameOverride; + _settings["toolbar"] = toolBarNameOverride; } else { - var toolbarName = this.SetUserToolbar(this._settings["configFolder"]); + var toolbarName = SetUserToolbar(_settings["configFolder"]); - var listToolbarSets = ToolbarUtil.GetToolbars(this._portalSettings.HomeDirectoryMapPath, this._settings["configFolder"]); + var listToolbarSets = ToolbarUtil.GetToolbars(_portalSettings.HomeDirectoryMapPath, _settings["configFolder"]); var toolbarSet = listToolbarSets.FirstOrDefault(toolbar => toolbar.Name.Equals(toolbarName)); var toolbarSetString = ToolbarUtil.ConvertToolbarSetToString(toolbarSet, true); - this._settings["toolbar"] = string.Format( + _settings["toolbar"] = string.Format( "[{0}]", toolbarSetString); } // Editor Width - if (!string.IsNullOrEmpty(this.currentSettings.Config.Width)) + if (!string.IsNullOrEmpty(currentSettings.Config.Width)) { - this._settings["width"] = this.currentSettings.Config.Width; + _settings["width"] = currentSettings.Config.Width; } else { - if (this.Width.Value > 0) + if (Width.Value > 0) { - this._settings["width"] = this.Width.ToString(); + _settings["width"] = Width.ToString(); } } // Editor Height - if (!string.IsNullOrEmpty(this.currentSettings.Config.Height)) + if (!string.IsNullOrEmpty(currentSettings.Config.Height)) { - this._settings["height"] = this.currentSettings.Config.Height; + _settings["height"] = currentSettings.Config.Height; } else { - if (this.Height.Value > 0) + if (Height.Value > 0) { - this._settings["height"] = this.Height.ToString(); + _settings["height"] = Height.ToString(); } } - if (!string.IsNullOrEmpty(this._settings["extraPlugins"]) - && this._settings["extraPlugins"].Contains("xmlstyles")) + if (!string.IsNullOrEmpty(_settings["extraPlugins"]) + && _settings["extraPlugins"].Contains("xmlstyles")) { - this._settings["extraPlugins"] = this._settings["extraPlugins"].Replace(",xmlstyles", string.Empty); + _settings["extraPlugins"] = _settings["extraPlugins"].Replace(",xmlstyles", string.Empty); } // fix oEmbed/oembed issue and other bad settings - if (!string.IsNullOrEmpty(this._settings["extraPlugins"]) - && this._settings["extraPlugins"].Contains("oEmbed")) + if (!string.IsNullOrEmpty(_settings["extraPlugins"]) + && _settings["extraPlugins"].Contains("oEmbed")) { - this._settings["extraPlugins"] = this._settings["extraPlugins"].Replace("oEmbed", "oembed"); + _settings["extraPlugins"] = _settings["extraPlugins"].Replace("oEmbed", "oembed"); } - if (this._settings["PasteFromWordCleanupFile"] != null - && this._settings["PasteFromWordCleanupFile"].Equals("default")) + if (_settings["PasteFromWordCleanupFile"] != null + && _settings["PasteFromWordCleanupFile"].Equals("default")) { - this._settings["PasteFromWordCleanupFile"] = string.Empty; + _settings["PasteFromWordCleanupFile"] = string.Empty; } - if (this._settings["menu_groups"] != null - && this._settings["menu_groups"].Equals("clipboard,table,anchor,link,image")) + if (_settings["menu_groups"] != null + && _settings["menu_groups"].Equals("clipboard,table,anchor,link,image")) { - this._settings["menu_groups"] = + _settings["menu_groups"] = "clipboard,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div"; } // Inject maxFileSize - this._settings["maxFileSize"] = Utility.GetMaxUploadSize().ToString(); + _settings["maxFileSize"] = Utility.GetMaxUploadSize().ToString(); - HttpContext.Current.Session["CKDNNtabid"] = this._portalSettings.ActiveTab.TabID; - HttpContext.Current.Session["CKDNNporid"] = this._portalSettings.PortalId; + HttpContext.Current.Session["CKDNNtabid"] = _portalSettings.ActiveTab.TabID; + HttpContext.Current.Session["CKDNNporid"] = _portalSettings.PortalId; // Add FileBrowser - switch (this.currentSettings.BrowserMode) + switch (currentSettings.BrowserMode) { - case Browser.StandardBrowser: + case BrowserType.StandardBrowser: { - this._settings["filebrowserBrowseUrl"] = + _settings["filebrowserBrowseUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/Browser/Browser.aspx?Type=Link&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId, - this.parentModulId, - this.ID, - this.currentSettings.SettingMode, + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx?Type=Link&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId, + parentModulId, + ID, + currentSettings.SettingMode, CultureInfo.CurrentCulture.Name)); - this._settings["filebrowserImageBrowseUrl"] = + _settings["filebrowserImageBrowseUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/Browser/Browser.aspx?Type=Image&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId, - this.parentModulId, - this.ID, - this.currentSettings.SettingMode, + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx?Type=Image&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId, + parentModulId, + ID, + currentSettings.SettingMode, CultureInfo.CurrentCulture.Name)); - this._settings["filebrowserFlashBrowseUrl"] = + _settings["filebrowserFlashBrowseUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/Browser/Browser.aspx?Type=Flash&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId, - this.parentModulId, - this.ID, - this.currentSettings.SettingMode, + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx?Type=Flash&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId, + parentModulId, + ID, + currentSettings.SettingMode, CultureInfo.CurrentCulture.Name)); - if (Utility.CheckIfUserHasFolderWriteAccess(this.currentSettings.UploadDirId, this._portalSettings)) + if (Utility.CheckIfUserHasFolderWriteAccess(currentSettings.UploadDirId, _portalSettings)) { - this._settings["filebrowserUploadUrl"] = + _settings["filebrowserUploadUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/Browser/Browser.aspx?Command=FileUpload&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId, - this.parentModulId, - this.ID, - this.currentSettings.SettingMode, + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx?Command=FileUpload&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId, + parentModulId, + ID, + currentSettings.SettingMode, CultureInfo.CurrentCulture.Name)); - this._settings["filebrowserFlashUploadUrl"] = + _settings["filebrowserFlashUploadUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/Browser/Browser.aspx?Command=FlashUpload&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId, - this.parentModulId, - this.ID, - this.currentSettings.SettingMode, + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx?Command=FlashUpload&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId, + parentModulId, + ID, + currentSettings.SettingMode, CultureInfo.CurrentCulture.Name)); - this._settings["filebrowserImageUploadUrl"] = + _settings["filebrowserImageUploadUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/Browser/Browser.aspx?Command=ImageUpload&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId, - this.parentModulId, - this.ID, - this.currentSettings.SettingMode, + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/Browser/Browser.aspx?Command=ImageUpload&tabid={0}&PortalID={1}&mid={2}&ckid={3}&mode={4}&lang={5}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId, + parentModulId, + ID, + currentSettings.SettingMode, CultureInfo.CurrentCulture.Name)); } - this._settings["filebrowserWindowWidth"] = "870"; - this._settings["filebrowserWindowHeight"] = "800"; + _settings["filebrowserWindowWidth"] = "870"; + _settings["filebrowserWindowHeight"] = "800"; // Set Browser Authorize - const bool CKDNNIsAuthorized = true; + const bool isAuthorized = true; - HttpContext.Current.Session["CKDNNIsAuthorized"] = CKDNNIsAuthorized; + HttpContext.Current.Session["CKE_DNNIsAuthorized"] = isAuthorized; - DataCache.SetCache("CKDNNIsAuthorized", CKDNNIsAuthorized); + DataCache.SetCache("CKE_DNNIsAuthorized", isAuthorized); } break; - case Browser.CKFinder: + case BrowserType.CKFinder: { - this._settings["filebrowserBrowseUrl"] = + _settings["filebrowserBrowseUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/ckfinder/ckfinder.html?tabid={0}&PortalID={1}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId)); - this._settings["filebrowserImageBrowseUrl"] = + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/ckfinder.html?tabid={0}&PortalID={1}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId)); + _settings["filebrowserImageBrowseUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/ckfinder/ckfinder.html?type=Images&tabid={0}&PortalID={1}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId)); - this._settings["filebrowserFlashBrowseUrl"] = + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/ckfinder.html?type=Images&tabid={0}&PortalID={1}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId)); + _settings["filebrowserFlashBrowseUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/ckfinder/ckfinder.html?type=Flash&tabid={0}&PortalID={1}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId)); + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/ckfinder.html?type=Flash&tabid={0}&PortalID={1}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId)); - if (Utility.CheckIfUserHasFolderWriteAccess(this.currentSettings.UploadDirId, this._portalSettings)) + if (Utility.CheckIfUserHasFolderWriteAccess(currentSettings.UploadDirId, _portalSettings)) { - this._settings["filebrowserUploadUrl"] = + _settings["filebrowserUploadUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/ckfinder/core/connector/aspx/connector.aspx?command=QuickUpload&type=Files&tabid={0}&PortalID={1}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId)); - this._settings["filebrowserFlashUploadUrl"] = + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/core/connector/aspx/connector.aspx?command=QuickUpload&type=Files&tabid={0}&PortalID={1}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId)); + _settings["filebrowserFlashUploadUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/ckfinder/core/connector/aspx/connector.aspx?command=QuickUpload&type=Flash&tabid={0}&PortalID={1}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId)); - this._settings["filebrowserImageUploadUrl"] = + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/core/connector/aspx/connector.aspx?command=QuickUpload&type=Flash&tabid={0}&PortalID={1}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId)); + _settings["filebrowserImageUploadUrl"] = Globals.ResolveUrl( string.Format( - "~/Providers/HtmlEditorProviders/CKEditor/ckfinder/core/connector/aspx/connector.aspx?command=QuickUpload&type=Images&tabid={0}&PortalID={1}", - this._portalSettings.ActiveTab.TabID, - this._portalSettings.PortalId)); + "~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/core/connector/aspx/connector.aspx?command=QuickUpload&type=Images&tabid={0}&PortalID={1}", + _portalSettings.ActiveTab.TabID, + _portalSettings.PortalId)); } - HttpContext.Current.Session["CKDNNSubDirs"] = this.currentSettings.SubDirs; + HttpContext.Current.Session["CKDNNSubDirs"] = currentSettings.SubDirs; - HttpContext.Current.Session["CKDNNRootDirId"] = this.currentSettings.BrowserRootDirId; - HttpContext.Current.Session["CKDNNUpDirId"] = this.currentSettings.UploadDirId; + HttpContext.Current.Session["CKDNNRootDirId"] = currentSettings.BrowserRootDirId; + HttpContext.Current.Session["CKDNNUpDirId"] = currentSettings.UploadDirId; // Set Browser Authorize - const bool CKDNNIsAuthorized = true; + const bool isAuthorized = true; - HttpContext.Current.Session["CKDNNIsAuthorized"] = CKDNNIsAuthorized; + HttpContext.Current.Session["CKE_DNNIsAuthorized"] = isAuthorized; - DataCache.SetCache("CKDNNIsAuthorized", CKDNNIsAuthorized); + DataCache.SetCache("CKE_DNNIsAuthorized", isAuthorized); } break; } - this.isMerged = true; + isMerged = true; - return this._settings; + return _settings; } } @@ -612,15 +592,15 @@ private string ReFormatURL(string inputUrl) return inputUrl; } - return string.Format("FileID={0}", Utility.ConvertFilePathToFileId(inputUrl, this._portalSettings.PortalId)); + return string.Format("FileID={0}", Utility.ConvertFilePathToFileId(inputUrl, _portalSettings.PortalId)); } /// Gets the container source. /// The container source path private string GetContainerSource() { - var containerSource = this._portalSettings.ActiveTab.ContainerSrc ?? this._portalSettings.DefaultPortalContainer; - containerSource = this.ResolveSourcePath(containerSource); + var containerSource = _portalSettings.ActiveTab.ContainerSrc ?? _portalSettings.DefaultPortalContainer; + containerSource = ResolveSourcePath(containerSource); return containerSource; } @@ -628,8 +608,8 @@ private string GetContainerSource() /// The skin source path private string GetSkinSource() { - var skinSource = this._portalSettings.ActiveTab.SkinSrc ?? this._portalSettings.DefaultPortalSkin; - skinSource = this.ResolveSourcePath(skinSource); + var skinSource = _portalSettings.ActiveTab.SkinSrc ?? _portalSettings.DefaultPortalSkin; + skinSource = ResolveSourcePath(skinSource); return skinSource; } @@ -650,12 +630,12 @@ public string ToolBarName // EL 20101006 get { - return this.toolBarNameOverride; + return toolBarNameOverride; } set { - this.toolBarNameOverride = value; + toolBarNameOverride = value; } } @@ -667,14 +647,14 @@ public string Value { get { - object o = this.ViewState["Value"]; + object o = ViewState["Value"]; return o == null ? string.Empty : Convert.ToString(o); } set { - this.ViewState["Value"] = value; + ViewState["Value"] = value; } } @@ -694,7 +674,7 @@ private static bool HasMsAjax var appAssemblies = AppDomain.CurrentDomain.GetAssemblies(); - foreach (Assembly asm in + foreach (System.Reflection.Assembly asm in appAssemblies.Where(asm => asm.ManifestModule.Name == "System.Web.Extensions.dll")) { try @@ -727,7 +707,7 @@ private static string SResXFile { return Globals.ResolveUrl( - string.Format("~/Providers/HtmlEditorProviders/CKEditor/{0}/Options.aspx.resx", Localization.LocalResourceDirectory)); + string.Format("~/Providers/HtmlEditorProviders/DNNConnect.CKE/{0}/Options.aspx.resx", Localization.LocalResourceDirectory)); } } @@ -787,12 +767,12 @@ public static Control FindModuleInstance(Control editorControl) /// public bool HasRenderedTextArea(Control control) { - if (control is CKEditorControl && ((CKEditorControl)control).IsRendered) + if (control is EditorControl && ((EditorControl)control).IsRendered) { return true; } - return control.Controls.Cast().Any(this.HasRenderedTextArea); + return control.Controls.Cast().Any(HasRenderedTextArea); } #endregion @@ -817,12 +797,12 @@ public bool LoadPostData(string postDataKey, NameValueCollection postCollection) { try { - string currentValue = this.Value; + string currentValue = Value; string postedValue = postCollection[postDataKey]; if (currentValue == null | !postedValue.Equals(currentValue)) { - if (this.currentSettings.InjectSyntaxJs) + if (currentSettings.InjectSyntaxJs) { if (postedValue.Contains("
    {1}",
-                                    Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/"),
+                                    Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/"),
                                     postedValue);
                         }
 
@@ -844,7 +824,7 @@ public bool LoadPostData(string postDataKey, NameValueCollection postCollection)
                         }
                     }
 
-                    this.Value = postedValue;
+                    Value = postedValue;
 
                     return true;
                 }
@@ -885,9 +865,9 @@ protected override void OnPreRender(EventArgs e)
                 return;
             }
 
-            this.RegisterCKEditorLibrary();
+            RegisterCKEditorLibrary();
 
-            this.GenerateEditorLoadScript();
+            GenerateEditorLoadScript();
         }
 
         /// 
@@ -908,19 +888,19 @@ protected override void Render(HtmlTextWriter outWriter)
 
             outWriter.Write(
                 "",
-                this._portalSettings.PortalId);
+                _portalSettings.PortalId);
 
             outWriter.Write(outWriter.NewLine);
 
-            var styleWidth = !string.IsNullOrEmpty(this.currentSettings.Config.Width)
-                                 ? string.Format(" style=\"width:{0};\"", this.currentSettings.Config.Width)
+            var styleWidth = !string.IsNullOrEmpty(currentSettings.Config.Width)
+                                 ? string.Format(" style=\"width:{0};\"", currentSettings.Config.Width)
                                  : string.Empty;
 
             outWriter.Write("", styleWidth);
 
             // Write text area
-            outWriter.AddAttribute("id", this.ClientID.Replace("-", string.Empty).Replace(".", string.Empty));
-            outWriter.AddAttribute("name", this.UniqueID);
+            outWriter.AddAttribute("id", ClientID.Replace("-", string.Empty).Replace(".", string.Empty));
+            outWriter.AddAttribute("name", UniqueID);
 
             outWriter.AddAttribute("cols", "80");
             outWriter.AddAttribute("rows", "10");
@@ -931,47 +911,47 @@ protected override void Render(HtmlTextWriter outWriter)
 
             outWriter.RenderBeginTag("textarea");
 
-            if (string.IsNullOrEmpty(this.Value))
+            if (string.IsNullOrEmpty(Value))
             {
-                if (!string.IsNullOrEmpty(this.currentSettings.BlankText))
+                if (!string.IsNullOrEmpty(currentSettings.BlankText))
                 {
-                    outWriter.Write(this.Context.Server.HtmlEncode(this.currentSettings.BlankText));
+                    outWriter.Write(Context.Server.HtmlEncode(currentSettings.BlankText));
                 }
             }
             else
             {
-                outWriter.Write(this.Context.Server.HtmlEncode(this.Value));
+                outWriter.Write(Context.Server.HtmlEncode(Value));
             }
 
             outWriter.RenderEndTag();
 
             outWriter.Write("");
 
-            this.IsRendered = true;
+            IsRendered = true;
 
             /////////////////
 
-            if (!this.HasRenderedTextArea(this.Page))
+            if (!HasRenderedTextArea(Page))
             {
                 return;
             }
 
             outWriter.Write("
    ");
 
-            if (PortalSecurity.IsInRoles(this._portalSettings.AdministratorRoleName))
+            if (PortalSecurity.IsInRoles(_portalSettings.AdministratorRoleName))
             {
                 var editorUrl = Globals.NavigateURL(
                     "CKEditorOptions",
-                    "ModuleId=" + this.parentModulId,
-                    "minc=" + this.ID,
-                    "PortalID=" + this._portalSettings.PortalId,
+                    "ModuleId=" + parentModulId,
+                    "minc=" + ID,
+                    "PortalID=" + _portalSettings.PortalId,
                     "langCode=" + CultureInfo.CurrentCulture.Name,
                     "popUp=true");
 
                 outWriter.Write(
                     "{2}",
                     HttpUtility.HtmlAttributeEncode(HttpUtility.JavaScriptStringEncode(editorUrl, true)),
-                    string.Format("{0}_ckoptions", this.ClientID.Replace("-", string.Empty).Replace(".", string.Empty)),
+                    string.Format("{0}_ckoptions", ClientID.Replace("-", string.Empty).Replace(".", string.Empty)),
                     Localization.GetString("Options.Text", SResXFile));
             }
 
@@ -985,50 +965,50 @@ protected override void Render(HtmlTextWriter outWriter)
         /// The  instance containing the event data.
         private void CKEditorInit(object sender, EventArgs e)
         {
-            if (this.Page != null)
+            if (Page != null)
             {
-                this.Page.RegisterRequiresPostBack(this); // Ensures that postback is handled
+                Page.RegisterRequiresPostBack(this); // Ensures that postback is handled
             }
 
-            this.myParModule = (PortalModuleBase)FindModuleInstance(this);
+            myParModule = (PortalModuleBase)FindModuleInstance(this);
 
-            if (this.myParModule == null || this.myParModule.ModuleId == -1)
+            if (myParModule == null || myParModule.ModuleId == -1)
             {
                 // Get Parent ModuleID From this ClientID
-                string sClientId = this.ClientID.Substring(this.ClientID.IndexOf("ctr") + 3);
+                string sClientId = ClientID.Substring(ClientID.IndexOf("ctr") + 3);
 
-                sClientId = sClientId.Remove(this.ClientID.IndexOf("_"));
+                sClientId = sClientId.Remove(ClientID.IndexOf("_"));
 
                 try
                 {
-                    this.parentModulId = int.Parse(sClientId);
+                    parentModulId = int.Parse(sClientId);
                 }
                 catch (Exception)
                 {
                     // The is no real module, then use the "User Accounts" module (Profile editor)
                     ModuleController db = new ModuleController();
-                    ModuleInfo objm = db.GetModuleByDefinition(this._portalSettings.PortalId, "User Accounts");
+                    ModuleInfo objm = db.GetModuleByDefinition(_portalSettings.PortalId, "User Accounts");
 
-                    this.parentModulId = objm.TabModuleID;
+                    parentModulId = objm.TabModuleID;
                 }
             }
             else
             {
-                this.parentModulId = this.myParModule.ModuleId;
+                parentModulId = myParModule.ModuleId;
             }
 
-            this.CheckFileBrowser();
+            CheckFileBrowser();
 
-            this.LoadAllSettings();
+            LoadAllSettings();
 
             if (!HasMsAjax)
             {
                 return;
             }
 
-            this.RegisterCKEditorLibrary();
+            RegisterCKEditorLibrary();
 
-            this.GenerateEditorLoadScript();
+            GenerateEditorLoadScript();
         }
 
         /// 
    
@@ -1047,13 +1027,13 @@ private void CheckFileBrowser()
             switch (objProvider.Attributes["ck_browser"])
             {
                 case "ckfinder":
-                    this.currentSettings.BrowserMode = Browser.CKFinder;
+                    currentSettings.BrowserMode = BrowserType.CKFinder;
                     break;
                 case "standard":
-                    this.currentSettings.BrowserMode = Browser.StandardBrowser;
+                    currentSettings.BrowserMode = BrowserType.StandardBrowser;
                     break;
                 case "none":
-                    this.currentSettings.BrowserMode = Browser.None;
+                    currentSettings.BrowserMode = BrowserType.None;
                     break;
             }
         }
@@ -1063,57 +1043,57 @@ private void CheckFileBrowser()
         /// 
         private void LoadAllSettings()
         {
-            var settingsDictionary = Utility.GetEditorHostSettings();
-            var portalRoles = new RoleController().GetPortalRoles(this._portalSettings.PortalId);
+            var settingsDictionary = EditorController.GetEditorHostSettings();
+            var portalRoles = new RoleController().GetPortalRoles(_portalSettings.PortalId);
 
             // Load Default Settings
-            this.currentSettings = SettingsUtil.GetDefaultSettings(
-                this._portalSettings,
-                this._portalSettings.HomeDirectoryMapPath,
-                this._settings["configFolder"],
+            currentSettings = SettingsUtil.GetDefaultSettings(
+                _portalSettings,
+                _portalSettings.HomeDirectoryMapPath,
+                _settings["configFolder"],
                 portalRoles);
 
             // Set Current Mode to Default
-            this.currentSettings.SettingMode = SettingsMode.Default;
+            currentSettings.SettingMode = SettingsMode.Default;
 
-            var portalKey = string.Format("DNNCKP#{0}#", this._portalSettings.PortalId);
-            var pageKey = string.Format("DNNCKT#{0}#", this._portalSettings.ActiveTab.TabID);
-            var moduleKey = string.Format("DNNCKMI#{0}#INS#{1}#", this.parentModulId, this.ID);
+            var portalKey = string.Format("DNNCKP#{0}#", _portalSettings.PortalId);
+            var pageKey = string.Format("DNNCKT#{0}#", _portalSettings.ActiveTab.TabID);
+            var moduleKey = string.Format("DNNCKMI#{0}#INS#{1}#", parentModulId, ID);
 
             // Load Portal Settings ?!
             if (SettingsUtil.CheckExistsPortalOrPageSettings(settingsDictionary, portalKey))
             {
-               /* throw new ApplicationException(settingsDictionary.FirstOrDefault(
-                            setting => setting.Name.Equals(string.Format("{0}{1}", portalKey, "StartupMode"))).Value);*/
+                /* throw new ApplicationException(settingsDictionary.FirstOrDefault(
+                             setting => setting.Name.Equals(string.Format("{0}{1}", portalKey, "StartupMode"))).Value);*/
 
-                this.currentSettings = SettingsUtil.LoadPortalOrPageSettings(
-                    this._portalSettings, this.currentSettings, settingsDictionary, portalKey, portalRoles);
+                currentSettings = SettingsUtil.LoadPortalOrPageSettings(
+                    _portalSettings, currentSettings, settingsDictionary, portalKey, portalRoles);
 
                 // Set Current Mode to Portal
-                this.currentSettings.SettingMode = SettingsMode.Portal;
+                currentSettings.SettingMode = SettingsMode.Portal;
             }
 
             // Load Page Settings ?!
             if (SettingsUtil.CheckExistsPortalOrPageSettings(settingsDictionary, pageKey))
             {
-                this.currentSettings = SettingsUtil.LoadPortalOrPageSettings(
-                    this._portalSettings, this.currentSettings, settingsDictionary, pageKey, portalRoles);
+                currentSettings = SettingsUtil.LoadPortalOrPageSettings(
+                    _portalSettings, currentSettings, settingsDictionary, pageKey, portalRoles);
 
                 // Set Current Mode to Page
-                this.currentSettings.SettingMode = SettingsMode.Page;
+                currentSettings.SettingMode = SettingsMode.Page;
             }
 
             // Load Module Settings ?!
-            if (!SettingsUtil.CheckExistsModuleInstanceSettings(moduleKey, this.parentModulId))
+            if (!SettingsUtil.CheckExistsModuleInstanceSettings(moduleKey, parentModulId))
             {
                 return;
             }
 
-            this.currentSettings = SettingsUtil.LoadModuleSettings(
-                this._portalSettings, this.currentSettings, moduleKey, this.parentModulId, portalRoles);
+            currentSettings = SettingsUtil.LoadModuleSettings(
+                _portalSettings, currentSettings, moduleKey, parentModulId, portalRoles);
 
             // Set Current Mode to Module Instance
-            this.currentSettings.SettingMode = SettingsMode.ModuleInstance;
+            currentSettings.SettingMode = SettingsMode.ModuleInstance;
         }
 
         /// 
@@ -1142,11 +1122,11 @@ private string FormatUrl(string sInputUrl)
             {
                 int iFileId = int.Parse(sInputUrl.Substring(7));
 
-               // FileController objFileController = new FileController();
-               var objFileInfo = FileManager.Instance.GetFile(iFileId);
+                // FileController objFileController = new FileController();
+                var objFileInfo = FileManager.Instance.GetFile(iFileId);
 
                 // FileInfo objFileInfo = objFileController.GetFileById(iFileId, this._portalSettings.PortalId);
-                sImageUrl = this._portalSettings.HomeDirectory + objFileInfo.Folder + objFileInfo.FileName;
+                sImageUrl = _portalSettings.HomeDirectory + objFileInfo.Folder + objFileInfo.FileName;
             }
 
             return sImageUrl;
@@ -1157,7 +1137,7 @@ private string FormatUrl(string sInputUrl)
         /// 
         private void LoadConfigSettings()
         {
-            this._settings = new NameValueCollection();
+            _settings = new NameValueCollection();
 
             var providerConfiguration = ProviderConfiguration.GetProviderConfiguration(ProviderType);
             var objProvider = (Provider)providerConfiguration.Providers[providerConfiguration.DefaultProvider];
@@ -1178,7 +1158,7 @@ private void LoadConfigSettings()
 
                 if (sAdjustedKey != string.Empty)
                 {
-                    this._settings[sAdjustedKey] = objProvider.Attributes[key];
+                    _settings[sAdjustedKey] = objProvider.Attributes[key];
                 }
             }
         }
@@ -1199,12 +1179,12 @@ private void RegisterStartupScript(string key, string script, bool addScriptTags
         {
             if (HasMsAjax)
             {
-                ScriptManager.RegisterStartupScript(this, this.GetType(), key, script, addScriptTags);
+                ScriptManager.RegisterStartupScript(this, GetType(), key, script, addScriptTags);
             }
             else
             {
-                this.Page.ClientScript.RegisterStartupScript(this.GetType(), key, script, true);
-            } 
+                Page.ClientScript.RegisterStartupScript(GetType(), key, script, true);
+            }
         }
 
         /// 
@@ -1239,18 +1219,18 @@ private string SetUserToolbar(string alternateConfigSubFolder)
             string toolbarName = HttpContext.Current.Request.IsAuthenticated ? "Full" : "Basic";
 
             var listToolbarSets = ToolbarUtil.GetToolbars(
-                this._portalSettings.HomeDirectoryMapPath, alternateConfigSubFolder);
+                _portalSettings.HomeDirectoryMapPath, alternateConfigSubFolder);
 
             var listUserToolbarSets = new List();
 
             var roleController = new RoleController();
 
-            if (this.currentSettings.ToolBarRoles.Count <= 0)
+            if (currentSettings.ToolBarRoles.Count <= 0)
             {
                 return toolbarName;
             }
 
-            foreach (var roleToolbar in this.currentSettings.ToolBarRoles)
+            foreach (var roleToolbar in currentSettings.ToolBarRoles)
             {
                 if (roleToolbar.RoleId.Equals(-1) && !HttpContext.Current.Request.IsAuthenticated)
                 {
@@ -1263,7 +1243,7 @@ private string SetUserToolbar(string alternateConfigSubFolder)
                 }
 
                 // Role
-                var role = roleController.GetRole(roleToolbar.RoleId, this._portalSettings.PortalId);
+                var role = roleController.GetRole(roleToolbar.RoleId, _portalSettings.PortalId);
 
                 if (role == null)
                 {
@@ -1311,12 +1291,12 @@ private string SetUserToolbar(string alternateConfigSubFolder)
         private void RegisterCKEditorLibrary()
         {
             ClientResourceManager.RegisterStyleSheet(
-                this.Page,
-                Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/editor.css"));
+                Page,
+                Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/editor.css"));
 
-            ClientScriptManager cs = this.Page.ClientScript;
+            ClientScriptManager cs = Page.ClientScript;
 
-            Type csType = this.GetType();
+            Type csType = GetType();
 
             const string CsName = "CKEdScript";
             const string CsAdaptName = "CKAdaptScript";
@@ -1332,44 +1312,44 @@ private void RegisterCKEditorLibrary()
                     this, csType, "jquery_registered", "//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js");
             }
 
-            if (File.Exists(this.Context.Server.MapPath("~/Providers/HtmlEditorProviders/CKEditor/ckeditor.js"))
+            if (File.Exists(Context.Server.MapPath("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/ckeditor.js"))
                 && !cs.IsClientScriptIncludeRegistered(csType, CsName))
             {
                 cs.RegisterClientScriptInclude(
-                    csType, CsName, Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/ckeditor.js"));
+                    csType, CsName, Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/CKEditor/ckeditor.js"));
             }
 
             if (
                 File.Exists(
-                    this.Context.Server.MapPath(
-                        "~/Providers/HtmlEditorProviders/CKEditor/js/jquery.ckeditor.adapter.js"))
+                    Context.Server.MapPath(
+						"~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/jquery.ckeditor.adapter.js"))
                 && !cs.IsClientScriptIncludeRegistered(csType, CsAdaptName))
             {
                 cs.RegisterClientScriptInclude(
                     csType,
                     CsAdaptName,
-                    Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/js/jquery.ckeditor.adapter.js"));
+                    Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/js/jquery.ckeditor.adapter.js"));
             }
 
             if (
                 File.Exists(
-                    this.Context.Server.MapPath("~/Providers/HtmlEditorProviders/CKEditor/ckfinder/ckfinder.js")) &&
-                !cs.IsClientScriptIncludeRegistered(csType, CsFindName) && this.currentSettings.BrowserMode.Equals(Browser.CKFinder))
+                    Context.Server.MapPath("~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/ckfinder.js")) &&
+                !cs.IsClientScriptIncludeRegistered(csType, CsFindName) && currentSettings.BrowserMode.Equals(BrowserType.CKFinder))
             {
                 cs.RegisterClientScriptInclude(
                     csType,
                     CsFindName,
-                    Globals.ResolveUrl("~/Providers/HtmlEditorProviders/CKEditor/ckfinder/ckfinder.js"));
+                    Globals.ResolveUrl("~/Providers/HtmlEditorProviders/DNNConnect.CKE/ckfinder/ckfinder.js"));
             }
 
             // Load Custom JS File
-            if (!string.IsNullOrEmpty(this.currentSettings.CustomJsFile)
+            if (!string.IsNullOrEmpty(currentSettings.CustomJsFile)
                 && !cs.IsClientScriptIncludeRegistered(csType, "CKCustomJSFile"))
             {
                 cs.RegisterClientScriptInclude(
                     csType,
                     "CKCustomJSFile",
-                    this.FormatUrl(this.currentSettings.CustomJsFile)); 
+                    FormatUrl(currentSettings.CustomJsFile));
             }
         }
 
@@ -1380,10 +1360,10 @@ private void GenerateEditorLoadScript()
         {
             var editorVar = string.Format(
                 "editor{0}",
-                this.ClientID.Substring(this.ClientID.LastIndexOf("_", StringComparison.Ordinal) + 1).Replace(
+                ClientID.Substring(ClientID.LastIndexOf("_", StringComparison.Ordinal) + 1).Replace(
                     "-", string.Empty));
 
-            var editorFixedId = this.ClientID.Replace("-", string.Empty).Replace(".", string.Empty);
+            var editorFixedId = ClientID.Replace("-", string.Empty).Replace(".", string.Empty);
 
             if (HasMsAjax)
             {
@@ -1392,8 +1372,8 @@ private void GenerateEditorLoadScript()
                         @"if (CKEDITOR && CKEDITOR.instances && CKEDITOR.instances.{0}) {{ CKEDITOR.instances.{0}.updateElement(); CKEDITOR.instances.{0}.destroy(); }}",
                         editorFixedId);
 
-                this.RegisterOnSubmitStatement(
-                    this.GetType(), string.Format("CKEditor_OnAjaxSubmit_{0}", editorFixedId), postBackScript);
+                RegisterOnSubmitStatement(
+                    GetType(), string.Format("CKEditor_OnAjaxSubmit_{0}", editorFixedId), postBackScript);
             }
 
             var editorScript = new StringBuilder();
@@ -1415,13 +1395,13 @@ private void GenerateEditorLoadScript()
             var test = new StringBuilder();
             test.AppendFormat("var editorConfig{0} = {{", editorVar);
 
-            var keysCount = this.Settings.Keys.Count;
+            var keysCount = Settings.Keys.Count;
             var currentCount = 0;
 
             // Write options
-            foreach (string key in this.Settings.Keys)
+            foreach (string key in Settings.Keys)
             {
-                var value = this.Settings[key];
+                var value = Settings[key];
 
                 currentCount++;
 
@@ -1437,7 +1417,7 @@ private void GenerateEditorLoadScript()
                     else if (value.Equals("False"))
                     {
                         value = "false";
-                    } 
+                    }
 
                     test.AppendFormat("{0}:{1}", key, value);
 
@@ -1460,7 +1440,7 @@ private void GenerateEditorLoadScript()
             editorScript.AppendFormat(
                 "if (CKEDITOR.instances.{0}){{return;}}",
                 editorFixedId);
-            
+
             // Check if we can use jQuery or $, and if both fail use ckeditor without the adapter
             editorScript.Append("if (jQuery().ckeditor) {");
 
@@ -1489,7 +1469,7 @@ private void GenerateEditorLoadScript()
             // End of LoadScript
             editorScript.Append("}");
 
-            this.RegisterStartupScript(string.Format(@"{0}_CKE_Startup", editorFixedId), editorScript.ToString(), true);
+            RegisterStartupScript(string.Format(@"{0}_CKE_Startup", editorFixedId), editorScript.ToString(), true);
         }
 
         #endregion
diff --git a/css/Options.css b/css/Options.css
index f8ab67c..2fdb4de 100644
--- a/css/Options.css
+++ b/css/Options.css
@@ -61,7 +61,7 @@ h1 {font-weight: bold;margin: 0;font-size:medium;font-family:Arial, Helvetica, s
 	opacity: 0.2
 }
 
-.LoadingContent h3 {background: url(../Images/loading.gif) no-repeat 102px 5px;height:20px}
+.LoadingContent h3 {background: url(../CKEditor/Images/loading.gif) no-repeat 102px 5px;height:20px}
 .LoadingMessage {text-align:center}
 
 /* Manager Module */