From 37a67a2a4625e9fbb504db0dd96919034eb9e75f Mon Sep 17 00:00:00 2001 From: Will Strohl Date: Thu, 17 Aug 2023 14:42:46 -0700 Subject: [PATCH 1/3] Updates to .NET 4.8, DNN 9.10, and new build scripts --- Modules/WillStrohl.Injection/Module.build | 8 +- .../Properties/AssemblyInfo.cs | 4 +- .../WillStrohl.Injection.dnn | 10 +- .../WillStrohl.Injection_Symbols.dnn | 6 +- .../WillStrohl.Modules.Injection.csproj | 528 +++++++-------- .../WillStrohl.Modules.Injection.xml | 610 +++++++++--------- Modules/WillStrohl.Injection/packages.config | 17 +- Modules/WillStrohl.Injection/releasenotes.txt | 83 ++- 8 files changed, 665 insertions(+), 601 deletions(-) diff --git a/Modules/WillStrohl.Injection/Module.build b/Modules/WillStrohl.Injection/Module.build index 8bd9ccd5..732945f3 100644 --- a/Modules/WillStrohl.Injection/Module.build +++ b/Modules/WillStrohl.Injection/Module.build @@ -22,11 +22,8 @@ - - - - + @@ -50,9 +47,6 @@ - - - diff --git a/Modules/WillStrohl.Injection/Properties/AssemblyInfo.cs b/Modules/WillStrohl.Injection/Properties/AssemblyInfo.cs index 0cd9a1c8..2dd2e90a 100644 --- a/Modules/WillStrohl.Injection/Properties/AssemblyInfo.cs +++ b/Modules/WillStrohl.Injection/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("03.00.00")] -[assembly: AssemblyFileVersion("03.00.00")] +[assembly: AssemblyVersion("03.01.00")] +[assembly: AssemblyFileVersion("03.01.00")] diff --git a/Modules/WillStrohl.Injection/WillStrohl.Injection.dnn b/Modules/WillStrohl.Injection/WillStrohl.Injection.dnn index 6df5895a..560161f8 100644 --- a/Modules/WillStrohl.Injection/WillStrohl.Injection.dnn +++ b/Modules/WillStrohl.Injection/WillStrohl.Injection.dnn @@ -1,6 +1,6 @@ - + Content Injection This is a content injection module, written by Upendo Ventures. Its purpose is to allow you to inject markup into the header, body, and footer of the page.

]]> @@ -9,14 +9,14 @@ Will Strohl Upendo Ventures, LLC - https://upendoventures.com + https://upendoventures.com/What/CMS/DNN/Extensions solutions@upendoventures.com true - 09.04.00 + 09.10.00 @@ -80,7 +80,7 @@ @@ -135,7 +135,7 @@ WillStrohl.Modules.Injection.dll - 03.00.00 + 03.01.00 bin diff --git a/Modules/WillStrohl.Injection/WillStrohl.Injection_Symbols.dnn b/Modules/WillStrohl.Injection/WillStrohl.Injection_Symbols.dnn index 5d50ae3f..964d3735 100644 --- a/Modules/WillStrohl.Injection/WillStrohl.Injection_Symbols.dnn +++ b/Modules/WillStrohl.Injection/WillStrohl.Injection_Symbols.dnn @@ -1,7 +1,7 @@ - + Content Injection Symbols This is a content injection module, written by Upendo Ventures. Its purpose is to allow you to inject markup into the header, body, and footer of the page.

]]> @@ -10,14 +10,14 @@ Will Strohl Upendo Ventures, LLC - https://upendoventures.com + https://upendoventures.com/What/CMS/DNN/Extensions solutions@upendoventures.com True - WillStrohl.Injection + WillStrohl.Injection diff --git a/Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.csproj b/Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.csproj index 8f0b6f53..604f4f82 100644 --- a/Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.csproj +++ b/Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.csproj @@ -1,253 +1,277 @@ - - - - {349c5851-65df-11da-9384-00065b846f21};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Local - 9.0.30729 - 2.0 - {35118921-95CD-4421-BB1A-1354DDEECEFB} - Debug - AnyCPU - - - WillStrohl.Modules.Injection - - None - JScript - Grid - IE50 - false - Library - Binary - On - On - - - - - Windows - 4.0 - - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - v4.7.2 - - false - - - - - - - - - bin\ - bin\WillStrohl.Modules.Injection.xml - 1581252608 - - - true - true - true - false - false - false - false - 1 - full - AllRules.ruleset - 1591 - false - - - bin\ - WillStrohl.Modules.Injection.xml - 1581252608 - - - false - true - false - true - false - false - false - 1 - 42016,42017,42018,42019,42032,42353,42354,42355 - none - AllRules.ruleset - false - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - ..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll - - - ..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll - - - False - ..\..\Website\bin\DotNetNuke.Web.Client.dll - False - - - ..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll - - - ..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll - - - - System - - - System.Data - - - - System.Web - - - - - - - System.XML - - - - - - Code - - - - - ASPXCodeBehind - - - EditInjections.ascx - ASPXCodeBehind - - - EditInjections.ascx - - - - - - - - - - - ViewInjection.ascx - ASPXCodeBehind - - - ViewInjection.ascx - - - - - - - - - - - - - - - - - - - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - - - - - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - - - - - + + + + {349c5851-65df-11da-9384-00065b846f21};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Local + 9.0.30729 + 2.0 + {35118921-95CD-4421-BB1A-1354DDEECEFB} + Debug + AnyCPU + + + WillStrohl.Modules.Injection + + None + JScript + Grid + IE50 + false + Library + Binary + On + On + + + + + Windows + 4.0 + + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + + + v4.8 + + false + + + + + + + + + bin\ + bin\WillStrohl.Modules.Injection.xml + 1581252608 + + + true + true + true + false + false + false + false + 1 + full + AllRules.ruleset + 1591 + false + + + bin\ + WillStrohl.Modules.Injection.xml + 1581252608 + + + false + true + false + true + false + false + false + 1 + 42016,42017,42018,42019,42032,42353,42354,42355 + none + AllRules.ruleset + false + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + + + + ..\..\packages\DotNetNuke.Core.9.10.0\lib\net45\DotNetNuke.dll + + + ..\..\packages\DotNetNuke.DependencyInjection.9.10.0\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll + + + ..\..\packages\DotNetNuke.Instrumentation.9.10.0\lib\net45\DotNetNuke.Instrumentation.dll + + + ..\..\packages\DotNetNuke.Instrumentation.9.10.0\lib\net45\DotNetNuke.log4net.dll + + + ..\..\packages\DotNetNuke.Web.9.10.0\lib\net45\DotNetNuke.Web.dll + + + ..\..\packages\DotNetNuke.Web.Client.9.10.0\lib\net45\DotNetNuke.Web.Client.dll + + + ..\..\packages\DotNetNuke.Web.9.10.0\lib\net45\DotNetNuke.WebUtility.dll + + + ..\..\packages\DotNetNuke.Core.9.10.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll + + + ..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll + + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + + System + + + System.Data + + + + + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + + + System.Web + + + + + + + ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll + + + System.XML + + + + + + Code + + + + + ASPXCodeBehind + + + EditInjections.ascx + ASPXCodeBehind + + + EditInjections.ascx + + + + + + + + + + + ViewInjection.ascx + ASPXCodeBehind + + + ViewInjection.ascx + + + + + + + + + + + + + + + + + + + + + False + .NET Framework 2.0 %28x86%29 + true + + + False + .NET Framework 3.0 %28x86%29 + false + + + False + .NET Framework 3.5 + false + + + + + + + + + + + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + + \ No newline at end of file diff --git a/Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.xml b/Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.xml index b00d0a60..e2e5aa57 100644 --- a/Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.xml +++ b/Modules/WillStrohl.Injection/WillStrohl.Modules.Injection.xml @@ -1,305 +1,305 @@ - - - - WillStrohl.Modules.Injection - - - - - pnlAddNew control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - hidInjectionId control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - vsAddNew control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lblName control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - txtName control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - rfvName control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - cvName control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lblType control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - radType control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lblEnabled control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - chkEnabled control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lblContent control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - txtContent control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - rfvContent control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - cvContent control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - divInject control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lblInject control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - radInject control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lblAudit control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - divAdvanced control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lblCrmPriority control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - txtCrmPriority control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - rvCrmPriority control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lblCrmProvider control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - ddlCrmProvider control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - cmdAdd control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - cmdDelete control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - cmdCancel control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - pnlManage control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lblNoRecords control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - dlInjection control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - lnkAddNewInjection control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - - cmdReturn control. - - - Auto-generated field. - To modify move field declaration from designer file to code-behind file. - - - - + + + + WillStrohl.Modules.Injection + + + + + pnlAddNew control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + hidInjectionId control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + vsAddNew control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lblName control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + txtName control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + rfvName control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + cvName control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lblType control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + radType control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lblEnabled control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + chkEnabled control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lblContent control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + txtContent control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + rfvContent control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + cvContent control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + divInject control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lblInject control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + radInject control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lblAudit control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + divAdvanced control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lblCrmPriority control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + txtCrmPriority control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + rvCrmPriority control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lblCrmProvider control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + ddlCrmProvider control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + cmdAdd control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + cmdDelete control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + cmdCancel control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + pnlManage control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lblNoRecords control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + dlInjection control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + lnkAddNewInjection control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + + cmdReturn control. + + + Auto-generated field. + To modify move field declaration from designer file to code-behind file. + + + + diff --git a/Modules/WillStrohl.Injection/packages.config b/Modules/WillStrohl.Injection/packages.config index af5e1af6..24866536 100644 --- a/Modules/WillStrohl.Injection/packages.config +++ b/Modules/WillStrohl.Injection/packages.config @@ -1,5 +1,14 @@ - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/Modules/WillStrohl.Injection/releasenotes.txt b/Modules/WillStrohl.Injection/releasenotes.txt index de458370..50fe5db1 100644 --- a/Modules/WillStrohl.Injection/releasenotes.txt +++ b/Modules/WillStrohl.Injection/releasenotes.txt @@ -4,31 +4,68 @@ .muy-importante { color:red;font-weight:bold; }
-

Version 03.00.00

+

Lightbox Gallery Module for DNN

+
+ +
+

The release notes continue after the Sponsors and Contributors below.

-

The release notes continue after the Sponsors and Code Contributors below.

+

Sponsors

+

Open-source is not free. We're so GRATEFUL for the following people/organizations for sponsoring developers to work on this release!

+

Sponsorship is Powered by GitHub Sponsors and ensures that this project lives and thrives. Please consider contributing any amount.

+

THANK YOU to the following rockstars!

+ -

Sponsors

-

Open-source is not free. We're so GRATEFUL for the following people/organizations for sponsoring developers to work on this release!

-

Sponsorship is Powered by GitHub Sponsors and ensures that this project lives and thrives. Please consider sponsoring any amount.

-

THANK YOU to the following rockstars!

- +

Contributors

+

THANK YOU to the following community members for participating in this release!

+ -

Code Contributors

-

THANK YOU to the following community members for participating in this release!

- +

Release Note Prefixes

+

The following prefixes are defined as:

+
    +
  • SI: Support Inquiry - This issue was reported by a support customer and, as such, was prioritized above all other tasks.
    • +
+
+ +

Version 03.01.00

+

Enhancements

+ +

Maintenence & Bug Fixes

+
    +
  • Updated the build scripts to work against the latest upendodnn generator build scripts.
    • + +
+
+ +

Version 03.00.00

+

Enhancements

+
    +
  • Increased minimum supported version to DNN 9.4.0, Thanks @WillStrohl!
    • +
  • Now generating and releasing a Symbols package, Thanks @WillStrohl!
    • +
+

Maintenence & Bug Fixes

+ +
+ +

For more information about this and previous releases of this module, visit the project website.

-

Date Released: 11/24/2020

- +
\ No newline at end of file From 19a59e15d05a43929f1273920accf8e6c473031b Mon Sep 17 00:00:00 2001 From: Will Strohl Date: Fri, 18 Aug 2023 12:22:26 -0700 Subject: [PATCH 2/3] Updated the copyright and license info --- .../Components/DataProvider.cs | 50 ++++++--------- .../Components/InjectionController.cs | 50 ++++++--------- .../Components/SqlDataProvider.cs | 50 ++++++--------- .../Components/WNSPortalModuleBase.cs | 50 ++++++--------- .../EditInjections.ascx.cs | 50 ++++++--------- .../Entities/CustomPropertyInfo.cs | 50 ++++++--------- .../Entities/ICustomPropertyInfo.cs | 50 ++++++--------- .../Entities/IInjectionInfo.cs | 64 ++++++------------- .../Entities/InjectionInfo.cs | 50 ++++++--------- .../Entities/InjectionInfoCollection.cs | 50 ++++++--------- .../Entities/InjectionInfoMembers.cs | 50 ++++++--------- .../Entities/InjectionType.cs | 50 ++++++--------- Modules/WillStrohl.Injection/License.txt | 23 ++++--- .../SqlDataProvider/01.00.00.SqlDataProvider | 12 +--- .../SqlDataProvider/01.00.01.SqlDataProvider | 11 +--- .../SqlDataProvider/01.00.02.SqlDataProvider | 11 +--- .../SqlDataProvider/01.00.03.SqlDataProvider | 11 +--- .../SqlDataProvider/01.00.04.SqlDataProvider | 11 +--- .../SqlDataProvider/01.01.00.SqlDataProvider | 11 +--- .../SqlDataProvider/01.02.00.SqlDataProvider | 11 +--- .../SqlDataProvider/01.02.01.SqlDataProvider | 11 +--- .../SqlDataProvider/02.00.00.SqlDataProvider | 11 +--- .../SqlDataProvider/02.00.01.SqlDataProvider | 11 +--- .../SqlDataProvider/02.00.02.SqlDataProvider | 11 +--- .../SqlDataProvider/Uninstall.SqlDataProvider | 7 +- .../ViewInjection.ascx.cs | 51 ++++++--------- .../WillStrohl.LightboxGallery/License.txt | 7 +- 27 files changed, 261 insertions(+), 563 deletions(-) diff --git a/Modules/WillStrohl.Injection/Components/DataProvider.cs b/Modules/WillStrohl.Injection/Components/DataProvider.cs index 3b82fda2..9a48ef71 100644 --- a/Modules/WillStrohl.Injection/Components/DataProvider.cs +++ b/Modules/WillStrohl.Injection/Components/DataProvider.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using DotNetNuke.Common.Utilities; using System; diff --git a/Modules/WillStrohl.Injection/Components/InjectionController.cs b/Modules/WillStrohl.Injection/Components/InjectionController.cs index f9fe02ef..423de389 100644 --- a/Modules/WillStrohl.Injection/Components/InjectionController.cs +++ b/Modules/WillStrohl.Injection/Components/InjectionController.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using DotNetNuke.Common.Utilities; using DotNetNuke.Services.Exceptions; diff --git a/Modules/WillStrohl.Injection/Components/SqlDataProvider.cs b/Modules/WillStrohl.Injection/Components/SqlDataProvider.cs index a79b550a..0e80fe02 100644 --- a/Modules/WillStrohl.Injection/Components/SqlDataProvider.cs +++ b/Modules/WillStrohl.Injection/Components/SqlDataProvider.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using System; using System.Data; diff --git a/Modules/WillStrohl.Injection/Components/WNSPortalModuleBase.cs b/Modules/WillStrohl.Injection/Components/WNSPortalModuleBase.cs index 20dbc60a..0d01a2b9 100644 --- a/Modules/WillStrohl.Injection/Components/WNSPortalModuleBase.cs +++ b/Modules/WillStrohl.Injection/Components/WNSPortalModuleBase.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using DotNetNuke.Services.Localization; using System; diff --git a/Modules/WillStrohl.Injection/EditInjections.ascx.cs b/Modules/WillStrohl.Injection/EditInjections.ascx.cs index 76665fa7..f43a144f 100644 --- a/Modules/WillStrohl.Injection/EditInjections.ascx.cs +++ b/Modules/WillStrohl.Injection/EditInjections.ascx.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using System.IO; using System.Linq; diff --git a/Modules/WillStrohl.Injection/Entities/CustomPropertyInfo.cs b/Modules/WillStrohl.Injection/Entities/CustomPropertyInfo.cs index e0e6a9c3..4913b658 100644 --- a/Modules/WillStrohl.Injection/Entities/CustomPropertyInfo.cs +++ b/Modules/WillStrohl.Injection/Entities/CustomPropertyInfo.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using System; diff --git a/Modules/WillStrohl.Injection/Entities/ICustomPropertyInfo.cs b/Modules/WillStrohl.Injection/Entities/ICustomPropertyInfo.cs index 90fed336..795f5de2 100644 --- a/Modules/WillStrohl.Injection/Entities/ICustomPropertyInfo.cs +++ b/Modules/WillStrohl.Injection/Entities/ICustomPropertyInfo.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ namespace WillStrohl.Modules.Injection.Entities { diff --git a/Modules/WillStrohl.Injection/Entities/IInjectionInfo.cs b/Modules/WillStrohl.Injection/Entities/IInjectionInfo.cs index 1acb0bec..d2f267b7 100644 --- a/Modules/WillStrohl.Injection/Entities/IInjectionInfo.cs +++ b/Modules/WillStrohl.Injection/Entities/IInjectionInfo.cs @@ -1,49 +1,21 @@ -using DotNetNuke; -using DotNetNuke.Common; -using DotNetNuke.Common.Utilities; -using DotNetNuke.Data; -using DotNetNuke.Entities.Users; -using DotNetNuke.Framework; -using DotNetNuke.Services.Exceptions; -using DotNetNuke.Services.Localization; -using DotNetNuke.UI; -using Microsoft.VisualBasic; -using System; -using System.Collections; -using System.Data; -using System.Diagnostics; -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using System.Collections.Generic; using WillStrohl.Modules.Injection.Entities; diff --git a/Modules/WillStrohl.Injection/Entities/InjectionInfo.cs b/Modules/WillStrohl.Injection/Entities/InjectionInfo.cs index 09ac361d..98e09c13 100644 --- a/Modules/WillStrohl.Injection/Entities/InjectionInfo.cs +++ b/Modules/WillStrohl.Injection/Entities/InjectionInfo.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using DotNetNuke.Common.Utilities; using DotNetNuke.Services.Exceptions; diff --git a/Modules/WillStrohl.Injection/Entities/InjectionInfoCollection.cs b/Modules/WillStrohl.Injection/Entities/InjectionInfoCollection.cs index be9ea494..c0e0c49f 100644 --- a/Modules/WillStrohl.Injection/Entities/InjectionInfoCollection.cs +++ b/Modules/WillStrohl.Injection/Entities/InjectionInfoCollection.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using DotNetNuke.Common.Utilities; using DotNetNuke.Services.Exceptions; diff --git a/Modules/WillStrohl.Injection/Entities/InjectionInfoMembers.cs b/Modules/WillStrohl.Injection/Entities/InjectionInfoMembers.cs index 82859f7c..298e6158 100644 --- a/Modules/WillStrohl.Injection/Entities/InjectionInfoMembers.cs +++ b/Modules/WillStrohl.Injection/Entities/InjectionInfoMembers.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ namespace WillStrohl.Modules.Injection.Entities { diff --git a/Modules/WillStrohl.Injection/Entities/InjectionType.cs b/Modules/WillStrohl.Injection/Entities/InjectionType.cs index 48ec3f0d..cad3a3ff 100644 --- a/Modules/WillStrohl.Injection/Entities/InjectionType.cs +++ b/Modules/WillStrohl.Injection/Entities/InjectionType.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ namespace WillStrohl.Modules.Injection.Entities { diff --git a/Modules/WillStrohl.Injection/License.txt b/Modules/WillStrohl.Injection/License.txt index ef70177f..8a16458b 100644 --- a/Modules/WillStrohl.Injection/License.txt +++ b/Modules/WillStrohl.Injection/License.txt @@ -1,15 +1,18 @@  -
-

Upendo Ventures, LLC(solutions@upendoventures.com)
https://upendoventures.com

-

Copyright (c) Upendo Ventures, LLC

-

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

-

Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

-

Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

-

Neither the name of Will Strohl, the Open Graph Module for DotNetNuke, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior - written permission.

-

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+
+

Copyright (C) Upendo Ventures, LLC

+ +

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

+ +

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

+ +

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE.

\ No newline at end of file diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.00.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.00.SqlDataProvider index 6990fb51..e132f024 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.00.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.00.SqlDataProvider @@ -2,17 +2,7 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 1.00.00 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - This is the first install script for the module. It creates the initial module - structure. +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.01.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.01.SqlDataProvider index 902cc09f..d036ee6c 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.01.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.01.SqlDataProvider @@ -2,15 +2,6 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 1.00.01 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - This is just a placeholder. +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.02.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.02.SqlDataProvider index 752418cf..5760d33d 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.02.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.02.SqlDataProvider @@ -2,16 +2,7 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 1.00.02 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - This update patches SQL problems that were created. +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.03.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.03.SqlDataProvider index e509069d..d036ee6c 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.03.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.03.SqlDataProvider @@ -2,15 +2,6 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 1.00.03 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - This is just a placeholder. +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.04.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.04.SqlDataProvider index 8a867211..e0db7405 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.04.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.00.04.SqlDataProvider @@ -2,16 +2,7 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 1.00.04 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - Increases the size of the injection content field, and shores up some DB inconsistencies. +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.01.00.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.01.00.SqlDataProvider index 3b403c15..0071fa48 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.01.00.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.01.00.SqlDataProvider @@ -2,16 +2,7 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 01.01.00 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - Placeholder +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.02.00.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.02.00.SqlDataProvider index 70a0c809..59322c1c 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.02.00.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.02.00.SqlDataProvider @@ -2,16 +2,7 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 01.02.00 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - Fixing a bug with the size of the injection content. +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.02.01.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.02.01.SqlDataProvider index fcbe1180..a6eda6a2 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.02.01.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/01.02.01.SqlDataProvider @@ -2,16 +2,7 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 01.02.01 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - Placeholder. No SQL updates. +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.00.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.00.SqlDataProvider index ecc0280c..ae1d79af 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.00.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.00.SqlDataProvider @@ -2,16 +2,7 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 02.00.00 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - Added CustomProperties property. +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.01.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.01.SqlDataProvider index 6288a5e2..111bf827 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.01.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.01.SqlDataProvider @@ -2,16 +2,7 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 02.00.01 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl - -Release Notes: - Placeholder +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.02.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.02.SqlDataProvider index 57fcf0b4..111bf827 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.02.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/02.00.02.SqlDataProvider @@ -2,16 +2,7 @@ INSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Version: 02.00.02 -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2016 Will Strohl - -Release Notes: - Placeholder +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/Uninstall.SqlDataProvider b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/Uninstall.SqlDataProvider index c0105b32..2ec8c554 100644 --- a/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/Uninstall.SqlDataProvider +++ b/Modules/WillStrohl.Injection/Providers/DataProviders/SqlDataProvider/Uninstall.SqlDataProvider @@ -2,12 +2,7 @@ UNINSTALL SQL PROVIDER SCRIPT -Injection Module for DotNetNuke -Author: Will Strohl -E-Mail: will.strohl@gmail.com -Website: http://www.willstrohl.com - -Copyright 2009-2015 Will Strohl +Copyright (C) Upendo Ventures, LLC */ diff --git a/Modules/WillStrohl.Injection/ViewInjection.ascx.cs b/Modules/WillStrohl.Injection/ViewInjection.ascx.cs index 7aa8daf2..a7edc52f 100644 --- a/Modules/WillStrohl.Injection/ViewInjection.ascx.cs +++ b/Modules/WillStrohl.Injection/ViewInjection.ascx.cs @@ -1,35 +1,21 @@ -// -// Will Strohl (will.strohl@gmail.com) -// http://www.willstrohl.com -// -//Copyright (c) 2009-2016, Will Strohl -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without modification, are -//permitted provided that the following conditions are met: -// -//Redistributions of source code must retain the above copyright notice, this list of -//conditions and the following disclaimer. -// -//Redistributions in binary form must reproduce the above copyright notice, this list -//of conditions and the following disclaimer in the documentation and/or other -//materials provided with the distribution. -// -//Neither the name of Will Strohl, Content Injection, nor the names of its contributors may be -//used to endorse or promote products derived from this software without specific prior -//written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -//BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -//CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -//DAMAGE. -// +/* +Copyright © Upendo Ventures, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ using DotNetNuke.Services.Exceptions; using System; @@ -41,7 +27,6 @@ using DotNetNuke.UI.Skins; using DotNetNuke.Web.Client; using DotNetNuke.Web.Client.ClientResourceManagement; -using DotNetNuke.Web.Client.Providers; using WillStrohl.Modules.Injection.Components; using WillStrohl.Modules.Injection.Entities; diff --git a/Modules/WillStrohl.LightboxGallery/License.txt b/Modules/WillStrohl.LightboxGallery/License.txt index e4157cef..8a16458b 100644 --- a/Modules/WillStrohl.LightboxGallery/License.txt +++ b/Modules/WillStrohl.LightboxGallery/License.txt @@ -2,11 +2,8 @@ div.uv-install-wrapper h3, div.uv-install-wrapper h4, div.uv-install-wrapper p, div.uv-install-wrapper hr, div.uv-install-wrapper ul { margin-bottom: 0.5em; } div.uv-install-wrapper ul { padding-left: 2em; } -
-

Lightbox Gallery Module for DotNetNuke

- -

Copyright Upendo Ventures, LLC

-

https://upendoventures.com

+
+

Copyright (C) Upendo Ventures, LLC

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, From 9701dc7cb8ba2483d021468bc29ff510aae40eb3 Mon Sep 17 00:00:00 2001 From: Will Strohl Date: Fri, 18 Aug 2023 12:51:34 -0700 Subject: [PATCH 3/3] Improved edit view US --- .../EditInjections.ascx.resx | 568 +++++++++--------- .../EditInjections.ascx.cs | 18 + Modules/WillStrohl.Injection/releasenotes.txt | 1 + 3 files changed, 306 insertions(+), 281 deletions(-) diff --git a/Modules/WillStrohl.Injection/App_LocalResources/EditInjections.ascx.resx b/Modules/WillStrohl.Injection/App_LocalResources/EditInjections.ascx.resx index 069d8a25..1eac1e62 100644 --- a/Modules/WillStrohl.Injection/App_LocalResources/EditInjections.ascx.resx +++ b/Modules/WillStrohl.Injection/App_LocalResources/EditInjections.ascx.resx @@ -1,135 +1,135 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Edit - - - Injection Type - - - Move Up/Down - - - Name - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Edit + + + Injection Type + + + Move Up/Down + + + Name + + <div class="Normal"> <h1>WillStrohl.Injection Module</h1> <p>The WillStrohl.Injection Module allows you to inject various items into the HTML markup of a DotNetNuke web page. This content could be client-side scripts and SCRIPT tags, HTML comments, and more.</p> @@ -182,132 +182,132 @@ document.write(unescape('%3Cscript language="javascript" type="text/javascript" <li>Move Up/Move Down are not yet enabled</li> <li>JavaScript confirm does not always occur when deleting injection records</li> </ul> -</div> - - - Injection Name - - - Inject Where - - - Content to Inject - - - Are you sure that you want to delete this injection item? - - - Add New Injection - - - Top of Page - - - Bottom of Page - - - <p class="Normal">No injection records were found.</p> - - - Manage Content Injections - - - Submit - - - Cancel - - - Return - - - Enabled? - - - Please enter some content for the Injection - - - Please enter a name for the Injection you are managing - - - The name you chose is already used in this module. Please enter a unque name. - - - Disabled - - - Enabled - - - Enabled? - - - Manage Injection - - - Enter the content that you want to be injected into the page. - - - Choose whether this content injection item should be enabled. If unchecked, the item will not be injected into the page. - - - Specify where in the page that you want to inject the content. - - - Enter a name for the injection. This should be short, but clearly describe what the injection does. - - - Delete - - - The content you are trying to inject should only be the path of the JavaScript or CSS file. - - - Choose the type of injection you are adding, either free-form HTML, or a JS/CSS script file path. - - - Injection Type - - - JavaScript/CSS - - - HTML - - - Advanced Settings - - - None Specified - - - Page Header - - - Body - - - Form Bottom - - - Enter a numeric value for the priority level in the Client Resource Manager. - - - Priority - - +</div> + + + Injection Name + + + Inject Where + + + Content to Inject + + + Are you sure that you want to delete this injection item? + + + Add New Injection + + + Top of Page + + + Bottom of Page + + + <p class="Normal">No injection records were found.</p> + + + Manage Content Injections + + + Submit + + + Cancel + + + Return + + + Enabled? + + + Please enter some content for the Injection + + + Please enter a name for the Injection you are managing + + + The name you chose is already used in this module. Please enter a unque name. + + + Disabled + + + Enabled + + + Enabled? + + + Manage Injection + + + Enter the content that you want to be injected into the page. JS/CSS: Any valid local and external file path for your JS/CSS file is acceptable (e.g., a local script, one in a CDN, etc.). HTML: Any valid HTML is acceptable. Please triple-check your HTML before saving/enabling the content injection. + + + Choose whether this content injection item should be enabled. If unchecked, the item will not be injected into the page. + + + Specify where in the page that you want to inject the content. + + + Enter a name for the injection. This should be short, but clearly describe what the injection does. + + + Delete + + + The content you are trying to inject should only be the path of the JavaScript or CSS file. + + + Choose the type of injection you are adding, either free-form HTML, or a JS/CSS script file path. + + + Injection Type + + + JavaScript/CSS + + + HTML + + + Advanced Settings + + + None Specified + + + Page Header + + + Body + + + Form Bottom + + + Enter a numeric value for the priority level in the Client Resource Manager. + + + Priority + + Choose the provider you wish to use to inject the CSS/JavaScript you've specified. If no choice is made, CSS will be injected into the Page Header, and the JavaScript will be injected in the Form Bottom.<br /> <strong>Page Header</strong> - adds the file to a specific location within the head<br/> <strong>Body</strong> - adds the file to the top of the body<br/> -<strong>Form Bottom</strong> - adds the file to the bottom of the body - - - Provider - - - The priority level can only be a number, between 0-1000. - - +<strong>Form Bottom</strong> - adds the file to the bottom of the body + + + Provider + + + The priority level can only be a number, between 0-1000. + + The following priorities are built-in. You should choose a priority that isn't currently being used.<br /><br /> <div class="dnnClear" style="width:100%;"> <div class="dnnLeft"> @@ -340,30 +340,36 @@ document.write(unescape('%3Cscript language="javascript" type="text/javascript" <li>Default: 100</li> </ul> </div> -</div> - - - CSS > - - - Body - - - Form Bottom - - - Page Header - - - HTML > Bottom of Page - - - HTML > Top of Page - - - JavaScript > - - - Last updated by <strong>{0}</strong> on <strong>{1}</strong>. - +</div> + + + CSS > + + + Body + + + Form Bottom + + + Page Header + + + HTML > Bottom of Page + + + HTML > Top of Page + + + JavaScript > + + + Last updated by <strong>{0}</strong> on <strong>{1}</strong>. + + + <!-- Enter any valid HTML you wish. --> + + + /full/path/to/my/script-or-css-file.js + \ No newline at end of file diff --git a/Modules/WillStrohl.Injection/EditInjections.ascx.cs b/Modules/WillStrohl.Injection/EditInjections.ascx.cs index f43a144f..2af7699f 100644 --- a/Modules/WillStrohl.Injection/EditInjections.ascx.cs +++ b/Modules/WillStrohl.Injection/EditInjections.ascx.cs @@ -42,6 +42,8 @@ public partial class EditInjections : WNSPortalModuleBase private const string c_Command_MoveDown = "MoveDown"; private const string c_Command_Delete = "Delete"; + private const string Placeholder = "placeholder"; + private const string c_Command_Insert = "Insert"; private const string c_True = "True"; @@ -235,6 +237,7 @@ protected void cmdDelete_Click(object sender, EventArgs e) protected void radType_OnSelectedIndexChanged(object sender, EventArgs e) { ToggleType(); + SwitchPlaceholder(); } protected void cvContent_OnServerValidate(object source, ServerValidateEventArgs args) @@ -316,6 +319,7 @@ private void BindData() radInject.SelectedIndex = 0; } + SwitchPlaceholder(); } private void LocalizeModule() @@ -415,6 +419,7 @@ private void BindForm(int ItemId) } ToggleType(); + SwitchPlaceholder(); } private void HandleException(Exception exc) @@ -440,6 +445,19 @@ private void SwapOrder(int ItemId, string UpDown) ctlModule.ChangeOrder(ItemId, UpDown); } + private void SwitchPlaceholder() + { + switch (this.radType.SelectedIndex) + { + case 0: + this.txtContent.Attributes.Add(Placeholder, LocalizeString("Script.Placeholder")); + return; + default: + this.txtContent.Attributes.Add(Placeholder, LocalizeString("Html.Placeholder")); + return; + } + } + #endregion #region Data Access diff --git a/Modules/WillStrohl.Injection/releasenotes.txt b/Modules/WillStrohl.Injection/releasenotes.txt index 50fe5db1..051fd6c5 100644 --- a/Modules/WillStrohl.Injection/releasenotes.txt +++ b/Modules/WillStrohl.Injection/releasenotes.txt @@ -40,6 +40,7 @@

  • Updated to build against DNN Platform 9.10.0. (Issue 237, thanks @WillStrohl!)
  • Updated to build against .NET Framework 4.8. (Issue 237, thanks @WillStrohl!)
    • +
  • Updated the Edit view to make it more obvious how you should use it for scripts and HTML. (No Issue, thanks @WillStrohl!)