Merge pull request #1565 from johnhenley/issues/cant-edit-post-1562

FIX: Regular user can't edit own post if "edit interval" module setting used for spam control

Author: johnhenley

Dnn.CommunityForums/App_LocalResources/SharedResources.de-DE.resx

@@ -580,7 +580,7 @@ Von
   <data name="[RESX:MemberSince].Text" xml:space="preserve">
     <value>Mitglied seit</value>
   </data>
-  <data name="[RESX:Message:EditIntervalReached].Text" xml:space="preserve">
+  <data name="[RESX:Message:EditIntervalNotReached].Text" xml:space="preserve">
     <value>In diesem Forum können Sie Ihren Beitrag nur innerhalb von {0} Minuten ab dem Zeitpunkt bearbeiten, an dem Sie Ihren Beitrag erstellt haben.</value>
   </data>
   <data name="[RESX:Message].Text" xml:space="preserve">

Dnn.CommunityForums/App_LocalResources/SharedResources.es-ES.resx

@@ -580,7 +580,7 @@ De
   <data name="[RESX:MemberSince].Text" xml:space="preserve">
     <value>Miembro desde</value>
   </data>
-  <data name="[RESX:Message:EditIntervalReached].Text" xml:space="preserve">
+  <data name="[RESX:Message:EditIntervalNotReached].Text" xml:space="preserve">
     <value>Este foro solo te permite editar una publicación durante {0} minutos desde el momento en que se publicó.</value>
   </data>
   <data name="[RESX:Message].Text" xml:space="preserve">

Dnn.CommunityForums/App_LocalResources/SharedResources.fr-FR.resx

@@ -580,7 +580,7 @@ De,
   <data name="[RESX:MemberSince].Text" xml:space="preserve">
     <value>Membre depuis</value>
   </data>
-  <data name="[RESX:Message:EditIntervalReached].Text" xml:space="preserve">
+  <data name="[RESX:Message:EditIntervalNotReached].Text" xml:space="preserve">
     <value>Ce forums permet seulement l'édition de publications en moins de {0} minutes suite à la publication initiale.</value>
   </data>
   <data name="[RESX:Message].Text" xml:space="preserve">

Dnn.CommunityForums/App_LocalResources/SharedResources.it-IT.resx

@@ -580,7 +580,7 @@ Da
   <data name="[RESX:MemberSince].Text" xml:space="preserve">
     <value>Membro dal</value>
   </data>
-  <data name="[RESX:Message:EditIntervalReached].Text" xml:space="preserve">
+  <data name="[RESX:Message:EditIntervalNotReached].Text" xml:space="preserve">
     <value>Questo forum ti consente di modificare il tuo post solo entro {0} minuti dal momento in cui hai creato il tuo post.</value>
   </data>
   <data name="[RESX:Message].Text" xml:space="preserve">

Dnn.CommunityForums/App_LocalResources/SharedResources.nl-NL.resx

@@ -1099,7 +1099,7 @@ Van,
   <data name="[RESX:PrefTopicSubscribe].Help" xml:space="preserve">
     <value>Dit is uw standaardinstelling wanneer u een onderwerp maakt of een antwoord toevoegt. Dit heeft geen invloed op abonnementen op forumniveau.</value>
   </data>
-  <data name="[RESX:Message:EditIntervalReached].Text" xml:space="preserve">
+  <data name="[RESX:Message:EditIntervalNotReached].Text" xml:space="preserve">
     <value>Dit forum staat toe dat u uw berichten kunt wijzigen tenminste {0} minuten nadat u het bericht heeft geplaatst.</value>
   </data>
   <data name="[RESX:SubmitVote].Text" xml:space="preserve">

Dnn.CommunityForums/App_LocalResources/SharedResources.resx

@@ -1102,7 +1102,7 @@ From,
   <data name="[RESX:PrefTopicSubscribe].Help" xml:space="preserve">
     <value>This will be your default setting when you are creating a topic or adding a reply.  This does not affect forum level subscriptions.</value>
   </data>
-  <data name="[RESX:Message:EditIntervalReached].Text" xml:space="preserve">
+  <data name="[RESX:Message:EditIntervalNotReached].Text" xml:space="preserve">
     <value>This forum only allows you to edit your post within {0} minutes from the time you created your post.</value>
   </data>
   <data name="[RESX:SubmitVote].Text" xml:space="preserve">

Dnn.CommunityForums/ReleaseNotes.txt

@@ -80,8 +80,9 @@
         <h4>Bug Fixes</h4>
         <ul>
             <li>FIX: Update indexes on forum/topic tracking tables for uniqueness; upgrade script to detect and remove duplicates, keeping the latest entries (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1434">Issue 1434</a>)</li>
-            <li>FIX: Forum Viewer updated to working correctly with friendly URLs and localized sites (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1557">Issue 1557</a>)</li>
-            <li>FIX: Permissions preventing viewing of attachments (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1559">Issue 1559</a>)</li>
+            <li>FIX: Friendly URLs updated to working correctly with Forum Viewer and/or localized sites (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1557">Issue 1557</a>)</li>
+            <li>FIX: Incorrect logic in permissions checking for attachments (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1559">Issue 1559</a>)</li>
+            <li>FIX: Non-Admin/Non-Moderator is unable to edit their own post when edit interval/spam control feature used (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1562">Issue 1562</a>)</li>
 
 <!--
              <li>None at this time.</li>

Dnn.CommunityForums/controls/af_post.ascx.cs

@@ -377,11 +377,11 @@ private void LoadTopic()
                 this.Response.Redirect(this.NavigateUrl(this.TabId), false);
                 this.Context.ApplicationInstance.CompleteRequest();
             }
-            else if (!this.canModEdit && ti.Content.AuthorId == this.UserId && this.canEdit && this.MainSettings.EditInterval > 0 && DateTime.UtcNow.Subtract(ti.Content.DateCreated).TotalMinutes > this.MainSettings.EditInterval)
+            else if (!this.canModEdit && ti.Content.AuthorId == this.UserId && this.canEdit && !Utilities.HasEditIntervalPassed(editInterval: this.ForumInfo.MainSettings.EditInterval, forumUser: this.ForumUser, forumInfo: this.ForumInfo, postInfo: ti))
             {
                 var im = new InfoMessage
                 {
-                    Message = "<div class=\"afmessage\">" + string.Format(this.GetSharedResource("[RESX:Message:EditIntervalReached]"), this.MainSettings.EditInterval) + "</div>",
+                    Message = "<div class=\"afmessage\">" + string.Format(this.GetSharedResource("[RESX:Message:EditIntervalNotReached]"), this.MainSettings.EditInterval) + "</div>",
                 };
                 this.plhMessage.Controls.Add(im);
                 this.plhContent.Controls.Clear();
@@ -467,7 +467,7 @@ private void LoadReply()
             {
                 var im = new Controls.InfoMessage
                 {
-                    Message = "<div class=\"afmessage\">" + string.Format(this.GetSharedResource("[RESX:Message:EditIntervalReached]"), this.MainSettings.EditInterval.ToString()) + "</div>",
+                    Message = "<div class=\"afmessage\">" + string.Format(this.GetSharedResource("[RESX:Message:EditIntervalNotReached]"), this.MainSettings.EditInterval.ToString()) + "</div>",
                 };
                 this.plhMessage.Controls.Add(im);
                 this.plhContent.Controls.Clear();