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

2012-12-03 Junichi Satoh <junichi@rworks.jp> 

* godmode/setup/setup.php: Changed not to depend on DateTimeZone
	constants with timezone setting to support php 5.2.x.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7213 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2012-12-03 02:37:48 +00:00
parent 71a67e8291
commit b7027b986e
2 changed files with 15 additions and 89 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 @@
2012-12-03 Junichi Satoh <junichi@rworks.jp>
* godmode/setup/setup.php: Changed not to depend on DateTimeZone
constants with timezone setting to support php 5.2.x.
2012-11-29 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/reporting_builder.php: Fix a pure fail

99
pandora_console/godmode/setup/setup.php
View File

@ -18,19 +18,6 @@ global $config;
check_login ();
// See http://php.net/manual/es/class.datetimezone.php
define ("AFRICA", 1);
define ("AMERICA", 2);
define ("ANTARCTICA", 4);
define ("ARCTIC", 8);
define ("ASIA", 16);
define ("ATLANTIC", 32);
define ("AUSTRALIA", 64);
define ("EUROPE", 128);
define ("INDIAN", 256);
define ("PACIFIC", 512);
define ("UTC", 1024);
if (is_ajax ()) {
$get_os_icon = (bool) get_parameter ('get_os_icon');
$select_timezone = get_parameter ('select_timezone', 0);
@ -44,44 +31,13 @@ if (is_ajax ()) {
if ($select_timezone) {
$zone = get_parameter('zone');
switch ($zone) {
case 'Africa':
$timezones = timezone_identifiers_list(AFRICA);
break;
case 'America':
$timezones = timezone_identifiers_list(AMERICA);
break;
case 'Antarctica':
$timezones = timezone_identifiers_list(ANTARCTICA);
break;
case 'Arctic':
$timezones = timezone_identifiers_list(ARCTIC);
break;
case 'Asia':
$timezones = timezone_identifiers_list(ASIA);
break;
case 'Atlantic':
$timezones = timezone_identifiers_list(ATLANTIC);
break;
case 'Australia':
$timezones = timezone_identifiers_list(AUSTRALIA);
break;
case 'Europe':
$timezones = timezone_identifiers_list(EUROPE);
break;
case 'Indian':
$timezones = timezone_identifiers_list(INDIAN);
break;
case 'Pacific':
$timezones = timezone_identifiers_list(PACIFIC);
break;
case 'UTC':
$timezones = timezone_identifiers_list(UTC);
break;
default:
$timezones = array();
break;
$timezones = timezone_identifiers_list();
foreach ($timezones as $timezone_key => $timezone) {
if (strpos($timezone, $zone) === false) {
unset($timezones[$timezone_key]);
}
}
echo json_encode($timezones);
}
return;
@ -261,46 +217,11 @@ if ($zone_selected == "") {
}
}
switch ($zone_selected) {
case 'Africa':
$timezones = timezone_identifiers_list(AFRICA);
break;
case 'America':
$timezones = timezone_identifiers_list(AMERICA);
break;
case 'Antarctica':
$timezones = timezone_identifiers_list(ANTARCTICA);
break;
case 'Arctic':
$timezones = timezone_identifiers_list(ARCTIC);
break;
case 'Asia':
$timezones = timezone_identifiers_list(ASIA);
break;
case 'Atlantic':
$timezones = timezone_identifiers_list(ATLANTIC);
break;
case 'Australia':
$timezones = timezone_identifiers_list(AUSTRALIA);
break;
case 'Europe':
$timezones = timezone_identifiers_list(EUROPE);
break;
case 'Indian':
$timezones = timezone_identifiers_list(INDIAN);
break;
case 'Pacific':
$timezones = timezone_identifiers_list(PACIFIC);
break;
case 'UTC':
$timezones = timezone_identifiers_list(UTC);
break;
default:
$timezones = array();
break;
}
$timezones = timezone_identifiers_list();
foreach ($timezones as $timezone) {
$timezone_n[$timezone] = $timezone;
if (strpos($timezone, $zone_selected) !== false) {
$timezone_n[$timezone] = $timezone;
}
}
$table->data[23][0] = __('Timezone setup');