Merge branch 'release/v.3.5'

sachatrauwaen · May 26, 2019 · 4d865bb · 4d865bb
2 parents c223c7e + da7d4e2
commit 4d865bb
Show file tree

Hide file tree

Showing 11 changed files with 414 additions and 220 deletions.
diff --git a/App_LocalResources/View.ascx.nl-NL.resx b/App_LocalResources/View.ascx.nl-NL.resx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="cmdCancel.Text" xml:space="preserve">
+    <value>Annuleren</value>
+  </data>  
+  <data name="cmdSave.Text" xml:space="preserve">
+    <value>Verzenden</value>
+  </data>
+  <data name="Sending.Text" xml:space="preserve">
+    <value>Verzending...</value>
+  </data>
+</root>
diff --git a/BuildScripts/ModulePackage.targets b/BuildScripts/ModulePackage.targets
@@ -14,7 +14,7 @@
     </XmlRead>
 
     <!--in VS 2012 we exclude the packages folder -->
-    <ItemGroup>     
+    <ItemGroup>
       <InstallInclude Include="**\*.ascx" Exclude="packages\**" />
       <InstallInclude Include="**\*.asmx" Exclude="packages\**" />
       <InstallInclude Include="**\*.css" Exclude="packages\**" />
@@ -44,7 +44,7 @@
       <SourceInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;**\.git\**;" />
       <SourceInclude Include="**\images\**" />
       <SourceInclude Include="**\*.cs" />
-	  <SourceInclude Include="**\Packages\**" />
+      <SourceInclude Include="**\Packages\**" />
       <SourceInclude Include="**\*.cs.designer" />
       <SourceInclude Include="**\*.csproj" />
       <SourceInclude Include="**\*.targets" />
@@ -63,7 +63,6 @@
       <Output TaskParameter="Include" ItemName="PackageTxtFiles" />
     </CreateItem>
 
-
     <CreateItem Include="**\*.sqldataprovider">
       <Output TaskParameter="Include" ItemName="SqlDataProviderFiles" />
     </CreateItem>
@@ -92,10 +91,6 @@
     <!-- Copy the Install package to the Packages folder -->
     <Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="install/" />
 
-    <RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" />
-    <RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" />
-
-
     <Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
     <Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
@@ -123,8 +118,9 @@
 
     <Delete Files="$(MSBuildProjectDirectory)\Resources.Zip" />
 
+    <RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" ContinueOnError="True"/>
     <RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" />
-
+    <RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" ContinueOnError="True"/>
     <RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" />
 
   </Target>

diff --git a/Components/OpenFormAPIController.cs b/Components/OpenFormAPIController.cs
@@ -250,7 +250,7 @@ public HttpResponseMessage Submit()
                             }
                         }
                         // language options
-                        optionsFilename = Path.GetDirectoryName(templateFilename) + "\\" + "options." + DnnUtils.GetCurrentCultureCode() + ".json";
+                        optionsFilename = Path.GetDirectoryName(templateFilename) + "\\" + "options." + DnnLanguageUtils.GetCurrentCultureCode() + ".json";
                         if (File.Exists(optionsFilename))
                         {
                             string fileContent = File.ReadAllText(optionsFilename);
@@ -281,18 +281,20 @@ public HttpResponseMessage Submit()
                                 string body = formData;
                                 if (!string.IsNullOrEmpty(notification.EmailBody))
                                 {
-
                                     body = hbs.Execute(notification.EmailBody, data);
                                 }
+                                string subject = notification.EmailSubject;
+                                if (!string.IsNullOrEmpty(notification.EmailSubject))
+                                {
+                                    subject = hbs.Execute(notification.EmailSubject, data);
+                                }
                                 var attachements = new List<Attachment>();
                                 foreach (var item in statuses)
                                 {
                                     var file = FileManager.Instance.GetFile(item.id);
                                     attachements.Add(new Attachment(FileManager.Instance.GetFileContent(file), item.name));
                                 }
-
-                                //string send = FormUtils.SendMail(from.ToString(), to.ToString(), reply?.ToString() ?? "", notification.EmailSubject, body);
-                                string send = FormUtils.SendMail(from.ToString(), to.ToString(), (reply == null ? "" : reply.ToString()), notification.EmailSubject, body, attachements);
+                                string send = FormUtils.SendMail(from.ToString(), to.ToString(), (reply == null ? "" : reply.ToString()), subject, body, attachements);
                                 if (!string.IsNullOrEmpty(send))
                                 {
                                     res.Errors.Add("From:" + from.ToString() + " - To:" + to.ToString() + " - " + send);

diff --git a/OpenForm.csproj b/OpenForm.csproj
@@ -77,9 +77,10 @@
       <HintPath>ref\dnn740\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OpenContent, Version=0.0.1.40237, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="OpenContent, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\bin\OpenContent.dll</HintPath>
+      <HintPath>ref\OpenContent.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -186,6 +187,20 @@
     <Content Include="AlpacaFormBuilder.ascx" />
     <Content Include="Edit.ascx" />
     <Content Include="EditData.ascx" />
+    <Content Include="images\edit.png" />
+    <Content Include="images\editcontent2.png" />
+    <Content Include="images\editsettings2.png" />
+    <Content Include="images\edittemplate.png" />
+    <Content Include="images\exchange.png" />
+    <Content Include="images\formbuilder.png" />
+    <Content Include="images\help.png" />
+    <Content Include="images\icon_extensions.png" />
+    <Content Include="images\settings.gif" />
+    <Content Include="images\settings.png" />
+    <Content Include="js\alpaca-bundle.js" />
+    <Content Include="js\alpaca-bundle.min.js">
+      <DependentUpon>alpaca-bundle.js</DependentUpon>
+    </Content>
     <Content Include="js\builder\formbuilder.css" />
     <Content Include="js\builder\formbuilder.html" />
     <Content Include="js\builder\formbuilder.js" />

diff --git a/OpenForm.dnn b/OpenForm.dnn
@@ -1,9 +1,9 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="OpenForm" type="Module" version="03.04.00">
+    <package name="OpenForm" type="Module" version="03.05.00">
       <friendlyName>OpenForm</friendlyName>
       <description>OpenForm module. Requires OpenContent v3.4.5 or higher</description>
-      <iconFile>~/Images/icon_extensions.png</iconFile>
+      <iconFile>~/DesktopModules/OpenForm/Images/icon_extensions.png</iconFile>
       <owner>
         <name>Satrabel.be</name>
         <organization>Satrabel.be</organization>

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("03.02.00.00")]
-[assembly: AssemblyFileVersion("03.02.00.00")]
+[assembly: AssemblyVersion("03.03.00.00")]
+[assembly: AssemblyFileVersion("03.03.00.00")]
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -2,6 +2,7 @@
 <p class="Contributor">
 	Satrabel.be <br />
 	<a href="mailto:[email protected]">[email protected]</a><br />
-	<a href=http://www.satrabel.be>http://www.satrabel.be</a><br />
+	<a href="http://www.satrabel.be">http://www.satrabel.be</a><br />
+	<a href="https://opencontent.readme.io/">Documentation</a><br />
 </p>
 <hr/>