nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-01 16:11:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set the default timezone to the database as well as for PHP.

Browse Source
This commit is contained in:
Andrew McMillan 2013-09-26 14:24:08 +02:00
parent f074f214d0
commit d0fffe490a
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/always.php
View File

@ -42,10 +42,13 @@ function early_exception_handler($e) {
} }
set_exception_handler('early_exception_handler'); set_exception_handler('early_exception_handler');
$c->default_timezone = ini_get('date.timezone'); $c->default_timezone = ini_get ( 'date.timezone' );
if ( empty($c->default_timezone) ) { if (empty ( $c->default_timezone )) {
$c->default_timezone = 'UTC'; if (isset ( $_SERVER ['HTTP_X_DAVICAL_TESTCASE'] )) {
date_default_timezone_set('UTC'); $c->default_timezone = 'Pacific/Auckland';
}
$c->default_timezone = 'UTC';
date_default_timezone_set ( 'UTC' );
} }
// Default some of the configurable values // Default some of the configurable values
@ -231,7 +234,9 @@ if ( $qry->Exec('always',__LINE__,__FILE__) && $row = $qry->Fetch() ) {
$c->messages[] = sprintf( 'Database schema needs upgrading. Current: %d.%d.%d, Desired: %d.%d.%d', $c->messages[] = sprintf( 'Database schema needs upgrading. Current: %d.%d.%d, Desired: %d.%d.%d',
$row->schema_major, $row->schema_minor, $row->schema_patch, $c->want_dbversion[0], $c->want_dbversion[1], $c->want_dbversion[2]); $row->schema_major, $row->schema_minor, $row->schema_patch, $c->want_dbversion[0], $c->want_dbversion[1], $c->want_dbversion[2]);
} }
if ( isset($_SERVER['HTTP_X_DAVICAL_TESTCASE']) ) $qry->QDo('SET TIMEZONE TO \'Pacific/Auckland\''); if ( isset($c->default_timezone) ) {
$qry->QDo('SET TIMEZONE TO ?', $c->default_timezone );
}
} }
require_once('Principal.php'); require_once('Principal.php');

15
inc/always.php.in
View File

@ -42,10 +42,13 @@ function early_exception_handler($e) {
} }
set_exception_handler('early_exception_handler'); set_exception_handler('early_exception_handler');
$c->default_timezone = ini_get('date.timezone'); $c->default_timezone = ini_get ( 'date.timezone' );
if ( empty($c->default_timezone) ) { if (empty ( $c->default_timezone )) {
$c->default_timezone = 'UTC'; if (isset ( $_SERVER ['HTTP_X_DAVICAL_TESTCASE'] )) {
date_default_timezone_set('UTC'); $c->default_timezone = 'Pacific/Auckland';
}
$c->default_timezone = 'UTC';
date_default_timezone_set ( 'UTC' );
} }
// Default some of the configurable values // Default some of the configurable values
@ -231,7 +234,9 @@ if ( $qry->Exec('always',__LINE__,__FILE__) && $row = $qry->Fetch() ) {
$c->messages[] = sprintf( 'Database schema needs upgrading. Current: %d.%d.%d, Desired: %d.%d.%d', $c->messages[] = sprintf( 'Database schema needs upgrading. Current: %d.%d.%d, Desired: %d.%d.%d',
$row->schema_major, $row->schema_minor, $row->schema_patch, $c->want_dbversion[0], $c->want_dbversion[1], $c->want_dbversion[2]); $row->schema_major, $row->schema_minor, $row->schema_patch, $c->want_dbversion[0], $c->want_dbversion[1], $c->want_dbversion[2]);
} }
if ( isset($_SERVER['HTTP_X_DAVICAL_TESTCASE']) ) $qry->QDo('SET TIMEZONE TO \'Pacific/Auckland\''); if ( isset($c->default_timezone) ) {
$qry->QDo('SET TIMEZONE TO ?', $c->default_timezone );
}
} }
require_once('Principal.php'); require_once('Principal.php');