tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

fixed: there were mktime() used on some dirs Items

Browse Source 
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:
Tomasz Sowa
2010-10-23 23:12:47 +00:00
parent a1bee81a5b
commit c48241f78a
33 changed files with 298 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/Makefile.dep
View File

@@ -433,4 +433,4 @@ winix.o: ../functions/run.h ../functions/stat.h ../functions/subject.h
winix.o: ../functions/funthread.h ../functions/template.h
winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
winix.o: ../functions/uptime.h ../functions/who.h ../core/htmlfilter.h
winix.o: ../templates/templates.h
winix.o: ../templates/templates.h ../core/misc.h

16
templates/dir.cpp
View File

@@ -350,31 +350,27 @@ void dir_last_url_is(Info & i)
void dir_last_date_creation(Info & i)
{
tm * ptm = &request->dir_tab.back()->date_creation;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
tm rtm = system->LocalTime(request->dir_tab.back()->date_creation);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void dir_last_date_modification(Info & i)
{
tm * ptm = &request->dir_tab.back()->date_modification;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
tm rtm = system->LocalTime(request->dir_tab.back()->date_modification);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void dir_last_date_creation_nice(Info & i)
{
tm * ptm = &request->dir_tab.back()->date_creation;
print_date_nice(i, ptm);
print_date_nice(i, request->dir_tab.back()->date_creation);
}
void dir_last_date_modification_nice(Info & i)
{
tm * ptm = &request->dir_tab.back()->date_modification;
print_date_nice(i, ptm);
print_date_nice(i, request->dir_tab.back()->date_modification);
}

32
templates/item.cpp
View File

@@ -224,31 +224,27 @@ void item_users_different(Info & i)
void item_date_creation(Info & i)
{
tm * ptm = &request->item.date_creation;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
tm rtm = system->LocalTime(request->item.date_creation);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void item_date_modification(Info & i)
{
tm * ptm = &request->item.date_modification;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
tm rtm = system->LocalTime(request->item.date_modification);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void item_date_creation_nice(Info & i)
{
tm * ptm = &request->item.date_creation;
print_date_nice(i, ptm);
print_date_nice(i, request->item.date_creation);
}
void item_date_modification_nice(Info & i)
{
tm * ptm = &request->item.date_modification;
print_date_nice(i, ptm);
print_date_nice(i, request->item.date_modification);
}
@@ -492,9 +488,8 @@ void item_tab_date_creation(Info & i)
{
if( item_index < request->item_tab.size() )
{
tm * ptm = &request->item_tab[item_index].date_creation;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
tm rtm = system->LocalTime(request->item_tab[item_index].date_creation);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
}
@@ -503,9 +498,8 @@ void item_tab_date_modification(Info & i)
{
if( item_index < request->item_tab.size() )
{
tm * ptm = &request->item_tab[item_index].date_modification;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
tm rtm = system->LocalTime(request->item_tab[item_index].date_modification);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
}
@@ -514,8 +508,7 @@ void item_tab_date_creation_nice(Info & i)
{
if( item_index < request->item_tab.size() )
{
tm * ptm = &request->item_tab[item_index].date_creation;
print_date_nice(i, ptm);
print_date_nice(i, request->item_tab[item_index].date_creation);
}
}
@@ -525,8 +518,7 @@ void item_tab_date_modification_nice(Info & i)
{
if( item_index < request->item_tab.size() )
{
tm * ptm = &request->item_tab[item_index].date_modification;
print_date_nice(i, ptm);
print_date_nice(i, request->item_tab[item_index].date_modification);
}
}

13
templates/misc.cpp
View File

@@ -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);
}

2
templates/misc.h
View File

@@ -24,7 +24,7 @@ namespace TemplatesFunctions
// table: [language][file]
typedef std::vector<std::vector<Ezc::Pattern> > Patterns;
void print_date_nice(Ezc::Info & i, const tm * ptm);
void print_date_nice(Ezc::Info & i, const tm & rtm);
void print_user_name(Ezc::Info & i, const User * puser, const std::string & guest_name);
int ParseCKeditorFun();

8
templates/stat.cpp
View File

@@ -71,15 +71,15 @@ void stat_item_privileges(Info & i)
void stat_item_date_creation(Info & i)
{
tm * ptm = &request->last_item->date_creation;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
tm rtm = system->LocalTime(request->last_item->date_creation);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void stat_item_date_modification(Info & i)
{
tm * ptm = &request->last_item->date_modification;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
tm rtm = system->LocalTime(request->last_item->date_modification);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}

2
templates/thread.cpp
View File

@@ -143,7 +143,7 @@ void thread_tab_last_item_date_modification_nice(Info & i)
{
if( thread_tab_index < functions->fun_thread.thread_tab.size() )
if( functions->fun_thread.thread_tab[thread_tab_index].last_item.id != -1 )
print_date_nice(i, &functions->fun_thread.thread_tab[thread_tab_index].last_item.date_modification);
print_date_nice(i, functions->fun_thread.thread_tab[thread_tab_index].last_item.date_modification);
}

6
templates/winix.cpp
View File

@@ -11,6 +11,7 @@
#include "templates.h"
#include "core/request.h"
#include "core/plugin.h"
#include "core/misc.h"
#include "functions/functions.h"
@@ -24,10 +25,9 @@ void winix_cur_time(Info & i)
{
static char buffer[100];
time_t t = time(0);
tm * ptm = localtime(&t);
tm rtm = Time(std::time(0));
sprintf(buffer, "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
sprintf(buffer, "%02d:%02d:%02d", rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
i.out << buffer;
}