Merge pull request #259 from DNNCommunity/dev

07.00.05 release merge
DNNCommunity · Mar 28, 2023 · fde903e · fde903e
2 parents afeac7c + 05075a6
commit fde903e
Show file tree

Hide file tree

Showing 17 changed files with 333 additions and 141 deletions.
diff --git a/ActiveForums.csproj b/ActiveForums.csproj
@@ -644,7 +644,7 @@
     <None Include="sql\06.04.01.SqlDataProvider" />
     <None Include="sql\07.00.02.SqlDataProvider" />
     <None Include="sql\07.00.00.SqlDataProvider" />
-    <None Include="sql\07.00.02.SqlDataProvider" />
+    <None Include="sql\07.00.05.SqlDataProvider" />
     <None Include="sql\Enterprise.sql" />
     <Content Include="config\templates\ModAlert_text.txt" />
     <Content Include="config\templates\ModEmail_text.txt" />

diff --git a/ActiveForums.dnn b/ActiveForums.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Active Forums" type="Module" version="07.00.04">
+    <package name="Active Forums" type="Module" version="07.00.05">
       <friendlyName>Active Forums</friendlyName>
       <description>Community Forums: The official online forums module for the DNN Community.</description>
       <iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
@@ -73,7 +73,7 @@
             <attributes>
               <businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
               <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-              <upgradeVersionsList>06.04.00,06.04.01,06.05.00,06.05.01,06.06.00,07.00.00,07.00.01,07.00.04</upgradeVersionsList>
+              <upgradeVersionsList>06.04.00,06.04.01,06.05.00,06.05.01,06.06.00,07.00.00,07.00.01,07.00.02,07.00.03,07.00.04,07.00.05</upgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
@@ -84,7 +84,7 @@
             <assembly>
               <name>DotNetNuke.Modules.ActiveForums.dll</name>
               <sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
-              <version>07.00.04</version>
+              <version>07.00.05</version>
             </assembly>
           </assemblies>
         </component>
@@ -329,20 +329,30 @@
               <name>06.04.01.SqlDataProvider</name>
               <version>06.04.01</version>
             </script>
-            <script type="Install">
-              <path>sql</path>
-              <name>07.00.00.SqlDataProvider</name>
-              <version>07.00.00</version>
-            </script>
-            <script type="Install">
-              <path>sql</path>
-              <name>07.00.04.SqlDataProvider</name>
-              <version>07.00.04</version>
-            </script>
-            <script type="UnInstall">
+             <script type="Install">
+               <path>sql</path>
+               <name>07.00.00.SqlDataProvider</name>
+               <version>07.00.00</version>
+             </script>
+             <script type="Install">
+               <path>sql</path>
+               <name>07.00.02.SqlDataProvider</name>
+               <version>07.00.02</version>
+             </script>
+             <script type="Install">
+               <path>sql</path>
+               <name>07.00.04.SqlDataProvider</name>
+               <version>07.00.04</version>
+             </script>
+             <script type="Install">
+               <path>sql</path>
+               <name>07.00.05.SqlDataProvider</name>
+               <version>07.00.05</version>
+             </script>
+             <script type="UnInstall">
               <path>sql</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>07.00.04</version>
+              <version>07.00.05</version>
             </script>
           </scripts>
         </component>
@@ -378,7 +388,7 @@
       </components>
     </package>
 
-    <package name="Active Forums What's New" type="Module" version="07.00.04">
+    <package name="Active Forums What's New" type="Module" version="07.00.05">
       <friendlyName>Active Forums What's New</friendlyName>
       <foldername>ActiveForumsWhatsNew</foldername>
       <description>Community Forums: Display the most recent topics or replies from selected forums on any page within your site.</description>
@@ -447,7 +457,7 @@
       </components>
     </package>
 
-    <package name="Active Forums Viewer" type="Module" version="07.00.04">
+    <package name="Active Forums Viewer" type="Module" version="07.00.05">
 		  <friendlyName>Active Forums Viewer</friendlyName>
 		  <foldername>ActiveForumsViewer</foldername>
 		  <description>Community Forums: Display any forum topic view on any page within your site.</description>

diff --git a/ActiveForums_Symbols.dnn b/ActiveForums_Symbols.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Active Forums_Symbols" type="Library" version="07.00.04">
+    <package name="Active Forums_Symbols" type="Library" version="07.00.05">
       <friendlyName>Active Forums Symbols</friendlyName>
       <description>Community Forums: The official online forums module for the DNN Community.</description>
       <iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
@@ -14,7 +14,7 @@
       <releaseNotes src="ReleaseNotes.txt" />
       <azureCompatible>True</azureCompatible>
       <dependencies>
-        <dependency type="managedPackage" version="7.0.4">Active Forums</dependency>
+        <dependency type="managedPackage" version="7.0.5">Active Forums</dependency>
       </dependencies>
       <components>
         <component type="ResourceFile">

diff --git a/App_LocalResources/SharedResources.resx b/App_LocalResources/SharedResources.resx
@@ -1589,42 +1589,69 @@ From,
     <value>Split mode:</value>
   </data>
   <data name="ActiveTopics-15min.Text" xml:space="preserve">
-        <value>Last 15 minutes</value>
-    </data>
+    <value>Last 15 minutes</value>
+  </data>
   <data name="ActiveTopics-30min.Text" xml:space="preserve">
-        <value>Last 30 minutes</value>
-    </data>
+    <value>Last 30 minutes</value>
+  </data>
   <data name="ActiveTopics-45min.Text" xml:space="preserve">
-        <value>Last 45 minutes</value>
-    </data>
+    <value>Last 45 minutes</value>
+  </data>
   <data name="ActiveTopics-60min.Text" xml:space="preserve">
-        <value>Last hour</value>
-    </data>
+    <value>Last hour</value>
+  </data>
   <data name="ActiveTopics-120min.Text" xml:space="preserve">
-        <value>Last 2 hours</value>
-    </data>
+    <value>Last 2 hours</value>
+  </data>
   <data name="ActiveTopics-360min.Text" xml:space="preserve">
-        <value>Last 6 hours</value>
-    </data>
+    <value>Last 6 hours</value>
+  </data>
   <data name="ActiveTopics-720min.Text" xml:space="preserve">
-        <value>Last 12 hours</value>
-    </data>
+    <value>Last 12 hours</value>
+  </data>
   <data name="ActiveTopics-1440min.Text" xml:space="preserve">
-        <value>Last day</value>
-    </data>
+    <value>Last day</value>
+  </data>
   <data name="ActiveTopics-2880min.Text" xml:space="preserve">
-        <value>Last 2 days</value>
-    </data>
+    <value>Last 2 days</value>
+  </data>
   <data name="ActiveTopics-10080min.Text" xml:space="preserve">
-        <value>Last week</value>
-    </data>
+    <value>Last week</value>
+  </data>
   <data name="ActiveTopics-20160min.Text" xml:space="preserve">
-        <value>Last 2 weeks</value>
+    <value>Last 2 weeks</value>
   </data>
   <data name="ActiveTopics-40320min.Text" xml:space="preserve">
-        <value>Last month</value>
+    <value>Last month</value>
   </data>
   <data name="ActiveTopics-80640min.Text" xml:space="preserve">
-        <value>Last 2 months</value>
+    <value>Last 2 months</value>
+  </data>
+  <data name="[RESX:NewPost].Text" xml:space="preserve">
+    <value>new post</value>
+  </data>
+  <data name="[RESX:NewReply].Text" xml:space="preserve">
+    <value>new reply</value>
+  </data>
+  <data name="[RESX:SubscribedForumName].Text" xml:space="preserve">
+    <value>Subscribed Forum {0}</value>
+  </data>
+  <data name="[RESX:SubscribedForum].Text" xml:space="preserve">
+    <value>Subscribed Forum</value>
+  </data>
+  <data name="[RESX:SubscribedTopicSubject].Text" xml:space="preserve">
+    <value>Subscribed Topic {0}</value>
+  </data>
+  <data name="[RESX:SubscribedTopic].Text" xml:space="preserve">
+    <value>Subscribed Topic</value>
+  </data>
+  <data name="[RESX:SubscribedTopicForumName].Text" xml:space="preserve">
+    <value>Subscribed Topic {0} on Forum {1}</value>
+  </data>
+  <data name="[RESX:postedIn.Text]" xml:space="preserve">
+    <value>posted in</value>
+  </data>
+  <data name="[RESX:repliedto.Text]" xml:space="preserve">
+    <value>replied to</value>
   </data>
 </root>
diff --git a/CustomControls/ServerControls/QuickReply.cs b/CustomControls/ServerControls/QuickReply.cs
@@ -188,21 +188,12 @@ private void ambtnSubmit_Click(object sender, System.EventArgs e)
         #region Private Methods
         private void SaveQuickReply()
         {
-            int iFloodInterval = MainSettings.FloodInterval;
-            if (iFloodInterval > 0)
+            ForumController fc = new ForumController();
+            Forum forumInfo = fc.Forums_Get(SiteId, InstanceId, ForumId, this.UserId, true, false, TopicId);
+            if (!Utilities.HasFloodIntervalPassed(floodInterval: MainSettings.FloodInterval, user: ForumUser, forumInfo: forumInfo))
             {
-                UserProfileController upc = new UserProfileController();
-                UserProfileInfo upi = upc.Profiles_Get(SiteId, InstanceId, this.UserId);
-                if (upi != null)
-                {
-                    if (SimulateDateDiff.DateDiff(SimulateDateDiff.DateInterval.Second, upi.DateLastPost, DateTime.UtcNow) < iFloodInterval)
-                    {
-                        Controls.InfoMessage im = new Controls.InfoMessage();
-                        im.Message = "<div class=\"afmessage\">" + string.Format(Utilities.GetSharedResource("[RESX:Error:FloodControl]"), iFloodInterval) + "</div>";
-                        plhMessage.Controls.Add(im);
-                        return;
-                    }
-                }
+                plhMessage.Controls.Add(new InfoMessage { Message = "<div class=\"afmessage\">" + string.Format(GetSharedResource("[RESX:Error:FloodControl]"), MainSettings.FloodInterval) + "</div>" });
+                return;
             }
             //TODO: Fix for anon
             //If Not Current.Request.IsAuthenticated Then
@@ -222,9 +213,7 @@ private void SaveQuickReply()
             //    ui.TrustLevel = -1
 
             //End If
-            ForumController fc = new ForumController();
-            Forum forumInfo = fc.Forums_Get(SiteId, InstanceId, ForumId, this.UserId, true, false, TopicId);
-            bool UserIsTrusted = false;
+             bool UserIsTrusted = false;
             UserIsTrusted = Utilities.IsTrusted((int)forumInfo.DefaultTrustValue, ControlConfig.User.TrustLevel, Permissions.HasPerm(forumInfo.Security.Trust, ForumUser.UserRoles), forumInfo.AutoTrustLevel, ControlConfig.User.PostCount);
             bool isApproved = false;
             isApproved = Convert.ToBoolean(((forumInfo.IsModerated == true) ? false : true));

diff --git a/CustomControls/UserControls/TopicView.cs b/CustomControls/UserControls/TopicView.cs
@@ -59,14 +59,14 @@ public class TopicView : ForumBase
         private bool _bTrust;
         private bool _bDelete;
         private bool _bEdit;
-        private bool _bLock;
-        private bool _bPin;
         private bool _bSubscribe;
         private bool _bModApprove;
         private bool _bModSplit;
         private bool _bModDelete;
         private bool _bModEdit;
         private bool _bModMove;
+        private bool _bModLock = false;
+        private bool _bModPin = false;
         private bool _bAllowRSS;
         private int _rowIndex;
         private int _pageSize = 20;
@@ -353,6 +353,8 @@ private void LoadData(int pageId)
             _bTrust = Permissions.HasPerm(_drSecurity["CanTrust"].ToString(), ForumUser.UserRoles);
             _bModEdit = Permissions.HasPerm(_drSecurity["CanModEdit"].ToString(), ForumUser.UserRoles);
             _bModMove = Permissions.HasPerm(_drSecurity["CanModMove"].ToString(), ForumUser.UserRoles);
+            _bModPin = Permissions.HasPerm(_drSecurity["CanModPin"].ToString(), ForumUser.UserRoles);
+            _bModLock = Permissions.HasPerm(_drSecurity["CanModLock"].ToString(), ForumUser.UserRoles);
 
             _isTrusted = Utilities.IsTrusted((int)ForumInfo.DefaultTrustValue, ForumUser.TrustLevel, Permissions.HasPerm(ForumInfo.Security.Trust, ForumUser.UserRoles));
 
@@ -1332,7 +1334,6 @@ private string ParseContent(DataRow dr, string tempate, int rowcount)
 
 
 
-
             // Parse Roles -- This should actually be taken care of in ParseProfileTemplate
             //if (sOutput.Contains("[ROLES:"))
             //    sOutput = TemplateUtils.ParseRoles(sOutput, (up.UserId == -1) ? string.Empty : up.Profile.Roles);
@@ -1406,6 +1407,26 @@ private string ParseContent(DataRow dr, string tempate, int rowcount)
                 sbOutput = sbOutput.Replace("[ACTIONS:MOVE]", string.Empty);
             }
 
+            if (_bModLock)
+            {
+                //sbOutput = sbOutput.Replace("[ACTIONS:LOCK]", "<a href=\"javascript:void(0)\" onclick=\"javascript:if(confirm('[RESX:Confirm:Lock]')){amaf_modLock([TOPICID]);};\" title=\"[RESX:LockTopic]\" style=\"vertical-align:middle;\"><i class=\"fa fa-lock fa-fw fa-blue\"></i></a>");
+                sbOutput = sbOutput.Replace("[ACTIONS:LOCK]", "<li onclick=\"javascript:if(confirm('[RESX:Confirm:Lock]')){amaf_modLock([TOPICID]);};\" title=\"[RESX:Lock]\"><i class=\"fa fa-lock fa-fm fa-blue\"></i>&nbsp;[RESX:Lock]</li>");
+
+            }
+            else
+            {
+                sbOutput = sbOutput.Replace("[ACTIONS:LOCK]", string.Empty);
+            }
+            if (_bModPin)
+            {
+                //sbOutput = sbOutput.Replace("[ACTIONS:PIN]", "<a href=\"javascript:void(0)\" onclick=\"javascript:if(confirm('[RESX:Confirm:Pin]')){amaf_modPin([TOPICID]);};\" title=\"[RESX:Pin]\" style=\"vertical-align:middle;\"><i class=\"fa fa-thumb-tack fa-fw fa-blue\"></i></a>");
+                sbOutput.Replace("[ACTIONS:PIN]", "<li onclick=\"javascript:if(confirm('[RESX:Confirm:Pin]')){amaf_modPin([TOPICID]);};\" title=\"[RESX:Pin]\"><i class=\"fa fa-thumb-tack fa-fm fa-blue\"></i>&nbsp;[RESX:Pin]</li>");
+
+            }
+            else
+            {
+                sbOutput = sbOutput.Replace("[ACTIONS:PIN]", string.Empty);
+            }
             sbOutput = sbOutput.Replace("[TOPICID]", TopicId.ToString());
 
             // Status

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -52,9 +52,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("07.00.04")]
+[assembly: AssemblyVersion("07.00.05")]
 
-[assembly: AssemblyFileVersion("07.00.04")]
+[assembly: AssemblyFileVersion("07.00.05")]
 
 [assembly: WebResource("DotNetNuke.Modules.ActiveForums.CustomControls.Resources.cb.js", "text/javascript")]
 [assembly: WebResource("DotNetNuke.Modules.ActiveForums.scripts.afadmin.properties.js", "text/javascript")]

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -7,6 +7,14 @@
 	<hr/>
 	<div class="dnnClear">
 
+		<h3>07.00.05</h3>
+		<h4>Features, Enhancements, and Bug Fixes</h4>
+		<ul>
+			<li>NEW: Applies Flood Control to All User Types, Including Admins (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/95">Issue 95</a>, thanks <a href="https://github.com/johnhenley" target="_blank">@johnhenley</a>!)</li>
+			<li>NEW: Improved Email Notifications &amp; Tokens (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/169">Issue 169</a>, thanks <a href="https://github.com/johnhenley" target="_blank">@johnhenley</a>!)</li>
+			<li>BUG: Copies Missing Moderator Controls to Posts View (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/153">Issue 153</a>, thanks <a href="https://github.com/johnhenley" target="_blank">@johnhenley</a>!)</li>
+		</ul>
+
 		<h3>07.00.04</h3>
 		<h4>Features, Enhancements, and Bug Fixes</h4>
 		<ul>