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

Merge some work by Jens-Andre Koch

Browse Source 
Only his changes to the core are presented here.
Unfortunately, the skin itself looks ugly on Opera,
and simply doesn't work on Firefox...

Merge branch 'master' into znc-ation

Conflicts:
	modules/data/lastseen/tmpl/lastseen_WebadminUser.tmpl
	modules/data/webadmin/tmpl/settings.tmpl
This commit is contained in:
Alexey Sokolov
2012-04-10 23:10:36 +07:00
parent 84d9377a4a 9b6ea8251c
commit 3e458a98e4
38 changed files with 272 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/Modules.h
+2
View File
@@ -183,11 +183,13 @@ public:
CModInfo() {
m_fLoader = NULL;
m_bHasArgs = false;
}
CModInfo(const CString& sName, const CString& sPath, EModuleType eType) {
m_sName = sName;
m_sPath = sPath;
m_fLoader = NULL;
m_bHasArgs = false;
}
~CModInfo() {}
include/znc/main.h
+1 -1
View File
@@ -13,7 +13,7 @@
// The following defines are for #if comparison (preprocessor only likes ints)
#define VERSION_MAJOR 0
#define VERSION_MINOR 205
#define VERSION_MINOR 207
// This one is for display purpose
#define VERSION (VERSION_MAJOR + VERSION_MINOR / 1000.0)
include/znc/znc.h
+2 -2
View File
@@ -143,6 +143,8 @@ public:
// Listener yummy
CListener* FindListener(u_short uPort, const CString& BindHost, EAddrType eAddr);
bool AddListener(CListener*);
bool AddListener(unsigned int uPort, const CString& sBindHost, bool bSSL,
EAddrType eAddr, CListener::EAcceptType eAccept, CString& sError);
bool DelListener(CListener*);
// Message of the Day
@@ -178,8 +180,6 @@ private:
CString MakeConfigHeader();
bool AddListener(const CString& sLine, CString& sError);
bool AddListener(CConfig* pConfig, CString& sError);
bool AddListener(unsigned int uPort, const CString& sBindHost, bool bSSL,
EAddrType eAddr, CListener::EAcceptType eAccept, CString& sError);
protected:
time_t m_TimeStarted;