Skip to content
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

Jump to bottom

TASK: Remove obsolete timezone offset settings and code #704

Merged
merged 4 commits into from
Mar 27, 2024
Merged

TASK: Remove obsolete timezone offset settings and code #704

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
c92a42d
TASK: Remove obsolete timezone offset module settings and streamline …
johnhenley Mar 11, 2024
3c347cc
TASK: Remove obsolete timezone offset module settings and streamline …
johnhenley Mar 11, 2024
d8bbe52
resync
johnhenley Mar 11, 2024
a8bcad1
resync current dev
johnhenley Mar 12, 2024
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
49 changes: 49 additions & 0 deletions Dnn.CommunityForums/Deprecated/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,55 @@ public static string HumanFriendlyDate(DateTime displayDate, int ModuleId, int t
return string.Format(GetSharedResource("[RESX:TimeSpan:YearsAgo]"), Math.Ceiling(ts.Days / 365.0));

}
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
public static DateTime GetUserDate(DateTime displayDate, int mid, int offset)
{
var mainSettings = SettingsBase.GetModuleSettings(mid);
var mServerOffSet = mainSettings.TimeZoneOffset;
var newDate = displayDate.AddMinutes(-mServerOffSet);

return newDate.AddMinutes(offset);
}
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
public string GetUserFormattedDate(DateTime date, DotNetNuke.Entities.Portals.PortalInfo portalInfo, DotNetNuke.Entities.Users.UserInfo userInfo)
{
return GetUserFormattedDateTime(date, portalInfo.PortalID, userInfo.UserID);
}
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
public static string GetDate(DateTime displayDate, int mid, int offset)
{
string dateStr;

try
{
var mUserOffSet = 0;
var mainSettings = SettingsBase.GetModuleSettings(mid);
var mServerOffSet = mainSettings.TimeZoneOffset;
var newDate = displayDate.AddMinutes(-mServerOffSet);

newDate = newDate.AddMinutes(offset);

var dateFormat = mainSettings.DateFormatString;
var timeFormat = mainSettings.TimeFormatString;
var formatString = string.Concat(dateFormat, " ", timeFormat);

try
{
dateStr = newDate.ToString(formatString);
}
catch
{
dateStr = displayDate.ToString();
}

return dateStr;
}
catch (Exception ex)
{
dateStr = displayDate.ToString();
return dateStr;
}
}
[Obsolete("Deprecated in Community Forums. Removed in 09.00.00. Use HttpUtility.HtmlEncode.")]
public static string HtmlEncode(string strMessage = "") => HttpUtility.HtmlEncode(strMessage);
[Obsolete("Deprecated in Community Forums. Removed in 09.00.00. Use HttpUtility.HtmlDecode.")]
Expand Down
2 changes: 1 addition & 1 deletion Dnn.CommunityForums/DnnCommunityForums.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<attributes>
<businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>07.00.07,07.00.11,07.00.12,08.00.00</upgradeVersionsList>
<upgradeVersionsList>07.00.07,07.00.11,07.00.12,08.00.00,08.01.00</upgradeVersionsList>
</attributes>
</eventMessage>
</component>
Expand Down
10 changes: 6 additions & 4 deletions Dnn.CommunityForums/class/Globals.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,9 @@ public class SettingKeys
public const string StatsTemplate = "STATSTEMPLATE";
public const string StatsCache = "STATSCACHE";
public const string DateFormatString = "DATEFORMATSTRING";
public const string TimeFormatString = "TIMEFORMATSTRING";
public const string TimeZoneOffset = "TIMEZONEOFFSET";
public const string TimeFormatString = "TIMEFORMATSTRING";
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
public const string TimeZoneOffset = "TIMEZONEOFFSET";
public const string UsersOnlineEnabled = "USERSONLINEENABLED";
public const string MemberListMode = "MEMBERLISTMODE";
public const string ForumTemplateId = "FORUMTEMPLATEID";
Expand All @@ -190,8 +191,9 @@ public class SettingKeys
public const string FloodInterval = "FLOODINTERVAL";
public const string EditInterval = "EDITINTERVAL";
public const string LoggingLevel = "LOGGINGLEVEL";
public const string DeleteBehavior = "DELETEBEHAVIOR";
public const string ProdKey = "AMFORUMS";
public const string DeleteBehavior = "DELETEBEHAVIOR";
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
public const string ProdKey = "AMFORUMS";

public const string EnablePoints = "ENABLEPOINTS";
public const string TopicPointValue = "TOPICPOINTVALUE";
Expand Down
2 changes: 1 addition & 1 deletion Dnn.CommunityForums/class/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public string TimeFormatString
{
get { return MainSettings.GetString(SettingKeys.TimeFormatString, "h:mm tt"); }
}

[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
public int TimeZoneOffset
{
get { return MainSettings.GetInt(SettingKeys.TimeZoneOffset); }
Expand Down
3 changes: 2 additions & 1 deletion Dnn.CommunityForums/class/SettingsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,8 @@ public TimeSpan TimeZoneOffset

#endregion

#region Protected Methods
#region Protected Methods
[Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
protected DateTime GetUserDate(DateTime displayDate)
{
return Utilities.GetUserDate(displayDate, ForumModuleId, Convert.ToInt32(TimeZoneOffset.TotalMinutes));
Expand Down
56 changes: 13 additions & 43 deletions Dnn.CommunityForums/class/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Web;
Expand Down Expand Up @@ -982,55 +983,24 @@ internal static string GetFileContent(string filePath)
}
return sContents;
}
public static string GetDate(DateTime displayDate, int mid, int offset)
internal static string GetUserFriendlyDateTimeString(DateTime datetime, int ModuleId, UserInfo userInfo)
{
string dateStr;

try
var mainSettings = SettingsBase.GetModuleSettings(ModuleId);
var displayDate = datetime.Add(GetTimeZoneOffsetForUser(userInfo));
if (displayDate.Date == DateTime.UtcNow.Date)
{
var mUserOffSet = 0;
var mainSettings = SettingsBase.GetModuleSettings(mid);
var mServerOffSet = mainSettings.TimeZoneOffset;
var newDate = displayDate.AddMinutes(-mServerOffSet);

newDate = newDate.AddMinutes(offset);

var dateFormat = mainSettings.DateFormatString;
var timeFormat = mainSettings.TimeFormatString;
var formatString = string.Concat(dateFormat, " ", timeFormat);

try
{
dateStr = newDate.ToString(formatString);
}
catch
{
dateStr = displayDate.ToString();
}

return dateStr;
return $"{GetSharedResource("Today")} @ {displayDate.ToString(mainSettings.TimeFormatString)}";
}
catch (Exception ex)
else if (datetime.Date == DateTime.UtcNow.AddDays(-1).Date)
{
dateStr = displayDate.ToString();
return dateStr;
return $"{GetSharedResource("Yesterday")} @ {displayDate.ToString(mainSettings.TimeFormatString)}";
}
else
{
return $"{displayDate.ToString(mainSettings.DateFormatString)} @ {displayDate.ToString(mainSettings.TimeFormatString)}";
}
}

public static DateTime GetUserDate(DateTime displayDate, int mid, int offset)
{
var mainSettings = SettingsBase.GetModuleSettings(mid);
var mServerOffSet = mainSettings.TimeZoneOffset;
var newDate = displayDate.AddMinutes(-mServerOffSet);

return newDate.AddMinutes(offset);
}

public string GetUserFormattedDate(DateTime date, PortalInfo portalInfo, UserInfo userInfo)
{
return GetUserFormattedDateTime(date, portalInfo.PortalID, userInfo.UserID);
}


public static string GetUserFormattedDateTime(DateTime dateTime, int portalId, int userId, string format)
{
CultureInfo userCultureInfo = GetCultureInfoForUser(portalId, userId);
Expand Down
Loading