mirror of
https://github.com/znc/znc.git
synced 2026-05-01 02:52:30 +02:00
Merged rev 838,888,890,894,899,900,902-904,926,934,963,984-989 from crox's branch:
- Changes to specfile - define PATH_MAX and RTLD_LOCAL if not defines - compile fixes - SetFileName should not set m_iFD - check for cygwin and do not use -fPIC - replaced if ... elif with case in configure.in - handle 437 reply code - allow disabled channels - use strerror() in CIRCSock::SockError() - added GetUser() to CClient and CIRCSock - added support for traffic accounting - added names to timers git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@806 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
4
User.cpp
4
User.cpp
@@ -19,6 +19,8 @@ CUser::CUser(const CString& sUserName) {
|
||||
m_sIdent = m_sCleanUserName;
|
||||
m_sRealName = sUserName;
|
||||
m_uServerIdx = 0;
|
||||
m_uBytesRead = 0;
|
||||
m_uBytesWritten = 0;
|
||||
#ifdef _MODULES
|
||||
m_pModules = new CModules;
|
||||
#endif
|
||||
@@ -615,7 +617,7 @@ CChan* CUser::FindChan(const CString& sName) const {
|
||||
void CUser::JoinChans() {
|
||||
for (unsigned int a = 0; a < m_vChans.size(); a++) {
|
||||
CChan* pChan = m_vChans[a];
|
||||
if (!pChan->IsOn()) {
|
||||
if (!pChan->IsOn() && !pChan->IsDisabled()) {
|
||||
PutIRC("JOIN " + pChan->GetName() + " " + pChan->GetKey());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user