Skip to content

Commit

Permalink
Merge pull request #663 from johnhenley/dev81/1-refactoring/3-constan…
Browse files Browse the repository at this point in the history 
…ts-registeredusers-administrators

TASK: Use constants rather than "-1" & "-3" for DNN "all users" and "unauthenticated" users
  • Loading branch information
@WillStrohl
WillStrohl committed Feb 14, 2024
2 parents 6c563d5 + d1468b8 commit 18d1446
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Dnn.CommunityForums/Deprecated/API.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion Dnn.CommunityForums/class/Data/AttachmentsDB.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 2 additions & 3 deletions Dnn.CommunityForums/class/ForumController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,7 @@ public string GetForumsHtmlOption(int portalId, int moduleId, User currentUser)

if (tmpGroupKey != groupKey)
{
sb.AppendFormat("<option value=\"{0}\">{1}</option>", "-1", groupName);
n += 1;
sb.AppendFormat("<option value=\"{0}\">{1}</option>", "-1", groupName); n += 1;
tmpGroupKey = groupKey;
}

Expand Down Expand Up @@ -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);
}
}
Expand Down
32 changes: 16 additions & 16 deletions Dnn.CommunityForums/class/Permissions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions Dnn.CommunityForums/components/Social/ActiveSocial.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,")))
Expand Down Expand Up @@ -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,"))))
Expand Down
12 changes: 2 additions & 10 deletions Dnn.CommunityForums/controls/admin_securitygrid.ascx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,12 @@ private void BindRoles()
StringBuilder sb = new StringBuilder();
sb.Append("<select id=\"drpSecRoles\" class=\"amcptxtbx\" style=\"width:150px;\">");
sb.Append("<option value=\"\">[RESX:DropDownDefault]</option>");
sb.Append("<option value=\"-1\">All Users</option>");
sb.Append("<option value=\"-3\">Unauthenticated Users</option>");
sb.Append($"<option value=\"{DotNetNuke.Common.Globals.glbRoleAllUsers}\">{DotNetNuke.Common.Globals.glbRoleAllUsersName}</option>");
sb.Append($"<option value=\"{DotNetNuke.Common.Globals.glbRoleUnauthUser}\">{DotNetNuke.Common.Globals.glbRoleUnauthUserName}</option>");
foreach (DotNetNuke.Security.Roles.RoleInfo ri in DotNetNuke.Modules.ActiveForums.Permissions.GetRoles(PortalId))
{
sb.Append("<option value=\"" + ri.RoleID + "\">" + ri.RoleName + "</option>");
}
//drpSecRoles.DataTextField = "RoleName"
//drpSecRoles.DataValueField = "RoleId"
//drpSecRoles.DataSource = rc.GetPortalRoles(PortalId)
//drpSecRoles.DataBind()
//drpSecRoles.Items.Insert(0, New ListItem("[RESX:DropDownDefault]", ""))
//drpSecRoles.Items.Insert(1, New ListItem("All Users", "-1"))
//drpSecRoles.Items.Insert(2, New ListItem("Unauthenticated Users", "-3"))
//drpSecRoles.Items.Insert(3, New ListItem("Topic Author", "-10"))
sb.Append("</select>");
litRoles.Text = sb.ToString();
}
Expand Down

0 comments on commit 18d1446

Please sign in to comment.