bump to YAF 3.1.3

YAF.SampleWebApplication/Chat.aspx.cs

@@ -32,6 +32,7 @@ namespace YAF.SampleWebApplication
     using YAF.Core.Services;
     using YAF.Types.Constants;
     using YAF.Types.Interfaces;
+    using YAF.Types.Interfaces.Services;
 
     /// <summary>
     /// The chat.
@@ -68,16 +69,16 @@ public void GetUserImage(string username)
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
         protected void Page_Load(object sender, EventArgs e)
         {
-            if (!this.PageContext().IsGuest)
+            if (!this.PageBoardContext().IsGuest)
             {
-                this.UserName = this.PageContext().PageUser.DisplayOrUserName();
-                this.UserId = this.PageContext().PageUserID;
+                this.UserName = this.PageBoardContext().PageUser.DisplayOrUserName();
+                this.UserId = this.PageBoardContext().PageUserID;
 
                 this.GetUserImage(this.UserName);
             }
             else
             {
-                this.PageContext().Get<LinkBuilder>().Redirect(ForumPages.Account_Login);
+                this.PageBoardContext().Get<LinkBuilder>().Redirect(ForumPages.Account_Login);
             }
 
             this.Header.DataBind();

YAF.SampleWebApplication/ChatHub.cs

@@ -35,6 +35,7 @@ namespace YAF.SampleWebApplication
     using YAF.Core.Extensions;
     using YAF.SampleWebApplication.Models;
     using YAF.Types.Interfaces;
+    using YAF.Types.Interfaces.Services;
     using YAF.Types.Models;
 
     /// <summary>

YAF.SampleWebApplication/Forum/CHANGES.md

@@ -1,11 +1,13 @@
 YetAnotherForum.NET Changelog
 ====================
 
+# YetAnotherForum.NET v3.1.2
+* bug fixes
+
 # YetAnotherForum.NET v3.1.1
 * [FIXED] Wrong Role Name after new Install
 * [FIXED] saving topic tags
 
-
 # YetAnotherForum.NET v3.1.0
 * [NEW] Auto Upgrader
 * [NEW] New Topics or Replies of Wach Forum/Topic appear in Notifications

YAF.SampleWebApplication/Forum/Controls/ActiveDiscussion.ascx

@@ -45,7 +45,7 @@
         <asp:Panel runat="server" ID="Footer"
                    CssClass="card-footer">
             <div class="btn-group float-end" role="group" aria-label="Tools">
-                <YAF:RssFeedLink ID="RssFeed" runat="server" FeedType="LatestPosts" />
+                <YAF:RssFeedLink ID="RssFeed" runat="server" />
             </div>
         </asp:Panel>
     </div>

YAF.SampleWebApplication/Forum/Controls/CategoryList.ascx

@@ -3,10 +3,13 @@
 <%@ Import Namespace="YAF.Types.Objects.Model" %>
 <%@ Import Namespace="YAF.Core.Extensions" %>
 <%@ Import Namespace="ServiceStack.Text" %>
+<%@ Import Namespace="YAF.Core.Services" %>
 
 <%@ Register TagPrefix="YAF" TagName="ForumList" Src="ForumList.ascx" %>
 
-<asp:Repeater ID="Categories" runat="server">
+<asp:UpdatePanel runat="server" UpdateMode="Conditional">
+    <ContentTemplate>
+        <asp:Repeater ID="Categories" runat="server">
     <ItemTemplate>
                     <div class="row">
                         <div class="col">
@@ -17,7 +20,9 @@
                                             <div class="d-none d-md-inline-block icon-category">
                                                 <%#  this.GetCategoryImage((ForumRead)Container.DataItem) %>
                                             </div>
-                                            <%# this.HtmlEncode(((ForumRead)Container.DataItem).Category) %>
+                                            <a href="<%#this.Get<LinkBuilder>().GetCategoryLink(((ForumRead)Container.DataItem).CategoryID, ((ForumRead)Container.DataItem).Category)%>">
+                                                <%# this.HtmlEncode(((ForumRead)Container.DataItem).Category) %>
+                                            </a>
                                         </div>
                                         <div class="col-auto">
                                             <YAF:CollapseButton ID="CollapsibleImage" runat="server"
@@ -48,17 +53,33 @@
                                                  Icon="eye"
                                                  TextLocalizedTag="WATCHFORUM_ALL"
                                                  TitleLocalizedTag="WATCHFORUM_ALL_HELP"
-                                                 CommandArgument="<%# this.PageContext.PageCategoryID != 0 ? this.PageContext.PageCategoryID.ToString() : null %>"
-                                                 Visible="<%# !this.PageContext.IsGuest %>"/>
+                                                 CommandArgument="<%# this.PageBoardContext.PageCategoryID != 0 ? this.PageBoardContext.PageCategoryID.ToString() : null %>"
+                                                 Visible="<%# !this.PageBoardContext.IsGuest %>"/>
                                 <YAF:ThemeButton runat="server" ID="MarkAll"
                                                  OnClick="MarkAllClick"
                                                  Type="Secondary"
                                                  Size="Small"
                                                  Icon="glasses"
                                                  TextLocalizedTag="MARKALL"
-                                                 CommandArgument="<%# this.PageContext.PageCategoryID != 0 ? this.PageContext.PageCategoryID.ToString() : null %>"/>
+                                                 CommandArgument="<%# this.PageBoardContext.PageCategoryID != 0 ? this.PageBoardContext.PageCategoryID.ToString() : null %>"/>
                             </div>
                         </div>
                     </div>
             </FooterTemplate>
-</asp:Repeater>
+</asp:Repeater>
+        <div class="text-center">
+            <YAF:Alert runat="server" id="ForumsShown" Type="light" Visible="False">
+                <asp:Label runat="server" id="ForumsShownLabel" CssClass="me-3 align-top"></asp:Label>
+                <YAF:ThemeButton runat="server" ID="ShowMore"
+                                 OnClick="ShowMoreClick"
+                                 CssClass="mb-3"
+                                 Type="OutlineSecondary"
+                                 Size="Small"
+                                 Icon="spinner"
+                                 TextLocalizedTag="LOAD_MORE"/>
+            </YAF:Alert>
+
+        </div>
+    </ContentTemplate>
+
+</asp:UpdatePanel>

YAF.SampleWebApplication/Forum/Controls/Header.ascx

@@ -5,17 +5,11 @@
 <%@ Register TagPrefix="YAF" TagName="AdminMenu" Src="AdminMenu.ascx" %>
 <%@ Register TagPrefix="YAF" TagName="UserMenu" Src="UserMenu.ascx" %>
 
-<YAF:Alert runat="server" Visible="False" ID="GuestUserMessage" 
-           Type="info" 
-           Dismissing="True">
-    <asp:Label id="GuestMessage" runat="server"></asp:Label>
-</YAF:Alert>
-
 <header class="mb-2">
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
         <div class="container-fluid">
         <a class="navbar-brand mb-1" href="<%=this.Get<LinkBuilder>().GetLink(ForumPages.Board) %>">
-            <%= this.PageContext.BoardSettings.Name %>
+            <%= this.PageBoardContext.BoardSettings.Name %>
         </a>
 
         <button class="navbar-toggler" type="button" 
@@ -50,23 +44,23 @@
                             <ul class="dropdown-menu" aria-labelledby="hostDropdown">
                                 <li>
                                     <a href="<%= this.Get<LinkBuilder>().GetLink(ForumPages.Admin_HostSettings) %>"
-                                       class="<%= this.PageContext.CurrentForumPage.PageType == ForumPages.Admin_HostSettings ? "dropdown-item active" : "dropdown-item" %>">
+                                       class="<%= this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Admin_HostSettings ? "dropdown-item active" : "dropdown-item" %>">
                                         <YAF:Icon runat="server" IconName="cog" />
                                         <YAF:LocalizedLabel runat="server" 
                                                             LocalizedTag="admin_hostsettings" />
                                     </a>
                                 </li>
                                 <li>
                                     <a href="<%= this.Get<LinkBuilder>().GetLink(ForumPages.Admin_Boards) %>"
-                                       class="<%= this.PageContext.CurrentForumPage.PageType == ForumPages.Admin_Boards || this.PageContext.CurrentForumPage.PageType == ForumPages.Admin_EditBoard ? "dropdown-item active" : "dropdown-item" %>">
+                                       class="<%= this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Admin_Boards || this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Admin_EditBoard ? "dropdown-item active" : "dropdown-item" %>">
                                         <YAF:Icon runat="server" IconName="globe" />
                                         <YAF:LocalizedLabel runat="server" 
                                                             LocalizedTag="admin_boards" LocalizedPage="adminmenu"></YAF:LocalizedLabel>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="<%= this.Get<LinkBuilder>().GetLink(ForumPages.Admin_PageAccessList) %>"
-                                       class="<%= this.PageContext.CurrentForumPage.PageType == ForumPages.Admin_PageAccessList || this.PageContext.CurrentForumPage.PageType == ForumPages.Admin_PageAccessEdit ? "dropdown-item active" : "dropdown-item" %>">
+                                       class="<%= this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Admin_PageAccessList || this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Admin_PageAccessEdit ? "dropdown-item active" : "dropdown-item" %>">
                                         <YAF:Icon runat="server" IconName="building" />
                                         <YAF:LocalizedLabel runat="server" 
                                                             LocalizedTag="admin_pageaccesslist"/>

YAF.SampleWebApplication/Forum/Controls/Statistics.ascx

@@ -1,6 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" EnableViewState="false" Inherits="YAF.Controls.Statistics" Codebehind="Statistics.ascx.cs" %>
 
-        <div class="card mb-3">
+<div class="card mb-3">
             <div class="card-header d-flex align-items-center">
                 <YAF:IconHeader runat="server"
                                 IconName="chart-bar"

YAF.SampleWebApplication/Forum/Controls/TopicTags.ascx

@@ -18,8 +18,7 @@
                     <YAF:Icon runat="server" IconName="tag"></YAF:Icon>
                     <a href="<%# this.Get<LinkBuilder>().GetLink(
                                      ForumPages.Search,
-                                     "tag={0}",
-                                     this.Eval("Item2.TagName")) %>"
+                                     new { tag = this.Eval("Item2.TagName")} ) %>"
                        class="link-light"><%# this.Eval("Item2.TagName") %>
                     </a>
                 </span>

YAF.SampleWebApplication/Forum/Controls/UserMenu.ascx

@@ -9,7 +9,7 @@
                        AlternateText="avatar"
                        CssClass="img-navbar-avatar rounded"/>
         </span>
-        <%= this.HtmlEncode(this.PageContext.PageUser.DisplayOrUserName()) %>
+        <%= this.HtmlEncode(this.PageBoardContext.PageUser.DisplayOrUserName()) %>
         <asp:PlaceHolder runat="server" id="UnreadPlaceHolder">
             <asp:Label runat="server" ID="UnreadLabel"
                        CssClass="ms-1 badge bg-danger">
@@ -19,14 +19,14 @@
     <div class="dropdown-menu" aria-labelledby="userDropdown">
         <asp:PlaceHolder id="MyProfile" runat="server"></asp:PlaceHolder>
         <a href="#" data-bs-toggle="dropdown"
-               class="dropdown-item dropdown-submenu dropdown-toggle<%= this.PageContext.CurrentForumPage.PageType == ForumPages.Profile_EditProfile ||
-                                                                        this.PageContext.CurrentForumPage.PageType == ForumPages.Profile_EditSettings ||
-                                                                        this.PageContext.CurrentForumPage.PageType == ForumPages.Profile_ChangePassword  ||
-                                                                        this.PageContext.CurrentForumPage.PageType == ForumPages.Profile_Attachments  ||
-                                                                        this.PageContext.CurrentForumPage.PageType == ForumPages.Profile_EditAvatar ||
-                                                                        this.PageContext.CurrentForumPage.PageType == ForumPages.Profile_EditSignature  ||
-                                                                        this.PageContext.CurrentForumPage.PageType == ForumPages.Profile_Subscriptions  ||
-                                                                        this.PageContext.CurrentForumPage.PageType == ForumPages.Profile_BlockOptions  ? " active" : ""%>"><i class="fa fa-user-cog fa-fw"></i>&nbsp;<YAF:LocalizedLabel runat="server"
+               class="dropdown-item dropdown-submenu dropdown-toggle<%= this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Profile_EditProfile ||
+                                                                        this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Profile_EditSettings ||
+                                                                        this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Profile_ChangePassword  ||
+                                                                        this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Profile_Attachments  ||
+                                                                        this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Profile_EditAvatar ||
+                                                                        this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Profile_EditSignature  ||
+                                                                        this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Profile_Subscriptions  ||
+                                                                        this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Profile_BlockOptions  ? " active" : ""%>"><i class="fa fa-user-cog fa-fw"></i>&nbsp;<YAF:LocalizedLabel runat="server"
                                                                            LocalizedTag="MYSETTINGS" LocalizedPage="TOOLBAR"></YAF:LocalizedLabel></a>
             <div class="dropdown-menu">
                 <asp:PlaceHolder runat="server" ID="MySettings"></asp:PlaceHolder>
@@ -50,7 +50,7 @@
     </div>
 </li>
 <asp:PlaceHolder runat="server" ID="MyNotifications">
-    <li class="nav-item dropdown dropdown-notify<%= this.PageContext.CurrentForumPage.PageType == ForumPages.Notification ? " active" : ""%>">
+    <li class="nav-item dropdown dropdown-notify<%= this.PageBoardContext.CurrentForumPage.PageType == ForumPages.Notification ? " active" : ""%>">
         <YAF:Themebutton runat="server" ID="NotifyItem"
                          Type="None"
                          DataToggle="dropdown"