Merge pull request #49 from valadas/master

Fixed an issue where the Referrer and UserAgent where reversed
DNNCommunity · Nov 1, 2018 · a5e6c09 · a5e6c09
2 parents 9ccbcc9 + 901a2f4
commit a5e6c09
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 4 deletions.
diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb
@@ -49,7 +49,7 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("06.06.02.02")>
+<Assembly: AssemblyVersion("06.06.02.05")>
 
 <Assembly: AssemblyFileVersion("06.06.01.00")>
 <Assembly: ComVisibleAttribute(False)>
diff --git a/DotNetNuke.Modules.Feedback.vbproj b/DotNetNuke.Modules.Feedback.vbproj
@@ -418,6 +418,7 @@
     <None Include="Installation\06.01.00.SqlDataProvider" />
     <None Include="Installation\06.02.00.SqlDataProvider" />
     <None Include="Installation\06.03.00.SqlDataProvider" />
+    <Content Include="Installation\06.06.02.SqlDataProvider" />
     <None Include="Installation\06.04.00.SqlDataProvider" />
     <None Include="Installation\DotNetNuke.Modules.Feedback.dnn">
       <SubType>Designer</SubType>

diff --git a/Feedback.ascx.vb b/Feedback.ascx.vb
@@ -595,8 +595,8 @@ Namespace DotNetNuke.Modules.Feedback
                         Next
                     End If
 
-                    oFeedback.Referrer = Request.UserAgent
-                    oFeedback.UserAgent = Request.UrlReferrer.ToString
+                    oFeedback.UserAgent = Request.UserAgent
+                    oFeedback.Referrer = Request.UrlReferrer.ToString
                     oFeedback.Status = status
 
                     'Akisemet spam check if required

diff --git a/Installation/06.06.02.SqlDataProvider b/Installation/06.06.02.SqlDataProvider
@@ -0,0 +1,17 @@
+/**********************************************************************/
+/*****                    06.06.02.SqlDataProvider                *****/
+/*****                                                            *****/
+/*****                                                            *****/
+/*****    Note: To manually execute this script you must          *****/
+/*****          perform a search and replace operation            *****/
+/*****          for {databaseOwner} and {objectQualifier}         *****/
+/*****                                                            *****/
+/**********************************************************************/
+
+/************************************************/
+/***     Swap Referrer and UserAgent          ***/
+/************************************************/
+UPDATE {databaseOwner}[{objectQualifier}Feedback]
+   SET Referrer = UserAgent
+      ,UserAgent = Referrer      
+GO
diff --git a/Installation/DotNetNuke.Modules.Feedback.dnn b/Installation/DotNetNuke.Modules.Feedback.dnn
@@ -80,6 +80,11 @@
                   <name>06.04.00.SqlDataProvider</name>
                   <version>06.04.00</version>
               </script>
+            <script type="Install">
+              <path>Installation</path>
+              <name>06.06.02.SqlDataProvider</name>
+              <version>06.06.02</version>
+            </script>
               <script type="Uninstall">
               <path>Installation</path>
               <name>Uninstall.SqlDataProvider</name>

diff --git a/Installation/ReleaseNotes/Release.06.06.02.htm b/Installation/ReleaseNotes/Release.06.06.02.htm
@@ -3,6 +3,7 @@ <h2>DotNetNuke&reg; Feedback Module v. 06.06.02 -- RELEASE NOTES</h2>
 <h3>Bug Fixes</h3>
 <ul>
 	<li>Issue #46 : Fixed an issue that prevented sending emails with some combination of settings</li>
+    <li>Issue #48 : Fixed an issue where the Referred and UserAgent where reversed</li>
 </ul>
 <h3>Enhancements</h3>
 <ul>

diff --git a/_buildfiles/version.txt b/_buildfiles/version.txt
@@ -1 +1 @@
-6.6.2.2
+6.6.2.5