Merge pull request #704 from johnhenley/dev81/1-refactoring/12-remove…

…-obsolete-timezone-code
DNNCommunity · Mar 27, 2024 · ada2b23 · ada2b23
2 parents 78f2b63 + a8bcad1
commit ada2b23
Show file tree

Hide file tree

Showing 11 changed files with 149 additions and 162 deletions.
diff --git a/Dnn.CommunityForums/Deprecated/Utilities.cs b/Dnn.CommunityForums/Deprecated/Utilities.cs
@@ -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.")]

diff --git a/Dnn.CommunityForums/DnnCommunityForums.dnn b/Dnn.CommunityForums/DnnCommunityForums.dnn
@@ -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>

diff --git a/Dnn.CommunityForums/class/Globals.cs b/Dnn.CommunityForums/class/Globals.cs
@@ -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";
@@ -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";

diff --git a/Dnn.CommunityForums/class/Settings.cs b/Dnn.CommunityForums/class/Settings.cs
@@ -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); }

diff --git a/Dnn.CommunityForums/class/SettingsBase.cs b/Dnn.CommunityForums/class/SettingsBase.cs
@@ -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));

diff --git a/Dnn.CommunityForums/class/Utilities.cs b/Dnn.CommunityForums/class/Utilities.cs
@@ -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;
@@ -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);