From d1468b8d62efa8024feb624eec1c7ca8681b3ada Mon Sep 17 00:00:00 2001 From: John Henley Date: Wed, 14 Feb 2024 02:59:31 +0000 Subject: [PATCH] TASK: Use constants rather than "-1" & "-3" for DNN "all users" and "unauthenticated users" --- Dnn.CommunityForums/Deprecated/API.cs | 2 +- .../class/Data/AttachmentsDB.cs | 2 +- Dnn.CommunityForums/class/ForumController.cs | 5 ++- Dnn.CommunityForums/class/Permissions.cs | 32 +++++++++---------- .../components/Social/ActiveSocial.cs | 4 +-- .../controls/admin_securitygrid.ascx.cs | 12 ++----- 6 files changed, 24 insertions(+), 33 deletions(-) diff --git a/Dnn.CommunityForums/Deprecated/API.cs b/Dnn.CommunityForums/Deprecated/API.cs index 36774d43..4cc8b93f 100644 --- a/Dnn.CommunityForums/Deprecated/API.cs +++ b/Dnn.CommunityForums/Deprecated/API.cs @@ -60,7 +60,7 @@ public class ForumGroups [Obsolete("Deprecated in Community Forums. Not Used. Scheduled removal in 09.00.00.")] public class Forums { - public int Forums_Save(int PortalId, ForumInfo fi, bool isNew, bool UseGroup) + public int Forums_Save(int PortalId, DotNetNuke.Modules.ActiveForums.Forum fi, bool isNew, bool UseGroup) { try { diff --git a/Dnn.CommunityForums/class/Data/AttachmentsDB.cs b/Dnn.CommunityForums/class/Data/AttachmentsDB.cs index 3122251f..7ad469c4 100644 --- a/Dnn.CommunityForums/class/Data/AttachmentsDB.cs +++ b/Dnn.CommunityForums/class/Data/AttachmentsDB.cs @@ -99,7 +99,7 @@ private static PermissionAttachment FillAttachment(IDataRecord dr) result.FileData = dr["FileData"] as byte[]; if (dr.HasColumn("CanRead")) - result.CanRead = Utilities.SafeConvertString(dr["CanRead"], "0;1;-3;-1;|||"); // Default to public read permissions + result.CanRead = Utilities.SafeConvertString(dr["CanRead"], "0;1;" + DotNetNuke.Common.Globals.glbRoleUnauthUser + ";" + DotNetNuke.Common.Globals.glbRoleAllUsers + ";|||"); // Default to public read permissions return result; } diff --git a/Dnn.CommunityForums/class/ForumController.cs b/Dnn.CommunityForums/class/ForumController.cs index 62cce6f5..8ece4696 100644 --- a/Dnn.CommunityForums/class/ForumController.cs +++ b/Dnn.CommunityForums/class/ForumController.cs @@ -296,8 +296,7 @@ public string GetForumsHtmlOption(int portalId, int moduleId, User currentUser) if (tmpGroupKey != groupKey) { - sb.AppendFormat("", "-1", groupName); - n += 1; + sb.AppendFormat("", "-1", groupName); n += 1; tmpGroupKey = groupKey; } @@ -472,7 +471,7 @@ public int CreateGroupForum(int portalId, int moduleId, int socialGroupId, int f continue; permSet = forumsDb.GetPermSet(permissionsId, secKey); - permSet = Permissions.AddPermToSet("-1", 0, permSet); + permSet = Permissions.AddPermToSet(DotNetNuke.Common.Globals.glbRoleAllUsers, 0, permSet); // forumsDb.SavePermSet(permissionsId, secKey, permSet); } } diff --git a/Dnn.CommunityForums/class/Permissions.cs b/Dnn.CommunityForums/class/Permissions.cs index 10607c27..1f617b39 100644 --- a/Dnn.CommunityForums/class/Permissions.cs +++ b/Dnn.CommunityForums/class/Permissions.cs @@ -369,17 +369,17 @@ internal static void CreateDefaultSets(int PortalId, int PermissionsId) } permSet = db.GetPermSet(PermissionsId, "View"); - permSet = AddPermToSet("-3", 0, permSet); - db.SavePermSet(PermissionsId, "View", permSet); + permSet = AddPermToSet(DotNetNuke.Common.Globals.glbRoleUnauthUser, 0, permSet); + db.SavePermSet(PermissionsId, "View", permSet); permSet = db.GetPermSet(PermissionsId, "Read"); - permSet = AddPermToSet("-3", 0, permSet); - db.SavePermSet(PermissionsId, "Read", permSet); + permSet = AddPermToSet(DotNetNuke.Common.Globals.glbRoleUnauthUser, 0, permSet); + db.SavePermSet(PermissionsId, "Read", permSet); permSet = db.GetPermSet(PermissionsId, "View"); - permSet = AddPermToSet("-1", 0, permSet); - db.SavePermSet(PermissionsId, "View", permSet); + permSet = AddPermToSet(DotNetNuke.Common.Globals.glbRoleAllUsers, 0, permSet); + db.SavePermSet(PermissionsId, "View", permSet); permSet = db.GetPermSet(PermissionsId, "Read"); - permSet = AddPermToSet("-1", 0, permSet); - db.SavePermSet(PermissionsId, "Read", permSet); + permSet = AddPermToSet(DotNetNuke.Common.Globals.glbRoleAllUsers, 0, permSet); + db.SavePermSet(PermissionsId, "Read", permSet); } public static string GetRoleIds(string[] Roles, int PortalId) { @@ -418,11 +418,11 @@ internal static NameValueCollection GetRolesNVC(int PortalId, string Roles) { switch (role) { - case "-1": - nvc.Add("-1", Common.Globals.glbRoleAllUsersName); + case DotNetNuke.Common.Globals.glbRoleAllUsers: + nvc.Add(DotNetNuke.Common.Globals.glbRoleAllUsers, DotNetNuke.Common.Globals.glbRoleAllUsersName); break; - case "-3": - nvc.Add("-3", Common.Globals.glbRoleUnauthUserName); + case DotNetNuke.Common.Globals.glbRoleUnauthUser: + nvc.Add(DotNetNuke.Common.Globals.glbRoleUnauthUser, Common.Globals.glbRoleUnauthUserName); break; default: roleName = GetRoleName(PortalId, role); @@ -457,11 +457,11 @@ internal static string GetRoleNames(int PortalId, string Roles) { switch (role) { - case "-1": - RoleNames = string.Concat(RoleNames + Common.Globals.glbRoleAllUsersName, ";"); + case DotNetNuke.Common.Globals.glbRoleAllUsers: + RoleNames = string.Concat(RoleNames + DotNetNuke.Common.Globals.glbRoleAllUsersName, ";"); break; - case "-3": - RoleNames = string.Concat(RoleNames + Common.Globals.glbRoleUnauthUserName, ";"); + case DotNetNuke.Common.Globals.glbRoleUnauthUser: + RoleNames = string.Concat(RoleNames + DotNetNuke.Common.Globals.glbRoleUnauthUserName, ";"); break; default: roleName = GetRoleName(PortalId: PortalId, role: role); diff --git a/Dnn.CommunityForums/components/Social/ActiveSocial.cs b/Dnn.CommunityForums/components/Social/ActiveSocial.cs index fde4dd89..64ac1f18 100644 --- a/Dnn.CommunityForums/components/Social/ActiveSocial.cs +++ b/Dnn.CommunityForums/components/Social/ActiveSocial.cs @@ -71,7 +71,7 @@ internal void AddTopicToJournal(int PortalId, int ModuleId, int TabId, int Forum foreach (string s in roles.Split(';')) { - if ((s == "-1") | (s == "-3")) + if ((s == DotNetNuke.Common.Globals.glbRoleAllUsers) | (s == DotNetNuke.Common.Globals.glbRoleUnauthUser)) { /* cjh - securityset was null and throwing an error, thus journal items weren't added */ if ((ji.SecuritySet != null) && !(ji.SecuritySet.Contains("E,"))) @@ -138,7 +138,7 @@ internal void AddReplyToJournal(int PortalId, int ModuleId, int TabId, int Forum foreach (string s in roles.Split(';')) { - if ((s == "-1") | (s == "-3")) + if ((s == DotNetNuke.Common.Globals.glbRoleAllUsers) | (s == DotNetNuke.Common.Globals.glbRoleUnauthUser)) { /* cjh - securityset was null and throwing an error, thus journal items weren't added */ if ((ji.SecuritySet != null) && (!(ji.SecuritySet.Contains("E,")))) diff --git a/Dnn.CommunityForums/controls/admin_securitygrid.ascx.cs b/Dnn.CommunityForums/controls/admin_securitygrid.ascx.cs index 9d87516d..3f68a2df 100644 --- a/Dnn.CommunityForums/controls/admin_securitygrid.ascx.cs +++ b/Dnn.CommunityForums/controls/admin_securitygrid.ascx.cs @@ -103,20 +103,12 @@ private void BindRoles() StringBuilder sb = new StringBuilder(); sb.Append(""); litRoles.Text = sb.ToString(); }