added: winix functions: locale, timezone
changed: time zones -- now we have the daylight saving time
different for each year (start, end)
added: config option: time_zone_id (size_t)
time zone identifier for not logged users
or for newly created accounts
those identifiers you can see in etc/time_zones.conf file
or by using timezone winix function with 'a' parameter (timezone/a) (!!IMPROVE ME NOT IMPLEMENTED YET)
default: 34 (Coordinated Universal Time UTC+00:00)
added: config option: locale_default_id (size_t)
locale for not logged users
or for newly created accounts
added: config option: locale_max_id (size_t)
a maximum value of a locale identifier
default: 100 (maximum: 1000)
each locale files should have its own identifier (in "winix_locale_id" field)
from zero to this value
added: config option: time_zone_max_id (size_t)
maximum value of a time zone identifier
time zones with an id greater than this will be skipped
default: 130 (maximum: 1000)
removed: config option: locale_default
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@852 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -69,6 +69,7 @@ void System::ReadTimeZones()
|
||||
name_temp += '/';
|
||||
name_temp += config->time_zones_file;
|
||||
|
||||
time_zones.SetTimeZoneMaxId(config->time_zone_max_id);
|
||||
time_zones.ReadTimeZones(name_temp);
|
||||
}
|
||||
|
||||
@@ -894,30 +895,40 @@ return status;
|
||||
|
||||
|
||||
|
||||
time_t System::ToLocal(time_t gmt_time)
|
||||
time_t System::ToLocal(time_t utc_time)
|
||||
{
|
||||
time_t local_time;
|
||||
size_t tz_id;
|
||||
|
||||
if( cur->session && cur->session->puser )
|
||||
local_time = cur->session->puser->time_zone.ToLocal(gmt_time);
|
||||
tz_id = cur->session->puser->time_zone_id;
|
||||
else
|
||||
local_time = config->time_zone.ToLocal(gmt_time);
|
||||
tz_id = config->time_zone_default_id;
|
||||
|
||||
return local_time;
|
||||
TimeZone * tz = time_zones.GetZone(tz_id);
|
||||
|
||||
if( tz )
|
||||
return tz->ToLocal(utc_time);
|
||||
|
||||
return utc_time;
|
||||
}
|
||||
|
||||
|
||||
|
||||
PT::Date System::ToLocal(const PT::Date & gmt_date)
|
||||
PT::Date System::ToLocal(const PT::Date & utc_date)
|
||||
{
|
||||
PT::Date local_date;
|
||||
size_t tz_id;
|
||||
|
||||
if( cur->session && cur->session->puser )
|
||||
local_date = cur->session->puser->time_zone.ToLocal(gmt_date);
|
||||
tz_id = cur->session->puser->time_zone_id;
|
||||
else
|
||||
local_date = config->time_zone.ToLocal(gmt_date);
|
||||
tz_id = config->time_zone_default_id;
|
||||
|
||||
return local_date;
|
||||
TimeZone * tz = time_zones.GetZone(tz_id);
|
||||
|
||||
if( tz )
|
||||
return tz->ToLocal(utc_date);
|
||||
|
||||
return utc_date;
|
||||
}
|
||||
|
||||
|
||||
@@ -925,28 +936,38 @@ return local_date;
|
||||
|
||||
time_t System::ToUTC(time_t local_time)
|
||||
{
|
||||
time_t utc_time;
|
||||
size_t tz_id;
|
||||
|
||||
if( cur->session && cur->session->puser )
|
||||
utc_time = cur->session->puser->time_zone.ToUTC(local_time);
|
||||
tz_id = cur->session->puser->time_zone_id;
|
||||
else
|
||||
utc_time = config->time_zone.ToUTC(local_time);
|
||||
tz_id = config->time_zone_default_id;
|
||||
|
||||
return utc_time;
|
||||
TimeZone * tz = time_zones.GetZone(tz_id);
|
||||
|
||||
if( tz )
|
||||
return tz->ToUTC(local_time);
|
||||
|
||||
return local_time;
|
||||
}
|
||||
|
||||
|
||||
|
||||
PT::Date System::ToUTC(const PT::Date & local_date)
|
||||
{
|
||||
PT::Date utc_date;
|
||||
size_t tz_id;
|
||||
|
||||
if( cur->session && cur->session->puser )
|
||||
utc_date = cur->session->puser->time_zone.ToUTC(local_date);
|
||||
tz_id = cur->session->puser->time_zone_id;
|
||||
else
|
||||
utc_date = config->time_zone.ToUTC(local_date);
|
||||
tz_id = config->time_zone_default_id;
|
||||
|
||||
return utc_date;
|
||||
TimeZone * tz = time_zones.GetZone(tz_id);
|
||||
|
||||
if( tz )
|
||||
return tz->ToUTC(local_date);
|
||||
|
||||
return local_date;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user