mirror of
https://github.com/znc/znc.git
synced 2026-08-08 18:03:22 +02:00
merge rev 962;965;972-975:
- increased select timeout to 0.5 secs (this should save CPU time) - added real-life ISpoof example to the example znc.conf - make away module ignore message from the user (fixes antiidle together with away) - show error message when webadmin cant bind to a port (improved later) - fix /me, it was turned into a CTCP - remove an extra space git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@802 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -484,6 +484,8 @@ private:
|
||||
|
||||
void AddMessage( time_t iTime, const CNick & Nick, CString & sMessage )
|
||||
{
|
||||
if (m_pUser && Nick.GetNick() == m_pUser->GetIRCNick().GetNick())
|
||||
return; // ignore messages from self
|
||||
AddMessage( CString( iTime ) + ":" + Nick.GetNickMask() + ":" + sMessage );
|
||||
}
|
||||
|
||||
|
||||
@@ -163,7 +163,12 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
return m_pManager->ListenHost(m_uPort, "WebAdmin::Listener", m_sListenHost, bSSL, SOMAXCONN, pListenSock, 0, bIPv6);
|
||||
bool b = m_pManager->ListenHost(m_uPort, "WebAdmin::Listener", m_sListenHost, bSSL, SOMAXCONN, pListenSock, 0, bIPv6);
|
||||
if (!b) {
|
||||
printf("\n"); // dont mix it up with the 'loading module' message
|
||||
CUtils::PrintMessage("Error: " + CString(strerror(errno)), true);
|
||||
}
|
||||
return b;
|
||||
}
|
||||
|
||||
void AddSock(CWebAdminSock* pSock) {
|
||||
|
||||
Reference in New Issue
Block a user