Skip to content

TASK: sync dev to master #1587

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 30, 2025
Merged

TASK: sync dev to master #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd8f20e
Update README.md
johnhenley Sep 30, 2025
2418dff
Delete ResXManager.config.xml
johnhenley Sep 30, 2025
dd72a2e
FIX: Performance on gravatar queue on large sites
johnhenley Sep 30, 2025
3ab18e1
Merge pull request #1585 from johnhenley/issues/gravatar-1584
johnhenley Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dnn.CommunityForums/DnnCommunityForums.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<Description>Discussion Forum Module for DNN</Description>
<Company>dnncommunity.org</Company>
<Authors>dnncommunity.org</Authors>
<FileVersion>09.01.00.00</FileVersion>
<AssemblyVersion>09.01.00.00</AssemblyVersion>
<FileVersion>09.01.01.00</FileVersion>
<AssemblyVersion>09.01.01.00</AssemblyVersion>

<IncludeSymbols>False</IncludeSymbols>
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
Expand Down
8 changes: 4 additions & 4 deletions Dnn.CommunityForums/DnnCommunityForums.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Active Forums" type="Module" version="09.01.00">
<package name="Active Forums" type="Module" version="09.01.01">
<friendlyName>DNN Community Forums</friendlyName>
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
<iconFile>DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Icon-64px.png</iconFile>
Expand Down Expand Up @@ -86,7 +86,7 @@
<assembly>
<name>DotNetNuke.Modules.ActiveForums.dll</name>
<sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
<version>09.01.00</version>
<version>09.01.01</version>
</assembly>
</assemblies>
</component>
Expand Down Expand Up @@ -486,7 +486,7 @@
</components>
</package>

<package name="Active Forums What's New" type="Module" version="09.01.00">
<package name="Active Forums What's New" type="Module" version="09.01.01">
<friendlyName>DNN Community Forums What's New</friendlyName>
<foldername>ActiveForumsWhatsNew</foldername>
<description>DNN Community Forums: Display the most recent topics or replies from selected forums on any page within your site.</description>
Expand Down Expand Up @@ -555,7 +555,7 @@
</components>
</package>

<package name="Active Forums Viewer" type="Module" version="09.01.00">
<package name="Active Forums Viewer" type="Module" version="09.01.01">
<friendlyName>DNN Community Forums Forums Viewer</friendlyName>
<foldername>ActiveForumsViewer</foldername>
<description>DNN Community Forums: Display any forum topic view on any page within your site.</description>
Expand Down
4 changes: 2 additions & 2 deletions Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Active Forums_Symbols" type="Library" version="09.01.00">
<package name="Active Forums_Symbols" type="Library" version="09.01.01">
<friendlyName>DNN Community Forums Symbols</friendlyName>
<description>DNN Community Forums: The official online forums module for the DNN Community.</description>
<iconFile>DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Icon-64px.png</iconFile>
Expand All @@ -14,7 +14,7 @@
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="managedPackage" version="9.1.0">Active Forums</dependency>
<dependency type="managedPackage" version="9.1.1">Active Forums</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
21 changes: 8 additions & 13 deletions Dnn.CommunityForums/ReleaseNotes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@
DNN Community Forums Release Notes
</h2>
<h3>
09.01.00
09.01.01
</h3>
<!--

<p>
<b>THANK YOU</b> for all of the valuable contributions by
<a href="https://github.com/Timo-Breumelhof" target="_blank">@Timo-Breumelhof</a>
and
<a href="https://github.com/johnhenley" target="_blank">@johnhenley</a>.
</p>
<!--
, and
<a href="https://github.com/nvsai" target="_blank">@nvsai</a>,
<a href="https://github.com/ernieblues" target="_blank">@nvsai</a>, and
Expand All @@ -69,28 +69,23 @@

<h4>New Features &amp; Enhancements</h4>
<ul>
<!--
<li>NEW: Adds Recycle Bin to be able to restore (soft-)deleted topics and replies (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/pull/1531">PR# 1531</a>)</li>
<li>NEW: Adds an avatar injection service to populate avatars (currently using Gravatar) for forums users who haven't set up their own DNN profile picture/avatar. (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/pull/1446">PR# 1446</a>)</li>
<li>NEW: Grid controls (Recycle Bin and Subscriptions page) now using DataTables.net JavaScript library for enhanced UI (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/pull/1553">PR# 1553</a>)</li>
<!--

<li>NEW: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/pull/TBD">PR# TBD</a>)</li>
<li>UPDATE: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>)</li>
-->
<li>UPDATE: Improved handling of XML & HTML in posts (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1385">Issue 1385</a>)</li>
<li>UPDATE: Changed "subscribe" to tokenized controls in topic and topics views to allow checkboxes or buttons (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1556">Issue 1556</a> & <a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1568">Issue 1568</a>)</li>

<!--
-->
<li>None at this time.</li>
-->
</ul>

<h4>Bug Fixes</h4>
<ul>
<li>FIX: Update indexes on forum/topic tracking tables for uniqueness; upgrade script to detect and remove duplicates, keeping the latest entries (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1434">Issue 1434</a>)</li>
<li>FIX: Friendly URLs updated to working correctly with Forum Viewer and/or localized sites (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1557">Issue 1557</a>)</li>
<li>FIX: Incorrect logic in permissions checking for attachments (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1559">Issue 1559</a>)</li>
<li>FIX: Non-Admin/Non-Moderator is unable to edit their own post when edit interval/spam control feature used (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1562">Issue 1562</a>)</li>
<li>FIX: Subscribe controls not working from viewer module (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1572">Issue 1572</a>)</li>
<li>FIX: Poor performance for avatar refresh queue on large sites (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1584">Issue 1584</a>)</li>

<!--
<li>None at this time.</li>
Expand All @@ -99,16 +94,16 @@

<h4>Tasks / Development Updates (and Technical Debt)</h4>
<ul>
<!--
<li>Remove unused columns from forums table (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/792">Issue 792</a>)</li>
<li>Categories and topic categories were previously handled as tags with an 'isCategory' flag; they are now first-class entities (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1441">Issue 1441</a>)</li>
<li>Update Web API method security to not require ForumId for certain methods (e.g. user Ban) (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1507">Issue 1507</a>)</li>
<li>Refactor Web API methods security checking to use Role Ids rather than string array of Role names; refactor Topic view model and Topic update panel (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1526">Issue 1526</a>)</li>
<li>Remove old "Core Forums" to "Active Forums" SQL migration script (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1569">Issue 1569</a>)</li>
<li>09.01.00 Release Prep (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1543">Issue 1543</a>)</li>
<!--
<li>TASK: (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>)</li>
<li>None at this time.</li>
-->
<li>None at this time.</li>
</ul>
<hr />
</div>
Expand Down
29 changes: 25 additions & 4 deletions Dnn.CommunityForums/Services/Avatars/AvatarRefreshQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ namespace DotNetNuke.Modules.ActiveForums.Services.Avatars
using System;
using System.Collections.Generic;
using System.Linq;

using DotNetNuke.Data;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Services.Log.EventLog;
using DotNetNuke.Services.Scheduling;
using DotNetNuke.UI.UserControls;

public class AvatarRefreshQueue : DotNetNuke.Services.Scheduling.SchedulerClient
{
Expand Down Expand Up @@ -96,10 +99,28 @@ private static int RefreshGravatars(int portalId, int moduleId)
{
try
{
return new DotNetNuke.Modules.ActiveForums.Controllers.ForumUserController(moduleId: moduleId).Get().Where(u => (u.PortalId == portalId && !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<int>(System.Data.CommandType.Text, sSql, portalId);

var users = new List<DotNetNuke.Modules.ActiveForums.Entities.ForumUserInfo>();
foreach (var userId in userIds)
{
var forumUser = forumUserController.GetByUserId(portalId: portalId, userId: userId);
if (forumUser != null)
{
users.Add(forumUser);
}
}

return users;
}
catch (Exception ex)
{
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Community Forums Module
# DNN Community Forums Module

![DNN Community Forums Module Logo](Dnn.CommunityForums/images/Branding/Logo/DNN-Community-Forums-Logo-Horizontal.png?raw=true "DNN Community Forums Module Logo")

Expand Down
4 changes: 0 additions & 4 deletions ResXManager.config.xml
View file
Open in desktop

This file was deleted.

Loading