iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge with rev 932 psychon branch:

Browse Source 
- module call for /me's
- timestamps for playback and query buffer
- WALLOP stuff / fix
- properly join channels _after_ namesx or uhnames were set up
- dont screw up raws on reconnect when you ran /lusers
- change default quit msg and version reply to CZNC::GetTag(false)
- change CZNC::GetTag() to point to sf.net
- kind of an rewrite for partyline, added fixed channels (this doesnt work on irssi,
		did it ever work?)
- add the timestamp support to webadmin too
- add ConnectDelay config option to avoid being killed because we connected too fast
- make znc handle usermodes correctly


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@799 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2007-05-16 22:13:17 +00:00
parent 6a6ae0ed94
commit f601db2cd8
19 changed files with 541 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
znc.cpp
View File

@@ -20,6 +20,7 @@ CZNC::CZNC() {
m_pModules = new CGlobalModules();
#endif
m_pISpoofLockFile = NULL;
m_uiConnectDelay = 30;
SetISpoofFormat(""); // Set ISpoofFormat to default
}
@@ -53,12 +54,12 @@ CZNC::~CZNC() {
CString CZNC::GetTag(bool bIncludeVersion) {
if (!bIncludeVersion) {
return "ZNC - by prozac@rottenboy.com";
return "ZNC by prozac - http://znc.sourceforge.net";
}
char szBuf[128];
memset(szBuf, 0, 128);
snprintf(szBuf, 127, "ZNC %1.3f - by prozac@rottenboy.com", VERSION);
snprintf(szBuf, 127, "ZNC %1.3f by prozac - http://znc.sourceforge.net", VERSION);
return szBuf;
}
@@ -82,6 +83,7 @@ bool CZNC::OnBoot() {
int CZNC::Loop() {
m_Manager.SetSelectTimeout(10000);
m_itUserIter = m_msUsers.begin();
time_t tNextConnect = 0;
while (true) {
// Check for users that need to be deleted
@@ -131,6 +133,10 @@ int CZNC::Loop() {
continue;
}
if (tNextConnect > time(NULL)) {
continue;
}
CString sSockName = "IRC::" + m_itUserIter->first;
CUser* pUser = m_itUserIter->second;
@@ -149,6 +155,8 @@ int CZNC::Loop() {
continue;
}
tNextConnect = time(NULL) + m_uiConnectDelay;
if(!WriteISpoof(pUser)) {
DEBUG_ONLY(cout << "ISpoof could not be written" << endl);
pUser->PutStatus("ISpoof could not be written, retrying...");
@@ -986,6 +994,23 @@ bool CZNC::ParseConfig(const CString& sConfig) {
} else if (sName.CaseCmp("Chan") == 0) {
pUser->AddChan(sValue, true);
continue;
} else if (sName.CaseCmp("TimestampFormat") == 0) {
pUser->SetTimestampFormat(sValue);
continue;
} else if (sName.CaseCmp("AppendTimestamp") == 0) {
pUser->SetTimestampAppend(sValue.ToBool());
continue;
} else if (sName.CaseCmp("Timestamp") == 0) {
if(sValue.Trim_n().CaseCmp("true") != 0) {
if(sValue.Trim_n().CaseCmp("append") == 0) {
pUser->SetTimestampAppend(true);
} else if(sValue.Trim_n().CaseCmp("false") == 0) {
pUser->SetTimestampFormat("");
} else {
pUser->SetTimestampFormat(sValue);
}
}
continue;
} else if (sName.CaseCmp("LoadModule") == 0) {
CString sModName = sValue.Token(0);
CUtils::PrintAction("Loading Module [" + sModName + "]");
@@ -1140,6 +1165,9 @@ bool CZNC::ParseConfig(const CString& sConfig) {
} else if (sName.CaseCmp("StatusPrefix") == 0) {
m_sStatusPrefix = sValue;
continue;
} else if (sName.CaseCmp("ConnectDelay") == 0) {
m_uiConnectDelay = sValue.ToUInt();
continue;
}
}
}
@@ -1159,6 +1187,8 @@ bool CZNC::ParseConfig(const CString& sConfig) {
return false;
}
GetModules().OnFinishedConfig();
return true;
}