[FORUMMAINLINK] > [FORUMGROUPLINK]
", string.Empty);
@@ -253,7 +253,7 @@ public string BuildForumView()
foreach (var fi in this.Forums.Where(f => !this.SubsOnly || f.ParentForumId > 0).OrderBy(f => f.ForumGroup?.SortOrder).ThenBy(f => f.ForumGroupId).ThenBy(f => f.SortOrder).Take(Globals.ForumCount))
{
fi.PortalSettings = this.PortalSettings;
- fi.MainSettings = this.MainSettings;
+ fi.MainSettings = this.ModuleSettings;
bool canView = DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.HasRequiredPerm(fi.Security?.ViewRoleIds, this.ForumUser.UserRoleIds);
if (this.UserInfo.IsSuperUser || (canView && !fi.ForumGroup.Hidden))
{
@@ -272,12 +272,12 @@ public string BuildForumView()
sGroupSectionTemp = TemplateUtils.GetTemplateSection(sTemplate, "[GROUPSECTION]", "[/GROUPSECTION]");
StringBuilder sGroupSectionTempStringBuilder = new StringBuilder(sGroupSectionTemp);
- sGroupSectionTempStringBuilder = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumGroupTokens(sGroupSectionTempStringBuilder, fi.ForumGroup, this.PortalSettings, this.MainSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl);
+ sGroupSectionTempStringBuilder = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumGroupTokens(sGroupSectionTempStringBuilder, fi.ForumGroup, this.PortalSettings, this.ModuleSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl);
sGroupSectionTemp = sGroupSectionTempStringBuilder.ToString();
// any replacements on the group
StringBuilder sNewGroupStringBuilder = new StringBuilder("" + sGroupTemplate + "
");
- sNewGroupStringBuilder = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumGroupTokens(sNewGroupStringBuilder, fi.ForumGroup, this.PortalSettings, this.MainSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl);
+ sNewGroupStringBuilder = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumGroupTokens(sNewGroupStringBuilder, fi.ForumGroup, this.PortalSettings, this.ModuleSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl);
string sNewGroup = sNewGroupStringBuilder.ToString();
sGroupSectionTemp = TemplateUtils.ReplaceSubSection(sGroupSectionTemp, sNewGroup, "[GROUP]", "[/GROUP]");
@@ -385,7 +385,7 @@ private string ParseForumRow(string template, DotNetNuke.Modules.ActiveForums.En
}
StringBuilder templateStringBuilder = new StringBuilder(template);
- templateStringBuilder = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumTokens(templateStringBuilder, fi, this.PortalSettings, this.MainSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl);
+ templateStringBuilder = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumTokens(templateStringBuilder, fi, this.PortalSettings, this.ModuleSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl);
if (templateStringBuilder.ToString().Contains("[AF:CONTROL:TOGGLESUBSCRIBE]"))
{
@@ -426,7 +426,7 @@ private string GetSubForums(string template, int forumId, int tabId)
string subForum;
foreach (DotNetNuke.Modules.ActiveForums.Entities.ForumInfo fi in subforums)
{
- subForum = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumTokens(new StringBuilder("[FORUMLINK]"), fi, this.PortalSettings, this.MainSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl).ToString();
+ subForum = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceForumTokens(new StringBuilder("[FORUMLINK]"), fi, this.PortalSettings, this.ModuleSettings, new Services.URLNavigator().NavigationManager(), this.ForumUser, this.TabId, this.ForumUser.CurrentUserType, this.Request.Url, this.Request.RawUrl).ToString();
if (subForum != string.Empty)
{
sb.Append(subForum);
diff --git a/Dnn.CommunityForums/CustomControls/UserControls/Members.cs b/Dnn.CommunityForums/CustomControls/UserControls/Members.cs
index 6ad9bf607..24c136a64 100644
--- a/Dnn.CommunityForums/CustomControls/UserControls/Members.cs
+++ b/Dnn.CommunityForums/CustomControls/UserControls/Members.cs
@@ -97,8 +97,8 @@ protected override void OnLoad(EventArgs e)
private void BuildControl()
{
System.Text.StringBuilder sb = new System.Text.StringBuilder(1024);
- SettingsInfo moduleSettings = SettingsBase.GetModuleSettings(this.ForumModuleId);
- string sTemplate = DotNetNuke.Modules.ActiveForums.Controllers.TemplateController.Template_Get(this.ForumModuleId, Enums.TemplateType._memberList, SettingsBase.GetModuleSettings(this.ForumModuleId).ForumFeatureSettings.TemplateFileNameSuffix);
+ ModuleSettings moduleSettings = SettingsBase.GetModuleSettings(this.ForumModuleId);
+ string sTemplate = DotNetNuke.Modules.ActiveForums.Controllers.TemplateController.Template_Get(this.ForumModuleId, Enums.TemplateType._memberList, SettingsBase.GetModuleSettings(this.ForumModuleId).DefaultFeatureSettings.TemplateFileNameSuffix);
if (!(sTemplate == string.Empty))
{
string sGrid = TemplateUtils.GetTemplateSection(sTemplate, "[AF:CONTROL:LIST]", "[/AF:CONTROL:LIST]");
@@ -212,7 +212,7 @@ private string BuildAlphaList()
{
List(![\"[RESX:MultiPageTopic]\"](\"")
";
+ sOut = "(System.Data.CommandType.Text, sSql, portalId);
-
- var users = new List();
- foreach (var userId in userIds)
- {
- var forumUser = forumUserController.GetByUserId(portalId: portalId, userId: userId);
- if (forumUser != null)
- {
- users.Add(forumUser);
- }
- }
-
- return users;
+ return new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(moduleId: moduleId).GetActiveUsers(portalId: portalId).Where(u => (!u.UserInfo.IsDeleted && !u.AvatarDisabled && !u.PrefBlockAvatars) &&
+ ((string.IsNullOrEmpty(u.UserInfo.Profile.GetPropertyValue("Photo")) && !u.AvatarLastRefresh.HasValue) || /* anyone without an avatar who has never had their avatar refreshed */
+ (u.AvatarLastRefresh.HasValue && DateTime.UtcNow.Subtract(u.AvatarLastRefresh.Value).TotalDays > 90))) /* or anyone whose avatar was last refreshed more than 90 days ago */
+ .OrderByDescending(u => u.AvatarLastRefresh).Take(50).ToList();
+
+ //var forumUserController = new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(moduleId: moduleId);
+ //string sSql = "SELECT TOP 50 fup.UserId FROM {databaseOwner}{objectQualifier}activeforums_UserProfiles fup ";
+ //sSql += "INNER JOIN {databaseOwner}{objectQualifier}UserPortals as up ON up.PortalId = fup.PortalId AND up.UserId = fup.UserId AND up.IsDeleted = 0 ";
+ //sSql += "INNER JOIN {databaseOwner}{objectQualifier}ProfilePropertyDefinition ppd ON ppd.PortalID = @0 AND ppd.PropertyName = 'Photo' ";
+ //sSql += "LEFT OUTER JOIN {databaseOwner}{objectQualifier}UserProfile as upr ON upr.UserId = fup.UserId AND upr.PropertyDefinitionID = ppd.PropertyDefinitionID ";
+ //sSql += "WHERE fup.PortalId = @0 AND fup.AvatarDisabled = 0 AND fup.PrefBlockAvatars = 0 ";
+ //sSql += "AND ( (fup.AvatarLastRefresh IS NULL AND upr.PropertyValue IS NULL) ";
+ //sSql += " OR (fup.AvatarLastRefresh IS NOT NULL AND DATEDIFF(dd,GETUTCDATE(),fup.AvatarLastRefresh) > 90) ) ";
+ //sSql += "ORDER BY fup.AvatarLastRefresh DESC";
+ //var userIds = DotNetNuke.Data.DataContext.Instance().ExecuteQuery(System.Data.CommandType.Text, sSql, portalId);
+
+ //var users = new List();
+ //foreach (var userId in userIds)
+ //{
+ // var forumUser = forumUserController.GetByUserId(portalId: portalId, userId: userId);
+ // if (forumUser != null)
+ // {
+ // users.Add(forumUser);
+ // }
+ //}
+
+ //return users;
}
catch (Exception ex)
{
diff --git a/Dnn.CommunityForums/Services/Badges/BadgeAwardQueue.cs b/Dnn.CommunityForums/Services/Badges/BadgeAwardQueue.cs
new file mode 100644
index 000000000..4573bbb93
--- /dev/null
+++ b/Dnn.CommunityForums/Services/Badges/BadgeAwardQueue.cs
@@ -0,0 +1,193 @@
+// Copyright (c) by DNN Community
+//
+// DNN Community licenses this file to you under the MIT license.
+//
+// See the LICENSE file in the project root for more information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace DotNetNuke.Modules.ActiveForums.Services.Badges
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+
+ using DotNetNuke.Collections;
+ using DotNetNuke.Common.Utilities;
+ using DotNetNuke.Entities.Modules;
+ using DotNetNuke.Modules.ActiveForums.Enums;
+ using DotNetNuke.Services.Log.EventLog;
+ using DotNetNuke.Services.Scheduling;
+
+ public class BadgeAwardQueue : DotNetNuke.Services.Scheduling.SchedulerClient
+ {
+ public BadgeAwardQueue(ScheduleHistoryItem scheduleHistoryItem)
+ {
+ this.ScheduleHistoryItem = scheduleHistoryItem;
+ }
+
+ public override void DoWork()
+ {
+ try
+ {
+ foreach (DotNetNuke.Abstractions.Portals.IPortalInfo portal in DotNetNuke.Entities.Portals.PortalController.Instance.GetPortals())
+ {
+ foreach (ModuleInfo module in DotNetNuke.Entities.Modules.ModuleController.Instance.GetModules(portal.PortalId))
+ {
+ if (!module.IsDeleted && module.DesktopModule.ModuleName.Trim().ToLowerInvariant().Equals(Globals.ModuleName.ToLowerInvariant()))
+ {
+ var badgeCount = ProcessBadgeAwards(module.PortalID, module.ModuleID);
+ this.ScheduleHistoryItem.Succeeded = true;
+ this.ScheduleHistoryItem.AddLogNote($"Processed {badgeCount} badge awards for {module.ModuleTitle} on portal {portal.PortalName}. ");
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ this.ScheduleHistoryItem.Succeeded = false;
+ this.ScheduleHistoryItem.AddLogNote(string.Concat("Badge Award Queue Failed. ", ex));
+ this.Errored(ref ex);
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+ }
+
+ private static int ProcessBadgeAwards(int portalId, int moduleId)
+ {
+ var badgeCount = 0;
+ try
+ {
+ var badges = new DotNetNuke.Modules.ActiveForums.Controllers.BadgeController().Get(moduleId).Where(b => b.BadgeMetric != BadgeMetric.BadgeMetricManual);
+ GetBatch(portalId, moduleId).ForEach(forumUser =>
+ {
+ foreach (var badge in badges)
+ {
+ var awarded = ProcessBadgesForUser(portalId: portalId, moduleId: moduleId, forumUser: forumUser, badge: badge);
+ if (awarded)
+ {
+ badgeCount += 1;
+ }
+ }
+ });
+ badges.Where(b => !b.InitialBackfillCompletedDate.HasValue).ForEach(b => {
+ b.InitialBackfillCompletedDate = DateTime.UtcNow;
+ new DotNetNuke.Modules.ActiveForums.Controllers.BadgeController().Update(b);
+ });
+
+ return badgeCount;
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return -1;
+ }
+ }
+
+ private static IEnumerable GetBatch(int portalId, int moduleId)
+ {
+ try
+ {
+ return new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(moduleId: moduleId).GetActiveUsers(portalId);
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return null;
+ }
+ }
+
+ private static bool ProcessBadgesForUser(int portalId, int moduleId, DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo forumUser, DotNetNuke.Modules.ActiveForums.Entities.BadgeInfo badge)
+ {
+ try
+ {
+ if (forumUser == null)
+ {
+ return false;
+ }
+
+ if (badge.OneTimeAward && forumUser.Badges.Any(b => b.BadgeId.Equals(badge.BadgeId)))
+ {
+ // One-time award badge has already been awarded to this user
+ return false;
+ }
+
+ var lastAward = forumUser.Badges.Where(b => b.BadgeId.Equals(badge.BadgeId)).OrderByDescending(b => b.DateAssigned).FirstOrDefault();
+ if (lastAward != null && lastAward.DateAssigned.AddDays(badge.IntervalDays) > DateTime.UtcNow)
+ {
+ // Badge has already been awarded within the interval period
+ return false;
+ }
+
+ var awardBadge = false;
+ switch (badge.BadgeMetric)
+ {
+ case BadgeMetric.BadgeMetricNewUser:
+ if (DateTime.UtcNow.Subtract(forumUser.DateCreated).TotalDays < (badge.IntervalDays > 0 ? badge.IntervalDays : 30))
+ {
+ awardBadge = true;
+ }
+
+ break;
+ case BadgeMetric.BadgeMetricLikesReceived:
+ if ((badge.IntervalDays > 0 && forumUser.GetLikeCountForUserSince(DateTime.UtcNow.AddDays(-1 * badge.IntervalDays)) >= badge.Threshold) ||
+ (forumUser.GetLikeCountForUser() >= badge.Threshold))
+ {
+ awardBadge = true;
+ }
+
+ break;
+ case BadgeMetric.BadgeMetricTopicsCreated:
+ if ((badge.IntervalDays > 0 && forumUser.GetTopicCountSince(DateTime.UtcNow.AddDays(-1 * badge.IntervalDays)) >= badge.Threshold) ||
+ (forumUser.TopicCount >= badge.Threshold))
+ {
+ awardBadge = true;
+ }
+
+ break;
+ case BadgeMetric.BadgeMetricRepliesCreated:
+ if ((badge.IntervalDays > 0 && forumUser.GetReplyCountSince(DateTime.UtcNow.AddDays(-1 * badge.IntervalDays)) >= badge.Threshold) ||
+ (forumUser.ReplyCount >= badge.Threshold))
+ {
+ awardBadge = true;
+ }
+
+ break;
+ case BadgeMetric.BadgeMetricTopicsRead:
+ if ((badge.IntervalDays > 0 && forumUser.GetTopicReadCountSince(DateTime.UtcNow.AddDays(-1 * badge.IntervalDays)) >= badge.Threshold) ||
+ (forumUser.GetTopicReadCount() >= badge.Threshold))
+ {
+ awardBadge = true;
+ }
+
+ break;
+ }
+
+ if (awardBadge)
+ {
+ DotNetNuke.Modules.ActiveForums.Controllers.UserBadgeController.AssignUserBadge(portalId, moduleId, forumUser.UserId, badge.BadgeId, string.Empty);
+ return true;
+ }
+
+ return false;
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return false;
+ }
+ }
+}
diff --git a/Dnn.CommunityForums/Services/Controllers/ControllerBase.cs b/Dnn.CommunityForums/Services/Controllers/ControllerBase.cs
index 39cc04fa6..2c5946976 100644
--- a/Dnn.CommunityForums/Services/Controllers/ControllerBase.cs
+++ b/Dnn.CommunityForums/Services/Controllers/ControllerBase.cs
@@ -32,7 +32,7 @@ namespace DotNetNuke.Modules.ActiveForums.Services
/// : DnnApiController
{
private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(T));
@@ -40,8 +40,8 @@ public class ControllerBase : DnnApiController
/// provide a simple method for testing
///
///
+ /// Web API controller for managing feature settings.
+ ///
+ public class FeatureSettingsController : ControllerBase
+ {
+ ///
+ /// Gets all settings for a given settings key.
+ ///
+ /// settingsKey
+ /// settings
+ [HttpGet]
+ [DnnAuthorize]
+ public IHttpActionResult GetAllSettings(string settingsKey)
+ {
+ try
+ {
+ var settings = new DotNetNuke.Modules.ActiveForums.Entities.FeatureSettings(this.ForumModuleId, settingsKey);
+ return this.Ok(settings.featureSettings);
+ }
+ catch (Exception ex)
+ {
+ return this.InternalServerError(ex);
+ }
+ }
+
+ ///
+ /// Gets a single setting value by key.
+ ///
+ /// settingsKey
+ /// key
+ /// setting
+ [HttpGet]
+ [DnnAuthorize]
+ public IHttpActionResult GetSetting(string settingsKey, string key)
+ {
+ try
+ {
+ var settings = new DotNetNuke.Modules.ActiveForums.Entities.FeatureSettings(this.ForumModuleId, settingsKey);
+ if (!settings.featureSettings.ContainsKey(key))
+ {
+ return this.NotFound();
+ }
+ return Ok(settings.featureSettings[key]);
+ }
+ catch (Exception ex)
+ {
+ return this.InternalServerError(ex);
+ }
+ }
+
+ ///
+ /// Creates or updates a single setting.
+ ///
+ /// settingsKey
+ /// key
+ /// value
+ /// HTTP status
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public IHttpActionResult SetSetting(string settingsKey, string key, [FromBody] string value)
+ {
+ try
+ {
+ var settings = new DotNetNuke.Modules.ActiveForums.Entities.FeatureSettings(this.ForumModuleId, settingsKey);
+ settings.featureSettings[key] = value;
+ DotNetNuke.Modules.ActiveForums.Entities.FeatureSettings.Save(this.ForumModuleId, settingsKey, settings);
+ return this.Ok();
+ }
+ catch (Exception ex)
+ {
+ return this.InternalServerError(ex);
+ }
+ }
+
+ ///
+ /// Deletes a single setting.
+ ///
+ /// settingsKey
+ /// key
+ /// HTTP status
+ [HttpDelete]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public IHttpActionResult DeleteSetting(string settingsKey, string key)
+ {
+ try
+ {
+ var settings = new DotNetNuke.Modules.ActiveForums.Entities.FeatureSettings(this.ForumModuleId, settingsKey);
+ if (!settings.featureSettings.ContainsKey(key))
+ {
+ return this.NotFound();
+ }
+ settings.featureSettings.Remove(key);
+ DotNetNuke.Modules.ActiveForums.Entities.FeatureSettings.Save(this.ForumModuleId, settingsKey, settings);
+ return this.Ok();
+ }
+ catch (Exception ex)
+ {
+ return this.InternalServerError(ex);
+ }
+ }
+
+ ///
+ /// Updates all settings for a given module and settings key.
+ ///
+ /// settingsKey
+ /// newSettings
+ /// HTTP status
+ [HttpPut]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public IHttpActionResult UpdateAllSettings(string settingsKey, [FromBody] Hashtable newSettings)
+ {
+ try
+ {
+ var settings = new DotNetNuke.Modules.ActiveForums.Entities.FeatureSettings(newSettings);
+ DotNetNuke.Modules.ActiveForums.Entities.FeatureSettings.Save(this.ForumModuleId, settingsKey, settings);
+ return this.Ok();
+ }
+ catch (Exception ex)
+ {
+ return this.InternalServerError(ex);
+ }
+ }
+
+ ///
+ /// Deletes all settings for a given settings key.
+ ///
+ /// settingsKey
+ /// HTTP status
+ [HttpDelete]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public IHttpActionResult DeleteAllSettings(string settingsKey)
+ {
+ try
+ {
+ var settings = new DotNetNuke.Modules.ActiveForums.Entities.FeatureSettings(this.ForumModuleId, settingsKey);
+ foreach (DictionaryEntry entry in settings.featureSettings)
+ {
+ new DotNetNuke.Modules.ActiveForums.Controllers.SettingsController().DeleteForModuleIdSettingsKeySettingName(this.ForumModuleId, settingsKey, (string)entry.Key);
+ }
+
+ return this.Ok();
+ }
+ catch (Exception ex)
+ {
+ return this.InternalServerError(ex);
+ }
+ }
+ }
+}
diff --git a/Dnn.CommunityForums/Services/Controllers/ForumController.cs b/Dnn.CommunityForums/Services/Controllers/ForumController.cs
index 87cf5ebaa..c3b111e29 100644
--- a/Dnn.CommunityForums/Services/Controllers/ForumController.cs
+++ b/Dnn.CommunityForums/Services/Controllers/ForumController.cs
@@ -21,16 +21,18 @@
namespace DotNetNuke.Modules.ActiveForums.Services.Controllers
{
using System;
+ using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Web.Http;
+ using System.Web.UI;
using DotNetNuke.Web.Api;
///
///
- public class ForumController : ControllerBase
+ public class ForumController : ControllerBase
{
public struct ForumDto
{
@@ -73,6 +75,7 @@ public HttpResponseMessage Subscribe(ForumDto dto)
/// https://dnndev.me/API/ActiveForums/Forum/SubscriberCount?ForumId=xxx
[HttpGet]
[DnnAuthorize]
+ [ForumsAuthorize(SecureActions.View)]
public HttpResponseMessage SubscriberCount(int forumId)
{
try
@@ -91,12 +94,13 @@ public HttpResponseMessage SubscriberCount(int forumId)
}
///
- /// Gets Subscriber count string for a Forum
+ /// Gets Subscriber count string for a Forum.
///
/// https://dnndev.me/API/ActiveForums/Forum/SubscriberCountString?ForumId=xxx
[HttpGet]
[DnnAuthorize]
+ [ForumsAuthorize(SecureActions.View)]
public HttpResponseMessage SubscriberCountString(int forumId)
{
try
@@ -115,7 +119,7 @@ public HttpResponseMessage SubscriberCountString(int forumId)
}
///
- /// Populates list of forums for an HTML control
+ /// Populates list of forums for an HTML control.
///
///
///
+ /// Gets a forum by ID.
+ ///
+ /// Forum ID
+ /// ForumInfo
+ /// https://dnndev.me/API/ActiveForums/Forum/Get?forumId=x
+ [HttpGet]
+ [DnnAuthorize]
+ [ForumsAuthorize(SecureActions.View)]
+ public HttpResponseMessage Get(int forumId)
+ {
+ try
+ {
+ if (forumId > 0)
+ {
+ var forum = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController().GetById(forumId: forumId, moduleId: this.ForumModuleId);
+ if (forum != null)
+ {
+ return this.Request.CreateResponse(HttpStatusCode.OK, new DotNetNuke.Modules.ActiveForums.ViewModels.Forum(forum));
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Creates a new forum.
+ ///
+ /// ForumInfo
+ /// Created forum
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Create([FromBody] DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forum)
+ {
+ try
+ {
+ if (forum != null)
+ {
+ var fc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController();
+ forum.ForumID = DotNetNuke.Common.Utilities.Null.NullInteger;
+ forum.ModuleId = this.ForumModuleId;
+ forum.ParentForumId = 0;
+ var forumId = fc.Forums_Save(portalId: this.ActiveModule.PortalID, forumInfo: forum, isNew: true, useGroupFeatures: true, useGroupSecurity: true);
+ var forumCreated = fc.GetById(forumId: forumId, moduleId: this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.Created, forumCreated);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Creates a new forum.
+ ///
+ /// ForumInfo
+ ///
+ ///
+ /// Created forum
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Create([FromBody] DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forum, bool useGroupFeatures, bool useGroupSecurity)
+ {
+ try
+ {
+ if (forum != null)
+ {
+ var fc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController();
+ forum.ForumID = DotNetNuke.Common.Utilities.Null.NullInteger;
+ forum.ModuleId = this.ForumModuleId;
+ forum.ParentForumId = 0;
+ var forumId = fc.Forums_Save(portalId: this.ActiveModule.PortalID, forumInfo: forum, isNew: true, useGroupFeatures: useGroupFeatures, useGroupSecurity: useGroupSecurity);
+ var forumCreated = fc.GetById(forumId: forumId, moduleId: this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.Created, forumCreated);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Updates an existing forum.
+ ///
+ /// ForumInfo
+ /// updated forum
+ [HttpPut]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Update([FromBody] DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forum)
+ {
+ try
+ {
+ if (forum != null && forum.ForumID > 0)
+ {
+ var fc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController();
+ var forumId = fc.Forums_Save(portalId: this.ActiveModule.PortalID, forumInfo: forum, isNew: false, useGroupFeatures: forum.InheritSettings, useGroupSecurity: forum.InheritSecurity);
+ var forumUpdated = fc.GetById(forumId: forum.ForumID, moduleId: this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.Created, forumUpdated);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Updates an existing forum.
+ ///
+ /// ForumInfo
+ ///
+ ///
+ /// Success status
+ [HttpPut]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Update([FromBody] DotNetNuke.Modules.ActiveForums.Entities.ForumInfo forum, bool useGroupFeatures, bool useGroupSecurity)
+ {
+ try
+ {
+ if (forum != null && forum.ForumID > 0)
+ {
+ var fc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController();
+ var forumId = fc.Forums_Save(portalId: this.ActiveModule.PortalID, forumInfo: forum, isNew: false, useGroupFeatures: useGroupFeatures, useGroupSecurity: useGroupSecurity);
+ var forumUpdated = fc.GetById(forumId: forum.ForumID, moduleId: this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.Created, forumUpdated);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Deletes a forum by ID.
+ ///
+ /// Forum ID
+ /// Success status
+ [HttpDelete]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Delete(int forumId)
+ {
+ try
+ {
+ if (forumId > 0)
+ {
+ var fc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController();
+ var forum = fc.GetById(forumId: forumId, moduleId: this.ForumModuleId);
+ if (forum != null)
+ {
+ fc.Forums_Delete(forumId: forumId, moduleId: this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.OK, true);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Lists all forums for the current module.
+ ///
+ [HttpGet]
+ [DnnAuthorize]
+ public HttpResponseMessage List()
+ {
+ try
+ {
+ var forumUser = new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ForumModuleId).GetByUserId(this.ActiveModule.PortalID, this.UserInfo.UserID);
+ var forums = new List();
+ new DotNetNuke.Modules.ActiveForums.Controllers.ForumController().GetForums(moduleId: this.ForumModuleId).ForEach(f =>
+ {
+ if (DotNetNuke.Modules.ActiveForums.Controllers.PermissionController.HasRequiredPerm(f.Security.ViewRoleIds, forumUser.UserRoleIds))
+ {
+ forums.Add(new DotNetNuke.Modules.ActiveForums.ViewModels.Forum(f));
+ }
+ });
+
+ return this.Request.CreateResponse(HttpStatusCode.OK, forums);
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return this.Request.CreateResponse(HttpStatusCode.InternalServerError);
+ }
+ }
+
+ ///
+ /// Lists moderators for a forum.
+ ///
+ [HttpGet]
+ [DnnAuthorize]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Moderators(int forumId)
+ {
+ try
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(new NotImplementedException("Forum moderators retrieval not implemented yet."));
+ return this.Request.CreateResponse(HttpStatusCode.InternalServerError);
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return this.Request.CreateResponse(HttpStatusCode.InternalServerError);
+ }
+ }
+
+ ///
+ /// Lists all forums the current user is subscribed to.
+ ///
+ [HttpGet]
+ [DnnAuthorize]
+ public HttpResponseMessage Subscriptions(int userId)
+ {
+ try
+ {
+ if (userId > 0)
+ {
+ var subscriptions = new DotNetNuke.Modules.ActiveForums.Controllers.SubscriptionController().SubscribedForums(portalId: this.ActiveModule.PortalID, moduleId: this.ForumModuleId, userId: userId);
+ return this.Request.CreateResponse(HttpStatusCode.OK, subscriptions);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return this.Request.CreateResponse(HttpStatusCode.InternalServerError);
+ }
+ }
+
+ ///
+ /// Gets forum settings.
+ ///
+ [HttpGet]
+ [DnnAuthorize]
+ public HttpResponseMessage Settings(int forumId)
+ {
+ try
+ {
+ if (forumId > 0)
+ {
+ var forum = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController().GetById(forumId: forumId, moduleId: this.ForumModuleId);
+ if (forum != null)
+ {
+ return this.Request.CreateResponse(HttpStatusCode.OK, forum.FeatureSettings);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return this.Request.CreateResponse(HttpStatusCode.InternalServerError);
+ }
+ }
+
+ ///
+ /// Gets forum security.
+ ///
+ [HttpGet]
+ [DnnAuthorize]
+ public HttpResponseMessage Security(int forumId)
+ {
+ try
+ {
+ if (forumId > 0)
+ {
+ var forum = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController().GetById(forumId: forumId, moduleId: this.ForumModuleId);
+ if (forum != null)
+ {
+ return this.Request.CreateResponse(HttpStatusCode.OK, forum.Security);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return this.Request.CreateResponse(HttpStatusCode.InternalServerError);
+ }
+ }
}
}
diff --git a/Dnn.CommunityForums/Services/Controllers/ForumGroupController.cs b/Dnn.CommunityForums/Services/Controllers/ForumGroupController.cs
new file mode 100644
index 000000000..15fd7195a
--- /dev/null
+++ b/Dnn.CommunityForums/Services/Controllers/ForumGroupController.cs
@@ -0,0 +1,301 @@
+// Copyright (c) by DNN Community
+//
+// DNN Community licenses this file to you under the MIT license.
+//
+// See the LICENSE file in the project root for more information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace DotNetNuke.Modules.ActiveForums.Services.Controllers
+{
+ using System;
+ using System.Net;
+ using System.Net.Http;
+ using System.Web.Http;
+
+ using DotNetNuke.Web.Api;
+
+ ///
+ ///
+ public class ForumGroupController : ControllerBase
+ {
+ public struct ForumGroupDto
+ {
+ public int ForumGroupId { get; set; }
+ }
+
+ ///
+ /// Gets a ForumGroup by ID.
+ ///
+ /// ForumGroup ID
+ /// ForumGroupInfo
+ /// https://dnndev.me/API/ActiveForums/ForumGroup/Get?ForumGroupId=x
+ [HttpGet]
+ [DnnAuthorize]
+ public HttpResponseMessage Get(int ForumGroupId)
+ {
+ try
+ {
+ if (ForumGroupId > 0)
+ {
+ var forumGroup = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController().GetById(ForumGroupId, this.ForumModuleId);
+ if (forumGroup != null)
+ {
+ return this.Request.CreateResponse(HttpStatusCode.OK, forumGroup);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Creates a new ForumGroup.
+ ///
+ /// ForumGroupInfo
+ /// Created ForumGroup
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Create([FromBody] DotNetNuke.Modules.ActiveForums.Entities.ForumGroupInfo forumGroup)
+ {
+ try
+ {
+ if (forumGroup != null)
+ {
+ var fgc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController();
+ forumGroup.ForumGroupId = DotNetNuke.Common.Utilities.Null.NullInteger;
+ forumGroup.ModuleId = this.ForumModuleId;
+ var forumGroupId = fgc.Groups_Save(portalId: this.ActiveModule.PortalID, forumGroupInfo: forumGroup, isNew: true, useDefaultFeatures: true, useDefaultSecurity: true);
+ var forumGroupCreated = fgc.GetById(forumGroupId, this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.Created, forumGroupCreated);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Creates a new ForumGroup.
+ ///
+ /// ForumGroupInfo
+ ///
+ ///
+ /// Created ForumGroup
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Create([FromBody] DotNetNuke.Modules.ActiveForums.Entities.ForumGroupInfo forumGroup, bool useDefaultFeatures, bool useDefaultSecurity)
+ {
+ try
+ {
+ if (forumGroup != null)
+ {
+ var fgc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController();
+ forumGroup.ForumGroupId = DotNetNuke.Common.Utilities.Null.NullInteger;
+ forumGroup.ModuleId = this.ForumModuleId;
+ var forumGroupId = fgc.Groups_Save(portalId: this.ActiveModule.PortalID, forumGroupInfo: forumGroup, isNew: true, useDefaultFeatures: useDefaultFeatures, useDefaultSecurity: useDefaultSecurity);
+ var forumGroupCreated = fgc.GetById(forumGroupId, this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.Created, forumGroupCreated);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Updates an existing ForumGroup.
+ ///
+ /// ForumGroupInfo
+ /// updated ForumGroup
+ [HttpPut]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Update([FromBody] DotNetNuke.Modules.ActiveForums.Entities.ForumGroupInfo forumGroup)
+ {
+ try
+ {
+ if (forumGroup != null && forumGroup.ForumGroupId > 0)
+ {
+ var fgc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController();
+ var forumGroupId = fgc.Groups_Save(portalId: this.ActiveModule.PortalID, forumGroupInfo: forumGroup, isNew: false, useDefaultFeatures: forumGroup.InheritSettings, useDefaultSecurity: forumGroup.InheritSecurity);
+ var forumGroupUpdated = fgc.GetById(forumGroup.ForumGroupId, this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.Created, forumGroupUpdated);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Updates an existing ForumGroup.
+ ///
+ /// ForumGroupInfo
+ ///
+ ///
+ /// Success status
+ [HttpPut]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Update([FromBody] DotNetNuke.Modules.ActiveForums.Entities.ForumGroupInfo forumGroup, bool useDefaultFeatures, bool useDefaultSecurity)
+ {
+ try
+ {
+ if (forumGroup != null && forumGroup.ForumGroupId > 0)
+ {
+ var fgc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController();
+ var forumGroupId = fgc.Groups_Save(portalId: this.ActiveModule.PortalID, forumGroupInfo: forumGroup, isNew: false, useDefaultFeatures: useDefaultFeatures, useDefaultSecurity: useDefaultSecurity);
+ var forumGroupUpdated = fgc.GetById(forumGroupId: forumGroup.ForumGroupId, moduleId: this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.Created, forumGroupUpdated);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Deletes a ForumGroup by ID.
+ ///
+ /// ForumGroup ID
+ /// Success status
+ [HttpDelete]
+ [ValidateAntiForgeryToken]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Delete(int forumGroupId)
+ {
+ try
+ {
+ if (forumGroupId > 0)
+ {
+ var fgc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController();
+ var forumGroup = fgc.GetById(forumGroupId: forumGroupId, moduleId: this.ForumModuleId);
+ if (forumGroup != null)
+ {
+ fgc.Groups_Delete(moduleId: this.ForumModuleId, forumGroupId: forumGroupId);
+ return this.Request.CreateResponse(HttpStatusCode.OK, true);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+
+ ///
+ /// Lists all ForumGroups for the current module.
+ ///
+ [HttpGet]
+ [DnnAuthorize]
+ public HttpResponseMessage List()
+ {
+ try
+ {
+ var forumGroups = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController().Get(scopeValue: this.ForumModuleId);
+ return this.Request.CreateResponse(HttpStatusCode.OK, forumGroups);
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return this.Request.CreateResponse(HttpStatusCode.InternalServerError);
+ }
+ }
+
+ ///
+ /// Gets ForumGroup settings.
+ ///
+ [HttpGet]
+ [DnnAuthorize]
+ public HttpResponseMessage Settings(int ForumGroupId)
+ {
+ try
+ {
+ if (ForumGroupId > 0)
+ {
+ var forumGroup = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController().GetById(forumGroupId: ForumGroupId, moduleId: this.ForumModuleId);
+ if (forumGroup != null)
+ {
+ return this.Request.CreateResponse(HttpStatusCode.OK, forumGroup.FeatureSettings);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return this.Request.CreateResponse(HttpStatusCode.InternalServerError);
+ }
+ }
+
+ ///
+ /// Gets ForumGroup security.
+ ///
+ [HttpGet]
+ [DnnAuthorize]
+ public HttpResponseMessage Security(int ForumGroupId)
+ {
+ try
+ {
+ if (ForumGroupId > 0)
+ {
+ var forumGroup = new DotNetNuke.Modules.ActiveForums.Controllers.ForumGroupController().GetById(forumGroupId: ForumGroupId, moduleId: this.ForumModuleId);
+ if (forumGroup != null)
+ {
+ return this.Request.CreateResponse(HttpStatusCode.OK, forumGroup.Security);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.NotFound);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ return this.Request.CreateResponse(HttpStatusCode.InternalServerError);
+ }
+ }
+ }
+}
diff --git a/Dnn.CommunityForums/Services/Controllers/LikeController.cs b/Dnn.CommunityForums/Services/Controllers/LikeController.cs
index 5ab1dbc26..270cda62e 100644
--- a/Dnn.CommunityForums/Services/Controllers/LikeController.cs
+++ b/Dnn.CommunityForums/Services/Controllers/LikeController.cs
@@ -87,6 +87,7 @@ public HttpResponseMessage Like(LikeDto dto)
/// https://dnndev.me/API/ActiveForums/Like/Get/1/1
[HttpGet]
[DnnAuthorize]
+ [ForumsAuthorize(SecureActions.View)]
public HttpResponseMessage Get(int forumId, int contentId)
{
try
diff --git a/Dnn.CommunityForums/Services/Controllers/TagController.cs b/Dnn.CommunityForums/Services/Controllers/TagController.cs
index 6963fbf4c..ce14286f4 100644
--- a/Dnn.CommunityForums/Services/Controllers/TagController.cs
+++ b/Dnn.CommunityForums/Services/Controllers/TagController.cs
@@ -44,7 +44,7 @@ public class TagController : ControllerBase
#pragma warning restore CS1570
[HttpGet]
[DnnAuthorize]
- [ForumsAuthorize(SecureActions.Tag)]
+ [ForumsAuthorize(SecureActions.Edit)]
public HttpResponseMessage Matches(int forumId, string matchString)
{
return this.Match($"%{CleanAndChopString(matchString, 20)}%");
@@ -61,7 +61,7 @@ public HttpResponseMessage Matches(int forumId, string matchString)
#pragma warning restore CS1570
[HttpGet]
[DnnAuthorize]
- [ForumsAuthorize(SecureActions.Tag)]
+ [ForumsAuthorize(SecureActions.Edit)]
public HttpResponseMessage BeginsWith(int forumId, string matchString)
{
return this.Match($"{CleanAndChopString(matchString, 20)}%");
diff --git a/Dnn.CommunityForums/Services/Controllers/TopicController.cs b/Dnn.CommunityForums/Services/Controllers/TopicController.cs
index 381f78545..5ddb115b2 100644
--- a/Dnn.CommunityForums/Services/Controllers/TopicController.cs
+++ b/Dnn.CommunityForums/Services/Controllers/TopicController.cs
@@ -88,6 +88,7 @@ public HttpResponseMessage Subscribe(TopicDto1 dto)
#pragma warning restore CS1570
[HttpGet]
[DnnAuthorize]
+ [ForumsAuthorize(SecureActions.View)]
public HttpResponseMessage SubscriberCount(int forumId, int topicId)
{
try
@@ -118,6 +119,7 @@ public HttpResponseMessage SubscriberCount(int forumId, int topicId)
#pragma warning restore CS1570
[HttpGet]
[DnnAuthorize]
+ [ForumsAuthorize(SecureActions.View)]
public HttpResponseMessage SubscriberCountString(int forumId, int topicId)
{
try
@@ -177,6 +179,7 @@ public HttpResponseMessage Pin(TopicDto1 dto)
contentId: ti.ContentId,
authorId: ti.Content.AuthorId,
userId: this.UserInfo.UserID,
+ badgeId: DotNetNuke.Common.Utilities.Null.NullInteger,
requestUrl: this.Request.RequestUri.ToString());
}
diff --git a/Dnn.CommunityForums/Services/Controllers/UserBadgeController.cs b/Dnn.CommunityForums/Services/Controllers/UserBadgeController.cs
new file mode 100644
index 000000000..65d2444ce
--- /dev/null
+++ b/Dnn.CommunityForums/Services/Controllers/UserBadgeController.cs
@@ -0,0 +1,102 @@
+// Copyright (c) by DNN Community
+//
+// DNN Community licenses this file to you under the MIT license.
+//
+// See the LICENSE file in the project root for more information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace DotNetNuke.Modules.ActiveForums.Services.Controllers
+{
+ using System;
+ using System.Linq;
+ using System.Net;
+ using System.Net.Http;
+ using System.Reflection;
+ using System.Web.Http;
+
+ using DotNetNuke.Modules.ActiveForums.Services.ProcessQueue;
+ using DotNetNuke.UI.UserControls;
+ using DotNetNuke.Web.Api;
+
+ ///
+ ///
+ public class UserBadgeController : ControllerBase
+ {
+ public struct UserBadgeDto
+ {
+ public int BadgeId { get; set; }
+
+ public int UserId { get; set; }
+
+ public int UserBadgeId { get; set; }
+
+ public bool Assign { get; set; }
+ }
+
+ ///
+ /// Assign/unassigns a user badge to a user.
+ ///
+ ///
+ /// https://dnndev.me/API/ActiveForums/UserBadge/Assign
+ [HttpPost]
+ [DnnAuthorize(StaticRoles = "Administrators")]
+ public HttpResponseMessage Assign(UserBadgeDto dto)
+ {
+ try
+ {
+ if (dto.BadgeId > 0 && dto.UserId > 0)
+ {
+ DotNetNuke.Modules.ActiveForums.Entities.UserBadgeInfo userBadge = null;
+ var userBadgeController = new DotNetNuke.Modules.ActiveForums.Controllers.UserBadgeController(this.PortalSettings.PortalId, this.ForumModuleId);
+ if (dto.UserBadgeId > 0)
+ {
+ userBadge = userBadgeController.GetById(dto.UserBadgeId);
+ }
+ else
+ {
+ userBadge = userBadgeController.GetLatestForUserAndBadge(portalId: this.PortalSettings.PortalId, userId: dto.UserId, badgeId: dto.BadgeId);
+ }
+
+ if (userBadge == null && dto.Assign.Equals(true))
+ {
+ DotNetNuke.Modules.ActiveForums.Controllers.UserBadgeController.AssignUserBadge(portalId: this.PortalSettings.PortalId, moduleId: this.ForumModuleId, userId: dto.UserId, badgeId: dto.BadgeId, requestUrl: this.Request.RequestUri.ToString());
+ return this.Request.CreateResponse(HttpStatusCode.OK, true);
+ }
+
+ if (dto.Assign.Equals(false))
+ {
+ if (userBadge != null)
+ {
+ userBadgeController.UnassignUserBadge(portalId: userBadge.PortalId, userId: userBadge.UserId, badgeId: userBadge.BadgeId, dateAssigned: userBadge.DateAssigned);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.OK, false);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+ }
+
+ return this.Request.CreateResponse(HttpStatusCode.BadRequest);
+ }
+ }
+}
diff --git a/Dnn.CommunityForums/Services/Controllers/UserController.cs b/Dnn.CommunityForums/Services/Controllers/UserController.cs
index 248ab92ed..b011b28a4 100644
--- a/Dnn.CommunityForums/Services/Controllers/UserController.cs
+++ b/Dnn.CommunityForums/Services/Controllers/UserController.cs
@@ -31,6 +31,7 @@ namespace DotNetNuke.Modules.ActiveForums.Services.Controllers
///
///
+ ///
public class UserController : ControllerBase
{
///
diff --git a/Dnn.CommunityForums/Services/ProcessQueue.cs b/Dnn.CommunityForums/Services/ProcessQueue.cs
index d9a33e473..b99e698a9 100644
--- a/Dnn.CommunityForums/Services/ProcessQueue.cs
+++ b/Dnn.CommunityForums/Services/ProcessQueue.cs
@@ -84,6 +84,9 @@ private static int ProcessQueue()
case ProcessType.UpdateForumTopicPointers:
completed = DotNetNuke.Modules.ActiveForums.Controllers.ForumController.RecalculateTopicPointers(item.ForumId);
break;
+ case ProcessType.BadgeAssigned:
+ completed = new DotNetNuke.Modules.ActiveForums.Controllers.UserBadgeController(item.PortalId, item.ModuleId).AssignUserBadgeAfterAction(item.PortalId, item.UserId, item.BadgeId, item.DateCreated, item.RequestUrl);
+ break;
default:
DotNetNuke.Services.Exceptions.Exceptions.LogException(new NotImplementedException("invalid ProcessType"));
break;
diff --git a/Dnn.CommunityForums/Services/ProcessType.cs b/Dnn.CommunityForums/Services/ProcessType.cs
index d91cc2a7c..f5a97bfc3 100644
--- a/Dnn.CommunityForums/Services/ProcessType.cs
+++ b/Dnn.CommunityForums/Services/ProcessType.cs
@@ -30,5 +30,6 @@ public enum ProcessType
UpdateForumTopicPointers = 6,
PostLiked = 7,
TopicPinned = 8,
+ BadgeAssigned = 9,
}
}
diff --git a/Dnn.CommunityForums/Services/Tokens/ForumsModuleTokenReplacer.cs b/Dnn.CommunityForums/Services/Tokens/ForumsModuleTokenReplacer.cs
index 31d3724cc..207b4d522 100644
--- a/Dnn.CommunityForums/Services/Tokens/ForumsModuleTokenReplacer.cs
+++ b/Dnn.CommunityForums/Services/Tokens/ForumsModuleTokenReplacer.cs
@@ -134,6 +134,7 @@ public string GetProperty(string propertyName, string format, System.Globalizati
string.Empty;
}
+ case "forumslink":
case "toolbar-forums-onclick":
return PropertyAccess.FormatString(Utilities.NavigateURL(this.TabId), format);
case "toolbar-controlpanel-onclick":
diff --git a/Dnn.CommunityForums/Services/Tokens/TokenReplacer.cs b/Dnn.CommunityForums/Services/Tokens/TokenReplacer.cs
index 455891e9e..33337efa2 100644
--- a/Dnn.CommunityForums/Services/Tokens/TokenReplacer.cs
+++ b/Dnn.CommunityForums/Services/Tokens/TokenReplacer.cs
@@ -46,6 +46,7 @@ internal class TokenReplacer : BaseCustomTokenReplace
private const string PropertySource_forumuser = "forumuser";
private const string PropertySource_like = "forumlike";
private const string PropertySource_user = "user";
+ private const string PropertySource_badge = "badge";
private const string PropertySource_profile = "profile";
private const string PropertySource_membership = "membership";
private const string PropertySource_forumauthor = "forumauthor";
@@ -346,7 +347,32 @@ public TokenReplacer(PortalSettings portalSettings, int forumTabId, int forumMod
this.CurrentAccessLevel = Scope.DefaultSettings;
}
+
+ public TokenReplacer(PortalSettings portalSettings, UserBadgeInfo userBadgeInfo, Uri requestUri, string rawUrl)
+ {
+ userBadgeInfo.ForumUser.RawUrl = rawUrl;
+ userBadgeInfo.ForumUser.RequestUri = requestUri;
+ this.PropertySource[PropertySource_resx] = new ResourceStringTokenReplacer();
+ this.PropertySource[PropertySource_forumuser] = userBadgeInfo.ForumUser;
+ this.PropertySource[PropertySource_badge] = userBadgeInfo;
+ this.PropertySource[PropertySource_user] = userBadgeInfo.ForumUser.UserInfo;
+ this.PropertySource[PropertySource_profile] = new ProfilePropertyAccess(userBadgeInfo.ForumUser.UserInfo);
+ this.PropertySource[PropertySource_membership] = new MembershipPropertyAccess(userBadgeInfo.ForumUser.UserInfo);
+ this.PropertySource[PropertySource_tab] = portalSettings.ActiveTab;
+ this.PropertySource[PropertySource_module] = userBadgeInfo.ForumUser.ModuleInfo;
+ this.PropertySource[PropertySource_portal] = portalSettings;
+ try
+ {
+ this.PropertySource[PropertySource_host] = new HostPropertyAccess();
+ }
+
+ /* this allows unit tests to complete */
+ catch (System.ArgumentNullException)
+ {
+ }
+ this.CurrentAccessLevel = Scope.DefaultSettings;
+ }
public new string ReplaceTokens(string source)
{
return base.ReplaceTokens(source);
@@ -362,7 +388,7 @@ internal static StringBuilder ReplaceForumControlTokens(StringBuilder template,
return template;
}
- internal static StringBuilder ReplaceForumTokens(StringBuilder template, ForumInfo forum, PortalSettings portalSettings, SettingsInfo mainSettings, INavigationManager navigationManager, ForumUserInfo forumUser, int tabId, CurrentUserTypes currentUserType, Uri requestUri, string rawUrl)
+ internal static StringBuilder ReplaceForumTokens(StringBuilder template, ForumInfo forum, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, INavigationManager navigationManager, ForumUserInfo forumUser, int tabId, CurrentUserTypes currentUserType, Uri requestUri, string rawUrl)
{
/* if no last post or subject missing, remove associated last topic tokens */
if (forum.LastPostID == 0 || string.IsNullOrEmpty(System.Net.WebUtility.HtmlDecode(forum.LastPostSubject)))
@@ -379,7 +405,7 @@ internal static StringBuilder ReplaceForumTokens(StringBuilder template, ForumIn
if (template.ToString().Contains("[AF:CONTROL:ADDFAVORITE]"))
{
var forumUrl = new ControlUtils().BuildUrl(forum.PortalId, tabId, forum.ModuleId, forum.ForumGroup.PrefixURL, forum.PrefixURL, forum.ForumGroupId, forum.ForumID, -1, -1, string.Empty, 1, -1, forum.SocialGroupId);
- template.Replace("[AF:CONTROL:ADDFAVORITE]", "");
+ template.Replace("[AF:CONTROL:ADDFAVORITE]", "");
}
template = ResourceStringTokenReplacer.ReplaceResourceTokens(template);
@@ -389,7 +415,7 @@ internal static StringBuilder ReplaceForumTokens(StringBuilder template, ForumIn
return template;
}
- internal static StringBuilder ReplaceForumGroupTokens(StringBuilder template, ForumGroupInfo forumGroup, PortalSettings portalSettings, SettingsInfo mainSettings, INavigationManager navigationManager, ForumUserInfo forumUser, int tabId, CurrentUserTypes currentUserType, Uri requestUri, string rawUrl)
+ internal static StringBuilder ReplaceForumGroupTokens(StringBuilder template, ForumGroupInfo forumGroup, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, INavigationManager navigationManager, ForumUserInfo forumUser, int tabId, CurrentUserTypes currentUserType, Uri requestUri, string rawUrl)
{
template = ResourceStringTokenReplacer.ReplaceResourceTokens(template);
var tokenReplacer = new TokenReplacer(portalSettings, forumUser, forumGroup, requestUri, rawUrl) { CurrentAccessLevel = Scope.DefaultSettings, AccessingUser = forumUser.UserInfo, };
@@ -399,7 +425,7 @@ internal static StringBuilder ReplaceForumGroupTokens(StringBuilder template, Fo
return template;
}
- internal static StringBuilder ReplaceAuthorTokens(StringBuilder template, PortalSettings portalSettings, SettingsInfo mainSettings, AuthorInfo author, ForumUserInfo accessingUser, Uri requestUri, string rawUrl, int forumModuleId)
+ internal static StringBuilder ReplaceAuthorTokens(StringBuilder template, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, AuthorInfo author, ForumUserInfo accessingUser, Uri requestUri, string rawUrl, int forumModuleId)
{
template = ResourceStringTokenReplacer.ReplaceResourceTokens(template);
var tokenReplacer = new TokenReplacer(portalSettings, author, accessingUser, requestUri, rawUrl) { CurrentAccessLevel = Scope.DefaultSettings, AccessingUser = accessingUser?.UserInfo, };
@@ -409,7 +435,7 @@ internal static StringBuilder ReplaceAuthorTokens(StringBuilder template, Portal
return template;
}
- internal static StringBuilder ReplaceUserTokens(StringBuilder template, PortalSettings portalSettings, SettingsInfo mainSettings, ForumUserInfo forumUser, ForumUserInfo accessingUser, Uri requestUri, string rawUrl, int forumModuleId)
+ internal static StringBuilder ReplaceUserTokens(StringBuilder template, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, ForumUserInfo forumUser, ForumUserInfo accessingUser, Uri requestUri, string rawUrl, int forumModuleId)
{
var language = accessingUser?.UserInfo?.Profile?.PreferredLocale ?? portalSettings?.DefaultLanguage;
@@ -423,9 +449,9 @@ internal static StringBuilder ReplaceUserTokens(StringBuilder template, PortalSe
return template;
}
- internal static StringBuilder ReplaceTopicTokens(StringBuilder template, TopicInfo topic, PortalSettings portalSettings, SettingsInfo mainSettings, INavigationManager navigationManager, ForumUserInfo forumUser, Uri requestUri, string rawUrl)
+ internal static StringBuilder ReplaceTopicTokens(StringBuilder template, TopicInfo topic, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, INavigationManager navigationManager, ForumUserInfo forumUser, Uri requestUri, string rawUrl)
{
- topic.Content.Body = ReplaceBody(topic.Content.Body, mainSettings, requestUri);
+ topic.Content.Body = ReplaceBody(topic.Content.Body, moduleSettings, requestUri);
template = ResourceStringTokenReplacer.ReplaceResourceTokens(template);
var tokenReplacer = new TokenReplacer(portalSettings, forumUser, topic, requestUri, rawUrl) { AccessingUser = forumUser.UserInfo, };
@@ -435,7 +461,7 @@ internal static StringBuilder ReplaceTopicTokens(StringBuilder template, TopicIn
return template;
}
- private static string ReplaceBody(string body, SettingsInfo mainSettings, Uri uri)
+ private static string ReplaceBody(string body, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, Uri uri)
{
if (!string.IsNullOrEmpty(body))
{
@@ -453,7 +479,7 @@ private static string ReplaceBody(string body, SettingsInfo mainSettings, Uri ur
}
body = Utilities.StripExecCode(body);
- if (mainSettings.AutoLinkEnabled)
+ if (moduleSettings.AutoLinkEnabled)
{
body = Utilities.AutoLinks(body, uri.Host);
}
@@ -472,7 +498,7 @@ private static string ReplaceBody(string body, SettingsInfo mainSettings, Uri ur
return body;
}
- internal static StringBuilder ReplacePostTokens(StringBuilder template, IPostInfo post, PortalSettings portalSettings, SettingsInfo mainSettings, INavigationManager navigationManager, ForumUserInfo forumUser, Uri requestUri, string rawUrl)
+ internal static StringBuilder ReplacePostTokens(StringBuilder template, IPostInfo post, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, INavigationManager navigationManager, ForumUserInfo forumUser, Uri requestUri, string rawUrl)
{
/* if likes not allowed for forum, remove like-related tokens */
if (!post.Forum.FeatureSettings.AllowLikes)
@@ -490,7 +516,7 @@ internal static StringBuilder ReplacePostTokens(StringBuilder template, IPostInf
template.Replace("[POSTINFO]", sPostInfo);
}
- post.Content.Body = ReplaceBody(post.Content.Body, mainSettings, requestUri);
+ post.Content.Body = ReplaceBody(post.Content.Body, moduleSettings, requestUri);
template = ResourceStringTokenReplacer.ReplaceResourceTokens(template);
var tokenReplacer = new TokenReplacer(portalSettings, forumUser, post, requestUri, rawUrl) { AccessingUser = forumUser.UserInfo, };
@@ -500,7 +526,7 @@ internal static StringBuilder ReplacePostTokens(StringBuilder template, IPostInf
return template;
}
- internal static StringBuilder ReplaceLikeTokens(StringBuilder template, LikeInfo like, PortalSettings portalSettings, SettingsInfo mainSettings, INavigationManager navigationManager, ForumUserInfo forumUser, Uri requestUri, string rawUrl)
+ internal static StringBuilder ReplaceLikeTokens(StringBuilder template, LikeInfo like, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, INavigationManager navigationManager, ForumUserInfo forumUser, Uri requestUri, string rawUrl)
{
/* if likes not allowed for forum, remove like-related tokens */
if (!like.Forum.FeatureSettings.AllowLikes)
@@ -516,6 +542,16 @@ internal static StringBuilder ReplaceLikeTokens(StringBuilder template, LikeInfo
return template;
}
+ internal static StringBuilder ReplaceBadgeTokens(StringBuilder template, UserBadgeInfo userBadge, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, INavigationManager navigationManager, ForumUserInfo forumUser, Uri requestUri, string rawUrl)
+ {
+ template = ResourceStringTokenReplacer.ReplaceResourceTokens(template);
+ var tokenReplacer = new TokenReplacer(portalSettings, userBadge, requestUri, rawUrl) { AccessingUser = forumUser.UserInfo, };
+ template = new StringBuilder(tokenReplacer.ReplaceEmbeddedTokens(template.ToString()));
+ template = new StringBuilder(tokenReplacer.ReplaceTokens(template.ToString()));
+
+ return template;
+ }
+
private static StringBuilder ExtractAndReplaceDateTokenWithOptionalFormatParameter(StringBuilder template, string tokenPrefix, DateTime? datetime, PortalSettings portalSettings, ForumUserInfo forumUser)
{
if (datetime == null || datetime == DateTime.MinValue || datetime == SqlDateTime.MinValue.Value || datetime == Utilities.NullDate())
@@ -781,7 +817,7 @@ internal static StringBuilder MapLegacyForumGroupTokenSynonyms(StringBuilder tem
return template;
}
- internal static StringBuilder MapLegacyUserTokenSynonyms(StringBuilder template, PortalSettings portalSettings, SettingsInfo mainSettings, string language)
+ internal static StringBuilder MapLegacyUserTokenSynonyms(StringBuilder template, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, string language)
{
template = ReplaceTokenSynonym(template, "[SENDERUSERNAME]", "[USER:USERNAME]");
template = ReplaceTokenSynonym(template, "[SENDERFIRSTNAME]", "[USER:FIRSTNAME]");
@@ -851,12 +887,12 @@ internal static StringBuilder MapLegacyUserTokenSynonyms(StringBuilder template,
template = ReplaceLegacyTokenWithFormatString(template, portalSettings, language, "[AF:BUTTON:EDITUSER]", "[FORUMUSER:EDITLINK", "[EDITUSERLINK]");
- if (mainSettings.PMType == PMTypes.Disabled)
+ if (moduleSettings.PMType == PMTypes.Disabled)
{
template.Replace("[AF:PROFILE:PMLINK]", string.Empty);
template.Replace("[AF:PROFILE:PMURL]", string.Empty);
}
- else if (mainSettings.PMType == PMTypes.Core)
+ else if (moduleSettings.PMType == PMTypes.Core)
{
template = ReplaceLegacyTokenWithFormatString(template, portalSettings, language, "[AF:PROFILE:PMLINK]", "[FORUMUSER:PMLINK", "[USERPMLINK]");
template.Replace("[AF:PROFILE:PMURL]", string.Empty);
@@ -865,7 +901,7 @@ internal static StringBuilder MapLegacyUserTokenSynonyms(StringBuilder template,
return template;
}
- internal static StringBuilder MapLegacyAuthorTokenSynonyms(StringBuilder template, PortalSettings portalSettings, SettingsInfo mainSettings, string language)
+ internal static StringBuilder MapLegacyAuthorTokenSynonyms(StringBuilder template, PortalSettings portalSettings, DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings, string language)
{
template = ReplaceTokenSynonym(template, "[SENDERUSERNAME]", "[FORUMAUTHOR:USERNAME]");
template = ReplaceTokenSynonym(template, "[SENDERFIRSTNAME]", "[FORUMAUTHOR:FIRSTNAME]");
@@ -935,12 +971,12 @@ internal static StringBuilder MapLegacyAuthorTokenSynonyms(StringBuilder templat
template = ReplaceLegacyTokenWithFormatString(template, portalSettings, language, "[AF:BUTTON:EDITUSER]", "[FORUMAUTHOR:EDITLINK", "[EDITAUTHORLINK]");
- if (mainSettings.PMType == PMTypes.Disabled)
+ if (moduleSettings.PMType == PMTypes.Disabled)
{
template.Replace("[AF:PROFILE:PMLINK]", string.Empty);
template.Replace("[AF:PROFILE:PMURL]", string.Empty);
}
- else if (mainSettings.PMType == PMTypes.Core)
+ else if (moduleSettings.PMType == PMTypes.Core)
{
template = ReplaceLegacyTokenWithFormatString(template, portalSettings, language, "[AF:PROFILE:PMLINK]", "[FORUMAUTHOR:PMLINK", "[AUTHORPMLINK]");
template.Replace("[AF:PROFILE:PMURL]", string.Empty);
@@ -1264,14 +1300,19 @@ internal static string GetTokenFormatString(string key, PortalSettings portalSet
internal string ReplaceEmbeddedTokens(string source)
{
+ return this.ReplaceEmbeddedTokens(new StringBuilder(source)).ToString();
+ }
+
+ internal StringBuilder ReplaceEmbeddedTokens(StringBuilder source)
+ {
+ var sb = new StringBuilder(source.ToString());
const string Pattern = @"(?(?:(?\[\])|\[(?:(?
\ No newline at end of file
diff --git a/Dnn.CommunityForums/config/templates/UserBadge.ascx b/Dnn.CommunityForums/config/templates/UserBadge.ascx
new file mode 100644
index 000000000..3d82cdd92
--- /dev/null
+++ b/Dnn.CommunityForums/config/templates/UserBadge.ascx
@@ -0,0 +1,8 @@
+(";
// Jump to pages
int intPostPages = 0;
@@ -718,7 +718,7 @@ private string GetSubPages(int tabID, int replies, int forumID, int postID)
{
Params = new List { ParamKeys.ForumId + "=" + forumID, ParamKeys.TopicId + "=" + postID, ParamKeys.ViewType + "=" + Views.Topic };
- if (this.MainSettings.UseShortUrls)
+ if (this.ModuleSettings.UseShortUrls)
{
Params = new List { ParamKeys.TopicId + "=" + postID };
}
@@ -736,7 +736,7 @@ private string GetSubPages(int tabID, int replies, int forumID, int postID)
}
Params = new List { ParamKeys.ForumId + "=" + forumID, ParamKeys.TopicId + "=" + postID, ParamKeys.ViewType + "=" + Views.Topic };
- if (this.MainSettings.UseShortUrls)
+ if (this.ModuleSettings.UseShortUrls)
{
Params = new List { ParamKeys.TopicId + "=" + postID };
}
@@ -756,7 +756,7 @@ private string GetSubPages(int tabID, int replies, int forumID, int postID)
for (i = 1; i <= intPostPages; i++)
{
Params = new List { ParamKeys.ForumId + "=" + forumID, ParamKeys.TopicId + "=" + postID, ParamKeys.ViewType + "=" + Views.Topic };
- if (this.MainSettings.UseShortUrls)
+ if (this.ModuleSettings.UseShortUrls)
{
Params = new List { ParamKeys.TopicId + "=" + postID };
}
diff --git a/Dnn.CommunityForums/CustomControls/UserControls/UserProfile.cs b/Dnn.CommunityForums/CustomControls/UserControls/UserProfile.cs
index d94855658..2d0e5cde1 100644
--- a/Dnn.CommunityForums/CustomControls/UserControls/UserProfile.cs
+++ b/Dnn.CommunityForums/CustomControls/UserControls/UserProfile.cs
@@ -116,7 +116,7 @@ protected override void OnInit(EventArgs e)
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
- string sTemplate = DotNetNuke.Modules.ActiveForums.Controllers.TemplateController.Template_Get(this.ForumModuleId, Enums.TemplateType._userProfile, SettingsBase.GetModuleSettings(this.ForumModuleId).ForumFeatureSettings.TemplateFileNameSuffix);
+ string sTemplate = DotNetNuke.Modules.ActiveForums.Controllers.TemplateController.Template_Get(this.ForumModuleId, Enums.TemplateType._userProfile, SettingsBase.GetModuleSettings(this.ForumModuleId).DefaultFeatureSettings.TemplateFileNameSuffix);
if (this.ProfileMode == ProfileModes.Edit)
{
@@ -226,7 +226,7 @@ protected override void OnLoad(EventArgs e)
{
ForumView ctlForums = new ForumView();
ctlForums.ModuleConfiguration = this.ModuleConfiguration;
- ctlForums.DisplayTemplate = DotNetNuke.Modules.ActiveForums.Controllers.TemplateController.Template_Get(this.ForumModuleId, (Enums.TemplateType)Enum.Parse(typeof(Enums.TemplateType), "ForumTracking", true), SettingsBase.GetModuleSettings(this.ForumModuleId).ForumFeatureSettings.TemplateFileNameSuffix);
+ ctlForums.DisplayTemplate = DotNetNuke.Modules.ActiveForums.Controllers.TemplateController.Template_Get(this.ForumModuleId, (Enums.TemplateType)Enum.Parse(typeof(Enums.TemplateType), "ForumTracking", true), SettingsBase.GetModuleSettings(this.ForumModuleId).DefaultFeatureSettings.TemplateFileNameSuffix);
ctlForums.CurrentUserId = this.UID;
ctlForums.ForumIds = user.UserForums;
this.plhTracker.Controls.Add(ctlForums);
@@ -358,13 +358,13 @@ private bool SaveProfile()
var user = new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ForumModuleId).GetByUserId(this.PortalId, this.UID);
if (user != null)
{
- if (this.MainSettings.AllowSignatures == 1)
+ if (this.ModuleSettings.AllowSignatures == 1)
{
user.Signature = Utilities.XSSFilter(this.txtSignature.Text, true);
user.Signature = Utilities.StripHTMLTag(user.Signature);
user.Signature = System.Net.WebUtility.HtmlEncode(user.Signature);
}
- else if (this.MainSettings.AllowSignatures == 2)
+ else if (this.ModuleSettings.AllowSignatures == 2)
{
user.Signature = Utilities.XSSFilter(this.txtSignature.Text, false);
}
diff --git a/Dnn.CommunityForums/DnnCommunityForums.csproj b/Dnn.CommunityForums/DnnCommunityForums.csproj
index 124102fa4..22b5a0d63 100644
--- a/Dnn.CommunityForums/DnnCommunityForums.csproj
+++ b/Dnn.CommunityForums/DnnCommunityForums.csproj
@@ -12,8 +12,8 @@
Discussion Forum Module for DNN
dnncommunity.org
dnncommunity.org
- 09.01.01.00
- 09.01.01.00
+ 09.02.00.00
+ 09.02.00.00
False
True
@@ -25,15 +25,22 @@
-
+
+
+
+ ASPXCodeBehind
+
+
+ ASPXCodeBehind
+
+
-
+
DNN Community Forums
DNN Community Forums: The official online forums module for the DNN Community.
DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Icon-64px.png
@@ -75,7 +75,7 @@
DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums
[DESKTOPMODULEID]
- 07.00.07,07.00.11,07.00.12,08.00.00,08.01.00,08.02.00,08.02.02,08.02.03,08.02.04,08.02.08,09.00.00,09.01.00
+ 07.00.07,07.00.11,07.00.12,08.00.00,08.01.00,08.02.00,08.02.02,08.02.03,08.02.04,08.02.08,09.00.00,09.01.00,09.02.00
@@ -86,7 +86,7 @@
DotNetNuke.Modules.ActiveForums.dll
bin\DotNetNuke.Modules.ActiveForums.dll
- 09.01.01
+ 09.02.00
@@ -436,13 +436,13 @@
@@ -485,8 +485,8 @@
-
-
+
+
DNN Community Forums What's New
ActiveForumsWhatsNew
DNN Community Forums: Display the most recent topics or replies from selected forums on any page within your site.
@@ -555,7 +555,7 @@
-
+
DNN Community Forums Forums Viewer
ActiveForumsViewer
DNN Community Forums: Display any forum topic view on any page within your site.
diff --git a/Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn b/Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn
index 7a9340c9a..be5cde55a 100644
--- a/Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn
+++ b/Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn
@@ -1,6 +1,6 @@
-
+
DNN Community Forums Symbols
DNN Community Forums: The official online forums module for the DNN Community.
DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Icon-64px.png
@@ -14,7 +14,7 @@
True
- Active Forums
+ Active Forums
diff --git a/Dnn.CommunityForums/Entities/BadgeInfo.cs b/Dnn.CommunityForums/Entities/BadgeInfo.cs
new file mode 100644
index 000000000..ca34cc99f
--- /dev/null
+++ b/Dnn.CommunityForums/Entities/BadgeInfo.cs
@@ -0,0 +1,121 @@
+// Copyright (c) by DNN Community
+//
+// DNN Community licenses this file to you under the MIT license.
+//
+// See the LICENSE file in the project root for more information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace DotNetNuke.Modules.ActiveForums.Entities
+{
+ using System;
+ using System.Web.Caching;
+
+ using DotNetNuke.ComponentModel.DataAnnotations;
+ using DotNetNuke.Services.Tokens;
+ using DotNetNuke.UI.UserControls;
+
+ ///
+ /// Represents a badge in the DNN Community Forums module.
+ ///
+ [TableName("activeforums_Badges")]
+ [PrimaryKey("BadgeId", AutoIncrement = true)]
+ [Cacheable("activeforums_Badges", CacheItemPriority.Normal)]
+ [Scope("ModuleId")]
+ public class BadgeInfo
+ {
+ ///
+ /// Gets or sets the badge ID.
+ ///
+ public int BadgeId { get; set; }
+
+ ///
+ /// Gets or sets the ModuleId.
+ ///
+ public int ModuleId { get; set; }
+
+ ///
+ /// Gets or sets the badge name.
+ ///
+ public string Name { get; set; }
+
+ ///
+ /// Gets or sets the badge description.
+ ///
+ public string Description { get; set; }
+
+ ///
+ /// Gets or sets the badge image markup (optional).
+ ///
+ public string ImageMarkup { get; set; }
+
+ ///
+ /// Gets or sets the file Id for the badge.
+ ///
+ public int FileId{ get; set; }
+
+ ///
+ /// Gets or sets the SortOrder for the badge.
+ ///
+ public int SortOrder { get; set; }
+
+ ///
+ /// Gets or sets One Time Award.
+ ///
+ public bool OneTimeAward { get; set; }
+
+ ///
+ /// Gets or sets the BadgeMetric.
+ ///
+ public DotNetNuke.Modules.ActiveForums.Enums.BadgeMetric BadgeMetric { get; set; }
+
+ ///
+ /// Gets or sets the Threshold.
+ ///
+ public int Threshold { get; set; }
+
+ ///
+ /// Gets or sets the interval days.
+ ///
+ public int IntervalDays { get; set; }
+
+ ///
+ /// Gets or sets the SendAwardNotification.
+ ///
+ public bool SendAwardNotification { get; set; }
+
+ ///
+ /// Gets or sets the InitialBackfillCompletedDate.
+ ///
+ public DateTime? InitialBackfillCompletedDate { get; set; }
+
+ ///
+ /// Gets or sets the SuppresssAwardNotificationOnBackfill.
+ ///
+ public bool SuppresssAwardNotificationOnBackfill { get; set; }
+
+ ///
+ /// Gets the enum name/description for the badge metric.
+ ///
+ [IgnoreColumn]
+ public string BadgeMetricEnumName => Enum.GetName(typeof(DotNetNuke.Modules.ActiveForums.Enums.BadgeMetric), this.BadgeMetric);
+
+ ///
+ /// Gets the Url for the badge image.
+ ///
+ [IgnoreColumn]
+ public string GetBadgeImageUrl(int portalId, int size = 32) => this.FileId <= 0 ? string.Empty : Utilities.ResolveUrl($"https://{Utilities.GetPortalSettings(portalId).DefaultPortalAlias}/DnnImageHandler.ashx?mode=securefile&fileId={this.FileId}&h={size}&w={size}");
+ }
+}
diff --git a/Dnn.CommunityForums/Entities/FeatureSettings.cs b/Dnn.CommunityForums/Entities/FeatureSettings.cs
index 457a83319..33b380255 100644
--- a/Dnn.CommunityForums/Entities/FeatureSettings.cs
+++ b/Dnn.CommunityForums/Entities/FeatureSettings.cs
@@ -41,12 +41,18 @@ public FeatureSettings(Hashtable featureSettings)
internal static void Save(int moduleId, string settingsKey, FeatureSettings settings)
{
+ new DotNetNuke.Modules.ActiveForums.Controllers.SettingsController().DeleteForModuleIdSettingsKey(moduleId, settingsKey);
foreach (DictionaryEntry setting in settings.featureSettings)
{
- Settings.SaveSetting(moduleId, settingsKey, setting.Key.ToString(), setting.Value.ToString());
+ DotNetNuke.Modules.ActiveForums.Controllers.SettingsController.SaveSetting(moduleId, settingsKey, setting.Key.ToString(), setting.Value.ToString());
}
}
+ internal static void Delete(int moduleId, string settingsKey, string settingName)
+ {
+ new DotNetNuke.Modules.ActiveForums.Controllers.SettingsController().DeleteForModuleIdSettingsKeySettingName(moduleId, settingsKey, settingName);
+ }
+
[IgnoreColumn]
public bool AllowAttach => Utilities.SafeConvertBool(this.featureSettings[ForumSettingKeys.AllowAttach]);
diff --git a/Dnn.CommunityForums/Entities/ForumGroupInfo.cs b/Dnn.CommunityForums/Entities/ForumGroupInfo.cs
index f807189c3..958ffb693 100644
--- a/Dnn.CommunityForums/Entities/ForumGroupInfo.cs
+++ b/Dnn.CommunityForums/Entities/ForumGroupInfo.cs
@@ -40,7 +40,7 @@ public partial class ForumGroupInfo : DotNetNuke.Services.Tokens.IPropertyAccess
private DotNetNuke.Modules.ActiveForums.Entities.PermissionInfo security;
private FeatureSettings featureSettings;
- private DotNetNuke.Modules.ActiveForums.SettingsInfo mainSettings;
+ private DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings;
private PortalSettings portalSettings;
private ModuleInfo moduleInfo;
private int? tabId;
@@ -79,10 +79,10 @@ public int TabId
public string ThemeLocation => Utilities.ResolveUrl(SettingsBase.GetModuleSettings(this.ModuleId).ThemeLocation);
[IgnoreColumn]
- public bool InheritSecurity => this.PermissionsId == this.MainSettings.DefaultPermissionId;
+ public bool InheritSecurity => this.PermissionsId == this.ModuleSettings.DefaultPermissionId;
[IgnoreColumn]
- public bool InheritSettings => this.GroupSettingsKey == this.MainSettings.DefaultSettingsKey;
+ public bool InheritSettings => this.GroupSettingsKey == this.ModuleSettings.DefaultSettingsKey;
[IgnoreColumn]
public DotNetNuke.Modules.ActiveForums.Entities.PermissionInfo Security
@@ -148,29 +148,29 @@ internal FeatureSettings LoadFeatureSettings()
}
[IgnoreColumn]
- public SettingsInfo MainSettings
+ public DotNetNuke.Modules.ActiveForums.ModuleSettings ModuleSettings
{
get
{
- if (this.mainSettings == null)
+ if (this.moduleSettings == null)
{
- this.mainSettings = this.LoadMainSettings();
+ this.moduleSettings = this.LoadModuleSettings();
this.UpdateCache();
}
- return this.mainSettings;
+ return this.moduleSettings;
}
set
{
- this.mainSettings = value;
+ this.moduleSettings = value;
this.UpdateCache();
}
}
- internal SettingsInfo LoadMainSettings()
+ internal DotNetNuke.Modules.ActiveForums.ModuleSettings LoadModuleSettings()
{
- return this.mainSettings = SettingsBase.GetModuleSettings(this.ModuleId);
+ return this.moduleSettings = SettingsBase.GetModuleSettings(this.ModuleId);
}
[IgnoreColumn]
diff --git a/Dnn.CommunityForums/Entities/ForumInfo.cs b/Dnn.CommunityForums/Entities/ForumInfo.cs
index 4e52db101..b1587dbaa 100644
--- a/Dnn.CommunityForums/Entities/ForumInfo.cs
+++ b/Dnn.CommunityForums/Entities/ForumInfo.cs
@@ -50,7 +50,7 @@ public class ForumInfo : DotNetNuke.Services.Tokens.IPropertyAccess
private DotNetNuke.Modules.ActiveForums.Entities.PermissionInfo security;
private DotNetNuke.Modules.ActiveForums.Entities.IPostInfo lastPostInfo;
private FeatureSettings featureSettings;
- private DotNetNuke.Modules.ActiveForums.SettingsInfo mainSettings;
+ private DotNetNuke.Modules.ActiveForums.ModuleSettings mainSettings;
private PortalSettings portalSettings;
private ModuleInfo moduleInfo;
private int? subscriberCount;
@@ -117,9 +117,9 @@ public ForumInfo(DotNetNuke.Entities.Portals.PortalSettings portalSettings)
public string ForumSettingsKey { get; set; }
- public DateTime DateCreated { get; set; } = DateTime.Now;
+ public DateTime DateCreated { get; set; } = DateTime.UtcNow;
- public DateTime DateUpdated { get; set; } = DateTime.Now;
+ public DateTime DateUpdated { get; set; } = DateTime.UtcNow;
public int LastTopicId { get; set; }
@@ -547,7 +547,7 @@ internal PermissionInfo LoadSecurity()
}
[IgnoreColumn]
- public SettingsInfo MainSettings
+ public DotNetNuke.Modules.ActiveForums.ModuleSettings MainSettings
{
get
{
@@ -567,7 +567,7 @@ public SettingsInfo MainSettings
}
}
- internal SettingsInfo LoadMainSettings()
+ internal DotNetNuke.Modules.ActiveForums.ModuleSettings LoadMainSettings()
{
return this.mainSettings = SettingsBase.GetModuleSettings(this.ModuleId);
}
@@ -713,7 +713,7 @@ internal string GetForumStatusCss(DotNetNuke.Modules.ActiveForums.Entities.Forum
}
}
- internal string GetForumFolderIcon(DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo forumUser, DotNetNuke.Modules.ActiveForums.SettingsInfo mainSettings)
+ internal string GetForumFolderIcon(DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo forumUser, DotNetNuke.Modules.ActiveForums.ModuleSettings mainSettings)
{
switch (this.GetForumStatusForUser(forumUser))
{
@@ -908,7 +908,8 @@ public string GetProperty(string propertyName, string format, System.Globalizati
case "lastpostdisplayname":
case "lastpostauthordisplayname":
var forumUserController = new Controllers.ForumUserController(this.ModuleId);
- return this.LastPostID > 0 && this.LastPostUserID > 0 ? PropertyAccess.FormatString(Controllers.ForumUserController.GetDisplayName(this.PortalSettings, this.MainSettings, forumUserController.GetByUserId(accessingUser.PortalID, accessingUser.UserID).GetIsMod(this.ModuleId), forumUserController.GetUserIsAdmin(accessingUser.PortalID, this.ModuleId, accessingUser.UserID) || forumUserController.GetUserIsSuperUser(accessingUser.PortalID, this.ModuleId, accessingUser.UserID), this.LastPostUserID, this.LastPostUserName, this.LastPostFirstName, this.LastPostLastName, this.LastPostDisplayName).Replace("&#", "&#").Replace("Anonymous", this.LastPostDisplayName), format) : string.Empty;
+ var forumUser = forumUserController.GetByUserId(accessingUser.PortalID, accessingUser.UserID);
+ return this.LastPostID > 0 && this.LastPostUserID > 0 ? PropertyAccess.FormatString(Controllers.ForumUserController.GetDisplayName(this.PortalSettings, this.MainSettings, forumUser.GetIsMod(this.ModuleId), forumUser.IsAdmin || forumUser.IsSuperUser, this.LastPostUserID, this.LastPostUserName, this.LastPostFirstName, this.LastPostLastName, this.LastPostDisplayName).Replace("&#", "&#").Replace("Anonymous", this.LastPostDisplayName), format) : string.Empty;
case "statuscssclass":
return PropertyAccess.FormatString(this.GetForumStatusCss(new Controllers.ForumUserController(this.ModuleId).GetByUserId(accessingUser.PortalID, accessingUser.UserID)), format);
diff --git a/Dnn.CommunityForums/Entities/ForumUserInfo.cs b/Dnn.CommunityForums/Entities/ForumUserInfo.cs
index e7817cdf9..4e7fa5596 100644
--- a/Dnn.CommunityForums/Entities/ForumUserInfo.cs
+++ b/Dnn.CommunityForums/Entities/ForumUserInfo.cs
@@ -19,6 +19,9 @@
// DEALINGS IN THE SOFTWARE.
using System.Linq;
+using System.Text;
+
+using DotNetNuke.Collections;
namespace DotNetNuke.Modules.ActiveForums.Entities
{
@@ -27,10 +30,12 @@ namespace DotNetNuke.Modules.ActiveForums.Entities
using System.Linq;
using DotNetNuke.ComponentModel.DataAnnotations;
+ using DotNetNuke.Data;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Entities.Portals;
using DotNetNuke.Entities.Users;
using DotNetNuke.Services.Tokens;
+ using DotNetNuke.UI.UserControls;
[TableName("activeforums_UserProfiles")]
[PrimaryKey("ProfileId", AutoIncrement = true)]
@@ -41,8 +46,9 @@ public class ForumUserInfo : DotNetNuke.Services.Tokens.IPropertyAccess
private string cacheKeyTemplate => CacheKeys.ForumUser;
private DotNetNuke.Entities.Users.UserInfo userInfo;
+ private IEnumerable userBadges;
private PortalSettings portalSettings;
- private SettingsInfo mainSettings;
+ private DotNetNuke.Modules.ActiveForums.ModuleSettings moduleSettings;
private ModuleInfo moduleInfo;
private HashSet userRoleIds;
private string userPermSet;
@@ -92,7 +98,7 @@ public ForumUserInfo(int moduleId, DotNetNuke.Entities.Users.UserInfo userInfo)
public int TopicCount { get; set; }
- public int ReplyCount { get; set; }
+ public int ReplyCount { get; set; }
public int ViewCount { get; set; }
@@ -108,11 +114,9 @@ public ForumUserInfo(int moduleId, DotNetNuke.Entities.Users.UserInfo userInfo)
public int? AvatarFileId { get; set; }
- [IgnoreColumn]
- public DateTime? DateCreated => this.UserInfo?.CreatedOnDate;
+ public DateTime DateCreated { get; set; }
- [IgnoreColumn]
- public DateTime? DateUpdated => this.UserInfo?.LastModifiedOnDate;
+ public DateTime? DateUpdated { get; set; }
public DateTime? DateLastActivity { get; set; }
@@ -120,6 +124,13 @@ public ForumUserInfo(int moduleId, DotNetNuke.Entities.Users.UserInfo userInfo)
public DateTime? DateLastReply { get; set; }
+ [IgnoreColumn]
+ public DateTime? DNNUserDateCreated => this.UserInfo?.CreatedOnDate;
+
+ [IgnoreColumn]
+ public DateTime? DNNUserDateUpdated => this.UserInfo?.LastModifiedOnDate;
+
+
public string Signature { get; set; }
public bool SignatureDisabled { get; set; }
@@ -162,6 +173,8 @@ public ForumUserInfo(int moduleId, DotNetNuke.Entities.Users.UserInfo userInfo)
public bool EnableNotificationsForOwnContent { get; set; } = false;
+ public bool BadgeNotificationsEnabled { get; set; } = true;
+
[IgnoreColumn]
public string RawUrl { get; set; }
@@ -262,29 +275,29 @@ public CurrentUserTypes CurrentUserType
TimeSpan TimeZoneOffsetForUser => Utilities.GetTimeZoneOffsetForUser(this.UserInfo);
[IgnoreColumn]
- public SettingsInfo MainSettings
+ public DotNetNuke.Modules.ActiveForums.ModuleSettings ModuleSettings
{
get
{
- if (this.mainSettings == null)
+ if (this.moduleSettings == null)
{
- this.mainSettings = this.LoadMainSettings();
+ this.moduleSettings = this.LoadModuleSettings();
this.UpdateCache();
}
- return this.mainSettings;
+ return this.moduleSettings;
}
set
{
- this.mainSettings = value;
+ this.moduleSettings = value;
this.UpdateCache();
}
}
- internal SettingsInfo LoadMainSettings()
+ internal DotNetNuke.Modules.ActiveForums.ModuleSettings LoadModuleSettings()
{
- return this.mainSettings = SettingsBase.GetModuleSettings(this.ModuleId);
+ return this.moduleSettings = SettingsBase.GetModuleSettings(this.ModuleId);
}
[IgnoreColumn]
@@ -495,11 +508,31 @@ internal int GetLastTopicRead(DotNetNuke.Modules.ActiveForums.Entities.ForumInfo
return 0;
}
+ internal int GetLikeCountForUser()
+ {
+ return new DotNetNuke.Modules.ActiveForums.Controllers.LikeController().Count("WHERE UserId = @0 AND Checked = 1", this.UserId);
+ }
+
+ internal int GetLikeCountForUserSince(DateTime minDateTime)
+ {
+ return new DotNetNuke.Modules.ActiveForums.Controllers.LikeController().Count("WHERE UserId = @0 AND Checked = 1 AND DateCreated >= @1", this.UserId, minDateTime);
+ }
+
internal int GetTopicReadCount(DotNetNuke.Modules.ActiveForums.Entities.ForumInfo fi)
{
return new DotNetNuke.Modules.ActiveForums.Controllers.TopicTrackingController().GetTopicsReadCountForUserForum(this.ModuleId, this.UserId, fi.ForumID);
}
+ internal int GetTopicReadCount()
+ {
+ return new DotNetNuke.Modules.ActiveForums.Controllers.TopicTrackingController().GetTopicsReadCountByUser(this.ModuleId, this.UserId);
+ }
+
+ internal int GetTopicReadCountSince(DateTime minDateTimeRead)
+ {
+ return new DotNetNuke.Modules.ActiveForums.Controllers.TopicTrackingController().GetTopicsReadCountByUser(this.ModuleId, this.UserId, minDateTimeRead);
+ }
+
internal int GetLastTopicReplyRead(DotNetNuke.Modules.ActiveForums.Entities.TopicInfo ti)
{
var topicTrak = new DotNetNuke.Modules.ActiveForums.Controllers.TopicTrackingController().GetByUserIdTopicId(this.ModuleId, this.UserId, ti.TopicId);
@@ -522,6 +555,24 @@ public bool RunningInViewer
}
}
+ [IgnoreColumn]
+ public IEnumerable Badges
+ {
+ get
+ {
+ if (this.userBadges == null)
+ {
+ this.GetUserBadges();
+ this.UpdateCache();
+ }
+
+ return this.userBadges;
+ }
+ set => this.userBadges = value;
+ }
+
+ internal IEnumerable GetUserBadges() => this.userBadges = new DotNetNuke.Modules.ActiveForums.Controllers.UserBadgeController(this.PortalId, this.ModuleId).GetForUser(this.PortalId, this.UserId);
+
[IgnoreColumn]
public int ForumsOrViewerModuleId
{
@@ -544,6 +595,18 @@ public int ForumsOrViewerModuleId
}
}
+ public int GetTopicCountSince(DateTime minDateTime)
+ {
+ string sSql = "SELECT COUNT(*) FROM {databaseOwner}{objectQualifier}activeforums_Content c INNER JOIN {databaseOwner}{objectQualifier}activeforums_Topics t ON t.ContentId = c.ContentId WHERE c.ModuleId = @0 AND c.AuthorId = @1 AND c.IsDeleted = 0 AND c.DateCreated >= @2";
+ return DataContext.Instance().ExecuteQuery(System.Data.CommandType.Text, sSql, this.ModuleId, this.UserId, minDateTime).FirstOrDefault();
+ }
+
+ public int GetReplyCountSince(DateTime minDateTime)
+ {
+ string sSql = "SELECT COUNT(*) FROM {databaseOwner}{objectQualifier}activeforums_Content c INNER JOIN {databaseOwner}{objectQualifier}activeforums_Replies r ON r.ContentId = c.ContentId WHERE c.ModuleId = @0 AND c.AuthorId = @1 AND c.IsDeleted = 0 AND c.DateCreated >= @2";
+ return DataContext.Instance().ExecuteQuery(System.Data.CommandType.Text, sSql, this.ModuleId, this.UserId, minDateTime).FirstOrDefault();
+ }
+
[IgnoreColumn]
public DotNetNuke.Services.Tokens.CacheLevel Cacheability => DotNetNuke.Services.Tokens.CacheLevel.notCacheable;
@@ -579,8 +642,8 @@ public string GetProperty(string propertyName, string format, System.Globalizati
return PropertyAccess.FormatString(string.Empty, format);
}
- var height = this.MainSettings.AvatarHeight;
- var width = this.MainSettings.AvatarWidth;
+ var height = this.ModuleSettings.AvatarHeight;
+ var width = this.ModuleSettings.AvatarWidth;
if (length > 0)
{
height = length;
@@ -591,11 +654,15 @@ public string GetProperty(string propertyName, string format, System.Globalizati
case "usercaption":
return PropertyAccess.FormatString(this.UserCaption, format);
case "displayname":
- return PropertyAccess.FormatString(DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.GetDisplayName(this.PortalSettings, this.MainSettings, isMod: new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ModuleId).GetByUserId(portalId: accessingUser.PortalID, userId: accessingUser.UserID).GetIsMod(this.ModuleId), isAdmin: new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ModuleId).GetByUserId(portalId: accessingUser.PortalID, userId: accessingUser.UserID).IsAdmin, this.UserId, this.Username, this.FirstName, this.LastName, this.DisplayName), format);
+ return PropertyAccess.FormatString(DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.GetDisplayName(this.PortalSettings, this.ModuleSettings, isMod: new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ModuleId).GetByUserId(portalId: accessingUser.PortalID, userId: accessingUser.UserID).GetIsMod(this.ModuleId), isAdmin: new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ModuleId).GetByUserId(portalId: accessingUser.PortalID, userId: accessingUser.UserID).IsAdmin, this.UserId, this.Username, this.FirstName, this.LastName, this.DisplayName), format);
case "datecreated":
return Utilities.GetUserFormattedDateTime(this.DateCreated, formatProvider, accessingUser.Profile.PreferredTimeZone.GetUtcOffset(DateTime.UtcNow));
+ case "dnnuserdatecreated":
+ return Utilities.GetUserFormattedDateTime(this.DNNUserDateCreated, formatProvider, accessingUser.Profile.PreferredTimeZone.GetUtcOffset(DateTime.UtcNow));
case "dateupdated":
return Utilities.GetUserFormattedDateTime(this.DateUpdated, formatProvider, accessingUser.Profile.PreferredTimeZone.GetUtcOffset(DateTime.UtcNow));
+ case "dnnuserdateupdated":
+ return Utilities.GetUserFormattedDateTime(this.DNNUserDateUpdated, formatProvider, accessingUser.Profile.PreferredTimeZone.GetUtcOffset(DateTime.UtcNow));
case "datelastpost":
return Utilities.GetUserFormattedDateTime(this.DateLastPost, formatProvider, accessingUser.Profile.PreferredTimeZone.GetUtcOffset(DateTime.UtcNow));
case "datelastreply":
@@ -611,31 +678,31 @@ public string GetProperty(string propertyName, string format, System.Globalizati
case "topiccount":
return PropertyAccess.FormatString(this.TopicCount.ToString(), format);
case "answercount":
- return PropertyAccess.FormatString(this.MainSettings.EnablePoints && this.UserId > 0 ? this.AnswerCount.ToString() : string.Empty, format);
+ return PropertyAccess.FormatString(this.ModuleSettings.EnablePoints && this.UserId > 0 ? this.AnswerCount.ToString() : string.Empty, format);
case "rewardpoints":
- return PropertyAccess.FormatString(this.MainSettings.EnablePoints && this.UserId > 0 ? this.RewardPoints.ToString() : string.Empty, format);
+ return PropertyAccess.FormatString(this.ModuleSettings.EnablePoints && this.UserId > 0 ? this.RewardPoints.ToString() : string.Empty, format);
case "totalpoints":
- return PropertyAccess.FormatString(this.MainSettings.EnablePoints && this.UserId > 0 ? ((this.TopicCount * this.MainSettings.TopicPointValue) + (this.ReplyCount * this.MainSettings.ReplyPointValue) + (this.AnswerCount * this.MainSettings.AnswerPointValue) + this.RewardPoints).ToString() : string.Empty, format);
+ return PropertyAccess.FormatString(this.ModuleSettings.EnablePoints && this.UserId > 0 ? ((this.TopicCount * this.ModuleSettings.TopicPointValue) + (this.ReplyCount * this.ModuleSettings.ReplyPointValue) + (this.AnswerCount * this.ModuleSettings.AnswerPointValue) + this.RewardPoints).ToString() : string.Empty, format);
case "rankdisplay":
return PropertyAccess.FormatString(this.UserId > 0 ? DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.GetUserRank(this.ModuleId, this, 0) : string.Empty, format);
case "rankname":
return PropertyAccess.FormatString(this.UserId > 0 ? DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.GetUserRank(this.ModuleId, this, 1) : string.Empty, format);
case "userprofilelink":
return PropertyAccess.FormatString(DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.CanLinkToProfile(portalSettings: this.PortalSettings,
- mainSettings: this.MainSettings,
+ moduleSettings: this.ModuleSettings,
moduleId: this.ModuleId,
accessingUser: new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ModuleId).GetByUserId(accessingUser.PortalID, accessingUser.UserID),
forumUser: this) ? Utilities.NavigateURL(this.PortalSettings.UserTabId, string.Empty, new[] { $"userId={this.UserId}" }) : string.Empty, format);
case "signature":
var sSignature = string.Empty;
- if (this.MainSettings.AllowSignatures != 0 && !this.PrefBlockSignatures && !this.SignatureDisabled)
+ if (this.ModuleSettings.AllowSignatures != 0 && !this.PrefBlockSignatures && !this.SignatureDisabled)
{
sSignature = this?.Signature ?? string.Empty;
if (!string.IsNullOrEmpty(sSignature))
{
sSignature = Utilities.ManageImagePath(sSignature, this.RequestUri);
- switch (this.MainSettings.AllowSignatures)
+ switch (this.ModuleSettings.AllowSignatures)
{
case 1:
sSignature = System.Net.WebUtility.HtmlEncode(sSignature);
@@ -651,12 +718,12 @@ public string GetProperty(string propertyName, string format, System.Globalizati
return PropertyAccess.FormatString(sSignature, format);
case "userstatus":
{
- return PropertyAccess.FormatString(this.MainSettings != null && this.MainSettings.UsersOnlineEnabled && this.UserId > 0 ? DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.GetTokenFormatString(this.IsUserOnline ? "[FORUMUSER-USERONLINE]" : "[FORUMUSER-USEROFFLINE]", this.PortalSettings, accessingUser.Profile.PreferredLocale) : string.Empty, format);
+ return PropertyAccess.FormatString(this.ModuleSettings != null && this.ModuleSettings.UsersOnlineEnabled && this.UserId > 0 ? DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.GetTokenFormatString(this.IsUserOnline ? "[FORUMUSER-USERONLINE]" : "[FORUMUSER-USEROFFLINE]", this.PortalSettings, accessingUser.Profile.PreferredLocale) : string.Empty, format);
}
case "userstatuscss":
{
- return PropertyAccess.FormatString(this.MainSettings != null && this.MainSettings.UsersOnlineEnabled && this.UserId > 0 ? DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.GetTokenFormatString(this.IsUserOnline ? "[FORUMUSER-USERONLINECSS]" : "[FORUMUSER-USEROFFLINECSS]", this.PortalSettings, accessingUser.Profile.PreferredLocale) : string.Empty, format);
+ return PropertyAccess.FormatString(this.ModuleSettings != null && this.ModuleSettings.UsersOnlineEnabled && this.UserId > 0 ? DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.GetTokenFormatString(this.IsUserOnline ? "[FORUMUSER-USERONLINECSS]" : "[FORUMUSER-USEROFFLINECSS]", this.PortalSettings, accessingUser.Profile.PreferredLocale) : string.Empty, format);
}
case "userid":
@@ -668,7 +735,7 @@ public string GetProperty(string propertyName, string format, System.Globalizati
return PropertyAccess.FormatString(
Controllers.ForumUserController.CanLinkToProfile(
this.PortalSettings,
- this.MainSettings,
+ this.ModuleSettings,
this.ModuleId,
new Controllers.ForumUserController(this.ModuleId).GetByUserId(
accessingUser.PortalID,
@@ -685,7 +752,7 @@ public string GetProperty(string propertyName, string format, System.Globalizati
return PropertyAccess.FormatString(string.IsNullOrEmpty(this.DisplayName) ? this.Username :
DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController.GetDisplayName(
this.PortalSettings,
- this.MainSettings,
+ this.ModuleSettings,
isMod: new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ModuleId).GetByUserId(accessingUser.PortalID, accessingUser.UserID).GetIsMod(this.ModuleId),
isAdmin: new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ModuleId).GetByUserId(accessingUser.PortalID, accessingUser.UserID).IsAdmin || new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ModuleId).GetByUserId(accessingUser.PortalID, accessingUser.UserID).IsSuperUser,
this.UserId,
@@ -705,6 +772,21 @@ public string GetProperty(string propertyName, string format, System.Globalizati
return PropertyAccess.FormatString((accessingUser.IsAdmin || accessingUser.IsSuperUser) && this.UserId > 0 ? this.UserId.ToString() : string.Empty, format);
case "displaynameforjson":
return PropertyAccess.FormatString(Utilities.JSON.EscapeJsonString(this.DisplayName), format);
+ case "badges":
+ if (length < 1)
+ {
+ length = 5; /* if no length specified, default to 5 badges */
+ }
+
+ var badgeString = string.Empty;
+ var userBadgesToDisplay = this.Badges.GroupBy(b => b.BadgeId).Select(g => g.OrderByDescending(b => b.DateAssigned).First()).ToList().OrderBy(b => b.Badge.SortOrder).Take(length);
+ var badgeTemplate = new StringBuilder(DotNetNuke.Modules.ActiveForums.Controllers.TemplateController.Template_Get(this.ModuleId, Enums.TemplateType.UserBadge, SettingsBase.GetModuleSettings(this.ModuleId).DefaultFeatureSettings.TemplateFileNameSuffix));
+ foreach (var userBadge in userBadgesToDisplay)
+ {
+ badgeString += DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.ReplaceBadgeTokens(badgeTemplate, userBadge, this.PortalSettings, this.ModuleSettings, new Services.URLNavigator().NavigationManager(), new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(this.ModuleId).GetByUserId(accessingUser.PortalID, accessingUser.UserID), this.RequestUri, this.RawUrl);
+ }
+
+ return PropertyAccess.FormatString(badgeString, format);
}
}
catch (Exception ex)
diff --git a/Dnn.CommunityForums/Entities/LikeInfo.cs b/Dnn.CommunityForums/Entities/LikeInfo.cs
index 0e91d3324..750ba0f19 100644
--- a/Dnn.CommunityForums/Entities/LikeInfo.cs
+++ b/Dnn.CommunityForums/Entities/LikeInfo.cs
@@ -45,6 +45,8 @@ internal class LikeInfo : DotNetNuke.Services.Tokens.IPropertyAccess
public bool Checked { get; set; }
+ public DateTime DateCreated { get; set; }
+
[IgnoreColumn]
public int ForumId => this.Content.Post.ForumId;
diff --git a/Dnn.CommunityForums/Entities/ProcessQueueInfo.cs b/Dnn.CommunityForums/Entities/ProcessQueueInfo.cs
index e1095315f..0e6cfe060 100644
--- a/Dnn.CommunityForums/Entities/ProcessQueueInfo.cs
+++ b/Dnn.CommunityForums/Entities/ProcessQueueInfo.cs
@@ -53,6 +53,8 @@ public class ProcessQueueInfo
public int UserId { get; set; }
+ public int BadgeId { get; set; }
+
public DateTime DateCreated { get; set; } = DateTime.UtcNow;
public string RequestUrl { get; set; }
diff --git a/Dnn.CommunityForums/Entities/SettingsInfo.cs b/Dnn.CommunityForums/Entities/SettingsInfo.cs
new file mode 100644
index 000000000..bfba7e61c
--- /dev/null
+++ b/Dnn.CommunityForums/Entities/SettingsInfo.cs
@@ -0,0 +1,43 @@
+// Copyright (c) by DNN Community
+//
+// DNN Community licenses this file to you under the MIT license.
+//
+// See the LICENSE file in the project root for more information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace DotNetNuke.Modules.ActiveForums.Entities
+{
+ using System.Web.Caching;
+
+ using DotNetNuke.ComponentModel.DataAnnotations;
+
+ [TableName("activeforums_Settings")]
+ [PrimaryKey("SettingsId", AutoIncrement = true)]
+ [Scope("ModuleId")]
+ [Cacheable("activeforums_Settings", CacheItemPriority.High)]
+ public partial class SettingsInfo
+ {
+ public int ModuleId { get; set; }
+
+ public int SettingsId { get; set; }
+
+ public string SettingsKey { get; set; }
+
+ public string SettingName { get; set; }
+
+ public string SettingValue { get; set; }
+ }
+}
diff --git a/Dnn.CommunityForums/Entities/UserBadgeInfo.cs b/Dnn.CommunityForums/Entities/UserBadgeInfo.cs
new file mode 100644
index 000000000..95219f26c
--- /dev/null
+++ b/Dnn.CommunityForums/Entities/UserBadgeInfo.cs
@@ -0,0 +1,216 @@
+// Copyright (c) by DNN Community
+//
+// DNN Community licenses this file to you under the MIT license.
+//
+// See the LICENSE file in the project root for more information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+
+namespace DotNetNuke.Modules.ActiveForums.Entities
+{
+ using System;
+ using System.Web.Caching;
+
+ using DotNetNuke.ComponentModel.DataAnnotations;
+ using DotNetNuke.Services.Tokens;
+
+ ///
+ /// Represents a user badge assignment in the DNN Community Forums module.
+ ///
+ [TableName("activeforums_UserBadges")]
+ [PrimaryKey("UserBadgeId", AutoIncrement = true)]
+ [Cacheable("activeforums_UserBadges", CacheItemPriority.Normal)]
+ [Scope("ModuleId")]
+ public class UserBadgeInfo : DotNetNuke.Services.Tokens.IPropertyAccess
+ {
+ [IgnoreColumn]
+ private string cacheKeyTemplate => CacheKeys.UserBadgeInfo;
+
+ private DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo forumUserInfo;
+ private DotNetNuke.Modules.ActiveForums.Entities.BadgeInfo badgeInfo;
+ private string badgeName;
+ private string userName;
+
+ public UserBadgeInfo()
+ {
+ }
+
+ public UserBadgeInfo(int userBadgeId, int badgeId, string badgeName, int userId, string userName, int portalId, int moduleId, DateTime? dateAssigned, bool assigned)
+ {
+ this.UserBadgeId = userBadgeId;
+ this.BadgeId = badgeId;
+ this.UserId = userId;
+ this.PortalId = portalId;
+ this.ModuleId = moduleId;
+ this.BadgeName = badgeName;
+ this.UserName = userName;
+ this.Assigned = assigned;
+ this.DateAssigned = dateAssigned.HasValue ? dateAssigned.Value : DotNetNuke.Common.Utilities.Null.NullDate;
+ }
+
+ ///
+ /// Gets or sets the badge ID.
+ ///
+ public int UserBadgeId { get; set; }
+
+ ///
+ /// Gets or sets the badge ID.
+ ///
+ public int BadgeId { get; set; }
+
+ ///
+ /// Gets or sets the User ID.
+ ///
+ public int UserId { get; set; }
+
+ ///
+ /// Gets or sets the PortalId.
+ ///
+ public int PortalId { get; set; }
+
+ /// Gets or sets the ModuleId.
+ ///
+ public int ModuleId { get; set; }
+
+ ///
+ /// Gets or sets the UTC date and time the badge was assigned.
+ ///
+ public DateTime DateAssigned { get; set; } = DateTime.UtcNow;
+
+ [IgnoreColumn]
+ public DotNetNuke.Modules.ActiveForums.Entities.BadgeInfo Badge
+ {
+ get
+ {
+ if (this.badgeInfo == null)
+ {
+ this.badgeInfo = this.GetBadge();
+ this.UpdateCache();
+ }
+
+ return this.badgeInfo;
+ }
+ set => this.badgeInfo = value;
+ }
+
+ internal DotNetNuke.Modules.ActiveForums.Entities.BadgeInfo GetBadge() => this.badgeInfo = new Controllers.BadgeController().GetById(this.BadgeId, this.ModuleId);
+
+ [IgnoreColumn]
+ public string BadgeName { get => this.badgeName ?? (this.badgeName = this.Badge.Name); set => this.badgeName = value; }
+
+ [IgnoreColumn]
+ public string UserName { get => this.userName ?? (this.userName = this.ForumUser.DisplayName); set => this.userName = value; }
+
+ [IgnoreColumn]
+ public bool Assigned { get; set; }
+
+ public int GetAwardCount()
+ {
+ return new DotNetNuke.Modules.ActiveForums.Controllers.UserBadgeController().BadgeCount(this.PortalId, this.UserId, this.BadgeId);
+ }
+
+ [IgnoreColumn]
+ public DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo ForumUser
+ {
+ get
+ {
+ if (this.forumUserInfo == null)
+ {
+ this.forumUserInfo = this.GetForumUser();
+ this.UpdateCache();
+ }
+
+ return this.forumUserInfo;
+ }
+ set => this.forumUserInfo = value;
+ }
+
+ internal DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo GetForumUser() => this.forumUserInfo = new Controllers.ForumUserController((int)this.ModuleId).GetByUserId(this.PortalId, this.UserId);
+
+ [IgnoreColumn]
+ public DotNetNuke.Services.Tokens.CacheLevel Cacheability
+ {
+ get
+ {
+ return DotNetNuke.Services.Tokens.CacheLevel.notCacheable;
+ }
+ }
+
+ [IgnoreColumn]
+ public string GetProperty(string propertyName, string format, System.Globalization.CultureInfo formatProvider, DotNetNuke.Entities.Users.UserInfo accessingUser, Scope accessLevel, ref bool propertyNotFound)
+ {
+ // replace any embedded tokens in format string
+ if (format.Contains("["))
+ {
+ var tokenReplacer = new DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer(this.ForumUser.PortalSettings, this, this.ForumUser.RequestUri, this.ForumUser.RawUrl)
+ {
+ AccessingUser = accessingUser,
+ };
+ format = tokenReplacer.ReplaceEmbeddedTokens(format);
+ }
+
+ int length = -1;
+ if (propertyName.Contains(":"))
+ {
+ var splitPropertyName = propertyName.Split(':');
+ propertyName = splitPropertyName[0];
+ length = Utilities.SafeConvertInt(splitPropertyName[1], -1);
+ }
+
+ propertyName = propertyName.ToLowerInvariant();
+ try
+ {
+ switch (propertyName)
+ {
+ case "id":
+ case "badgeid":
+ return PropertyAccess.FormatString(this.BadgeId.ToString(), format);
+ case "awardcount":
+ return PropertyAccess.FormatString(this.GetAwardCount() > 1 ? this.GetAwardCount().ToString() : string.Empty, format);
+ case "name":
+ return PropertyAccess.FormatString(this.Badge.Name, format);
+ case "description":
+ return PropertyAccess.FormatString(Utilities.EncodeBrackets(length > 0 && this.Badge.Description.Length > length ? string.Concat(Utilities.StripHTMLTag(this.Badge.Description), "...") : Utilities.StripHTMLTag(this.Badge.Description)), format);
+ case "imagemarkup":
+ return PropertyAccess.FormatString(System.Web.HttpUtility.HtmlDecode(this.Badge.ImageMarkup), format);
+ case "imageurl":
+ return PropertyAccess.FormatString(length > 0 ? this.Badge.GetBadgeImageUrl(this.PortalId, length) : this.Badge.GetBadgeImageUrl(this.PortalId), format);
+ case "dateassigned":
+ return Utilities.GetUserFormattedDateTime((DateTime?)this.DateAssigned, formatProvider, accessingUser.Profile.PreferredTimeZone.GetUtcOffset(DateTime.UtcNow));
+ case "intervaldays":
+ return PropertyAccess.FormatString(this.Badge.IntervalDays.ToString(), format);
+ case "threshold":
+ return PropertyAccess.FormatString(this.Badge.Threshold.ToString(), format);
+ case "metricname":
+ return PropertyAccess.FormatString(this.Badge.BadgeMetricEnumName, format);
+ }
+ }
+ catch (Exception ex)
+ {
+ DotNetNuke.Modules.ActiveForums.Exceptions.LogException(ex);
+ DotNetNuke.Modules.ActiveForums.Exceptions.LogException(new ArgumentException(string.Format(Utilities.GetSharedResource("[RESX:TokenReplacementException]"), "UserBadgeInfo", this.UserBadgeId, propertyName, format)));
+ return string.Empty;
+ }
+
+ propertyNotFound = true;
+ return string.Empty;
+ }
+
+ internal string GetCacheKey() => string.Format(this.cacheKeyTemplate, this.ModuleId, this.UserBadgeId);
+
+ internal void UpdateCache() => DotNetNuke.Modules.ActiveForums.DataCache.ContentCacheStore(this.ModuleId, this.GetCacheKey(), this);
+ }
+}
diff --git a/Dnn.CommunityForums/Enums/BadgeMetric.cs b/Dnn.CommunityForums/Enums/BadgeMetric.cs
new file mode 100644
index 000000000..922e9b440
--- /dev/null
+++ b/Dnn.CommunityForums/Enums/BadgeMetric.cs
@@ -0,0 +1,32 @@
+// Copyright (c) by DNN Community
+//
+// DNN Community licenses this file to you under the MIT license.
+//
+// See the LICENSE file in the project root for more information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace DotNetNuke.Modules.ActiveForums.Enums
+{
+ public enum BadgeMetric
+ {
+ BadgeMetricManual,
+ BadgeMetricNewUser,
+ BadgeMetricTopicsCreated,
+ BadgeMetricRepliesCreated,
+ BadgeMetricLikesReceived,
+ BadgeMetricTopicsRead,
+ }
+}
diff --git a/Dnn.CommunityForums/Enums/TemplateType.cs b/Dnn.CommunityForums/Enums/TemplateType.cs
index 08b612f7c..bc7fb36ad 100644
--- a/Dnn.CommunityForums/Enums/TemplateType.cs
+++ b/Dnn.CommunityForums/Enums/TemplateType.cs
@@ -48,5 +48,8 @@ public enum TemplateType : int
TopicResults,
_userProfile,
_memberList,
+ BadgeNotificationSubject,
+ BadgeNotificationBody,
+ UserBadge,
}
}
diff --git a/Dnn.CommunityForums/ForumSettings.ascx.cs b/Dnn.CommunityForums/ForumSettings.ascx.cs
index 4f89d0953..792f996ed 100644
--- a/Dnn.CommunityForums/ForumSettings.ascx.cs
+++ b/Dnn.CommunityForums/ForumSettings.ascx.cs
@@ -22,11 +22,13 @@ namespace DotNetNuke.Modules.ActiveForums.Controls
{
using System;
using System.Linq;
+ using System.Reflection;
using System.Text;
using System.Web;
using System.Web.UI.WebControls;
using System.Xml;
+ using DotNetNuke.Collections;
using DotNetNuke.Entities.Tabs;
using DotNetNuke.Entities.Urls;
using DotNetNuke.Framework;
@@ -254,17 +256,30 @@ public override void UpdateSettings()
this.TimeFormatString = !string.IsNullOrWhiteSpace(this.txtTimeFormat.Text) ? this.txtTimeFormat.Text : "h:mm tt";
this.DateFormatString = !string.IsNullOrWhiteSpace(this.txtDateFormat.Text) ? this.txtDateFormat.Text : "M/d/yyyy";
- this.ForumGroupTemplate = Utilities.SafeConvertInt(this.drpForumGroupTemplate.SelectedValue);
- var adminSec = this.txtGroupModSec.Value.Split(',');
- this.SaveForumSecurity("groupadmin", adminSec);
- var memSec = this.txtGroupMemSec.Value.Split(',');
- this.SaveForumSecurity("groupmember", memSec);
- var regSec = this.txtGroupRegSec.Value.Split(',');
- this.SaveForumSecurity("registereduser", regSec);
- var anonSec = this.txtGroupAnonSec.Value.Split(',');
- this.SaveForumSecurity("anon", anonSec);
-
- DotNetNuke.Modules.ActiveForums.Controllers.ForumController.UpdatePermissionsForSocialGroupForums(this.ModuleId);
+ if (this.Mode.Equals("SocialGroup"))
+ {
+ this.ForumGroupTemplate = Utilities.SafeConvertInt(this.drpForumGroupTemplate.SelectedValue);
+ var adminSec = this.txtGroupModSec.Value.Split(',');
+ this.SaveForumSecurity("groupadmin", adminSec);
+ var memSec = this.txtGroupMemSec.Value.Split(',');
+ this.SaveForumSecurity("groupmember", memSec);
+ var regSec = this.txtGroupRegSec.Value.Split(',');
+ this.SaveForumSecurity("registereduser", regSec);
+ var anonSec = this.txtGroupAnonSec.Value.Split(',');
+ this.SaveForumSecurity("anon", anonSec);
+ DotNetNuke.Modules.ActiveForums.Controllers.ForumController.UpdatePermissionsForSocialGroupForums(this.ModuleId);
+ }
+ else
+ {
+ DotNetNuke.Entities.Modules.ModuleController.Instance.DeleteModuleSetting(this.ModuleId, "ForumConfig");
+ DotNetNuke.Entities.Modules.ModuleController.Instance.DeleteModuleSetting(this.ModuleId, "ForumGroupTemplate");
+ var fc = new DotNetNuke.Modules.ActiveForums.Controllers.ForumController();
+ fc.Get(this.ModuleId).Where(f => f.SocialGroupId != 0).ForEach(forum =>
+ {
+ forum.SocialGroupId = 0;
+ fc.Update(forum);
+ });
+ }
try
{
diff --git a/Dnn.CommunityForums/Providers/DataProviders/SqlDataProvider/SqlDataProvider.cs b/Dnn.CommunityForums/Providers/DataProviders/SqlDataProvider/SqlDataProvider.cs
index b553ad276..fad1d9319 100644
--- a/Dnn.CommunityForums/Providers/DataProviders/SqlDataProvider/SqlDataProvider.cs
+++ b/Dnn.CommunityForums/Providers/DataProviders/SqlDataProvider/SqlDataProvider.cs
@@ -124,6 +124,13 @@ public override DataSet Dashboard_Get(int PortalId, int ModuleId)
return (DataSet)SqlHelper.ExecuteDataset(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_DashBoard_Stats", PortalId, ModuleId);
}
+ #endregion
+ #region Badges
+ public override IDataReader Badges_List(int ModuleId)
+ {
+ return (IDataReader)SqlHelper.ExecuteReader(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_Badges_List", ModuleId);
+ }
+
#endregion
#region Filters
[Obsolete("Deprecated in Community Forums. Scheduled removal in 10.00.00. Use DotNetNuke.Modules.ActiveForums.Controllers.FilterController.Delete()")]
@@ -236,7 +243,7 @@ public override void Groups_Move(int ModuleId, int ForumGroupId, int SortDirecti
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. No longer used.")]
public override int Groups_Save(int PortalId, int ModuleId, int ForumGroupId, string GroupName, int SortOrder, bool Active, bool Hidden, int PermissionsId, string PrefixURL)
{
- return Convert.ToInt32(SqlHelper.ExecuteScalar(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_Groups_Save", PortalId, ModuleId, ForumGroupId, GroupName, SortOrder, Active, Hidden, PermissionsId, PrefixURL, $"G:{ForumGroupId}"));
+ return Convert.ToInt32(SqlHelper.ExecuteScalar(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_Groups_Save", PortalId, ModuleId, ForumGroupId, GroupName, SortOrder, Active, Hidden, PermissionsId, PrefixURL, $"G{ForumGroupId}"));
}
public override int Groups_Save(int PortalId, int ModuleId, int ForumGroupId, string GroupName, int SortOrder, bool Active, bool Hidden, int PermissionsId, string PrefixURL, string GroupSettingsKey)
@@ -403,27 +410,31 @@ public override IDataReader Security_GetByKey(string SecurityKey)
#endregion
#region Settings
+ [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. No Longer Used.")]
public override void Settings_Delete(int ModuleId, string GroupKey, string SettingName)
{
SqlHelper.ExecuteNonQuery(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_Settings_Delete", ModuleId, GroupKey, SettingName);
}
+ [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. No Longer Used.")]
public override string Settings_Get(int ModuleId, string GroupKey, string SettingName)
{
return Convert.ToString(SqlHelper.ExecuteScalar(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_Settings_Get", ModuleId, GroupKey, SettingName));
}
+ [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. No Longer Used.")]
public override System.Data.IDataReader Settings_List(int ModuleId, string GroupKey)
{
return SqlHelper.ExecuteReader(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_Settings_List", ModuleId, GroupKey);
}
- // KR - grabs all settings for caching
+ [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. No Longer Used.")]
public override System.Data.IDataReader Settings_ListAll(int ModuleId)
{
return SqlHelper.ExecuteReader(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_Settings_ListAll", ModuleId);
}
+ [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. No Longer Used.")]
public override void Settings_Save(int ModuleId, string GroupKey, string SettingName, string SettingValue)
{
SqlHelper.ExecuteNonQuery(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_Settings_Save", ModuleId, GroupKey, SettingName, SettingValue);
diff --git a/Dnn.CommunityForums/ReleaseNotes.txt b/Dnn.CommunityForums/ReleaseNotes.txt
index 429149212..93c1e4005 100644
--- a/Dnn.CommunityForums/ReleaseNotes.txt
+++ b/Dnn.CommunityForums/ReleaseNotes.txt
@@ -46,19 +46,20 @@
DNN Community Forums Release Notes
diff --git a/Dnn.CommunityForums/Services/AdminServiceController.cs b/Dnn.CommunityForums/Services/AdminServiceController.cs
index f2b8244d0..1cb8e8f5d 100644
--- a/Dnn.CommunityForums/Services/AdminServiceController.cs
+++ b/Dnn.CommunityForums/Services/AdminServiceController.cs
@@ -72,7 +72,7 @@ public class RunMaintenanceDTO
public HttpResponseMessage RunMaintenance(RunMaintenanceDTO dto)
{
- var moduleSettings = new SettingsInfo { ModuleId = dto.ModuleId, MainSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: dto.ModuleId, DotNetNuke.Common.Utilities.Null.NullInteger, true).ModuleSettings };
+ var moduleSettings = new ModuleSettings { ModuleId = dto.ModuleId, MainSettings = DotNetNuke.Entities.Modules.ModuleController.Instance.GetModule(moduleId: dto.ModuleId, DotNetNuke.Common.Utilities.Null.NullInteger, true).ModuleSettings };
var rows = DataProvider.Instance().Forum_Maintenance(dto.ForumId, dto.OlderThan, dto.LastActive, dto.ByUserId, dto.WithNoReplies, dto.DryRun, (int)moduleSettings.DeleteBehavior);
if (dto.DryRun)
{
diff --git a/Dnn.CommunityForums/Services/Avatars/AvatarRefreshQueue.cs b/Dnn.CommunityForums/Services/Avatars/AvatarRefreshQueue.cs
index e83e92f9e..2c6526e76 100644
--- a/Dnn.CommunityForums/Services/Avatars/AvatarRefreshQueue.cs
+++ b/Dnn.CommunityForums/Services/Avatars/AvatarRefreshQueue.cs
@@ -99,28 +99,33 @@ private static int RefreshGravatars(int portalId, int moduleId)
{
try
{
- var forumUserController = new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(moduleId: moduleId);
- string sSql = "SELECT TOP 50 fup.UserId FROM {databaseOwner}{objectQualifier}activeforums_UserProfiles fup ";
- sSql += "INNER JOIN {databaseOwner}{objectQualifier}UserPortals as up ON up.PortalId = fup.PortalId AND up.UserId = fup.UserId AND up.IsDeleted = 0 ";
- sSql += "INNER JOIN {databaseOwner}{objectQualifier}ProfilePropertyDefinition ppd ON ppd.PortalID = @0 AND ppd.PropertyName = 'Photo' ";
- sSql += "LEFT OUTER JOIN {databaseOwner}{objectQualifier}UserProfile as upr ON upr.UserId = fup.UserId AND upr.PropertyDefinitionID = ppd.PropertyDefinitionID ";
- sSql += "WHERE fup.PortalId = @0 AND fup.AvatarDisabled = 0 AND fup.PrefBlockAvatars = 0 ";
- sSql += "AND ( (fup.AvatarLastRefresh IS NULL AND upr.PropertyValue IS NULL) ";
- sSql += " OR (fup.AvatarLastRefresh IS NOT NULL AND DATEDIFF(dd,GETUTCDATE(),fup.AvatarLastRefresh) > 90) ) ";
- sSql += "ORDER BY fup.AvatarLastRefresh DESC";
- var userIds = DotNetNuke.Data.DataContext.Instance().ExecuteQuery- 09.01.01 + 09.02.00
- -New Features & Enhancements
-
+
- NEW: User Badges (PR# 1579) +
- UPDATE: Change User Setting "Subscribe to Topics" to "Auto-Subscribe to My Topics (Issue 1579) +
- UPDATE: Encode non-Latin characters in content-disposition for attachments (Issue 1604)
- None at this time. +-->
Bug Fixes
-
-
- FIX: Poor performance for avatar refresh queue on large sites (Issue 1584) + +
- FIX: Error moving topics to another forum (Issue 1594) +
- FIX: Forum permissions changing under certain rare conditions when updating module settings (Issue 1606) +
- FIX: Missing (resource) text when viewing tags in Control Panel (Issue 1593) +
- FIX: On "My Subscriptions" page, forums subscriptions not showing if not subscribed to any forums yet (Issue 1608) +
- FIX: Reserved HTML characters in topic subjects no longer are encoded in e-mail notification subjects (Issue 1607)
Tasks / Development Updates (and Technical Debt)
-
+
- Modernize "Settings" table (Issue 1582) +
- Track Dates for Likes (Issue 1535) +
- Remove colon from internally-used settings keys (Issue 1547) +
- 09.02.00 Release Prep (Issue 1612)
- None at this time. +-->
+
diff --git a/Dnn.CommunityForums/controls/admin_badges.ascx b/Dnn.CommunityForums/controls/admin_badges.ascx
new file mode 100644
index 000000000..b8cab9e6f
--- /dev/null
+++ b/Dnn.CommunityForums/controls/admin_badges.ascx
@@ -0,0 +1,254 @@
+<%@ control language="C#" autoeventwireup="false" codebehind="admin_badges.ascx.cs" inherits="DotNetNuke.Modules.ActiveForums.admin_badges" %>
+<%@ register assembly="DotNetNuke.Modules.ActiveForums" namespace="DotNetNuke.Modules.ActiveForums.Controls" tagprefix="am" %>
+
+
+[BADGE:AWARDCOUNT]
+
+ [BADGE:IMAGEURL:32|![[BADGE:NAME]]({0} "[BADGE:NAME] ([RESX:lastawarded] [BADGE:DATEASSIGNED])")
]
+ [BADGE:IMAGEMARKUP|{0}]
+
+
+
+ [RESX:Badges]
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Dnn.CommunityForums/controls/admin_badges.ascx.cs b/Dnn.CommunityForums/controls/admin_badges.ascx.cs
new file mode 100644
index 000000000..ce16be939
--- /dev/null
+++ b/Dnn.CommunityForums/controls/admin_badges.ascx.cs
@@ -0,0 +1,103 @@
+// Copyright (c) by DNN Community
+//
+// DNN Community licenses this file to you under the MIT license.
+//
+// See the LICENSE file in the project root for more information.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+// TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace DotNetNuke.Modules.ActiveForums
+{
+ using System;
+ using System.Web.UI;
+ using System.Web.UI.WebControls;
+
+ public partial class admin_badges : ActiveAdminBase
+ {
+ public string ImagePath => this.Page.ResolveUrl(string.Concat(this.MainSettings.ThemeLocation, "/images"));
+
+ protected global::DotNetNuke.Modules.ActiveForums.Controls.ActiveGrid agBadges;
+ protected global::System.Web.UI.WebControls.DropDownList drpBadgeMetrics;
+ protected global::System.Web.UI.WebControls.DropDownList drpBadgeImages;
+
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+
+ this.agBadges.Callback += this.agBadges_Callback;
+ this.agBadges.ItemBound += this.AgBadgesItemBound;
+
+ }
+
+ protected override void OnLoad(EventArgs e)
+ {
+ if (!Page.IsPostBack)
+ {
+ base.OnLoad(e);
+
+ this.BindBadgeMetrics();
+ this.BindBadgeImages();
+ }
+ }
+
+ private void agBadges_Callback(object sender, Modules.ActiveForums.Controls.CallBackEventArgs e)
+ {
+ this.agBadges.Datasource = DataProvider.Instance().Badges_List(this.ModuleId);
+ this.agBadges.Refresh(e.Output);
+ }
+
+ private void AgBadgesItemBound(object sender, Modules.ActiveForums.Controls.ItemBoundEventArgs e)
+ {
+ e.Item[8] = this.GetImageTag(Utilities.SafeConvertInt(e.Item[7].ToString()), e.Item[2].ToString());
+ e.Item[5] = this.GetEnumName((DotNetNuke.Modules.ActiveForums.Enums.BadgeMetric)Utilities.SafeConvertInt(e.Item[4].ToString()));
+ }
+
+ private string GetImageTag(int fileId, string badgeName)
+ {
+ if (fileId <= 0)
+ {
+ return string.Empty;
+ }
+
+ var imgUrl = Utilities.ResolveUrl($"https://{this.PortalSettings.DefaultPortalAlias}/DnnImageHandler.ashx?mode=securefile&fileId={fileId}&h=16&w=16");
+ return $"|
+ [RESX:BadgeName]
+ |
+
+ [RESX:SortOrder]
+ |
+
+
+ [RESX:BadgeMetric]
+ |
+
+ [RESX:BadgeThreshold]
+ |
+
+ + |
![\"{badgeName}\"](\"{imgUrl}\")
";
+
+ }
+
+ private string GetEnumName(DotNetNuke.Modules.ActiveForums.Enums.BadgeMetric badgeMetric)
+ {
+ return Utilities.GetSharedResource($"[RESX:{Enum.GetName(typeof(DotNetNuke.Modules.ActiveForums.Enums.BadgeMetric), badgeMetric)}]", isAdmin: true);
+ }
+
+ private void BindBadgeMetrics()
+ {
+ Utilities.BindEnum(pDDL: this.drpBadgeMetrics, enumType: typeof(Enums.BadgeMetric), pColValue: string.Empty, addEmptyValue: false, localize: true, excludeIndex: -1);
+ }
+
+ private void BindBadgeImages()
+ {
+ var folderInfo = DotNetNuke.Services.FileSystem.FolderManager.Instance.GetFolder(this.PortalId, Globals.DefaultBadgesFolderName);
+ foreach (var fileInfo in DotNetNuke.Services.FileSystem.FolderManager.Instance.GetFiles(folderInfo, recursive: true))
+ {
+ if (fileInfo.ContentType.ToLowerInvariant().Contains("image/"))
+ {
+ this.drpBadgeImages.Items.Add(new ListItem(fileInfo.FileName, fileInfo.FileId.ToString()));
+ }
+ }
+ this.drpBadgeImages.Items.Insert(0, new ListItem("[RESX:DropDownDefault]", "-1"));
+
+ }
+ }
+}
diff --git a/Dnn.CommunityForums/controls/admin_categories.ascx b/Dnn.CommunityForums/controls/admin_categories.ascx
index 6deb92fd4..248caffa5 100644
--- a/Dnn.CommunityForums/controls/admin_categories.ascx
+++ b/Dnn.CommunityForums/controls/admin_categories.ascx
@@ -70,7 +70,7 @@ function amaf_deleteCategory(row){
-
+
|
- [RESX:TagItems]
+ [RESX:Items]
|
+
+ |