Merge pull request #1315 from DNNCommunity/dev

WillStrohl · web-flow · commit 9978ce024696 · 2025-02-20T14:30:13.000-08:00
Syncing branches for 08.02.05 GA
diff --git a/Dnn.CommunityForums/Classic.ascx.cs b/Dnn.CommunityForums/Classic.ascx.cs
@@ -59,13 +59,6 @@ protected override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
 
-            this.SocialGroupId = -1;
-            if (this.Request.QueryString[Literals.GroupId] != null && SimulateIsNumeric.IsNumeric(this.Request.QueryString[Literals.GroupId]))
-            {
-                this.SocialGroupId = Convert.ToInt32(this.Request.QueryString[Literals.GroupId]);
-            }
-            this.SetupPage();
-
 #if DEBUG
             //ForumsConfig.Install_Upgrade_CreateForumDefaultSettingsAndSecurity_080200();
             //new DotNetNuke.Modules.ActiveForums.Controllers.PermissionController().RemoveUnused(this.ForumModuleId);
@@ -84,6 +77,11 @@ protected override void OnLoad(EventArgs e)
                         this.ForumModuleId = this.ModuleId;
                     }
 
+                    this.SocialGroupId = -1;
+                    if (this.Request.QueryString[Literals.GroupId] != null && SimulateIsNumeric.IsNumeric(this.Request.QueryString[Literals.GroupId]))
+                    {
+                        this.SocialGroupId = Convert.ToInt32(this.Request.QueryString[Literals.GroupId]);
+                    }
                     string ctl = this.DefaultView;
                     string opts = string.Empty;
 
@@ -130,6 +128,7 @@ protected override void OnLoad(EventArgs e)
                     }
 
                     this.currView = ctl;
+                    this.SetupPage();
                     this.GetControl(ctl, opts);
 
                     if (this.Request.IsAuthenticated)
@@ -142,6 +141,7 @@ protected override void OnLoad(EventArgs e)
                 }
                 else
                 {
+                    this.ShowToolbar = false;
                     string ctlPath = Globals.ModulePath + "controls/_default.ascx";
                     ForumBase ctlDefault = (ForumBase)this.LoadControl(ctlPath);
                     ctlDefault.ID = "ctlConfig";
diff --git a/Dnn.CommunityForums/Controllers/PermissionController.cs b/Dnn.CommunityForums/Controllers/PermissionController.cs
@@ -572,6 +572,18 @@ internal static string GetUsersRoleIds(int PortalId, DotNetNuke.Entities.Users.U
                 }
             }
 
+            roles.Add(int.Parse(DotNetNuke.Common.Globals.glbRoleAllUsers));
+            if (u.UserID < 0)
+            {
+                roles.Add(int.Parse(DotNetNuke.Common.Globals.glbRoleUnauthUser));
+            }
+
+            if (u.IsSuperUser)
+            {
+                roles.Add(int.Parse(DotNetNuke.Common.Globals.glbRoleUnauthUser));
+                roles.Add(DotNetNuke.Modules.ActiveForums.Utilities.GetPortalSettings(PortalId).AdministratorRoleId);
+            }
+
             return string.Join(";", roles.ToArray());
         }
 
diff --git a/Dnn.CommunityForums/DnnCommunityForums.dnn b/Dnn.CommunityForums/DnnCommunityForums.dnn
@@ -1,6 +1,6 @@
 ﻿<dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Active Forums" type="Module" version="08.02.04">
+    <package name="Active Forums" type="Module" version="08.02.05">
       <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>
@@ -86,7 +86,7 @@
             <assembly>
               <name>DotNetNuke.Modules.ActiveForums.dll</name>
               <sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
-              <version>08.02.04</version>
+              <version>08.02.05</version>
             </assembly>
           </assemblies>
         </component>
@@ -417,7 +417,7 @@
             <script type="UnInstall">
               <path>sql</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>08.02.04</version>
+              <version>08.02.05</version>
             </script>
           </scripts>
         </component>
@@ -460,7 +460,7 @@
       </components>
     </package>
 
-    <package name="Active Forums What's New" type="Module" version="08.02.04">
+    <package name="Active Forums What's New" type="Module" version="08.02.05">
 
       <friendlyName>DNN Community Forums What's New</friendlyName>
       <foldername>ActiveForumsWhatsNew</foldername>
@@ -530,7 +530,7 @@
       </components>
     </package>
 
-    <package name="Active Forums Viewer" type="Module" version="08.02.04">
+    <package name="Active Forums Viewer" type="Module" version="08.02.05">
       <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>
diff --git a/Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn b/Dnn.CommunityForums/DnnCommunityForums_Symbols.dnn
@@ -1,6 +1,6 @@
 ﻿<dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Active Forums_Symbols" type="Library" version="08.02.04">
+    <package name="Active Forums_Symbols" type="Library" version="08.02.05">
 
       <friendlyName>DNN Community Forums Symbols</friendlyName>
       <description>DNN Community Forums: The official online forums module for the DNN Community.</description>
@@ -15,7 +15,7 @@
       <releaseNotes src="ReleaseNotes.txt" />
       <azureCompatible>True</azureCompatible>
       <dependencies>
-        <dependency type="managedPackage" version="8.2.4">Active Forums</dependency>
+        <dependency type="managedPackage" version="8.2.5">Active Forums</dependency>
       </dependencies>
       <components>
         <component type="ResourceFile">
diff --git a/Dnn.CommunityForums/Properties/AssemblyInfo.cs b/Dnn.CommunityForums/Properties/AssemblyInfo.cs
@@ -52,9 +52,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("08.02.04")]
+[assembly: AssemblyVersion("08.02.05")]
 
-[assembly: AssemblyFileVersion("08.02.04")]
+[assembly: AssemblyFileVersion("08.02.05")]
 
 [assembly: WebResource("DotNetNuke.Modules.ActiveForums.CustomControls.Resources.cb.js", "text/javascript")]
 [assembly: WebResource("DotNetNuke.Modules.ActiveForums.scripts.afadmin.properties.js", "text/javascript")]
diff --git a/Dnn.CommunityForums/ReleaseNotes.txt b/Dnn.CommunityForums/ReleaseNotes.txt
@@ -89,7 +89,7 @@
         <hr />
 
         <h3>
-            08.02.04
+            08.02.05
         </h3>
         <p>
             <b>THANK YOU</b> for all of the valuable contributions by <a href="https://github.com/johnhenley" target="_blank">@johnhenley</a><!--, 
@@ -102,7 +102,8 @@
 
         <h4>New Features &amp; Enhancements</h4>
         <ul>
-            <li>None at this time.</li>
+            <li>Improved User Experience When Placing the Module on a Page (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1305">Issue 1305</a>)</li>
+            <li>Improved User Experience When Placing the Module on Blue Backgrounds (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1304">Issue 1304</a>)</li>
             <!--
             <li>UPDATE:  (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>)</li>
             <li>None at this time.</li>
@@ -111,13 +112,7 @@
 
         <h4>Bug Fixes</h4>
         <ul>
-            <li>FIXED: Quick Replies Sending Notifications Before Going Through Moderation (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1289">Issue 1289</a>!)</li>
-            <li>FIXED: Unable to Delete a Topic After Creating It (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1277">Issue 1277</a>!)</li>
-            <li>FIXED: `MODEDITEDATE` Token Incorrectly Being Updated on Every Refresh (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1282">Issue 1282</a>!)</li>
-            <li>FIXED: &quot;Forums not available&quot; Exception in Topics View (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1273">Issue 1273</a>!)</li>
-            <li>FIXED: User Accounts Without a `UserPortals` Record Throws Exceptions (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1283">Issue 1283</a>!)</li>
-            <li>FIXED: Moderation HTML Output Issues (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1288">Issue 1288</a>!)</li>
-            <li>FIXED: No Longer Getting Current User Accounts from `HttpContext` (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1290">Issue 1290</a>)</li>
+            <li>FIXED: Topics Not Showing to Anonymous Visitors (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1301">Issue 1301</a>!)</li>
             <!--
             <li>FIXED:  (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>!)</li>
             <li>None at this time.</li>
@@ -126,9 +121,7 @@
 
         <h4>Tasks / Development Updates (and Technical Debt)</h4>
         <ul>
-            <li>TASK: Replaced Obsolete DNN API Methods (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1294">Issue 1294</a>)</li>
-            <li>TASK: Updates to Unit Test Project to Better Integrate and Mock DNN objects (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1275">Issue 1275</a>)</li>
-            <li>TASK: 8.2.4 Release Prep (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1296">Issue 1296</a>)</li>
+            <li>Release Prep: 08.02.05 (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/1313">Issue 1313</a>)</li>
             <!--
             <li>TASK:  (<a href="https://github.com/DNNCommunity/Dnn.CommunityForums/issues/">Issue </a>)</li>
             <li>None at this time.</li>
diff --git a/Dnn.CommunityForums/controls/_default.ascx b/Dnn.CommunityForums/controls/_default.ascx
@@ -1,54 +1,25 @@
 ﻿<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="_default.ascx.cs" Inherits="DotNetNuke.Modules.ActiveForums._default" %>
-<div style="margin-left: auto; margin-right: auto; width: 460px; height: auto; text-align: left; padding: 20px 0px; font-family: Helvetica Neue, Helvetica, Arial, sans-serif; font-size: 14px; color: rgba(0, 0, 0, 0.44); border: 0 none; line-height: 1.5;">
+<div class="dcf-init-screen">
 
-    <div style="margin-left: auto; margin-right: auto; max-width: 130px; height: 100%; text-align: left; margin-bottom: 20px; margin-top: 2px; float: left; margin-right: 20px;">
-        <img runat="server" src="~/DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Logo-Horizontal.png" alt="DNN Community Forums" />
+    <div class="dcf-init-logo-wrap">
+        <img class="dcf-init-logo" runat="server" src="~/DesktopModules/ActiveForums/images/branding/logo/DNN-Community-Forums-Logo-Horizontal.png" alt="DNN Community Forums" />
     </div>
 
-    <p style="font-weight: 300; font-size: 22px; letter-spacing: -0.02em; color: rgba(0, 0, 0, 0.6);">
-        Thank you for choosing DNN Community Forums as your method of easily building a complete online community.
-    </p>
-    <p style="border-top: 1px solid rgba(0, 0, 0, 0.1); padding-top: 15px;">DNN Community Forums allows you to quickly setup a feature-rich discussion forum for your website.</p>
+	<h2 class="dcf-init-title-main">
+		Thank you for choosing DNN Community Forums.<br>
+		Your method of easily building a complete online community.
+	</h2>
+
+    <p>DNN Community Forums allows you to quickly setup a feature-rich discussion forum for your website.</p>
     <p>
         Whether you are a hobbyist who just needs a single forum or you are building an on-line community for your enterprise, DNN 
         Community Forums is the leading solution. As you will soon see, no other forum package for DNN has as many features or the flexibility of DNN Community Forums.
     </p>
     <p>
         Click the continue button to get started.<br />
 
-        <style>
-            .afcontinue {
-                text-decoration: none;
-                -webkit-border-radius: 2px;
-                -moz-border-radius: 2px;
-                border-radius: 2px;
-                -webkit-user-select: none;
-                -moz-user-select: none;
-                -ms-user-select: none;
-                user-select: none;
-                -webkit-box-sizing: border-box;
-                -moz-box-sizing: border-box;
-                -ms-box-sizing: border-box;
-                -o-box-sizing: border-box;
-                box-sizing: border-box;
-                display: inline-block;
-                float: right;
-                font-weight: 500;
-                outline: 0;
-                padding: 3px 7px 4px 7px;
-                text-align: center;
-                text-decoration: none;
-                text-shadow: none;
-                cursor: pointer;
-                box-shadow: 0 1px 2px rgba(0,0,0,0.15);
-                border: 1px solid #46292b;
-                background: #dfe7ff;
-                color: #0162dea3;
-                line-height: 1.5;
-                margin-top: 20px;
-                margin-bottom: 15px;
-            }
-        </style>
-        <asp:Button ID="btnContinue" runat="server" CssClass="afcontinue" Text="Continue" />
+    <div class="dcf-buttons">
+        <asp:Button ID="btnContinue" runat="server" CssClass="dnnPrimaryAction" Text="Continue" />
+    </div>
     </p>
-</div>
+</div>
diff --git a/Dnn.CommunityForums/images/Branding/Logo/DNN-Community-Forums-Logo-Horizontal.png b/Dnn.CommunityForums/images/Branding/Logo/DNN-Community-Forums-Logo-Horizontal.png
diff --git a/Dnn.CommunityForums/images/Branding/Logo/DNN-Community-Forums-Logo-Horizontal.psd b/Dnn.CommunityForums/images/Branding/Logo/DNN-Community-Forums-Logo-Horizontal.psd
diff --git a/Dnn.CommunityForums/module.css b/Dnn.CommunityForums/module.css
@@ -10,6 +10,11 @@
 ------------ */
 
 
+/* Module Init screen */
+.dcf-init-screen img{
+	max-width: 300px;
+}
+
 /* #1 New wrapper class */
 .dnn-community-forums input[type=checkbox],
 .dnn-community-forums input[type=radio] {

Original file line number	Diff line number	Diff line change
`@@ -572,6 +572,18 @@ internal static string GetUsersRoleIds(int PortalId, DotNetNuke.Entities.Users.U`
`572`	`572`	`}`
`573`	`573`	`}`
`574`	`574`
	`575`	`+ roles.Add(int.Parse(DotNetNuke.Common.Globals.glbRoleAllUsers));`
	`576`	`+ if (u.UserID < 0)`
	`577`	`+ {`
	`578`	`+ roles.Add(int.Parse(DotNetNuke.Common.Globals.glbRoleUnauthUser));`
	`579`	`+ }`
	`580`	`+`
	`581`	`+ if (u.IsSuperUser)`
	`582`	`+ {`
	`583`	`+ roles.Add(int.Parse(DotNetNuke.Common.Globals.glbRoleUnauthUser));`
	`584`	`+ roles.Add(DotNetNuke.Modules.ActiveForums.Utilities.GetPortalSettings(PortalId).AdministratorRoleId);`
	`585`	`+ }`
	`586`	`+`
`575`	`587`	`return string.Join(";", roles.ToArray());`
`576`	`588`	`}`
`577`	`589`