New Release 6.5.4, fixes #65

DNNCommunity · Sep 22, 2019 · 612caa7 · 612caa7
1 parent 76260af
commit 612caa7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: ComVisible(false)]
 
 
-[assembly: AssemblyVersion("06.05.03.00")]
+[assembly: AssemblyVersion("06.05.04.00")]
 [assembly: CLSCompliant(true)]
-[assembly: AssemblyFileVersion("06.05.03.00")]
+[assembly: AssemblyFileVersion("06.05.04.00")]
 
diff --git a/Components/GlobalConstants.cs b/Components/GlobalConstants.cs
@@ -118,7 +118,6 @@ public class SettingName
         public const string SortOrder = "UDT_SortOrder";
         public const string CalculatedColumnsRenderExpressionInForm = "CalculatedColumnsRenderExpressionInForm";
         public const string URLNewWindow = "UDT_URLNewWindow";
-        public const string URLDownloadTracking = "UDT_ URLDownloadTracking";
         public const string UserLinkNewWindow = "UDT_UserLinkNewWindow";
         public const string UserLinkCaption = "UDT_UserLinkUserName";
         public const string CnCLink = "UDT_CnCLink";

diff --git a/DataTypes/Download.cs b/DataTypes/Download.cs
@@ -21,21 +21,17 @@ namespace DotNetNuke.Modules.UserDefinedTable.DataTypes
     /// -----------------------------------------------------------------------------
     public class EditDownload : EditURL
     {
-        void EditDownload_Load(object sender, EventArgs e)
+        internal override void EditURL_Load(object sender, EventArgs e)
         {
             if (! Page.IsPostBack && IsNotAListOfValues)
             {
                 CtlUrl.ShowUrls = false;
                 CtlUrl.ShowTabs = false;
                 CtlUrl.ShowTrack = true;
+                CtlUrl.ShowLog = false;
             }
         }
 
-        public EditDownload()
-        {
-            Load += EditDownload_Load;
-        }
-
         public override string Value
         {
             get

diff --git a/DataTypes/URL.cs b/DataTypes/URL.cs
@@ -85,7 +85,7 @@ void InitEditControl()
         }
 
 
-        void EditURL_Load(object sender, EventArgs e)
+        internal virtual void EditURL_Load(object sender, EventArgs e)
         {
             //we need to intilialize only once
             if (! Page.IsPostBack)
@@ -129,8 +129,9 @@ public override string Value
                     var settings = mc.GetModule(ModuleId).ModuleSettings;
 
                     var urlController = new UrlController();
+                    var trackDownloads = GetFieldSetting("TrackDownloads").AsBoolean();
                     urlController.UpdateUrl(PortalId, CtlUrl.Url, CtlUrl.UrlType, CtlUrl.Log,
-                                      settings[SettingName.URLDownloadTracking].AsBoolean(), CtlUrl.ModuleID,
+                                      trackDownloads, CtlUrl.ModuleID,
                                       CtlUrl.NewWindow);
                     returnValue = CtlUrl.Url + (CtlUrl.NewWindow ? "|options=W" : "");
                 }
@@ -268,7 +269,7 @@ void FillTypeColumns(int moduleId, TokenReplace objTokenReplace, PortalSettings
             var isLink = true;
             //Link readable by browsers
             link = UrlUtil.StripURL(link);
-            var url  = HttpUtility.HtmlEncode(Globals.LinkClick(link, portalSettings.ActiveTab.TabID, moduleId));
+            var url  = Globals.LinkClick(link, portalSettings.ActiveTab.TabID, moduleId, field.TrackDownloads, field.EnforceDownload);
             if (link != string.Empty)
             {
                 switch (Globals.GetURLType(link))
@@ -307,9 +308,7 @@ void FillTypeColumns(int moduleId, TokenReplace objTokenReplace, PortalSettings
                                     caption = tab.TabName;
                                 }
                             }
-                            url =field.EnforceDownload 
-                                ? Globals.LinkClick(link, portalSettings.ActiveTab.TabID, moduleId) 
-                                : Globals.NavigateURL(int.Parse(link));
+                            url = field.EnforceDownload ? url : Globals.NavigateURL(int.Parse(link));
                         }
                         else
                         {
@@ -374,7 +373,7 @@ void FillTypeColumns(int moduleId, TokenReplace objTokenReplace, PortalSettings
                 string strFieldvalue;
                 if (isLink)
                 {
-                    strFieldvalue = string.Format("<!--{1}--><a href=\"{0}\"{2}>{1}</a>", HttpUtility.HtmlEncode(url),
+                    strFieldvalue = string.Format("<!--{1}--><a href=\"{0}\"{2}>{1}</a>", url,
                                                   caption, (openInNewWindow ? " target=\"_blank\"" : ""));
                 }
                 else

diff --git a/FormAndList.dnn b/FormAndList.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_UserDefinedTable" type="Module" version="06.05.03">
+    <package name="DNN_UserDefinedTable" type="Module" version="06.05.04">
       <friendlyName>Form and List</friendlyName>
       <description>Create a simple form or a view of repetitive and simple data.</description>
       <iconFile>desktopmodules/userdefinedtable/icon_fnl_32px.gif</iconFile>

diff --git a/releasenotes.htm b/releasenotes.htm
@@ -1,5 +1,11 @@
 <h3>Release Notes</h3>
 
+<h2>DNN Form and List 06.05.04</h2>
+<p>Changes</p>
+<ul>
+    <li>Fix: Track number of clicks for Url and Download</li>
+</ul>
+
 <h2>DNN Form and List 06.05.03</h2>
 <p>Changes</p>
 <ul>