Settings: ForumLink

ONLYOFFICE · Dec 13, 2023 · 3955cab · 3955cab
1 parent 7792144
commit 3955cab
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/web/ASC.Web.Api/Api/Settings/SettingsController.cs b/web/ASC.Web.Api/Api/Settings/SettingsController.cs
@@ -171,6 +171,7 @@ public async Task<SettingsDto> GetSettingsAsync(bool? withpassword)
             LegalTerms = _setupInfo.LegalTerms,
             CookieSettingsEnabled = tenantCookieSettings.Enabled,
             UserNameRegex = _userFormatter.UserNameRegex.ToString(),
+            ForumLink = await _commonLinkUtility.GetUserForumLinkAsync(_settingsManager, _additionalWhiteLabelSettingsHelper)
         };
 
         if (!_authContext.IsAuthenticated && await _externalShare.GetLinkIdAsync() != default)

diff --git a/web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs b/web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
@@ -133,6 +133,10 @@ public class SettingsDto
     /// <summary>Link to the help</summary>
     /// <type>System.String, System</type>
     public string HelpLink { get; set; }
+
+    /// <summary>Link to the forum</summary>
+    /// <type>System.String, System</type>
+    public string ForumLink { get; set; }
 
     /// <summary>API documentation link</summary>
     /// <type>System.String, System</type>

diff --git a/web/ASC.Web.Core/Notify/StudioNotifyHelper.cs b/web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
@@ -31,7 +31,6 @@ namespace ASC.Web.Studio.Core.Notify;
 [Scope]
 public class StudioNotifyHelper
 {
-    public readonly string Helplink;
     public readonly string SiteLink;
     public readonly StudioNotifySource NotifySource;
     public readonly ISubscriptionProvider SubscriptionProvider;
@@ -52,7 +51,6 @@ public StudioNotifyHelper(
         StudioNotifySource studioNotifySource,
         UserManager userManager,
         SettingsManager settingsManager,
-        AdditionalWhiteLabelSettingsHelperInit additionalWhiteLabelSettingsHelper,
         MailWhiteLabelSettingsHelper mailWhiteLabelSettingsHelper,
         CommonLinkUtility commonLinkUtility,
         TenantManager tenantManager,
@@ -62,7 +60,6 @@ public StudioNotifyHelper(
         IConfiguration configuration,
         ILogger<StudioNotifyHelper> logger)
     {
-        Helplink = commonLinkUtility.GetHelpLink(settingsManager, additionalWhiteLabelSettingsHelper, false);
         SiteLink = commonLinkUtility.GetSiteLink(mailWhiteLabelSettingsHelper);
         NotifySource = studioNotifySource;
         _userManager = userManager;

diff --git a/web/ASC.Web.Core/SetupInfo.cs b/web/ASC.Web.Core/SetupInfo.cs
@@ -70,7 +70,6 @@ public long AvailableFileSize
     public string NoTenantRedirectURL { get; private set; }
     public string NotifyAddress { get; private set; }
     public string TipsAddress { get; private set; }
-    public string UserForum { get; private set; }
     public string SupportFeedback { get; private set; }
     public string WebApiBaseUrl { get { return VirtualPathUtility.ToAbsolute(GetAppSettings("api.url", "~/api/2.0/")); } }
     public TimeSpan ValidEmailKeyInterval { get; private set; }
@@ -159,7 +158,6 @@ public SetupInfo(IConfiguration configuration)
 
         NotifyAddress = GetAppSettings("web.promo-url", string.Empty);
         TipsAddress = GetAppSettings("web.promo-tips-url", string.Empty);
-        UserForum = GetAppSettings("web.user-forum", string.Empty);
         SupportFeedback = GetAppSettings("web.support-feedback", string.Empty);
 
         ValidEmailKeyInterval = GetAppSettings("email.validinterval", TimeSpan.FromDays(7));

diff --git a/web/ASC.Web.Core/Utility/CommonLinkUtility.cs b/web/ASC.Web.Core/Utility/CommonLinkUtility.cs
@@ -314,16 +314,14 @@ public string GetUserParamsPair(UserInfo user)
         return HttpUtility.UrlEncode(user.UserName.ToLowerInvariant());
     }
 
-    #region Help Centr
-
-    public async Task<string> GetHelpLinkAsync(SettingsManager settingsManager, AdditionalWhiteLabelSettingsHelperInit additionalWhiteLabelSettingsHelper, bool inCurrentCulture = true)
+    public async Task<string> GetUserForumLinkAsync(SettingsManager settingsManager, AdditionalWhiteLabelSettingsHelperInit additionalWhiteLabelSettingsHelper, bool inCurrentCulture = true)
     {
-        if (!(await settingsManager.LoadForDefaultTenantAsync<AdditionalWhiteLabelSettings>()).HelpCenterEnabled)
+        if (!(await settingsManager.LoadForDefaultTenantAsync<AdditionalWhiteLabelSettings>()).UserForumEnabled)
         {
             return string.Empty;
         }
 
-        var url = additionalWhiteLabelSettingsHelper.DefaultHelpCenterUrl;
+        var url = additionalWhiteLabelSettingsHelper.DefaultUserForumUrl;
 
         if (string.IsNullOrEmpty(url))
         {
@@ -332,10 +330,12 @@ public async Task<string> GetHelpLinkAsync(SettingsManager settingsManager, Addi
 
         return GetRegionalUrl(url, inCurrentCulture ? CultureInfo.CurrentCulture.TwoLetterISOLanguageName : null);
     }
+
+    #region Help Centr
 
-    public string GetHelpLink(SettingsManager settingsManager, AdditionalWhiteLabelSettingsHelperInit additionalWhiteLabelSettingsHelper, bool inCurrentCulture = true)
+    public async Task<string> GetHelpLinkAsync(SettingsManager settingsManager, AdditionalWhiteLabelSettingsHelperInit additionalWhiteLabelSettingsHelper, bool inCurrentCulture = true)
     {
-        if (!settingsManager.LoadForDefaultTenant<AdditionalWhiteLabelSettings>().HelpCenterEnabled)
+        if (!(await settingsManager.LoadForDefaultTenantAsync<AdditionalWhiteLabelSettings>()).HelpCenterEnabled)
         {
             return string.Empty;
         }