tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-08-19 Sancho Lerena <slerena@artica.es> 

* include/config_process.php: Fixed problem with timezone on
        page load in setup.      


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4787 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2011-08-19 16:25:39 +00:00
parent 100e9d1d4e
commit 558bc0cdeb
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-19 Sancho Lerena <slerena@artica.es>
* include/config_process.php: Fixed problem with timezone on page load
in setup.
2011-08-19 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: in function "graphic_agentaccess" fixed when

15
pandora_console/include/config_process.php
View File

@ -25,6 +25,8 @@
$build_version = 'PC110121';
$pandora_version = 'v4.0dev';
date_default_timezone_set("Europe/Berlin");
/* Help to debug problems. Override global PHP configuration */
if (!isset($develop_bypass)) $develop_bypass = 0;
@ -78,6 +80,12 @@ require_once ($ownDir. 'functions_config.php');
config_process_config();
// Set a the system timezone default
if ((!isset($config["timezone"])) OR ($config["timezone"] == "")){
$config["timezone"] = "Europe/Berlin";
}
date_default_timezone_set($config["timezone"]);
require_once ($ownDir . 'streams.php');
require_once ($ownDir . 'gettext.php');
@ -88,13 +96,6 @@ else {
$config["remote_addr"] = null;
}
// Set a the system timezone default
if ((!isset($config["timezone"])) OR ($config["timezone"] == "")){
$config["timezone"] = "Europe/Berlin";
}
date_default_timezone_set($config["timezone"]);
// Save the global values
$config["global_block_size"] = $config["block_size"];
$config["global_flash_charts"] = $config["flash_charts"];