Merge pull request #1849 from johnhenley/dev97/issues/regex-1845

TASK: Update Regex objects to use DNN cached regex objects

Author: johnhenley

Dnn.CommunityForums/CustomControls/ServerControls/Callback.cs

@@ -368,7 +368,7 @@ public string XSSFilter(string sText)
         {
             sText = System.Net.WebUtility.UrlDecode(sText);
             string pattern = "<script.*/*>|</script>|<[a-zA-Z][^>]*=['\"]+javascript:\\w+.*['\"]+>|<\\w+[^>]*\\son\\w+=.*[ /]*>";
-            return RegexUtils.GetCachedRegex(pattern, RegexOptions.Compiled & RegexOptions.IgnoreCase, 2).Replace(sText, string.Empty).Replace("-->", string.Empty).Replace("<!--", string.Empty);
+            return DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex(pattern, RegexOptions.Compiled & RegexOptions.IgnoreCase, 2).Replace(sText, string.Empty).Replace("-->", string.Empty).Replace("<!--", string.Empty);
         }
 
         protected override void CreateChildControls()

Dnn.CommunityForums/CustomControls/UserControls/WhatsNewRSS.cs

@@ -330,9 +330,7 @@ private string BuildRSS()
                         {
                             var strHost = Common.Globals.AddHTTP(Common.Globals.GetDomainName(HttpContext.Current.Request)) + "/";
                             const string pattern = "([IMAGE:(.+?)])";
-                            var regExp = new Regex(pattern);
-                            var matches = regExp.Matches(bodyHtml);
-                            foreach (Match match in matches)
+                            foreach (Match match in DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex(pattern).Matches(bodyHtml))
                             {
                                 var sImage = "<img src=\"" + strHost + "DesktopModules/ActiveForums/viewer.aspx?portalid=" + this.PortalId + "&moduleid=" + this.ModuleId + "&attachid=" + match.Groups[2].Value + "\" border=\"0\" />";
                                 bodyHtml = bodyHtml.Replace(match.Value, sImage);
@@ -344,9 +342,7 @@ private string BuildRSS()
                         {
                             var strHost = Common.Globals.AddHTTP(Common.Globals.GetDomainName(HttpContext.Current.Request)) + "/";
                             const string pattern = "(&#91;THUMBNAIL:(.+?)&#93;)";
-                            var regExp = new Regex(pattern);
-                            var matches = regExp.Matches(bodyHtml);
-                            foreach (Match match in matches)
+                            foreach (Match match in DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex(pattern).Matches(bodyHtml))
                             {
                                 var thumbId = match.Groups[2].Value.Split(':')[0];
                                 var parentId = match.Groups[2].Value.Split(':')[1];

Dnn.CommunityForums/class/TemplateUtils.cs

@@ -393,7 +393,7 @@ public static string ParseRoles(string template, string userRoles)
 
             const string pattern = @"\[ROLES:(.+?)\]";
 
-            template = Regex.Replace(template, pattern, delegate (Match match)
+            template = DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex(pattern).Replace(template, match =>
             {
                 if (userRoleArray == null || userRoleArray.Count == 0)
                 {
@@ -464,7 +464,7 @@ internal static string ParseProfile(DotNetNuke.Modules.ActiveForums.Entities.For
             var s = template ?? string.Empty;
             const string pattern = "(\\[DNN:PROFILE:(.+?)\\])";
 
-            foreach (Match match in Regex.Matches(s, pattern))
+            foreach (Match match in DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex(pattern).Matches(s))
             {
                 var sReplace = string.Empty;
                 var sResource = string.Empty;
@@ -565,7 +565,7 @@ private static string ParsePreview(int portalId, string template, string message
             {
                 var strHost = Common.Globals.AddHTTP(Common.Globals.GetDomainName(HttpContext.Current.Request)) + "/";
                 const string pattern = "([IMAGE:(.+?)])";
-                foreach (Match match in Regex.Matches(message, pattern))
+                foreach (Match match in DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex(pattern).Matches(message))
                 {
                     var sImage = string.Format("<img src=\"{0}DesktopModules/ActiveForums/viewer.aspx?portalid={1}&moduleid={2}&attachid={3}\" border=\"0\" />", strHost, portalId, moduleId, match.Groups[2].Value);
                     message = message.Replace(match.Value, sImage);
@@ -577,7 +577,7 @@ private static string ParsePreview(int portalId, string template, string message
             {
                 var strHost = string.Concat(Common.Globals.AddHTTP(Common.Globals.GetDomainName(HttpContext.Current.Request)), "/");
                 const string pattern = "(&#91;THUMBNAIL:(.+?)&#93;)";
-                foreach (Match match in Regex.Matches(message, pattern))
+                foreach (Match match in DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex(pattern).Matches(message))
                 {
                     var thumbId = match.Groups[2].Value.Split(':')[0];
                     var parentId = match.Groups[2].Value.Split(':')[1];
@@ -587,16 +587,9 @@ private static string ParsePreview(int portalId, string template, string message
             }
 
             template = template.Replace("[BODY]", message);
-            if (Regex.IsMatch(template, "<CODE([^>]*)>", RegexOptions.IgnoreCase))
+            if (DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex("<CODE([^>]*)>", RegexOptions.IgnoreCase).IsMatch(template))
             {
-                if (Regex.IsMatch(message, "<CODE([^>]*)>", RegexOptions.IgnoreCase))
-                {
-                    foreach (Match m in Regex.Matches(message, "<CODE([^>]*)>(.*?)</CODE>", RegexOptions.IgnoreCase))
-                    {
-                        message = message.Replace(m.Value, m.Value.Replace("<br>", System.Environment.NewLine));
-                    }
-                }
-
+                template = CodeParser.ReplaceBreakTagsWithNewLines(template);
                 template = CodeParser.ParseCode(System.Net.WebUtility.HtmlDecode(template));
             }