fixed: there were mktime() used on some dirs Items
so sometimes the time of the dir was changed now for converting tm into time_t use: time_t Time(const tm & par); time_t Time(const tm * par); tm Time(time_t par); from core/misc.h now winix internally use GMT time only when printing it is converted to local user time temporarily all users use the same local time (config: time_zone_offset) (only logs are genereted with local system time) added to system: time_t LocalTime(time_t gmt_time); tm LocalTime(const tm * ptm); tm LocalTime(const tm & ptm); they convert GMT time to local user time git-svn-id: svn://ttmath.org/publicrep/winix/trunk@666 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -18,19 +18,18 @@ namespace TemplatesFunctions
|
||||
{
|
||||
|
||||
|
||||
void print_date_nice(Ezc::Info & i, const tm * ptm)
|
||||
void print_date_nice(Ezc::Info & i, const tm & rtm)
|
||||
{
|
||||
tm tm_temp(*ptm);
|
||||
|
||||
time_t t = mktime(&tm_temp); // mktime do something in tm_temp
|
||||
time_t now = time(0);
|
||||
time_t t = Time(rtm);
|
||||
time_t now = std::time(0);
|
||||
time_t one_day = 60 * 60 * 24;
|
||||
|
||||
tm ltm = system->LocalTime(rtm);
|
||||
|
||||
if( t + one_day > now )
|
||||
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
|
||||
i.out << DateToStr(ltm.tm_year + 1900, ltm.tm_mon + 1, ltm.tm_mday, ltm.tm_hour, ltm.tm_min, ltm.tm_sec);
|
||||
else
|
||||
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday);
|
||||
i.out << DateToStr(ltm.tm_year + 1900, ltm.tm_mon + 1, ltm.tm_mday);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user