Skip to content

Commit 9f41e25

Browse files
author
Will Strohl
authored
Merge pull request #188 from hismightiness/development
Open Graph Protocol 2.0 Release
2 parents f944270 + 261108d commit 9f41e25

19 files changed

+292
-207
lines changed

‎Build/ModulePackage.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
5959
<InstallInclude Include="**\*.bmp" Exclude="packages\**;node_modules\**;clientApp\**" />
6060
<InstallInclude Include="**\*.xml" Exclude="packages\**;node_modules\**;clientApp\**;bin\**" />
6161
<InstallInclude Include="**\web.config" Exclude="packages\**;node_modules\**;clientApp\**" />
62+
<InstallInclude Include="**\*.xml.resources" Exclude="packages\**;node_modules\**;clientApp\**;Config\ogConfig*.xml.resources;Config\ogSettings*.xml.resources" />
6263
</ItemGroup>
6364

6465
<CreateItem Include="$(DNNFileName).dnn">

‎Modules/WillStrohl.Injection/License.txt‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
<p>Will Strohl (<a href="mailto:will.strohl@gmail.com">will.strohl@gmail.com</a>)<br /><a href="http://hismightiness.github.io/dnnextensions/" target="_blank">http://hismightiness.github.io/dnnextensions/</a></p>
2-
<p>Copyright (c) 2009-2016, Will Strohl</p>
3-
<p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
4-
<p>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</p>
5-
<p>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.</p>
6-
<p>Neither the name of Will Strohl, the Content Injection Module, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.</p>
7-
<p>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.</p>
1+
<style>
2+
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; }
3+
div.uv-install-wrapper ul { padding-left: 2em; }
4+
.muy-importante { color:red;font-weight:bold; }
5+
</style>
6+
<div class="uv-install-wrapper">
7+
<p>Upendo Ventures, LLC(<a href="mailto:solutions@upendoventures.com">solutions@upendoventures.com</a>)<br /><a href="https://upendoventures.com" target="_blank">https://upendoventures.com</a></p>
8+
<p>Copyright (c) Upendo Ventures, LLC</p>
9+
<p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
10+
<p>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</p>
11+
<p>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.</p>
12+
<p>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
13+
written permission.</p>
14+
<p>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.</p>
15+
</div>

‎Modules/WillStrohl.Injection/Module.build‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,45 @@
1414
</Target>
1515
<Target Name="GetFiles">
1616
<ItemGroup>
17-
<Manifest Include="*.dnn;*.dnn5;*.dnn6" />
17+
<Manifest Include="*.dnn;*.dnn5;*.dnn6" Exclude="*_Symbols.dnn" />
1818
<TextFiles Include="*.txt" Exclude="releasenotes.txt;license.txt" />
19-
<SourceFiles Include="*.css;*.htm" />
19+
<SourceFiles Include="*.css;*.htm;*.html" />
2020
<Views Include="*.ascx;" />
2121
<ResourceFiles Include="App_LocalResources/*.resx" />
2222
<Images Include="Images/**/*.*" />
2323
<JsFiles Include="js/**/*.*" />
2424
<Styles Include="Styles/**/*.*" />
25+
<MvcViews Include="Views/**/*.*" />
26+
<Libraries Include="bin/*.dll;bin/*.pdb" Exclude="bin/DotNetNuke*;bin/Telerik*;bin/System.*;bin/Microsoft.*;bin/Newtonsoft.Json.*" />
27+
<Config Include="web.config" />
2528
<DataProvider Include="Providers/DataProviders/SqlDataProvider/*.SqlDataProvider" />
26-
<Resources Include="@(ResourceFiles);@(Views);@(Images);@(TextFiles);@(SourceFiles);@(JsFiles);@(Manifest);@(DataProvider);@(Styles)" />
29+
<Resources Include="@(Manifest);@(TextFiles);@(SourceFiles);@(Views);@(ResourceFiles);@(Images);@(JsFiles);@(Styles);@(MvcViews);@(Libraries);@(Config);@(DataProvider)" />
2730
</ItemGroup>
2831
</Target>
2932
<ItemGroup>
30-
<BinSourceInclude Include="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" />
31-
<BinSourceInclude Include="$(MSBuildProjectDirectory)\bin\$(AssemblyName).pdb" />
32-
<BinSourceInclude Include="$(MSBuildProjectDirectory)\bin\$(AssemblyName).xml" />
33-
</ItemGroup>
34-
<ItemGroup>
35-
<BinInstallInclude Include="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" />
33+
<SymbolsInclude Include="$(DNNFileName)_Symbols.dnn" />
34+
<SymbolsInclude Include="License.txt" />
35+
<SymbolsInclude Include="ReleaseNotes.txt" />
3636
</ItemGroup>
3737
<Target Name="CopyBin">
38-
<Copy SourceFiles="@(BinSourceInclude)" DestinationFolder="$(WebsitePath)/bin" />
38+
<ItemGroup>
39+
<BinSourceInclude Include="$(MSBuildProjectDirectory)\bin\*.dll" Exclude="$(MSBuildProjectDirectory)\bin\DotNetNuke*;$(MSBuildProjectDirectory)\bin\Telerik*;$(MSBuildProjectDirectory)\bin\System.*;$(MSBuildProjectDirectory)\bin\Microsoft.*;$(MSBuildProjectDirectory)\bin\Newtonsoft.Json.*" />
40+
<BinSourceInclude Include="$(MSBuildProjectDirectory)\bin\*.pdb" Exclude="$(MSBuildProjectDirectory)\bin\DotNetNuke*;$(MSBuildProjectDirectory)\bin\Telerik*;$(MSBuildProjectDirectory)\bin\System.*;$(MSBuildProjectDirectory)\bin\Microsoft.*;$(MSBuildProjectDirectory)\bin\Newtonsoft.Json.*" />
41+
</ItemGroup>
42+
<Copy SourceFiles="@(BinSourceInclude)" DestinationFolder="$(WebsitePath)\bin" />
3943
</Target>
4044
<Target Name="DebugProject" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4145
<Copy SourceFiles="@(Manifest)" DestinationFolder="$(FullModulePath)" />
46+
<Copy SourceFiles="@(TextFiles)" DestinationFolder="$(FullModulePath)" />
47+
<Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(FullModulePath)" />
4248
<Copy SourceFiles="@(Views)" DestinationFolder="$(FullModulePath)" />
49+
<Copy SourceFiles="@(ResourceFiles)" DestinationFolder="$(FullModulePath)\App_LocalResources" />
4350
<Copy SourceFiles="@(Images)" DestinationFolder="$(FullModulePath)\Images\%(RecursiveDir)" />
4451
<Copy SourceFiles="@(JsFiles)" DestinationFolder="$(FullModulePath)\Scripts\%(RecursiveDir)" />
4552
<Copy SourceFiles="@(Styles)" DestinationFolder="$(FullModulePath)\Styles\%(RecursiveDir)" />
46-
<Copy SourceFiles="@(TextFiles)" DestinationFolder="$(FullModulePath)" />
47-
<Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(FullModulePath)" />
53+
<Copy SourceFiles="@(MvcViews)" DestinationFolder="$(FullModulePath)\Views\%(RecursiveDir)" />
54+
<Copy SourceFiles="@(Libraries)" DestinationFolder="$(WebsitePath)\bin" />
55+
<Copy SourceFiles="@(Config)" DestinationFolder="$(FullModulePath)" />
4856
<Copy SourceFiles="@(DataProvider)" DestinationFolder="$(FullModulePath)\Providers\DataProviders\SqlDataProvider" />
49-
<Copy SourceFiles="@(ResourceFiles)" DestinationFolder="$(FullModulePath)\App_LocalResources" />
5057
</Target>
51-
</Project>
58+
</Project>

‎Modules/WillStrohl.Injection/WillStrohl.Injection_Symbols.dnn‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
<packages>
44
<package name="WillStrohl.Injection_Symbols" type="Library" version="03.00.00">
55
<friendlyName>Content Injection Symbols</friendlyName>
6-
<![CDATA[<p>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.</p>]]>
6+
<description>
7+
<![CDATA[<p>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.</p>]]>
8+
</description>
9+
<iconFile>DesktopModules/WillStrohl.Injection/Images/logo.png</iconFile>
710
<owner>
811
<name>Will Strohl</name>
912
<organization>Upendo Ventures, LLC</organization>

‎Modules/WillStrohl.OpenGraph/Components/OpenGraphController.vb‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
'
2-
' Will Strohl (will.strohl@gmail.com)
3-
' http://www.willstrohl.com
2+
' Upendo Ventures, LLC (solutions@upendoventures.com)
3+
' https://upendoventures.com
44
'
5-
'Copyright (c) 2011-2013, Will Strohl
6-
'All rights reserved.
5+
'Copyright (c) Upendo Ventures, LLC
76
'
87
'Redistribution and use in source and binary forms, with or without modification, are
98
'permitted provided that the following conditions are met:
@@ -373,9 +372,14 @@ Namespace WillStrohl.Modules.OpenGraph
373372

374373
Public Shared Sub NukeSettings(ByVal PortalId As Integer, ByVal ModuleId As Integer, ByVal TabModuleId As Integer)
375374

376-
Dim ctlModule As New ModuleController
377-
ctlModule.DeleteModuleSettings(ModuleId)
378-
ctlModule.DeleteTabModuleSettings(TabModuleId)
375+
ModuleController.Instance.DeleteTabModuleSetting(TabModuleId, OG_TITLE_SETTING)
376+
ModuleController.Instance.DeleteTabModuleSetting(TabModuleId, USE_TABTITLE_SETTING)
377+
ModuleController.Instance.DeleteTabModuleSetting(TabModuleId, OG_DESCRIPTION_SETTING)
378+
ModuleController.Instance.DeleteTabModuleSetting(TabModuleId, USE_TABDESCRIPTION_SETTING)
379+
ModuleController.Instance.DeleteTabModuleSetting(TabModuleId, OG_URL_SETTING)
380+
ModuleController.Instance.DeleteTabModuleSetting(TabModuleId, USE_TABURL_SETTING)
381+
ModuleController.Instance.DeleteTabModuleSetting(TabModuleId, OG_IMAGE_SETTING)
382+
ModuleController.Instance.DeleteTabModuleSetting(TabModuleId, OG_LOCALE_SETTING)
379383

380384
PortalController.DeletePortalSetting(PortalId, OG_SITENAME_SETTING)
381385
PortalController.DeletePortalSetting(PortalId, USE_PORTALTITLE_SETTING)

‎Modules/WillStrohl.OpenGraph/Components/OpenGraphWriter.vb‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
'
2-
' Will Strohl (will.strohl@gmail.com)
3-
' http://www.willstrohl.com
2+
' Upendo Ventures, LLC (solutions@upendoventures.com)
3+
' https://upendoventures.com
44
'
5-
'Copyright (c) 2011-2013, Will Strohl
6-
'All rights reserved.
5+
'Copyright (c) Upendo Ventures, LLC
76
'
87
'Redistribution and use in source and binary forms, with or without modification, are
98
'permitted provided that the following conditions are met:
@@ -50,7 +49,7 @@ Namespace WillStrohl.Modules.OpenGraph
5049

5150
Private mApplication As HttpApplication
5251
Private Const INVALID_EXTENSION_MATCH_PATTERN As String = "\.(swf|jpg|jpeg|jpe|gif|bmp|png|doc|docx|xls|xlsx|ppt|pptx|pdf|txt|xml|xsl|xsd|css|zip|template|htmtemplate|ico|avi|mpg|mpeg|mp3|wmv|mov|wav|js|axd|htm|html|ashx)$"
53-
Private Const INVALID_REQUEST_PATCH_MATCH_PATTERN As String = "(ctl=Edit|mid=\d+|popUp=true|ctl/Edit|mid/\d+|/Admin/|/Host/|/DesktopModules/|/Providers/|/Resources/|\.ashx/)"
52+
Private Const INVALID_REQUEST_PATCH_MATCH_PATTERN As String = "(ctl=Edit|mid=\d+|popUp=true|ctl/Edit|mid/\d+|/Admin/|/Host/|/DesktopModules/|/Providers/|/Resources/|\.ashx/|fileticket=)"
5453
'Private Const REQUEST_POST As String = "POST"
5554
'Private Const REQUEST_CONTENTTYPE_AJAX As String = "application/json"
5655
Private Const HEADER_AJAX_KEY As String = "X-MicrosoftAjax"

‎Modules/WillStrohl.OpenGraph/Components/WnsPortalModuleBase.vb‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
'
2-
' Will Strohl (will.strohl@gmail.com)
3-
' http://www.willstrohl.com
2+
' Upendo Ventures, LLC (solutions@upendoventures.com)
3+
' https://upendoventures.com
44
'
5-
'Copyright (c) 2011-2013, Will Strohl
6-
'All rights reserved.
5+
'Copyright (c) Upendo Ventures, LLC
76
'
87
'Redistribution and use in source and binary forms, with or without modification, are
98
'permitted provided that the following conditions are met:

‎Modules/WillStrohl.OpenGraph/Default.ascx.vb‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
'
2-
' Will Strohl (will.strohl@gmail.com)
3-
' http://www.willstrohl.com
2+
' Upendo Ventures, LLC (solutions@upendoventures.com)
3+
' https://upendoventures.com
44
'
5-
'Copyright (c) 2011-2013, Will Strohl
6-
'All rights reserved.
5+
'Copyright (c) Upendo Ventures, LLC
76
'
87
'Redistribution and use in source and binary forms, with or without modification, are
98
'permitted provided that the following conditions are met:

‎Modules/WillStrohl.OpenGraph/Images/logo.png‎

6.52 KB
Loading

‎Modules/WillStrohl.OpenGraph/License.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
<div style="width:100%;height:375px;overflow:auto;">
2-
<p>Will Strohl (<a href="mailto:will.strohl@gmail.com">will.strohl@gmail.com</a>)<br /><a href="http://www.willstrohl.com" target="_blank">http://www.willstrohl.com</a></p>
3-
<p>Copyright (c) 2011-2013, Will Strohl<br />All rights reserved.</p>
1+
<style>
2+
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; }
3+
div.uv-install-wrapper ul { padding-left: 2em; }
4+
.muy-importante { color:red;font-weight:bold; }
5+
</style>
6+
<div class="uv-install-wrapper">
7+
<p>Upendo Ventures, LLC(<a href="mailto:solutions@upendoventures.com">solutions@upendoventures.com</a>)<br /><a href="https://upendoventures.com" target="_blank">https://upendoventures.com</a></p>
8+
<p>Copyright (c) Upendo Ventures, LLC</p>
49
<p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
510
<p>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</p>
611
<p>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.</p>

0 commit comments

Comments
 (0)