Index: openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl,v diff -u -N -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl 5 Aug 2014 07:18:47 -0000 1.10.2.2 +++ openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl 22 Oct 2014 09:47:46 -0000 1.10.2.3 @@ -44,18 +44,18 @@ # Try to get the correct UTC time from www.timeanddate.com if { [catch { - set result [util::http::get -url "http://www.timeanddate.com/worldclock/"] + set h [ns_set create headers Accept-Language en-us] + set result [util::http::get -url "http://www.timeanddate.com/worldclock/" -headers $h] set time_and_date_page [dict get $result page] } errmsg] } { - global errorInfo ns_log Error "set-system-timezone.tcl: Error trying to get timeanddate.com/worldclock/" set utc_ansi {Couldn't get time from timeanddate.com, sorry.} } # example input: -# ss=m3>Current UTC \(or GMT/Zulu\)-time used: Friday, July 27, 2012 at 19:20:27 +# ss=m3>UTC \(or GMT/Zulu\)-time used: Friday, July 27, 2012 at 19:20:27 -if { [regexp {Current[ ]+UTC[^:]+[:][ ]*]*>([^<]+)} $time_and_date_page match utc_from_page] } { +if { [regexp {UTC[^:]+[:][ ]*]*>([^<]+)} $time_and_date_page match utc_from_page] } { # UTC in format (including some historical ones to help keep a robust regexp: # Friday, July 27, 2012 at 19:20:27 # Wednesday, 20 November 2002, at 2:49:07 PM @@ -95,7 +95,7 @@ set delta_hours [expr {round(($sysdate_utc_epoch - $utc_epoch)*4.0 / (60*60)) / 4.0}] set recommended_offset [expr {$system_utc_offset + $delta_hours}] - set recommended_offset_pretty "UTC [format "+%d:%02d" [expr {int($recommended_offset)}] [expr {int($recommended_offset*60) % 60}]]" + set recommended_offset_pretty "UTC [format {+%d:%02d} [expr {int($recommended_offset)}] [expr {int($recommended_offset*60) % 60}]]" if { $delta_hours == 0 } { set correct_p 1 @@ -106,9 +106,9 @@ set try_offsets [list] foreach offset [list $recommended_offset [expr {$recommended_offset -24}]] { if { $offset < 0 } { - lappend try_offsets "'[db_quote [expr {-int(abs($offset)*60*60)]}]'" + lappend try_offsets '[db_quote [expr {-int(abs($offset)*60*60)}]]' } else { - lappend try_offsets "'[db_quote [expr {int($offset*60*60)}]]'" + lappend try_offsets '[db_quote [expr {int($offset*60*60)}]]' } }