Merge pull request #120 from DNNCommunity/release/6.5.9

Released v6.5.9

Author: valadas

AssemblyInfo.cs

@@ -9,7 +9,7 @@
 [assembly: ComVisible(false)]
 
 
-[assembly: AssemblyVersion("06.05.08.00")]
+[assembly: AssemblyVersion("06.05.09.00")]
 [assembly: CLSCompliant(true)]
 [assembly: AssemblyFileVersion("06.05.08.00")]
 

BusinessController.cs

@@ -1,5 +1,7 @@
 using System.Collections;
 using System.Globalization;
+using DotNetNuke.Abstractions;
+using DotNetNuke.Abstractions.Portals;
 using DotNetNuke.Common.Utilities;
 using DotNetNuke.Entities.Modules;
 using DotNetNuke.Entities.Portals;
@@ -10,8 +12,14 @@ namespace DotNetNuke.Modules.UserDefinedTable.Components
 {
     public abstract class BaseController
     {
-        protected BaseController()
+        private readonly INavigationManager navigationManager;
+        private readonly IPortalAliasService portalAliasService;
+
+        protected BaseController(INavigationManager navigationManager, IPortalAliasService portalAliasService)
         {
+            this.navigationManager = navigationManager;
+            this.portalAliasService = portalAliasService;
+
             TabId = Null.NullInteger;
             TabModuleId = Null.NullInteger;
         }
@@ -22,6 +30,10 @@ protected BaseController()
         PortalInfo _portalInfo;
         Components.Settings _settings;
 
+        protected INavigationManager NavigationManager => navigationManager;
+
+        protected IPortalAliasService PortalAliasService => portalAliasService;
+
         public Components.Settings  Settings
         {
             get
@@ -77,16 +89,11 @@ public PortalInfo PortalInfo
 
         protected int PortalId { get; set; }
 
-
-        public string EditUrlPattern { get; set; }
-
         public void Initialise(ModuleInstanceContext context)
         {
             _moduleSettings  = context.Settings;
             Configuration = context.Configuration;
             User = context.PortalSettings.UserInfo;
-         
-            EditUrlPattern = context.EditUrl(  DataTableColumn.RowId.ToString(CultureInfo.InvariantCulture), "{0}","edit");
         }
 
         public void Initialise(int moduleId, int tabId, UserInfo user)

Components/BaseController.cs

@@ -1,5 +1,6 @@
 using System.Collections.Specialized;
 using System.Globalization;
+using System.Net;
 using DotNetNuke.Entities.Users;
 using DotNetNuke.Security;
 using DotNetNuke.Services.Tokens;
@@ -33,9 +34,8 @@ public string GetProperty(string strPropertyName, string strFormat, CultureInfo
             if (value != null)
             {
                 var security = new PortalSecurity();
-                value = security.InputFilter(value, PortalSecurity.FilterFlag.NoScripting);
-                return security.InputFilter(PropertyAccess.FormatString(value, strFormat),
-                                            PortalSecurity.FilterFlag.NoScripting);
+                value = WebUtility.HtmlEncode(value);
+                return WebUtility.HtmlDecode(PropertyAccess.FormatString(value, strFormat));
             }
             else
             {

Components/FilteredNameValueCollectionPropertyAccess.cs

@@ -3,10 +3,12 @@
 using System.Data;
 using System.IO;
 using System.Net.Mail;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Web;
 using System.Xml;
 using System.Xml.Xsl;
+using DotNetNuke.Abstractions.Portals;
 using DotNetNuke.Common;
 using DotNetNuke.Entities.Host;
 using DotNetNuke.Modules.UserDefinedTable.Interfaces;
@@ -24,13 +26,13 @@ public enum Trigger
             Delete
         }
 
-        public static void OnAction(Trigger trigger, int rowId, UserDefinedTableController udtC)
+        public static void OnAction(Trigger trigger, int rowId, UserDefinedTableController udtC, string httpAlias)
         {
             if (ActionIsTriggered(trigger, udtC.Settings))
             {
                 var ds = udtC.GetRow(rowId,true,true);
                 ds.Tables.Add(udtC.Context());
-                HandleAction(trigger, ds, udtC);
+                HandleAction(trigger, ds, udtC, httpAlias);
             }
         }
 
@@ -43,7 +45,7 @@ static bool ActionIsTriggered(Trigger trigger, Settings  settings)
         }
 
 
-        static void HandleAction(Trigger trigger, DataSet data, UserDefinedTableController udtC)
+        static void HandleAction(Trigger trigger, DataSet data, UserDefinedTableController udtC, string httpAlias)
         {
             var settings = udtC.Settings;
             var subject = settings.TrackingSubject;
@@ -85,7 +87,7 @@ static void HandleAction(Trigger trigger, DataSet data, UserDefinedTableControll
             subject =
                 ((new TokenReplace()).ReplaceEnvironmentTokens(subject, data.Tables[DataSetTableName.Data].Rows[0]));
 
-            SendMail(from, mailTo, cc, bcc, replyto, subject, data.GetXml(), message, triggerMessage, script);
+            SendMail(from, mailTo, cc, bcc, replyto, subject, data.GetXml(), message, triggerMessage, script, httpAlias);
         }
 
 
@@ -123,7 +125,7 @@ static string GetEmailAddressList(string mailto, DataSet data)
         }
 
         static void SendMail(string from, string mailTo, string cc, string bcc, string replyto, string subject,
-                             string data, string message, string trigger, string script)
+                             string data, string message, string trigger, string script, string httpAlias)
         {
             var xslTrans = new XslCompiledTransform();
             xslTrans.Load(HttpContext.Current.Server.MapPath(script));
@@ -143,12 +145,12 @@ static void SendMail(string from, string mailTo, string cc, string bcc, string r
                     var body = bodyTextWriter.ToString();
                     body = body.Replace("href=\"/",
                                         string.Format("href=\"http://{0}/",
-                                                      Globals.GetPortalSettings().PortalAlias.HTTPAlias.Split('/')[0]));
+                                                      httpAlias.Split('/')[0]));
                     body = body.Replace("src=\"/",
                                         string.Format("src=\"http://{0}/",
-                                                      Globals.GetPortalSettings().PortalAlias.HTTPAlias.Split('/')[0]));
+                                                      httpAlias.Split('/')[0]));
 
-                    var noAttachments = new List<Attachment>();
+                    var noAttachments = new List<MailAttachment>();
                     Mail.SendMail(from, mailTo, cc, bcc, replyto, MailPriority.Normal, subject, MailFormat.Html,
                                   Encoding.UTF8, body, noAttachments, "", "", "", "", Host.EnableSMTPSSL);
                 }