added configuration for timezone and suppress warnings (fixes # 80)

This commit is contained in:
Steffen Vogel 2011-07-31 18:12:47 +02:00
parent 886fc9551c
commit d0abd1618f
2 changed files with 18 additions and 4 deletions

View file

@ -77,18 +77,28 @@ $config['db']['dbname'] = 'volkszaehler';
* @link http://www.php.net/manual/en/ini.core.php#ini.include-path
*/
$config['lib']['doctrine'] = VZ_DIR . '/lib/vendor/Doctrine';
$config['lib']['jpgraph'] = VZ_DIR . '/lib/vendor/JpGraph';
//$config['lib']['jpgraph'] = VZ_DIR . '/lib/vendor/JpGraph';
/**
* @var string timezone for the middleware
* @link http://www.php.net/manual/de/timezones.php
* @link http://www.php.net/manual/de/datetime.configuration.php#ini.date.timezone
*/
//$config['timezone'] = 'Europe/Berlin';
/**
* Plot colors
* @var array of colors for plot series
*/
$config['colors'] = array('#83CAFF', '#7E0021', '#579D1C', '#FFD320', '#FF420E', '#004586', '#0084D1', '#C5000B', '#FF950E', '#4B1F6F', '#AECF00', '#314004');
/** @var boolean disables some optimizations. Only use it when you exactly know what you are doing. */
/**
* @var boolean disables some optimizations. Only use it when you exactly know what you are doing.
*/
$config['devmode'] = FALSE;
/** @var integer set to > 0 to show debugging messages */
/**
* @var integer set to > 0 to show debugging messages
*/
$config['debug'] = 0;
?>

View file

@ -42,6 +42,10 @@ require_once VZ_DIR . '/lib/Util/Configuration.php';
// load configuration
Util\Configuration::load(VZ_DIR . '/etc/volkszaehler.conf');
// set timezone
$tz = (Util\Configuration::read('timezone')) ? Util\Configuration::read('timezone') : @date_default_timezone_get()
date_default_timezone_set($tz);
// define include dirs for vendor libs
define('DOCTRINE_DIR', Util\Configuration::read('lib.doctrine') ? Util\Configuration::read('lib.doctrine') : 'Doctrine');
define('JPGRAPH_DIR', Util\Configuration::read('lib.jpgraph') ? Util\Configuration::read('lib.jpgraph') : 'JpGraph');