Skip to content

Commit 4d865bb

Browse files
sachatrauwaensachatrauwaen
committed
Merge branch 'release/v.3.5'
2 parents c223c7e + da7d4e2 commit 4d865bb

11 files changed

+414
-220
lines changed

‎App_LocalResources/View.ascx.nl-NL.resx

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="cmdCancel.Text" xml:space="preserve">
121+
<value>Annuleren</value>
122+
</data>
123+
<data name="cmdSave.Text" xml:space="preserve">
124+
<value>Verzenden</value>
125+
</data>
126+
<data name="Sending.Text" xml:space="preserve">
127+
<value>Verzending...</value>
128+
</data>
129+
</root>

‎BuildScripts/ModulePackage.targets

+4-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</XmlRead>
1515

1616
<!--in VS 2012 we exclude the packages folder -->
17-
<ItemGroup>
17+
<ItemGroup>
1818
<InstallInclude Include="**\*.ascx" Exclude="packages\**" />
1919
<InstallInclude Include="**\*.asmx" Exclude="packages\**" />
2020
<InstallInclude Include="**\*.css" Exclude="packages\**" />
@@ -44,7 +44,7 @@
4444
<SourceInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;**\.git\**;" />
4545
<SourceInclude Include="**\images\**" />
4646
<SourceInclude Include="**\*.cs" />
47-
<SourceInclude Include="**\Packages\**" />
47+
<SourceInclude Include="**\Packages\**" />
4848
<SourceInclude Include="**\*.cs.designer" />
4949
<SourceInclude Include="**\*.csproj" />
5050
<SourceInclude Include="**\*.targets" />
@@ -63,7 +63,6 @@
6363
<Output TaskParameter="Include" ItemName="PackageTxtFiles" />
6464
</CreateItem>
6565

66-
6766
<CreateItem Include="**\*.sqldataprovider">
6867
<Output TaskParameter="Include" ItemName="SqlDataProviderFiles" />
6968
</CreateItem>
@@ -92,10 +91,6 @@
9291
<!-- Copy the Install package to the Packages folder -->
9392
<Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="install/" />
9493

95-
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" />
96-
<RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" />
97-
98-
9994
<Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
10095
<Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
10196
<Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
@@ -123,8 +118,9 @@
123118

124119
<Delete Files="$(MSBuildProjectDirectory)\Resources.Zip" />
125120

121+
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" ContinueOnError="True"/>
126122
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" />
127-
123+
<RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" ContinueOnError="True"/>
128124
<RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" />
129125

130126
</Target>

‎Components/OpenFormAPIController.cs

+7-5
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public HttpResponseMessage Submit()
250250
}
251251
}
252252
// language options
253-
optionsFilename = Path.GetDirectoryName(templateFilename) + "\\" + "options." + DnnUtils.GetCurrentCultureCode() + ".json";
253+
optionsFilename = Path.GetDirectoryName(templateFilename) + "\\" + "options." + DnnLanguageUtils.GetCurrentCultureCode() + ".json";
254254
if (File.Exists(optionsFilename))
255255
{
256256
string fileContent = File.ReadAllText(optionsFilename);
@@ -281,18 +281,20 @@ public HttpResponseMessage Submit()
281281
string body = formData;
282282
if (!string.IsNullOrEmpty(notification.EmailBody))
283283
{
284-
285284
body = hbs.Execute(notification.EmailBody, data);
286285
}
286+
string subject = notification.EmailSubject;
287+
if (!string.IsNullOrEmpty(notification.EmailSubject))
288+
{
289+
subject = hbs.Execute(notification.EmailSubject, data);
290+
}
287291
var attachements = new List<Attachment>();
288292
foreach (var item in statuses)
289293
{
290294
var file = FileManager.Instance.GetFile(item.id);
291295
attachements.Add(new Attachment(FileManager.Instance.GetFileContent(file), item.name));
292296
}
293-
294-
//string send = FormUtils.SendMail(from.ToString(), to.ToString(), reply?.ToString() ?? "", notification.EmailSubject, body);
295-
string send = FormUtils.SendMail(from.ToString(), to.ToString(), (reply == null ? "" : reply.ToString()), notification.EmailSubject, body, attachements);
297+
string send = FormUtils.SendMail(from.ToString(), to.ToString(), (reply == null ? "" : reply.ToString()), subject, body, attachements);
296298
if (!string.IsNullOrEmpty(send))
297299
{
298300
res.Errors.Add("From:" + from.ToString() + " - To:" + to.ToString() + " - " + send);

‎OpenForm.csproj

+17-2
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@
7777
<HintPath>ref\dnn740\Newtonsoft.Json.dll</HintPath>
7878
<Private>False</Private>
7979
</Reference>
80-
<Reference Include="OpenContent, Version=0.0.1.40237, Culture=neutral, processorArchitecture=MSIL">
80+
<Reference Include="OpenContent, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
8181
<SpecificVersion>False</SpecificVersion>
82-
<HintPath>..\..\bin\OpenContent.dll</HintPath>
82+
<HintPath>ref\OpenContent.dll</HintPath>
83+
<Private>False</Private>
8384
</Reference>
8485
<Reference Include="System" />
8586
<Reference Include="System.Data" />
@@ -186,6 +187,20 @@
186187
<Content Include="AlpacaFormBuilder.ascx" />
187188
<Content Include="Edit.ascx" />
188189
<Content Include="EditData.ascx" />
190+
<Content Include="images\edit.png" />
191+
<Content Include="images\editcontent2.png" />
192+
<Content Include="images\editsettings2.png" />
193+
<Content Include="images\edittemplate.png" />
194+
<Content Include="images\exchange.png" />
195+
<Content Include="images\formbuilder.png" />
196+
<Content Include="images\help.png" />
197+
<Content Include="images\icon_extensions.png" />
198+
<Content Include="images\settings.gif" />
199+
<Content Include="images\settings.png" />
200+
<Content Include="js\alpaca-bundle.js" />
201+
<Content Include="js\alpaca-bundle.min.js">
202+
<DependentUpon>alpaca-bundle.js</DependentUpon>
203+
</Content>
189204
<Content Include="js\builder\formbuilder.css" />
190205
<Content Include="js\builder\formbuilder.html" />
191206
<Content Include="js\builder\formbuilder.js" />

‎OpenForm.dnn

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="OpenForm" type="Module" version="03.04.00">
3+
<package name="OpenForm" type="Module" version="03.05.00">
44
<friendlyName>OpenForm</friendlyName>
55
<description>OpenForm module. Requires OpenContent v3.4.5 or higher</description>
6-
<iconFile>~/Images/icon_extensions.png</iconFile>
6+
<iconFile>~/DesktopModules/OpenForm/Images/icon_extensions.png</iconFile>
77
<owner>
88
<name>Satrabel.be</name>
99
<organization>Satrabel.be</organization>

‎Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
//
3131
// You can specify all the values or you can default the Revision and Build Numbers
3232
// by using the '*' as shown below:
33-
[assembly: AssemblyVersion("03.02.00.00")]
34-
[assembly: AssemblyFileVersion("03.02.00.00")]
33+
[assembly: AssemblyVersion("03.03.00.00")]
34+
[assembly: AssemblyFileVersion("03.03.00.00")]

‎ReleaseNotes.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<p class="Contributor">
33
Satrabel.be <br />
44
<a href="mailto:info@satrabel.be">info@satrabel.be</a><br />
5-
<a href=http://www.satrabel.be>http://www.satrabel.be</a><br />
5+
<a href="http://www.satrabel.be">http://www.satrabel.be</a><br />
6+
<a href="https://opencontent.readme.io/">Documentation</a><br />
67
</p>
78
<hr/>

0 commit comments

Comments
 (0)