Skip to content

Commit a81fd88

Browse files
rxturrxtur
committed
Time zone changes
1 parent f86d672 commit a81fd88

7 files changed

Lines changed: 38 additions & 39 deletions

File tree

‎BlogEngine/BlogEngine.Core/BlogSettings.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,11 +1078,6 @@ public enum CommentsBy
10781078

10791079
#region Timezone
10801080

1081-
/// <summary>
1082-
/// Gets or sets the maximum number of characters that are displayed from a blog-roll retrieved post.
1083-
/// </summary>
1084-
/// <value>The maximum number of characters to display.</value>
1085-
public double Timezone { get; set; }
10861081
/// <summary>
10871082
/// Time zone id
10881083
/// </summary>
@@ -1095,10 +1090,10 @@ public enum CommentsBy
10951090
/// <returns>Server time</returns>
10961091
public DateTime ServerTime(DateTime ? localTime = null)
10971092
{
1098-
if(localTime == null || localTime == new DateTime())
1093+
if(localTime == null || localTime == new DateTime()) // no time sent in, use "now"
10991094
return DateTime.UtcNow;
11001095

1101-
return localTime.Value.AddHours(-Timezone);
1096+
return localTime.Value.ToUniversalTime();
11021097
}
11031098

11041099
/// <summary>
@@ -1109,9 +1104,13 @@ public DateTime ServerTime(DateTime ? localTime = null)
11091104
public DateTime ClientTime(DateTime ? serverTime = null)
11101105
{
11111106
if (serverTime == null || serverTime == new DateTime())
1112-
return DateTime.UtcNow.AddHours(Timezone);
1107+
return DateTime.UtcNow;
1108+
1109+
var zone = string.IsNullOrEmpty(Instance.TimeZoneId) ? "UTC" : Instance.TimeZoneId;
1110+
1111+
var tz = TimeZoneInfo.FindSystemTimeZoneById(zone);
11131112

1114-
return serverTime.Value.AddHours(Timezone);
1113+
return TimeZoneInfo.ConvertTimeFromUtc(serverTime.Value, tz);
11151114
}
11161115

11171116
#endregion

‎BlogEngine/BlogEngine.Core/Data/SettingsRepository.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public bool Update(Settings ns)
4848
bs.TimeStampPostLinks = ns.TimeStampPostLinks;
4949
bs.ShowPostNavigation = ns.ShowPostNavigation;
5050
bs.Culture = ns.Culture;
51-
bs.Timezone = ns.Timezone;
5251
bs.TimeZoneId = ns.TimeZoneId;
5352
bs.RemoveExtensionsFromUrls = ns.RemoveExtensionsFromUrls;
5453
bs.RedirectToRemoveFileExtension = ns.RedirectToRemoveFileExtension;
@@ -163,7 +162,6 @@ private Settings GetSettings()
163162
ns.TimeStampPostLinks = bs.TimeStampPostLinks;
164163
ns.ShowPostNavigation = bs.ShowPostNavigation;
165164
ns.Culture = bs.Culture;
166-
ns.Timezone = bs.Timezone;
167165
ns.TimeZoneId = bs.TimeZoneId == null ? "UTC" : bs.TimeZoneId;
168166
ns.RemoveExtensionsFromUrls = bs.RemoveExtensionsFromUrls;
169167
ns.RedirectToRemoveFileExtension = bs.RedirectToRemoveFileExtension;

‎BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ public override Page SelectPage(Guid id)
13951395
page.Description = rdr.IsDBNull(2) ? String.Empty : rdr.GetString(2);
13961396
if (!rdr.IsDBNull(4))
13971397
{
1398-
page.DateCreated = rdr.GetDateTime(4).AddHours(BlogSettings.Instance.Timezone);
1398+
page.DateCreated = BlogSettings.Instance.ServerTime(rdr.GetDateTime(4));
13991399
}
14001400

14011401
if (!rdr.IsDBNull(5))
@@ -1484,7 +1484,7 @@ public override Post SelectPost(Guid id)
14841484
post.Description = rdr.IsDBNull(2) ? String.Empty : rdr.GetString(2);
14851485
if (!rdr.IsDBNull(4))
14861486
{
1487-
post.DateCreated = rdr.GetDateTime(4).AddHours(BlogSettings.Instance.Timezone);
1487+
post.DateCreated = BlogSettings.Instance.ClientTime(rdr.GetDateTime(4));
14881488
}
14891489

14901490
if (!rdr.IsDBNull(5))
@@ -1578,7 +1578,7 @@ public override Post SelectPost(Guid id)
15781578

15791579
comment.Email = rdr.GetString(3);
15801580
comment.Content = rdr.GetString(5);
1581-
comment.DateCreated = rdr.GetDateTime(1).AddHours(BlogSettings.Instance.Timezone);
1581+
comment.DateCreated = BlogSettings.Instance.ClientTime(rdr.GetDateTime(1));
15821582
comment.Parent = post;
15831583

15841584
if (!rdr.IsDBNull(6))
@@ -2923,7 +2923,7 @@ public override List<QuickNote> FillQuickNotes(string userId)
29232923
Id = rdr.GetGuid(0),
29242924
Author = userId,
29252925
Note = rdr.GetString(1),
2926-
Updated = rdr.GetDateTime(2).AddHours(BlogSettings.Instance.Timezone)
2926+
Updated = BlogSettings.Instance.ClientTime(rdr.GetDateTime(2))
29272927
};
29282928
notes.Add(n);
29292929
}
@@ -3192,7 +3192,7 @@ private void UpdateComments(Post post, DbConnectionHelper conn)
31923192
parms.Add(conn.CreateParameter(FormatParamName("postcommentid"), comment.Id.ToString()));
31933193
parms.Add(conn.CreateParameter(FormatParamName("parentid"), comment.ParentId.ToString()));
31943194
parms.Add(conn.CreateParameter(FormatParamName("id"), post.Id.ToString()));
3195-
parms.Add(conn.CreateParameter(FormatParamName("date"), comment.DateCreated.AddHours(-BlogSettings.Instance.Timezone)));
3195+
parms.Add(conn.CreateParameter(FormatParamName("date"), BlogSettings.Instance.ServerTime(comment.DateCreated)));
31963196
parms.Add(conn.CreateParameter(FormatParamName("author"), comment.Author));
31973197
parms.Add(conn.CreateParameter(FormatParamName("email"), comment.Email));
31983198
parms.Add(conn.CreateParameter(FormatParamName("website"), (comment.Website == null ? string.Empty : comment.Website.ToString())));

‎BlogEngine/BlogEngine.Core/Providers/XmlProvider/Pages.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public override void InsertPage(Page page)
9393
ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture));
9494

9595
writer.WriteElementString("datemodified", (page.DateModified == new DateTime() ? DateTime.Now :
96-
page.DateModified.AddHours(-BlogSettings.Instance.Timezone)).
96+
BlogSettings.Instance.ServerTime(page.DateModified)).
9797
ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture));
9898

9999
writer.WriteEndElement();
@@ -156,11 +156,11 @@ public override Page SelectPage(Guid id)
156156

157157
page.DateCreated = DateTime.Parse(
158158
doc.SelectSingleNode("page/datecreated").InnerText, CultureInfo.InvariantCulture);
159-
page.DateCreated = page.DateCreated.AddHours(BlogSettings.Instance.Timezone);
159+
page.DateCreated = BlogSettings.Instance.ClientTime(page.DateCreated);
160160

161161
page.DateModified = DateTime.Parse(
162162
doc.SelectSingleNode("page/datemodified").InnerText, CultureInfo.InvariantCulture);
163-
page.DateModified = page.DateModified.AddHours(BlogSettings.Instance.Timezone);
163+
page.DateModified = BlogSettings.Instance.ClientTime(page.DateModified);
164164

165165
return page;
166166
}

‎BlogEngine/BlogEngine.Core/Providers/XmlProvider/Posts.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,15 +234,15 @@ public override Post SelectPost(Guid id)
234234
post.DateCreated = DateTime.Parse(
235235
doc.SelectSingleNode("post/pubDate").InnerText, CultureInfo.InvariantCulture);
236236

237-
post.DateCreated = post.DateCreated.AddHours(BlogSettings.Instance.Timezone);
237+
post.DateCreated = BlogSettings.Instance.ClientTime(post.DateCreated);
238238
}
239239

240240
if (doc.SelectSingleNode("post/lastModified") != null)
241241
{
242242
post.DateModified = DateTime.Parse(
243243
doc.SelectSingleNode("post/lastModified").InnerText, CultureInfo.InvariantCulture);
244244

245-
post.DateModified = post.DateModified.AddHours(BlogSettings.Instance.Timezone);
245+
post.DateModified = BlogSettings.Instance.ClientTime(post.DateModified);
246246
}
247247

248248
if (doc.SelectSingleNode("post/author") != null)
@@ -346,7 +346,7 @@ public override Post SelectPost(Guid id)
346346
comment.DateCreated = DateTime.Parse(
347347
node.SelectSingleNode("date").InnerText, CultureInfo.InvariantCulture);
348348

349-
comment.DateCreated = comment.DateCreated.AddHours(BlogSettings.Instance.Timezone);
349+
comment.DateCreated = BlogSettings.Instance.ClientTime(comment.DateCreated);
350350

351351
post.AllComments.Add(comment);
352352
}

‎BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -210,26 +210,28 @@ private static Dictionary<string, string> SupportedMedia
210210
/// </returns>
211211
public static string ToRfc822DateTime(DateTime dateTime)
212212
{
213-
var offset =
214-
(int)(TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now).TotalHours + BlogSettings.Instance.Timezone);
215-
var timeZone = string.Format("+{0}", offset.ToString(NumberFormatInfo.InvariantInfo).PadLeft(2, '0'));
216-
217-
// ------------------------------------------------------------
218-
// Adjust time zone based on offset
219-
// ------------------------------------------------------------
220-
if (offset < 0)
221-
{
222-
var i = offset * -1;
223-
timeZone = string.Format("-{0}", i.ToString(NumberFormatInfo.InvariantInfo).PadLeft(2, '0'));
224-
}
225-
213+
//var offset =
214+
// (int)(TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now).TotalHours + BlogSettings.Instance.Timezone);
215+
//var timeZone = string.Format("+{0}", offset.ToString(NumberFormatInfo.InvariantInfo).PadLeft(2, '0'));
216+
217+
//// ------------------------------------------------------------
218+
//// Adjust time zone based on offset
219+
//// ------------------------------------------------------------
220+
//if (offset < 0)
221+
//{
222+
// var i = offset * -1;
223+
// timeZone = string.Format("-{0}", i.ToString(NumberFormatInfo.InvariantInfo).PadLeft(2, '0'));
224+
//}
225+
226+
//return dateTime.ToString(
227+
// string.Format("ddd, dd MMM yyyy HH:mm:ss {0}", timeZone.PadRight(5, '0')), DateTimeFormatInfo.InvariantInfo);
226228
return dateTime.ToString(
227-
string.Format("ddd, dd MMM yyyy HH:mm:ss {0}", timeZone.PadRight(5, '0')), DateTimeFormatInfo.InvariantInfo);
229+
string.Format("ddd, dd MMM yyyy HH:mm:ss {0}", BlogSettings.Instance.TimeZoneId), DateTimeFormatInfo.InvariantInfo);
228230
}
229231

230232
static string RssDateString(DateTime pubDate)
231233
{
232-
pubDate = pubDate.AddHours(BlogSettings.Instance.Timezone);
234+
pubDate = BlogSettings.Instance.ClientTime(pubDate);
233235
var value = pubDate.ToString("ddd',' d MMM yyyy HH':'mm':'ss") + " " +
234236
pubDate.ToString("zzzz").Replace(":", "");
235237
return value;

‎BlogEngine/BlogEngine.Core/Web/HttpHandlers/SyndicationHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,9 @@ private static void SetHeaderInformation(
357357
var lastModified = new DateTime(1900, 1, 3); // don't use DateTime.MinValue here, as Mono doesn't like it
358358
foreach (var item in items)
359359
{
360-
if (item.DateModified.AddHours(-BlogSettings.Instance.Timezone) > lastModified)
360+
if (BlogSettings.Instance.ClientTime(item.DateModified) > lastModified)
361361
{
362-
lastModified = item.DateModified.AddHours(-BlogSettings.Instance.Timezone);
362+
lastModified = BlogSettings.Instance.ClientTime(item.DateModified);
363363
}
364364
}
365365

0 commit comments

Comments
 (0)