@@ -98,10 +98,7 @@ require_once INCLUDES_DIR."/lib/gettext/gettext.php"; require_once INCLUDES_DIR."/lib/gettext/streams.php"; - if (function_exists("date_default_timezone_set")) - date_default_timezone_set($config->timezone); - else - ini_set("date.timezone", $config->timezone); + set_timezone($config->timezone); header("X-Pingback: ".$config->chyrp_url."/includes/xmlrpc.php"); includes/common.php @@ -1696,7 +1696,7 @@ closedir($open); } - $this->context["timezones"] = timezones(true); + $this->context["timezones"] = timezones(); if (empty($_POST)) return; includes/controller/Admin.php @@ -1049,12 +1049,12 @@ $zones = array(); $offsets = array(); - $reverse = (isset(Config::current()->timezone)) ? $timezones[Config::current()->timezone] : 0 ; + $undo = $timezones[get_timezone()]; foreach ($timezones as $timezone => $offset) { if (!in_array($offset, $offsets)) $zones[] = array("offset" => ($offsets[] = $offset) / 3600, "name" => $timezone, - "now" => time() - $reverse + $offset); + "now" => time() - $undo + $offset); } function by_time($a, $b) { @@ -1067,6 +1067,31 @@ } /** + * Function: set_timezone + * Sets the timezone. + * + * Parameters: + * $timezone - The timezone to set. + */ + function set_timezone($timezone) { + if (function_exists("date_default_timezone_set")) + date_default_timezone_set($timezone); + else + ini_set("date.timezone", $timezone); + } + + /** + * Function: get_timezone() + * Returns the current timezone. + */ + function get_timezone() { + if (function_exists("date_default_timezone_set")) + return date_default_timezone_get(); + else + return ini_get("date.timezone"); + } + + /** * Function: error_panicker * Exits and states where the error occurred. */ includes/helpers.php @@ -10,7 +10,8 @@ define('XML_RPC', false); define('UPGRADING', false); define('INSTALLING', true); - define('TESTER', true); + + define('TESTER', isset($_SERVER['HTTP_USER_AGENT']) and $_SERVER['HTTP_USER_AGENT'] == "tester.rb"); ini_set('error_reporting', E_ALL); ini_set('display_errors', true); @@ -23,6 +24,10 @@ # Helpers require INCLUDES_DIR."/helpers.php"; + # Atlantic/Reykjavik is 0 offset. Set it so the timezones() function is + # always accurate, even if the server has its own timezone settings. + set_timezone("Atlantic/Reykjavik"); + require_once INCLUDES_DIR."/class/Query.php"; require_once INCLUDES_DIR."/class/QueryBuilder.php"; require_once INCLUDES_DIR."/lib/YAML.php"; install.php c71daaba73c6538dc94d64108eadc3f47c6f7b5f Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/3adf78dfab6e39235682694388d7913361a3a7a4 3adf78dfab6e39235682694388d7913361a3a7a4 2008-09-03T18:12:10-07:00 2008-09-03T18:12:10-07:00 * Timezone refactoring/fixes. * Added set_timezone() and get_timezone(). * timezones() now undoes the current timezone, instead of the config setting. * Set the timezone to an offset of 0 in install.php so it ignores the server's settings. * Fixed TESTER constant in installer.php bfd1cdee5fc70bf78a955d792390826afa2c9686 Alex Suraci i.am@toogeneric.com