Skip to content

Commit ad28779

Browse files
johnhenleyjohnhenley
authored
Merge pull request #1912 from johnhenley/dev10/issues/deprecated-1909
TASK: Remove deprecated methods and properties, and SQL procedures
2 parents 8bfc8a7 + 3780c6b commit ad28779

93 files changed

Lines changed: 231 additions & 4043 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dnn.CommunityForums/Controllers/ContentController.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ public DotNetNuke.Modules.ActiveForums.Entities.ContentInfo GetById(int contentI
5050
return content;
5151
}
5252

53-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used. Use GetById(int contentId, int moduleId).")]
54-
public DotNetNuke.Modules.ActiveForums.Entities.ContentInfo GetById(int contentId)
55-
{
56-
return this.GetById(contentId, -1);
57-
}
58-
5953
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1118:Parameter should not span multiple lines", Justification = "Readability")]
6054
public static int GetMostLikesCount(int moduleId, HashSet<int> forumIds, int timeFrameMinutes)
6155
{

‎Dnn.CommunityForums/Controllers/EmailController.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ public EmailController(IHostSettingsService hostSettingsService)
5555
this.hostSettingsService = hostSettingsService;
5656
}
5757

58-
[Obsolete("Deprecated in Community Forums. Scheduled removal in 10.00.00. Not Used.")]
59-
public static void SendEmail(int templateId, int portalId, int moduleId, int tabId, int forumId, int topicId, int replyId, string comments, DotNetNuke.Modules.ActiveForums.Entities.AuthorInfo author) => throw new NotImplementedException();
60-
6158
internal static void SendEmail(Enums.TemplateType templateType, int tabId, DotNetNuke.Modules.ActiveForums.Entities.ForumInfo fi, int topicId, int replyId, DotNetNuke.Modules.ActiveForums.Entities.AuthorInfo author)
6259
{
6360
DotNetNuke.Abstractions.Portals.IPortalSettings portalSettings = new PortalSettingsHelper().GetPortalSettings(fi.PortalId);
@@ -145,9 +142,6 @@ internal static void SendTemplatedEmail(int topicId, int replyId, int moduleId,
145142
}
146143
}
147144

148-
[Obsolete("Deprecated in Community Forums. Scheduled removal in 9.0.0. Use SendNotification(int portalId, int moduleId, string fromEmail, string toEmail, string subject, string body).")]
149-
public static void SendNotification(int portalId, int moduleId, string fromEmail, string toEmail, string subject, string bodyText, string bodyHTML) => throw new NotImplementedException();
150-
151145
internal void SendNotification(int portalId, int moduleId, string fromEmail, string toEmail, string subject, string body)
152146
{
153147
// USE DNN API for this to ensure proper delivery & adherence to portal settings

‎Dnn.CommunityForums/Controllers/ForumController.cs‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,6 @@ public DotNetNuke.Modules.ActiveForums.Entities.ForumCollection GetSubForums(int
144144
return forums;
145145
}
146146

147-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Use HashSet<int> GetForumIdsBySocialGroup(int moduleId, int socialGroupId)")]
148-
public static string GetForumIdsBySocialGroup(int portalId, int moduleId, int socialGroupId) => GetForumIdsBySocialGroup(moduleId, socialGroupId).FromHashSetToDelimitedString<int>(";");
149-
150147
internal static HashSet<int> GetForumIdsBySocialGroup(int moduleId, int socialGroupId)
151148
{
152149
return socialGroupId > 0 ? new DotNetNuke.Modules.ActiveForums.Controllers.ForumController().Find("WHERE SocialGroupId = @0 AND ModuleId = @1", socialGroupId, moduleId).Select(f => f.ForumID).Distinct().ToHashSet() : new HashSet<int>();
@@ -168,9 +165,6 @@ internal static DotNetNuke.Modules.ActiveForums.Entities.ForumInfo Forums_Get(in
168165
return forumId <= 0 ? null : new DotNetNuke.Modules.ActiveForums.Controllers.ForumController().GetById(forumId, moduleId);
169166
}
170167

171-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Use HashSet<int> GetForumsForUser(int moduleId, ForumUserInfo forumUser, DotNetNuke.Modules.ActiveForums.SecureActions action)")]
172-
public static string GetForumsForUser(int portalId, int moduleId, ForumUserInfo forumUser, DotNetNuke.Modules.ActiveForums.SecureActions action = DotNetNuke.Modules.ActiveForums.SecureActions.View, string permissionType = "CanView") => GetForumsForUser(moduleId: moduleId, forumUser: forumUser, action: action).FromHashSetToDelimitedString(";");
173-
174168
internal static HashSet<int> GetForumsForUser(int moduleId, ForumUserInfo forumUser, DotNetNuke.Modules.ActiveForums.SecureActions action = DotNetNuke.Modules.ActiveForums.SecureActions.View)
175169
{
176170
var forumIds = new HashSet<int>();
@@ -262,13 +256,6 @@ internal static HashSet<int> GetForumsForUser(int moduleId, ForumUserInfo forumU
262256
return forumIds;
263257
}
264258

265-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Use GetForumsHtmlOption(int moduleId, DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo currentUser)")]
266-
public static string GetForumsHtmlOption(int moduleId, DotNetNuke.Modules.ActiveForums.User currentUser)
267-
{
268-
var user = new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(moduleId).GetByUserId(DotNetNuke.Entities.Portals.PortalController.Instance.GetCurrentPortalSettings().PortalId, currentUser.UserId);
269-
return GetForumsHtmlOption(moduleId, currentUser: user, includeHiddenForums: true);
270-
}
271-
272259
internal static string GetForumsHtmlOption(int moduleId, DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo currentUser, bool includeHiddenForums)
273260
{
274261
var sb = new StringBuilder();
@@ -297,9 +284,6 @@ internal static string GetForumsHtmlOption(int moduleId, DotNetNuke.Modules.Acti
297284
return sb.ToString();
298285
}
299286

300-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
301-
public XmlDocument GetForumListXML(int portalId, int moduleId) => throw new NotImplementedException();
302-
303287
public int Forums_Save(int portalId, DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forumInfo, bool isNew, bool useGroupFeatures, bool useGroupSecurity)
304288
{
305289
var oldPermissionsId = -1;
@@ -377,9 +361,6 @@ public int Forums_Save(int portalId, DotNetNuke.Modules.ActiveForums.Entities.Fo
377361
return forumId;
378362
}
379363

380-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
381-
public void Forums_Delete(int portalId, int forumId, int moduleId) => Forums_Delete(forumId: forumId, moduleId: moduleId);
382-
383364
internal void Forums_Delete(int forumId, int moduleId)
384365
{
385366
var parentForumId = this.GetById(forumId, moduleId).ParentForumId;
@@ -420,12 +401,6 @@ internal static void IterateForumsList(
420401
}
421402
}
422403

423-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Use DotNetNuke.Modules.ActiveForums.Controllers.ForumController.CreateSocialGroupForum (renamed method to be more descriptive).")]
424-
public static int CreateGroupForum(int portalId, int moduleId, int socialGroupId, int forumGroupId, string forumName, string forumDescription, bool isPrivate, string forumConfig)
425-
{
426-
return CreateSocialGroupForum(portalId, moduleId, socialGroupId, forumGroupId, forumName, forumDescription, isPrivate, forumConfig);
427-
}
428-
429404
public static int CreateSocialGroupForum(int portalId, int moduleId, int socialGroupId, int forumGroupId, string forumName, string forumDescription, bool isPrivate, string forumConfig)
430405
{
431406
var forumId = -1;
@@ -546,12 +521,6 @@ public static int CreateSocialGroupForum(int portalId, int moduleId, int socialG
546521
return forumId;
547522
}
548523

549-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
550-
public static int Forum_GetByTopicId(int topicId)
551-
{
552-
return Forum_GetByTopicId(-1, topicId);
553-
}
554-
555524
public static int Forum_GetByTopicId(int moduleId, int topicId)
556525
{
557526
try

‎Dnn.CommunityForums/Controllers/ForumUserController.cs‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ internal static int GetUserIdByUserName(int portalId, string userName)
164164
}
165165
}
166166

167-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Use GetUserFromHttpContext() [renamed method]")]
168-
public DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo GetUser(int portalId, int moduleId) => throw new NotImplementedException();
169-
170167
public DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo GetUserFromHttpContext(int portalId, int moduleId)
171168
{
172169
DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo u = null;
@@ -227,34 +224,13 @@ internal DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo DNNGetCurrentUse
227224
return new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(moduleId).GetByUserId(portalId, cu.UserID);
228225
}
229226

230-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Needed.")]
231-
private DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo GetDNNUser(int portalId, int userId) => new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(-1).GetByUserId(portalId, userId);
232-
233-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Needed.")]
234-
internal DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo GetDNNUser(int portalId, string userName) => new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(-1).GetByUserId(portalId, GetUserIdByUserName(portalId, userName));
235-
236-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Needed.")]
237-
public DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo GetUser(int portalId, int moduleId, string userName) => new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(-1).GetByUserId(portalId, GetUserIdByUserName(portalId, userName));
238-
239227
public static int Save(DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo user)
240228
{
241229
var forumUser = new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(user.ModuleId).Save<int>(user, user.ProfileId);
242230
DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.ClearCache(user.PortalId, user.UserId);
243231
return forumUser.UserId;
244232
}
245233

246-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Needed.")]
247-
public bool GetUserIsAdmin(int portalId, int moduleId, int userId)
248-
{
249-
return this.GetByUserId(portalId, userId).IsAdmin;
250-
}
251-
252-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Needed.")]
253-
public bool GetUserIsSuperUser(int portalId, int moduleId, int userId)
254-
{
255-
return this.GetByUserId(portalId, userId).IsSuperUser;
256-
}
257-
258234
private class JournalContentForUser
259235
{
260236
internal int ForumId { get; set; }

‎Dnn.CommunityForums/Controllers/PermissionController.cs‎

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -364,18 +364,6 @@ internal static HashSet<int> GetRoleIdsFromRoleString(string roleString)
364364
return roleString.ToHashSetFromDelimitedString<int>(";");
365365
}
366366

367-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
368-
internal static HashSet<int> GetRoleIdsFromRoleIdArray(string[] roles)
369-
{
370-
return roles.Select(r => Convert.ToInt32(r)).ToHashSet();
371-
}
372-
373-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
374-
internal static HashSet<int> GetRoleIdsFromRoleNameArray(int portalId, string[] roles)
375-
{
376-
return GetRoleIdsFromRoleString(GetPortalRoleIds(portalId: portalId, roles: roles));
377-
}
378-
379367
public static bool HasAccess(string authorizedRoles, string userRoles)
380368
{
381369
return !string.IsNullOrEmpty(authorizedRoles) && !string.IsNullOrEmpty(userRoles) && HasRequiredPerm(authorizedRoleIds: GetRoleIdsFromRoleString(authorizedRoles), userRoleIds: GetRoleIdsFromRoleString(userRoles));
@@ -464,10 +452,6 @@ internal static int GetRoleId(DotNetNuke.Entities.Portals.PortalSettings portalS
464452
return GetRoles(portalSettings).Where(r => r.RoleName.Equals(roleName)).Select(r => r.RoleID).FirstOrDefault();
465453
}
466454

467-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Use GetPortalRoleIds(int PortalId, delimitedString[] Roles).")]
468-
public static string GetRoleIds(string[] roles, int portalId) => GetPortalRoleIds(portalId, roles);
469-
470-
471455
internal static string GetPortalRoleIds(int portalId, string[] roles)
472456
{
473457
string roleIds = (string)DataCache.SettingsCacheRetrieve(-1, string.Format(CacheKeys.RoleIDs, portalId));
@@ -567,24 +551,6 @@ internal static HashSet<int> GetUsersRoleIds(DotNetNuke.Entities.Portals.PortalS
567551
return roleIds.Distinct().OrderBy(r => r).ToHashSet();
568552
}
569553

570-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
571-
public static bool HasPerm(string authorizedPermSet, int userId, int portalId) => throw new NotImplementedException();
572-
573-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
574-
public static bool HasPerm(string authorizedRoles, DotNetNuke.Entities.Users.UserInfo user) => throw new NotImplementedException();
575-
576-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
577-
public static bool HasPerm(string authorizedPermSet, string userPermSet) => throw new NotImplementedException();
578-
579-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
580-
public static bool HasPerm(DotNetNuke.Entities.Portals.PortalSettings portalSettings, string authorizedPermSet, DotNetNuke.Entities.Users.UserInfo user) => throw new NotImplementedException();
581-
582-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
583-
public static bool HasPerm(string authorizedPermSet, int portalId, int moduleId, int userId) => throw new NotImplementedException();
584-
585-
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
586-
public string GetPermSet(int moduleId, int permissionsId, string requestedAccess) => throw new NotImplementedException();
587-
588554
internal static string GetPermSetForRequestedAccess(int moduleId, int permissionsId, DotNetNuke.Modules.ActiveForums.SecureActions requestedAccess)
589555
{
590556
var permission = new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().GetById(permissionsId, moduleId);
@@ -653,12 +619,6 @@ internal static HashSet<int> GetRoleIdsForRequestedAccess(int moduleId, int perm
653619
return GetRoleIdsFromPermSet(GetPermSetForRequestedAccess(permission, requestedAccess));
654620
}
655621

656-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
657-
public string SavePermSet(int moduleId, int permissionsId, string requestedAccess, string permSet)
658-
{
659-
return this.SavePermSet(moduleId, permissionsId, (DotNetNuke.Modules.ActiveForums.SecureActions)Enum.Parse(typeof(DotNetNuke.Modules.ActiveForums.SecureActions), requestedAccess), permSet);
660-
}
661-
662622
public string SavePermSet(int moduleId, int permissionsId, DotNetNuke.Modules.ActiveForums.SecureActions requestedAccess, string permSet)
663623
{
664624
var permission = this.GetById(permissionsId, moduleId);
@@ -671,12 +631,6 @@ public string SavePermSet(int moduleId, int permissionsId, DotNetNuke.Modules.Ac
671631
return GetPermSetForRequestedAccess(permission, requestedAccess);
672632
}
673633

674-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
675-
public static void AddObjectToPermissions(int moduleId, int permissionsId, string requestedAccess, string objectId, int objectType)
676-
{
677-
AddObjectToPermissions(moduleId, permissionsId, (DotNetNuke.Modules.ActiveForums.SecureActions)Enum.Parse(typeof(DotNetNuke.Modules.ActiveForums.SecureActions), requestedAccess), objectId);
678-
}
679-
680634
internal static void AddObjectToPermissions(int moduleId, int permissionsId, DotNetNuke.Modules.ActiveForums.SecureActions requestedAccess, string objectId)
681635
{
682636
var pc = new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController();
@@ -693,18 +647,6 @@ internal static DotNetNuke.Modules.ActiveForums.Entities.PermissionInfo AddObjec
693647
return permissionInfo;
694648
}
695649

696-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
697-
internal static DotNetNuke.Modules.ActiveForums.Entities.PermissionInfo AddObjectToPermSet(DotNetNuke.Modules.ActiveForums.Entities.PermissionInfo permissionInfo, DotNetNuke.Modules.ActiveForums.SecureActions requestedAccess, string objectId, int objectType)
698-
{
699-
return AddObjectToPermSet(permissionInfo, requestedAccess, objectId);
700-
}
701-
702-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
703-
public static void RemoveObjectFromPermissions(int moduleId, int permissionsId, string requestedAccess, string objectId, int objectType)
704-
{
705-
RemoveObjectFromPermissions(moduleId, permissionsId, (DotNetNuke.Modules.ActiveForums.SecureActions)Enum.Parse(typeof(DotNetNuke.Modules.ActiveForums.SecureActions), requestedAccess), objectId);
706-
}
707-
708650
internal static void RemoveObjectFromPermissions(int moduleId, int permissionsId, DotNetNuke.Modules.ActiveForums.SecureActions requestedAccess, string objectId)
709651
{
710652
var pc = new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController();
@@ -724,37 +666,6 @@ internal static HashSet<int> RemoveRoleIdFromRoleIds(int roleId, HashSet<int> ro
724666
return roleIds;
725667
}
726668

727-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
728-
public static string RemovePermFromSet(string objectId, int objectType, string permissionSet)
729-
{
730-
return RemovePermFromSet(objectId, permissionSet);
731-
}
732-
733-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
734-
internal static string SortPermissionSetMembers(string permissionSet)
735-
{
736-
if (string.IsNullOrEmpty(permissionSet))
737-
{
738-
return string.Empty;
739-
}
740-
741-
var permSet = permissionSet;
742-
var members = permSet.ToHashSetFromDelimitedString<int>(";").OrderBy(r => r);
743-
permSet = string.Join(";", members);
744-
if (!string.IsNullOrEmpty(permSet))
745-
{
746-
permSet += ";";
747-
}
748-
749-
return permSet;
750-
}
751-
752-
[Obsolete("Deprecated in Community Forums. Removing in 10.00.00. Not Used.")]
753-
public static string AddPermToSet(string objectId, int objectType, string permissionSet)
754-
{
755-
return AddPermToSet(objectId, permissionSet);
756-
}
757-
758669
internal static string AddPermToSet(string objectId, string permissionSet)
759670
{
760671
return GetRoleIds(AddRoleIdToRoleIds(Convert.ToInt32(objectId), GetRoleIdsFromPermSet(permissionSet)));

‎Dnn.CommunityForums/Controllers/TokenController.cs‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,15 @@
1818
// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
1919
// DEALINGS IN THE SOFTWARE.
2020

21-
namespace DotNetNuke.Modules.ActiveForums
22-
{
23-
using System;
24-
using System.Runtime.CompilerServices;
25-
using System.Web.UI;
26-
27-
[Obsolete("Deprecated in Community Forums. Remove in 10.00.00. Not Used. Use DotNetNuke.Modules.ActiveForums.Controllers.TokenController()")]
28-
29-
#pragma warning disable SA1402 // File may only contain a single type
30-
#pragma warning disable SA1649 // File name should match first type name
31-
public class TokensController { private TokensController() => throw new NotImplementedException(); }
32-
#pragma warning restore SA1649 // File name should match first type name
33-
#pragma warning restore SA1402 // File may only contain a single type
34-
}
35-
36-
#pragma warning disable SA1403 // File may only contain a single namespace
3721
namespace DotNetNuke.Modules.ActiveForums.Controllers
38-
#pragma warning restore SA1403 // File may only contain a single namespace
3922
{
4023
using System;
4124
using System.Collections.Generic;
4225

4326
using DotNetNuke.Modules.ActiveForums.Entities;
4427

45-
#pragma warning disable SA1402 // File may only contain a single type
4628
internal class TokenController
47-
#pragma warning restore SA1402 // File may only contain a single type
4829
{
49-
5030
internal static List<Token> TokensList(int moduleId, string group)
5131
{
5232
try

0 commit comments

Comments
 (0)