Skip to content

Commit d010fd6

Browse files
EPTammingaEPTamminga
committed
Merge branch 'master' of https://github.com/DNNCommunity/DNN.XML into development
2 parents 4e5c4bc + 6948471 commit d010fd6

9 files changed

Lines changed: 369 additions & 428 deletions

File tree

‎BuildScripts/MSBuild.Community.Tasks.Targets‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎BuildScripts/ModulePackage.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="windows-1252"?>
22
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="MSBuild.Community.Tasks.Targets" />
3+
<!--<Import Project="..\..\packages\MSBuildTasks.1.4.0.128\tools\MSBuild.Community.Tasks.Targets" />-->
44

55
<Target Name="PackageModule" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
66
<XmlRead Prefix="n"
@@ -66,7 +66,7 @@
6666
</CreateItem>
6767

6868

69-
<Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
69+
<Copy SourceFiles="..\..\bin\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
7070
<Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
7171
<Copy SourceFiles="@(XmlFileName)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
7272
<Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
@@ -93,7 +93,7 @@
9393
<RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" />
9494

9595

96-
<Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
96+
<Copy SourceFiles="..\..\bin\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
9797
<Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
9898
<Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
9999

‎Components/XmlBaseController.cs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
// DEALINGS IN THE SOFTWARE.
1818
//
1919
using System;
20+
using System.Collections.Generic;
2021
using System.IO;
2122
using System.Web;
2223
using System.Web.UI;
@@ -25,7 +26,8 @@
2526
using DotNetNuke.Entities.Modules;
2627
using DotNetNuke.Modules.Xml.Providers.XmlDataProvider;
2728
using DotNetNuke.Modules.Xml.Providers.XmlRenderingProvider;
28-
29+
using DotNetNuke.Services.Search;
30+
2931
namespace DotNetNuke.Modules.Xml.Components
3032
{
3133
public class XmlBaseController : BaseController
@@ -127,8 +129,14 @@ public void Render(Stream stream)
127129
/// Clears the indexed content of the DotNetNuke search for this module
128130
/// </summary>
129131
public void ClearSearchIndex()
130-
{
131-
DataProvider.Instance().DeleteSearchItems(ModuleId);
132+
{
133+
// FIX: for Error CS1061 'DataProvider' does not contain a definition for 'DeleteSearchItems' and no extension method 'DeleteSearchItems' accepting a first argument of type 'DataProvider' could be found(are you missing a using directive or an assembly reference ?) Xml D:\Materijali\SD\Portal2015\Dev\Prototips\DNN.XML\Components\XmlBaseController.cs 132 Active
134+
//DataProvider.Instance().DeleteSearchItems(ModuleId);
135+
var moduleSearchItems = SearchDataStoreController.GetSearchItems(ModuleId);
136+
foreach (var searchItem in moduleSearchItems)
137+
{
138+
SearchDataStoreController.DeleteSearchItem(searchItem.Value.SearchItemId);
139+
}
132140
}
133141

134142

‎Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
[assembly: AssemblyConfiguration("")]
3232
[assembly: AssemblyCompany("")]
3333
[assembly: AssemblyProduct("")]
34-
[assembly: AssemblyCopyright("2012 DotNetNuke Corporation")]
34+
[assembly: AssemblyCopyright("2016 DotNetNuke Corporation")]
3535
[assembly: AssemblyTrademark("")]
3636
[assembly: AssemblyCulture("")]
3737
[assembly: ComVisible(false)]
@@ -47,7 +47,7 @@
4747
// You can specify all the values or you can default the Revision and Build Numbers
4848
// by using the '*' as shown below:
4949

50-
[assembly: AssemblyVersion("6.0.3.*")]
50+
[assembly: AssemblyVersion("6.0.4.*")]
5151
[assembly: AssemblyDelaySign(false)]
5252
[assembly: AssemblyKeyFile("")]
5353
[assembly: AssemblyKeyName("")]

‎Providers/XmlRenderingProvider/XslCompiledTransform/Provider.cs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,17 @@ private bool EnableDocument
6060
}
6161
}
6262

63+
private bool EnableScript
64+
{
65+
get
66+
{
67+
bool enableScript;
68+
var tryParse = bool.TryParse(GetComponentSettings()["enableScript"].DefaultIfNullOrEmpty(bool.FalseString), out enableScript);
69+
if (!tryParse) enableScript = false;
70+
return enableScript;
71+
}
72+
}
73+
6374
public override void Render(XmlReader reader, TextWriter output, Page page, ModuleInfo moduleConfiguration)
6475
{
6576
var settings = moduleConfiguration.ModuleSettings;
@@ -99,7 +110,7 @@ public override void ImportProviderSettings(int moduleId, XmlNode settingsNode)
99110
/// <param name = "contentUrl">The url to the xsl text</param>
100111
/// <param name = "prohibitDtd"></param>
101112
/// <returns>A XslCompiledTransform</returns>
102-
private static System.Xml.Xsl.XslCompiledTransform GetXslContentByWebRequest(string contentUrl, bool prohibitDtd, bool enableDocument)
113+
private static System.Xml.Xsl.XslCompiledTransform GetXslContentByWebRequest(string contentUrl, bool prohibitDtd, bool enableDocument, bool enableScript)
103114
{
104115
var xslCompiledTransform = new System.Xml.Xsl.XslCompiledTransform();
105116
var req = Globals.GetExternalRequest(contentUrl);
@@ -111,7 +122,7 @@ private static System.Xml.Xsl.XslCompiledTransform GetXslContentByWebRequest(str
111122
{
112123
using (var objXslTransform = XmlReader.Create(receiveStream, new XmlReaderSettings {ProhibitDtd = prohibitDtd}))
113124
{
114-
var settings = new XsltSettings(enableDocument, false);
125+
var settings = new XsltSettings(enableDocument, enableScript);
115126
xslCompiledTransform.Load(objXslTransform, settings, new XmlUrlResolver());
116127
}
117128
}
@@ -131,13 +142,13 @@ private System.Xml.Xsl.XslCompiledTransform GetXslTransform(string xslsrc, int p
131142
switch (Globals.GetURLType(xslsrc))
132143
{
133144
case TabType.Url:
134-
return GetXslContentByWebRequest(xslsrc, ProhibitDtd,EnableDocument );
145+
return GetXslContentByWebRequest(xslsrc, ProhibitDtd, EnableDocument, EnableScript);
135146
default:
136147

137148
var trans = new System.Xml.Xsl.XslCompiledTransform();
138149
using (var compiledStylesheet = Utils.CreateXmlReader(xslsrc, portalId, ProhibitDtd))
139150
{
140-
var settings = new XsltSettings(EnableDocument, false);
151+
var settings = new XsltSettings(EnableDocument, EnableScript);
141152
trans.Load(compiledStylesheet, settings, new XmlUrlResolver() );
142153
}
143154

0 commit comments

Comments
 (0)