adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-08 09:52:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/znc/znc/pull/78 (TZ)

Browse Source 
Conflicts:
	modules/admin.cpp
	src/User.cpp
This commit is contained in:
Alexey Sokolov
2012-03-22 22:58:46 +07:00
parent e83efead26 355d5feb7a
commit f0cab46c3f
9 changed files with 89 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/listsockets.cpp
+1 -15
View File
@@ -155,7 +155,7 @@ public:
CString GetCreatedTime(Csock* pSocket) {
unsigned long long iStartTime = pSocket->GetStartTime();
time_t iTime = iStartTime / 1000;
return FormatTime("%Y-%m-%d %H:%M:%S", iTime);
return CUtils::FormatTime(iTime, "%Y-%m-%d %H:%M:%S", m_pUser->GetTimezone());
}
CString GetLocalHost(Csock* pSocket, bool bShowHosts) {
@@ -241,20 +241,6 @@ public:
virtual ~CListSockets() {
}
CString FormatTime(const CString& sFormat, time_t tm = 0) const {
char szTimestamp[1024];
if (tm == 0) {
tm = time(NULL);
}
// offset is in hours
tm += (time_t)(m_pUser->GetTimezoneOffset() * 60 * 60);
strftime(szTimestamp, sizeof(szTimestamp) / sizeof(char),
sFormat.c_str(), localtime(&tm));
return szTimestamp;
}
};
USERMODULEDEFS(CListSockets, "List active sockets")