|
| From: | Mark A Peters <address@hidden> |
| Subject: | [Phpgroupware-cvs] CVS: phpgwapi/inc class.datetime.inc.php,1.7,1.8 |
| Date: | Sun, 23 Jun 2002 14:05:17 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv3518
Modified Files:
class.datetime.inc.php
Log Message:
A more enahanced datetime class. This one will store the server's TZ offset in
the cache and use that value to calculate GMT.
Index: class.datetime.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.datetime.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.datetime.inc.php 17 Apr 2002 23:43:29 -0000 1.7
--- class.datetime.inc.php 23 Jun 2002 18:05:15 -0000 1.8
***************
*** 45,64 ****
{
var $tz_offset;
var $days = Array();
! var $gmtnow;
var $gmtdate;
function datetime()
{
! $this->tz_offset = ((60 * 60) *
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']));
! /*
! * This is not advanced enough to automatically recalc Daylight Savings time
! if(date('I') == 1)
! {
! $this->tz_offset += 3600;
! }
! */
! $this->gmtdate = gmdate('D, d M Y H:i:s',time()).' GMT';
! $this->gmtnow =
$this->convert_rfc_to_epoch($this->gmtdate);
}
--- 45,127 ----
{
var $tz_offset;
+ var $TZs = Array();
var $days = Array();
! var $gmtnow = 0;
! var $users_localtime;
var $gmtdate;
function datetime()
{
! $this->tz_offset = 3600 *
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']);
! // echo '<!-- datetime::datetime::gmtnow =
'.$this->gmtnow.' -->'."\n";
!
! $error_occured = True;
! // If we already have a GMT time, no need to do this
again.
! if(!$this->gmtnow &&
address@hidden($GLOBALS['phpgw_info']['server']['tz_offset']))
! {
! // echo '<!-- datetime::datetime::debug: Inside
network time -->'."\n";
! $error_occured = False;
! if(address@hidden($GLOBALS['phpgw']->network))
! {
! $GLOBALS['phpgw']->network =
createobject('phpgwapi.network');
! }
! $server_time = time();
!
if($GLOBALS['phpgw']->network->open_port('129.6.15.28',13,15))
! {
! $line =
$GLOBALS['phpgw']->network->bs_read_port(64);
! // Value returned is 52384 02-04-20
13:55:29 50 0 0 9.2 UTC(NIST) *
!
$GLOBALS['phpgw']->network->close_port();
!
! $array = explode(' ',$line);
!
! if ($array[5] == 4)
! {
! $error_occured = True;
! }
! else
! {
! $date = explode('-',$array[1]);
! $time = explode(':',$array[2]);
! $this->gmtnow =
mktime(intval($time[0]),intval($time[1]),intval($time[2]),intval($date[1]),intval($date[2]),intval($date[0])
+ 2000);
! }
! }
! }
!
elseif(isset($GLOBALS['phpgw_info']['server']['tz_offset']))
! {
! // echo '<!-- datetime::datetime::debug: Inside
server already set -->'."\n";
! $error_occured = False;
! $this->gmtnow = time() -
(intval($GLOBALS['phpgw_info']['server']['tz_offset']) * 3600);
! }
! else
! {
! $error_occured = True;
! }
!
! if($error_occured)
! {
! // echo '<!-- datetime::datetime::debug: Inside
getting from local server -->'."\n";
! $server_time = time();
! // Calculate GMT time...
! // If DST, add 1 hour...
! // - (date('I') == 1?3600:0)
! $this->gmtnow =
$this->convert_rfc_to_epoch(gmdate('D, d M Y H:i:s',$server_time).' GMT');
! }
!
!
if(address@hidden($GLOBALS['phpgw_info']['server']['tz_offset']))
! {
! $GLOBALS['phpgw_info']['server']['tz_offset'] =
(($server_time - $this->gmtnow) / 3600);
!
if(@isset($GLOBALS['phpgw_info']['server']['cache_phpgw_info']))
! {
! $cache_query = "DELETE FROM
phpgw_app_sessions WHERE sessionid='0' and loginid='0' and app='phpgwapi' and
location='config'";
!
$GLOBALS['phpgw']->db->query($cache_query,__LINE__,__FILE__);
! $cache_query = 'INSERT INTO
phpgw_app_sessions(sessionid,loginid,app,location,content) VALUES('
! .
"'0','0','phpgwapi','config','".addslashes(serialize($GLOBALS['phpgw_info']['server']))."')";
!
$GLOBALS['phpgw']->db->query($cache_query,__LINE__,__FILE__);
! }
! }
! $this->users_localtime = $this->gmtnow -
$this->tz_offset;
! // echo '<!-- datetime::datetime::tz_offset =
'.$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'].'
-->'."\n";
! // echo '<!-- datetime::datetime::server:tz_offset =
'.$GLOBALS['phpgw_info']['server']['tz_offset'].' -->'."\n";
! // echo '<!-- datetime::datetime::gmtnow =
'.$this->gmtnow.' -->'."\n";
}
***************
*** 389,392 ****
--- 452,928 ----
{
return $this->localdates($localtime - $this->tz_offset);
+ }
+
+ function timezone_list()
+ {
+ $this->TZs = Array(
+ 'US/Alaska',
+ 'US/Aleutian',
+ 'US/Arizona',
+ 'US/Central',
+ 'US/Eastern',
+ 'US/East-Indiana',
+ 'US/Hawaii',
+ 'US/Indiana-Starke',
+ 'US/Michigan',
+ 'US/Mountain',
+ 'US/Pacific',
+ 'US/Samoa',
+ 'Africa/Abidjan',
+ 'Africa/Accra',
+ 'Africa/Addis_Ababa',
+ 'Africa/Algiers',
+ 'Africa/Asmera',
+ 'Africa/Bamako',
+ 'Africa/Bangui',
+ 'Africa/Banjul',
+ 'Africa/Bissau',
+ 'Africa/Blantyre',
+ 'Africa/Brazzaville',
+ 'Africa/Bujumbura',
+ 'Africa/Cairo',
+ 'Africa/Casablanca',
+ 'Africa/Ceuta',
+ 'Africa/Conakry',
+ 'Africa/Dakar',
+ 'Africa/Dar_es_Salaam',
+ 'Africa/Djibouti',
+ 'Africa/Douala',
+ 'Africa/El_Aaiun',
+ 'Africa/Freetown',
+ 'Africa/Gaborone',
+ 'Africa/Harare',
+ 'Africa/Johannesburg',
+ 'Africa/Kampala',
+ 'Africa/Khartoum',
+ 'Africa/Kigali',
+ 'Africa/Kinshasa',
+ 'Africa/Lagos',
+ 'Africa/Libreville',
+ 'Africa/Lome',
+ 'Africa/Luanda',
+ 'Africa/Lubumbashi',
+ 'Africa/Lusaka',
+ 'Africa/Malabo',
+ 'Africa/Maputo',
+ 'Africa/Maseru',
+ 'Africa/Mbabane',
+ 'Africa/Mogadishu',
+ 'Africa/Monrovia',
+ 'Africa/Nairobi',
+ 'Africa/Ndjamena',
+ 'Africa/Niamey',
+ 'Africa/Nouakchott',
+ 'Africa/Ouagadougou',
+ 'Africa/Porto-Novo',
+ 'Africa/Sao_Tome',
+ 'Africa/Timbuktu',
+ 'Africa/Tripoli',
+ 'Africa/Tunis',
+ 'Africa/Windhoek',
+ 'America/Adak',
+ 'America/Anchorage',
+ 'America/Anguilla',
+ 'America/Antigua',
+ 'America/Araguaina',
+ 'America/Aruba',
+ 'America/Asuncion',
+ 'America/Atka',
+ 'America/Barbados',
+ 'America/Belem',
+ 'America/Belize',
+ 'America/Boa_Vista',
+ 'America/Bogota',
+ 'America/Boise',
+ 'America/Buenos_Aires',
+ 'America/Cambridge_Bay',
+ 'America/Cancun',
+ 'America/Caracas',
+ 'America/Catamarca',
+ 'America/Cayenne',
+ 'America/Cayman',
+ 'America/Chicago',
+ 'America/Chihuahua',
+ 'America/Cordoba',
+ 'America/Costa_Rica',
+ 'America/Cuiaba',
+ 'America/Curacao',
+ 'America/Dawson',
+ 'America/Dawson_Creek',
+ 'America/Denver',
+ 'America/Detroit',
+ 'America/Dominica',
+ 'America/Edmonton',
+ 'America/El_Salvador',
+ 'America/Ensenada',
+ 'America/Fortaleza',
+ 'America/Fort_Wayne',
+ 'America/Glace_Bay',
+ 'America/Godthab',
+ 'America/Goose_Bay',
+ 'America/Grand_Turk',
+ 'America/Grenada',
+ 'America/Guadeloupe',
+ 'America/Guatemala',
+ 'America/Guayaquil',
+ 'America/Guyana',
+ 'America/Halifax',
+ 'America/Havana',
+ 'America/Hermosillo',
+ 'America/Indiana/Indianapolis',
+ 'America/Indiana/Knox',
+ 'America/Indiana/Marengo',
+ 'America/Indiana/Vevay',
+ 'America/Indianapolis',
+ 'America/Inuvik',
+ 'America/Iqaluit',
+ 'America/Jamaica',
+ 'America/Jujuy',
+ 'America/Juneau',
+ 'America/Knox_IN',
+ 'America/La_Paz',
+ 'America/Lima',
+ 'America/Los_Angeles',
+ 'America/Louisville',
+ 'America/Maceio',
+ 'America/Managua',
+ 'America/Manaus',
+ 'America/Martinique',
+ 'America/Mazatlan',
+ 'America/Mendoza',
+ 'America/Menominee',
+ 'America/Mexico_City',
+ 'America/Miquelon',
+ 'America/Montevideo',
+ 'America/Montreal',
+ 'America/Montserrat',
+ 'America/Nassau',
+ 'America/New_York',
+ 'America/Nipigon',
+ 'America/Nome',
+ 'America/Noronha',
+ 'America/Panama',
+ 'America/Pangnirtung',
+ 'America/Paramaribo',
+ 'America/Phoenix',
+ 'America/Port-au-Prince',
+ 'America/Porto_Acre',
+ 'America/Port_of_Spain',
+ 'America/Porto_Velho',
+ 'America/Puerto_Rico',
+ 'America/Rainy_River',
+ 'America/Rankin_Inlet',
+ 'America/Regina',
+ 'America/Rosario',
+ 'America/Santiago',
+ 'America/Santo_Domingo',
+ 'America/Sao_Paulo',
+ 'America/Scoresbysund',
+ 'America/Shiprock',
+ 'America/St_Johns',
+ 'America/St_Kitts',
+ 'America/St_Lucia',
+ 'America/St_Thomas',
+ 'America/St_Vincent',
+ 'America/Swift_Current',
+ 'America/Tegucigalpa',
+ 'America/Thule',
+ 'America/Thunder_Bay',
+ 'America/Tijuana',
+ 'America/Tortola',
+ 'America/Vancouver',
+ 'America/Virgin',
+ 'America/Whitehorse',
+ 'America/Winnipeg',
+ 'America/Yakutat',
+ 'America/Yellowknife',
+ 'Antarctica/Casey',
+ 'Antarctica/Davis',
+ 'Antarctica/DumontDUrville',
+ 'Antarctica/Mawson',
+ 'Antarctica/McMurdo',
+ 'Antarctica/Palmer',
+ 'Antarctica/South_Pole',
+ 'Antarctica/Syowa',
+ 'Arctic/Longyearbyen',
+ 'Asia/Aden',
+ 'Asia/Almaty',
+ 'Asia/Amman',
+ 'Asia/Anadyr',
+ 'Asia/Aqtau',
+ 'Asia/Aqtobe',
+ 'Asia/Ashkhabad',
+ 'Asia/Baghdad',
+ 'Asia/Bahrain',
+ 'Asia/Baku',
+ 'Asia/Bangkok',
+ 'Asia/Beirut',
+ 'Asia/Bishkek',
+ 'Asia/Brunei',
+ 'Asia/Calcutta',
+ 'Asia/Chungking',
+ 'Asia/Colombo',
+ 'Asia/Dacca',
+ 'Asia/Damascus',
+ 'Asia/Dili',
+ 'Asia/Dubai',
+ 'Asia/Dushanbe',
+ 'Asia/Gaza',
+ 'Asia/Harbin',
+ 'Asia/Hong_Kong',
+ 'Asia/Hovd',
+ 'Asia/Irkutsk',
+ 'Asia/Istanbul',
+ 'Asia/Jakarta',
+ 'Asia/Jayapura',
+ 'Asia/Jerusalem',
+ 'Asia/Kabul',
+ 'Asia/Kamchatka',
+ 'Asia/Karachi',
+ 'Asia/Kashgar',
+ 'Asia/Katmandu',
+ 'Asia/Krasnoyarsk',
+ 'Asia/Kuala_Lumpur',
+ 'Asia/Kuching',
+ 'Asia/Kuwait',
+ 'Asia/Macao',
+ 'Asia/Magadan',
+ 'Asia/Manila',
+ 'Asia/Muscat',
+ 'Asia/Nicosia',
+ 'Asia/Novosibirsk',
+ 'Asia/Omsk',
+ 'Asia/Phnom_Penh',
+ 'Asia/Pyongyang',
+ 'Asia/Qatar',
+ 'Asia/Rangoon',
+ 'Asia/Riyadh',
+ 'Asia/Riyadh87',
+ 'Asia/Riyadh88',
+ 'Asia/Riyadh89',
+ 'Asia/Saigon',
+ 'Asia/Samarkand',
+ 'Asia/Seoul',
+ 'Asia/Shanghai',
+ 'Asia/Singapore',
+ 'Asia/Taipei',
+ 'Asia/Tashkent',
+ 'Asia/Tbilisi',
+ 'Asia/Tehran',
+ 'Asia/Tel_Aviv',
+ 'Asia/Thimbu',
+ 'Asia/Tokyo',
+ 'Asia/Ujung_Pandang',
+ 'Asia/Ulaanbaatar',
+ 'Asia/Ulan_Bator',
+ 'Asia/Urumqi',
+ 'Asia/Vientiane',
+ 'Asia/Vladivostok',
+ 'Asia/Yakutsk',
+ 'Asia/Yekaterinburg',
+ 'Asia/Yerevan',
+ 'Atlantic/Azores',
+ 'Atlantic/Bermuda',
+ 'Atlantic/Canary',
+ 'Atlantic/Cape_Verde',
+ 'Atlantic/Faeroe',
+ 'Atlantic/Jan_Mayen',
+ 'Atlantic/Madeira',
+ 'Atlantic/Reykjavik',
+ 'Atlantic/South_Georgia',
+ 'Atlantic/Stanley',
+ 'Atlantic/St_Helena',
+ 'Australia/ACT',
+ 'Australia/Adelaide',
+ 'Australia/Brisbane',
+ 'Australia/Broken_Hill',
+ 'Australia/Canberra',
+ 'Australia/Darwin',
+ 'Australia/Hobart',
+ 'Australia/LHI',
+ 'Australia/Lindeman',
+ 'Australia/Lord_Howe',
+ 'Australia/Melbourne',
+ 'Australia/North',
+ 'Australia/NSW',
+ 'Australia/Perth',
+ 'Australia/Queensland',
+ 'Australia/South',
+ 'Australia/Sydney',
+ 'Australia/Tasmania',
+ 'Australia/Victoria',
+ 'Australia/West',
+ 'Australia/Yancowinna',
+ 'Brazil/Acre',
+ 'Brazil/DeNoronha',
+ 'Brazil/East',
+ 'Brazil/West',
+ 'Canada/Atlantic',
+ 'Canada/Central',
+ 'Canada/Eastern',
+ 'Canada/East-Saskatchewan',
+ 'Canada/Mountain',
+ 'Canada/Newfoundland',
+ 'Canada/Pacific',
+ 'Canada/Saskatchewan',
+ 'Canada/Yukon',
+ 'CET',
+ 'Chile/Continental',
+ 'Chile/EasterIsland',
+ 'China/Beijing',
+ 'China/Shanghai',
+ 'CST6CDT',
+ 'Cuba',
+ 'EET',
+ 'Egypt',
+ 'Eire',
+ 'EST',
+ 'EST5EDT',
+ 'Europe/Amsterdam',
+ 'Europe/Andorra',
+ 'Europe/Athens',
+ 'Europe/Belfast',
+ 'Europe/Belgrade',
+ 'Europe/Berlin',
+ 'Europe/Bratislava',
+ 'Europe/Brussels',
+ 'Europe/Bucharest',
+ 'Europe/Budapest',
+ 'Europe/Chisinau',
+ 'Europe/Copenhagen',
+ 'Europe/Dublin',
+ 'Europe/Gibraltar',
+ 'Europe/Helsinki',
+ 'Europe/Istanbul',
+ 'Europe/Kaliningrad',
+ 'Europe/Kiev',
+ 'Europe/Lisbon',
+ 'Europe/Ljubljana',
+ 'Europe/London',
+ 'Europe/Luxembourg',
+ 'Europe/Madrid',
+ 'Europe/Malta',
+ 'Europe/Minsk',
+ 'Europe/Monaco',
+ 'Europe/Moscow',
+ 'Europe/Oslo',
+ 'Europe/Paris',
+ 'Europe/Prague',
+ 'Europe/Riga',
+ 'Europe/Rome',
+ 'Europe/Samara',
+ 'Europe/San_Marino',
+ 'Europe/Sarajevo',
+ 'Europe/Simferopol',
+ 'Europe/Skopje',
+ 'Europe/Sofia',
+ 'Europe/Stockholm',
+ 'Europe/Tallinn',
+ 'Europe/Tirane',
+ 'Europe/Tiraspol',
+ 'Europe/Uzhgorod',
+ 'Europe/Vaduz',
+ 'Europe/Vatican',
+ 'Europe/Vienna',
+ 'Europe/Vilnius',
+ 'Europe/Warsaw',
+ 'Europe/Zagreb',
+ 'Europe/Zaporozhye',
+ 'Europe/Zurich',
+ 'Factory',
+ 'GB',
+ 'GB-Eire',
+ 'GMT',
+ 'GMT0',
+ 'GMT-0',
+ 'GMT+0',
+ 'Greenwich',
+ 'Hongkong',
+ 'HST',
+ 'Iceland',
+ 'Indian/Antananarivo',
+ 'Indian/Chagos',
+ 'Indian/Christmas',
+ 'Indian/Cocos',
+ 'Indian/Comoro',
+ 'Indian/Kerguelen',
+ 'Indian/Mahe',
+ 'Indian/Maldives',
+ 'Indian/Mauritius',
+ 'Indian/Mayotte',
+ 'Indian/Reunion',
+ 'Iran',
+ 'Israel',
+ 'Jamaica',
+ 'Japan',
+ 'Kwajalein',
+ 'Libya',
+ 'MET',
+ 'Mexico/BajaNorte',
+ 'Mexico/BajaSur',
+ 'Mexico/General',
+ 'Mideast/Riyadh87',
+ 'Mideast/Riyadh88',
+ 'Mideast/Riyadh89',
+ 'MST',
+ 'MST7MDT',
+ 'Navajo',
+ 'NZ',
+ 'NZ-CHAT',
+ 'Pacific/Apia',
+ 'Pacific/Auckland',
+ 'Pacific/Chatham',
+ 'Pacific/Easter',
+ 'Pacific/Efate',
+ 'Pacific/Enderbury',
+ 'Pacific/Fakaofo',
+ 'Pacific/Fiji',
+ 'Pacific/Funafuti',
+ 'Pacific/Galapagos',
+ 'Pacific/Gambier',
+ 'Pacific/Guadalcanal',
+ 'Pacific/Guam',
+ 'Pacific/Honolulu',
+ 'Pacific/Johnston',
+ 'Pacific/Kiritimati',
+ 'Pacific/Kosrae',
+ 'Pacific/Kwajalein',
+ 'Pacific/Majuro',
+ 'Pacific/Marquesas',
+ 'Pacific/Midway',
+ 'Pacific/Nauru',
+ 'Pacific/Niue',
+ 'Pacific/Norfolk',
+ 'Pacific/Noumea',
+ 'Pacific/Pago_Pago',
+ 'Pacific/Palau',
+ 'Pacific/Pitcairn',
+ 'Pacific/Ponape',
+ 'Pacific/Port_Moresby',
+ 'Pacific/Rarotonga',
+ 'Pacific/Saipan',
+ 'Pacific/Samoa',
+ 'Pacific/Tahiti',
+ 'Pacific/Tarawa',
+ 'Pacific/Tongatapu',
+ 'Pacific/Truk',
+ 'Pacific/Wake',
+ 'Pacific/Wallis',
+ 'Pacific/Yap',
+ 'Poland',
+ 'Portugal',
+ 'PRC',
+ 'PST8PDT',
+ 'ROC',
+ 'ROK',
+ 'Singapore',
+ 'Turkey',
+ 'UCT',
+ 'Universal',
+ 'UTC',
+ 'WET',
+ 'W-SU',
+ 'Zulu'
+ );
}
}
| [Prev in Thread] | Current Thread | [Next in Thread] |