Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: Incorrect author shown in filtered topics view immediately after a reply #1261

Merged
merged 3 commits into from
Feb 6, 2025
Merged

FIX: Incorrect author shown in filtered topics view immediately after a reply #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5253618
FIX: Add 'IsRegistered' property to ForumUserInfo; don't use HttpCont…
johnhenley Jan 28, 2025
aba2cac
Refactor ForumUserController.GetDisplayName to remove HttpContext rel…
johnhenley Jan 28, 2025
bc96abe
FIX: population of topics ContentId in TopicView
johnhenley Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 1 addition & 53 deletions Dnn.CommunityForums/Controllers/ForumUserController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,58 +359,6 @@ public static string GetUserRank(int moduleId, DotNetNuke.Modules.ActiveForums.E
}
}

internal static string GetDisplayName(DotNetNuke.Entities.Portals.PortalSettings portalSettings, int moduleId, bool linkProfile, bool isMod, bool isAdmin, int userId, string username, string firstName = "", string lastName = "", string displayName = "", string profileLinkClass = "af-profile-link", string profileNameClass = "af-profile-name")
{
if (portalSettings == null)
{
portalSettings = DotNetNuke.Modules.ActiveForums.Utilities.GetPortalSettings();
}

if (portalSettings == null)
{
return null;
}

var mainSettings = SettingsBase.GetModuleSettings(moduleId);

var outputTemplate = string.IsNullOrWhiteSpace(profileLinkClass) ? "{0}" : string.Concat("<span class='", profileNameClass, "'>{0}</span>");

if (linkProfile && userId > 0)
{
var profileVisibility = mainSettings.ProfileVisibility;

switch (profileVisibility)
{
case ProfileVisibilities.Disabled:
linkProfile = false;
break;

case ProfileVisibilities.Everyone: // Nothing to do in this case
break;

case ProfileVisibilities.RegisteredUsers:
linkProfile = HttpContext.Current.Request.IsAuthenticated;
break;

case ProfileVisibilities.Moderators:
linkProfile = isMod || isAdmin;
break;

case ProfileVisibilities.Admins:
linkProfile = isAdmin;
break;
}

if (linkProfile && portalSettings.UserTabId != null && portalSettings.UserTabId != DotNetNuke.Common.Utilities.Null.NullInteger && portalSettings.UserTabId != -1)
outputTemplate = string.Concat("<a href='", Utilities.NavigateURL(portalSettings.UserTabId, string.Empty, new[] { "userid=" + userId }), "' class='", profileLinkClass, "' rel='nofollow'>{0}</a>");
}

var outputName = GetDisplayName(portalSettings, mainSettings, isMod, isAdmin, userId, username, firstName, lastName, displayName);
outputName = System.Net.WebUtility.HtmlEncode(outputName);

return string.Format(outputTemplate, outputName);
}

internal static bool CanLinkToProfile(DotNetNuke.Entities.Portals.PortalSettings portalSettings, SettingsInfo mainSettings, int moduleId, DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo accessingUser, DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo forumUser)
{
if (portalSettings == null)
Expand Down Expand Up @@ -441,7 +389,7 @@ internal static bool CanLinkToProfile(DotNetNuke.Entities.Portals.PortalSettings
break;

case ProfileVisibilities.RegisteredUsers:
canLinkToProfile = HttpContext.Current.Request.IsAuthenticated;
canLinkToProfile = accessingUser.IsRegistered;
break;

case ProfileVisibilities.Moderators:
Expand Down
11 changes: 7 additions & 4 deletions Dnn.CommunityForums/CustomControls/UserControls/TopicView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,10 +1028,13 @@ private string ParseContent(DataRow dr, string template, int rowcount)
{
var sOutput = template;

// most topic values come in first result set and are set in LoadData(); however some, like IP Address and contentId, comes in this result set.
this.topic.Content.IPAddress = dr.GetString("IPAddress");
this.topic.ContentId = dr.GetInt("ContentId");
this.topic.Content.ContentId = dr.GetInt("ContentId");
if (dr.GetInt("ReplyId").Equals(0))
{
// most topic values come in first result set and are set in LoadData(); however some, like IP Address and contentId, comes in this result set.
this.topic.Content.IPAddress = dr.GetString("IPAddress");
this.topic.ContentId = dr.GetInt("ContentId");
this.topic.Content.ContentId = dr.GetInt("ContentId");
}

var reply = new DotNetNuke.Modules.ActiveForums.Entities.ReplyInfo
{
Expand Down
12 changes: 5 additions & 7 deletions Dnn.CommunityForums/Entities/ForumUserInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@
namespace DotNetNuke.Modules.ActiveForums.Entities
{
using System;
using System.Web;
using System.Linq;

using DotNetNuke.ComponentModel.DataAnnotations;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Entities.Portals;
using DotNetNuke.Entities.Users;
using DotNetNuke.Security.Permissions;
using DotNetNuke.Services.Tokens;
using DotNetNuke.UI.UserControls;

[TableName("activeforums_UserProfiles")]
[PrimaryKey("ProfileId", AutoIncrement = true)]
Expand Down Expand Up @@ -154,10 +152,10 @@ public ForumUserInfo(int moduleId)
public string Email => string.IsNullOrEmpty(this.UserInfo?.Email) ? string.Empty : this.UserInfo?.Email;

[IgnoreColumn]
public bool GetIsMod(int ModuleId)
{
return (!this.IsAnonymous && !(string.IsNullOrEmpty(DotNetNuke.Modules.ActiveForums.Controllers.ForumController.GetForumsForUser(this.UserRoles, this.PortalId, ModuleId, "CanApprove"))));
}
public bool IsRegistered => !this.IsAnonymous && this.UserInfo != null && this.UserInfo.Roles.Contains(DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.GetRegisteredRoleName(this.PortalId));

[IgnoreColumn]
public bool GetIsMod(int ModuleId) => !this.IsAnonymous && !(string.IsNullOrEmpty(DotNetNuke.Modules.ActiveForums.Controllers.ForumController.GetForumsForUser(this.UserRoles, this.PortalId, ModuleId, "CanApprove")));

[IgnoreColumn]
public bool IsSuperUser => this.UserInfo != null && this.UserInfo.IsSuperUser;
Expand Down
2 changes: 1 addition & 1 deletion Dnn.CommunityForums/controls/af_sendto.ascx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected override void OnLoad(EventArgs e)
}

messageDefault = messageDefault.Replace("[TOPICLINK]", sURL);
messageDefault = messageDefault.Replace("[DISPLAYNAME]", DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.GetDisplayName(this.PortalSettings, this.ModuleId, false, false, false, this.UserId, this.UserInfo.Username, this.UserInfo.FirstName, this.UserInfo.LastName, this.UserInfo.DisplayName));
messageDefault = messageDefault.Replace("[DISPLAYNAME]", $"<span class='af-profile-name'>{DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.GetDisplayName(portalSettings: this.PortalSettings, mainSettings: this.MainSettings, isMod: false, isAdmin: false, userId: this.UserId, username: this.UserInfo.Username, firstName: this.UserInfo.FirstName, lastName: this.UserInfo.LastName, displayName: this.UserInfo.DisplayName)}</span>");
this.txtMessage.Text = messageDefault;
}
}
Expand Down
12 changes: 11 additions & 1 deletion Dnn.CommunityForums/feeds.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace DotNetNuke.Modules.ActiveForums
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using System.Web;
Expand Down Expand Up @@ -241,7 +242,16 @@ private string BuildItem(DataRow dr, int postTabID, int indent, bool includeBody
sb.Append(this.WriteElement("title", dr["Subject"].ToString(), indent + 1));
sb.Append(this.WriteElement("description", body, indent + 1));
sb.Append(this.WriteElement("link", uRL, indent + 1));
sb.Append(this.WriteElement("dc:creator", DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.GetDisplayName(this.PortalSettings, this.moduleID, false, false, false, -1, dr["AuthorUserName"].ToString(), dr["AuthorFirstName"].ToString(), dr["AuthorLastName"].ToString(), dr["AuthorDisplayName"].ToString(), null), indent + 1));
sb.Append(this.WriteElement("dc:creator", DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.GetDisplayName(portalSettings: this.PortalSettings,
mainSettings: mainSettings,
isMod: false,
isAdmin: false,
userId: -1,
username: dr["AuthorUserName"].ToString(),
firstName: dr["AuthorFirstName"].ToString(),
lastName: dr["AuthorLastName"].ToString(),
displayName: dr["AuthorDisplayName"].ToString()),
indent + 1));
sb.Append(this.WriteElement("pubDate", Convert.ToDateTime(dr["DateCreated"]).AddMinutes(this.offSet).ToString("r"), indent + 1));
sb.Append(this.WriteElement("guid", uRL, indent + 1));
sb.Append(this.WriteElement("slash:comments", dr["ReplyCount"].ToString(), indent + 1));
Expand Down