Skip to content

Commit

Permalink
Merge pull request #240 from DNNCommunity/dev
Browse files Browse the repository at this point in the history 
07.00.04 Release Tasks
  • Loading branch information
@WillStrohl
WillStrohl authored Feb 20, 2023
2 parents 12c7a5c + fc3b3f5 commit afeac7c
Show file tree
Hide file tree
Showing 37 changed files with 133 additions and 577 deletions.
3 changes: 1 addition & 2 deletions ActiveForumViewer.ascx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// 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.
//

using System;
using System.Web.UI.WebControls;
Expand Down Expand Up @@ -91,4 +90,4 @@ protected override void OnLoad(EventArgs e)
}
#endregion
}
}
}
5 changes: 4 additions & 1 deletion ActiveForums.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,9 @@
<Content Include="config\templates\ModAlert_html.txt" />
<Content Include="config\templates\ToolBar.txt" />
<Content Include="config\templates\_UserProfile.txt" />
<Content Include="controls\admin_properties.ascx" />
<Content Include="controls\admin_properties.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="controls\admin_securitygrid.ascx">
<SubType>ASPXCodeBehind</SubType>
</Content>
Expand Down Expand Up @@ -638,6 +640,7 @@
<None Include="sql\06.01.06.SqlDataProvider" />
<None Include="sql\06.01.03.SqlDataProvider" />
<None Include="sql\06.03.03.SqlDataProvider" />
<None Include="sql\07.00.04.SqlDataProvider" />
<None Include="sql\06.04.01.SqlDataProvider" />
<None Include="sql\07.00.02.SqlDataProvider" />
<None Include="sql\07.00.00.SqlDataProvider" />
Expand Down
49 changes: 25 additions & 24 deletions ActiveForums.dnn
View file
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="07.00.03">
<package name="Active Forums" type="Module" version="07.00.04">
<friendlyName>Active Forums</friendlyName>
<description>Community Forums: The official online forums module for the DNN Community.</description>
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
Expand All @@ -23,7 +23,8 @@
<foldername>ActiveForums</foldername>
<businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
<supportedFeatures>
<supportedFeature type="Searchable" />
<supportedFeature type="Searchable" />
<supportedFeature type="Upgradeable" />
</supportedFeatures>
<moduleDefinitions>
<moduleDefinition>
Expand Down Expand Up @@ -72,7 +73,7 @@
<attributes>
<businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>06.04.00,06.04.01,06.05.00,06.05.01,06.06.00,07.00.00,07.00.01,07.00.02,07.00.03</upgradeVersionsList>
<upgradeVersionsList>06.04.00,06.04.01,06.05.00,06.05.01,06.06.00,07.00.00,07.00.01,07.00.04</upgradeVersionsList>
</attributes>
</eventMessage>
</component>
Expand All @@ -83,7 +84,7 @@
<assembly>
<name>DotNetNuke.Modules.ActiveForums.dll</name>
<sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
<version>07.00.03</version>
<version>07.00.04</version>
</assembly>
</assemblies>
</component>
Expand Down Expand Up @@ -328,20 +329,20 @@
<name>06.04.01.SqlDataProvider</name>
<version>06.04.01</version>
</script>
<script type="Install">
<path>sql</path>
<name>07.00.00.SqlDataProvider</name>
<version>07.00.00</version>
</script>
<script type="Install">
<path>sql</path>
<name>07.00.02.SqlDataProvider</name>
<version>07.00.02</version>
</script>
<script type="Install">
<path>sql</path>
<name>07.00.00.SqlDataProvider</name>
<version>07.00.00</version>
</script>
<script type="Install">
<path>sql</path>
<name>07.00.04.SqlDataProvider</name>
<version>07.00.04</version>
</script>
<script type="UnInstall">
<path>sql</path>
<name>Uninstall.SqlDataProvider</name>
<version>07.00.03</version>
<version>07.00.04</version>
</script>
</scripts>
</component>
Expand Down Expand Up @@ -377,18 +378,18 @@
</components>
</package>

<package name="Active Forums What's New" type="Module" version="07.00.03">
<package name="Active Forums What's New" type="Module" version="07.00.04">
<friendlyName>Active Forums What's New</friendlyName>
<foldername>ActiveForumsWhatsNew</foldername>
<description>Community Forums: Display the most recent topics or replies from selected forums on any page within your site.</description>
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
<owner>
<name>DotNetNuke Active Forums Module</name>
<organization>DotNetNuke Corporation</organization>
<url>activeforums.codeplex.com</url>
<email>[email protected]</email>
</owner>
<license src="License.txt" />
<owner>
<name>DNN Community</name>
<organization>DNN Community</organization>
<url>dnncommunity.org</url>
<email>[email protected]</email>
</owner>
<license src="License.txt" />
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>true</azureCompatible>
<dependencies>
Expand Down Expand Up @@ -446,7 +447,7 @@
</components>
</package>

<package name="Active Forums Viewer" type="Module" version="07.00.03">
<package name="Active Forums Viewer" type="Module" version="07.00.04">
<friendlyName>Active Forums Viewer</friendlyName>
<foldername>ActiveForumsViewer</foldername>
<description>Community Forums: Display any forum topic view on any page within your site.</description>
Expand Down
4 changes: 2 additions & 2 deletions ActiveForums_Symbols.dnn
View file
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="07.00.03">
<package name="Active Forums_Symbols" type="Library" version="07.00.04">
<friendlyName>Active Forums Symbols</friendlyName>
<description>Community Forums: The official online forums module for the DNN Community.</description>
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
Expand All @@ -14,7 +14,7 @@
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="managedPackage" version="7.0.3">Active Forums</dependency>
<dependency type="managedPackage" version="7.0.4">Active Forums</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
15 changes: 0 additions & 15 deletions App_LocalResources/ControlPanel.ascx.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1216,18 +1216,6 @@ Your removal method is currently set to {0}. Your topics will be {1} based upon
<data name="[RESX:TopicPriority].Text" xml:space="preserve">
<value>Allow Topic Priority</value>
</data>
<data name="[RESX:ActiveSocialIntegration].Text" xml:space="preserve">
<value>Active Social Integration</value>
</data>
<data name="[RESX:RepliesAccessKey].Text" xml:space="preserve">
<value>Access Key for Replies</value>
</data>
<data name="[RESX:TopicsAccessKey].Text" xml:space="preserve">
<value>Access Key for Topics</value>
</data>
<data name="[RESX:ActiveSocialTip].Text" xml:space="preserve">
<value>Enter the keys you created in the Active Social Control panel under the Access Control section of the Journal.</value>
</data>
<data name="[RESX:Community].Text" xml:space="preserve">
<value>Community</value>
</data>
Expand Down Expand Up @@ -1384,9 +1372,6 @@ Your removal method is currently set to {0}. Your topics will be {1} based upon
<data name="[RESX:PleaseWait].Text" xml:space="preserve">
<value>Loading... Please wait.</value>
</data>
<data name="[RESX:Tips:ActiveSocial].Text" xml:space="preserve">
<value>Active Forums will send updates to the Active Social Journal.</value>
</data>
<data name="[RESX:Confirm:URLToggle].Text" xml:space="preserve">
<value>Caution: Installing or Uninstalling the Active Forums URL Handler will require a change to your web.config. \n\nAre you sure you want to make this change right now?</value>
</data>
Expand Down
13 changes: 2 additions & 11 deletions Classic.ascx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,6 @@ private void SetupPage()
{
ClientResourceManager.RegisterStyleSheet(this.Page, "~/DesktopModules/ActiveForums/themes/" + MainSettings.Theme + "/module.css");
ClientResourceManager.RegisterStyleSheet(this.Page, "~/DesktopModules/ActiveForums/themes/" + MainSettings.Theme + "/jquery-ui.min.css");
if (Request.QueryString["asg"] != null)
{
ClientResourceManager.RegisterStyleSheet(this.Page, "~/DesktopModules/ActiveForums/module.css");
}
}

string lang = "en-US";
Expand Down Expand Up @@ -407,18 +403,13 @@ protected override void OnPreRender(EventArgs e)
{
ShowToolbar = false;
}
if (Request.QueryString["dnnprintmode"] == null & Request.QueryString["asg"] == null)
if (Request.QueryString["dnnprintmode"] == null)
{
bool show = true;
if (currView == "grid" && Request.Params["asg"] != null)
{
show = false;
}
if (HttpContext.Current.Items["ShowToolbar"] != null)
{
ShowToolbar = bool.Parse(HttpContext.Current.Items["ShowToolbar"].ToString());
}
if (show && ShowToolbar == true)
if (ShowToolbar == true)
{
LiteralControl lit = new LiteralControl();
object sToolbar = DataCache.CacheRetrieve("aftb" + ForumModuleId);
Expand Down
20 changes: 0 additions & 20 deletions CustomControls/HTML/ControlPanel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,26 +86,6 @@ public string BindRolesForSecurityGrid(string rootPath)
{
sb.Append("<option value=\"" + ri.RoleID + "\">" + ri.RoleName + "</option>");
}

#if !SKU_LITE
if (System.IO.File.Exists(rootPath + "bin\\active.modules.social.dll"))
{
Modules.ActiveForums.Social social = new Modules.ActiveForums.Social();
using (IDataReader dr = social.ActiveSocialListGroups(PortalId))
{
while (dr.Read())
{
sb.Append("<optgroup label=\"" + dr["GroupName"].ToString() + "\">");
sb.Append("<option value=\"" + dr["GroupId"].ToString() + ":0\">Group Admin</option>");
sb.Append("<option value=\"" + dr["GroupId"].ToString() + ":1\">Group Member</option>");
sb.Append("</optgroup>");

}
dr.Close();
}
}
#endif

return sb.ToString();
}
}
Expand Down
26 changes: 1 addition & 25 deletions CustomControls/HTML/SecurityGrid.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,31 +104,7 @@ public string GetNewGrid()
}
}
}
//Groups
string groups = GetSecureObjectList(Security, 2);
if (! (string.IsNullOrEmpty(groups)))
{
foreach (string g in groups.Split(';'))
{
if (! (string.IsNullOrEmpty(g)))
{
Social uc = new Social();
string gType = g.Split(':')[1];
int groupId = Convert.ToInt32(g.Split(':')[0]);
string groupName = uc.ActiveSocialGetGroup(groupId);
if (! (string.IsNullOrEmpty(groupName)))
{
PermissionInfo pi = new PermissionInfo();
pi.ObjectId = g;
pi.ObjectName = groupName;
pi.Type = ObjectType.GroupId;
pi.ObjectName += "-" + uc.ActiveSocialGetGroupType(Convert.ToInt32(gType), PortalId);
pl.Add(pi);
}
}
}
}


string[,] grid = new string[pl.Count + 1, 28];
i = 0;
foreach (PermissionInfo pi in pl)
Expand Down
1 change: 0 additions & 1 deletion CustomControls/HTML/TopicViewer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ private string ParseDataRow(IDataRecord row, string tmp)
tmp = tmp.Replace(k, value);
}

//tmp = tmp.Replace("[AVATAR]", "<span style=""background-image:url('/desktopmodules/activesocial/profilepic.ashx?PortalId=" & PortalId.ToString & "&uid=" & row("LastAuthorId").ToString & "&h=26&w=26');""></span>")
return tmp;
}
catch (Exception ex)
Expand Down
41 changes: 5 additions & 36 deletions CustomControls/ServerControls/QuickReply.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Security.Policy;
using System.Xml.Linq;

namespace DotNetNuke.Modules.ActiveForums.Controls
{
Expand Down Expand Up @@ -286,19 +288,8 @@ private void SaveQuickReply()
{
string sURL = Utilities.NavigateUrl(PageId, "", new string[] { ParamKeys.ForumId + "=" + ForumId, ParamKeys.ViewType + "=" + Views.Topic, ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + ReplyId });
Subscriptions.SendSubscriptions(SiteId, InstanceId, PageId, ForumId, TopicId, ReplyId, UserId);

#if !SKU_LITE
try
{
Social oSocial = new Social();
oSocial.AddForumItemToJournal(SiteId, InstanceId, UserId, "forumreply", sURL, Subject, sBody);
}
catch (Exception ex)
{
DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
}

#endif
Social amas = new Social();
amas.AddReplyToJournal(PortalId, ForumModuleId, ForumId, TopicId, ReplyId, UserId, sURL, Subject, string.Empty, sBody,ForumInfo.Security.Read, SocialGroupId);
}
catch (Exception ex)
{
Expand All @@ -308,34 +299,12 @@ private void SaveQuickReply()
string fullURL = Utilities.NavigateUrl(PageId, "", new string[] { ParamKeys.ForumId + "=" + ForumId, ParamKeys.ViewType + "=" + Views.Topic, ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + ReplyId });
HttpContext.Current.Response.Redirect(fullURL, false);
}
else if (isApproved == false)
else
{
Email.SendEmailToModerators(forumInfo.ModNotifyTemplateId, SiteId, ForumId, ri.TopicId, ReplyId, InstanceId, PageId, string.Empty);
string[] Params = { ParamKeys.ForumId + "=" + ForumId, ParamKeys.ViewType + "=confirmaction", "afmsg=pendingmod", ParamKeys.TopicId + "=" + TopicId };
HttpContext.Current.Response.Redirect(Utilities.NavigateUrl(PageId, "", Params), false);
}
else
{
string fullURL = Utilities.NavigateUrl(PageId, "", new string[] { ParamKeys.ForumId + "=" + ForumId, ParamKeys.ViewType + "=" + Views.Topic, ParamKeys.TopicId + "=" + TopicId, ParamKeys.ContentJumpId + "=" + ReplyId });

#if !SKU_LITE
try
{
Modules.ActiveForums.Social oSocial = new Modules.ActiveForums.Social();
oSocial.AddForumItemToJournal(SiteId, InstanceId, UserId, "forumreply", fullURL, Subject, sBody);
}
catch (Exception ex)
{
DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
}

#endif
HttpContext.Current.Response.Redirect(fullURL, false);
}

//End If


}
private string ParseTemplate()
{
Expand Down
6 changes: 1 addition & 5 deletions CustomControls/UserControls/ForumView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,10 @@ public string BuildForumView(int ForumTemplateId, int CurrentUserId, string Them
Forum fi;
int tmpGroupCount = 0;
int asForumGroupId;
var social = new Social();
asForumGroupId = social.GetMasterForumGroup(PortalId, TabId);
int groupForumsCount = 0;
foreach (DataRow dr in rsForums.Rows)
{

//If CBool(dr("CanView")) Or (Not CBool(dr("GroupHidden"))) Then ' And Not CBool(dr("CanView"))) Or UserInfo.IsSuperUser Then
if (!(asForumGroupId == Convert.ToInt32(dr["ForumGroupId"]) && Convert.ToBoolean(dr["GroupHidden"])))
if (!Convert.ToBoolean(dr["GroupHidden"]))
{
if (tmpGroup != dr["GroupName"].ToString())
{
Expand Down
2 changes: 1 addition & 1 deletion CustomControls/UserControls/TopicView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ private void LoadData(int pageId)

var sURL = string.Empty;

if (MainSettings.URLRewriteEnabled && Request.QueryString["asg"] == null && !string.IsNullOrEmpty(_topicURL))
if (MainSettings.URLRewriteEnabled && !string.IsNullOrEmpty(_topicURL))
{
var db = new Data.Common();
sURL = db.GetUrl(ModuleId, ForumGroupId, ForumId, TopicId, UserId, contentJumpId);
Expand Down
Loading

0 comments on commit afeac7c

Please sign in to comment.