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

Revert r1738-1742

Browse Source 
This broke webadmin, changed CString::Token()'s behavior possibly breaking a lot
of stuff just before a release and added an unused config entry.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1748 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-02-08 13:49:44 +00:00
parent 7bb6c2ad7a
commit 702faeeed5
8 changed files with 28 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
znc.cpp
-29
View File
@@ -575,11 +575,6 @@ bool CZNC::WriteConfig() {
if (!m_sPidFile.empty()) {
m_LockFile.Write("PidFile = " + m_sPidFile.FirstLine() + "\n");
}
if (!m_sSkinName.empty()) {
m_LockFile.Write("Skin = " + m_sSkinName.FirstLine() + "\n");
}
if (!m_sStatusPrefix.empty()) {
m_LockFile.Write("StatusPrefix = " + m_sStatusPrefix.FirstLine() + "\n");
}
@@ -1423,9 +1418,6 @@ bool CZNC::DoRehash(CString& sError)
} else if (sName.Equals("MaxJoins")) {
pUser->SetMaxJoins(sValue.ToUInt());
continue;
} else if (sName.Equals("Skin")) {
pUser->SetSkinName(sValue);
continue;
} else if (sName.Equals("LoadModule")) {
CString sModName = sValue.Token(0);
CUtils::PrintAction("Loading Module [" + sModName + "]");
@@ -1578,9 +1570,6 @@ bool CZNC::DoRehash(CString& sError)
} else if (sName.Equals("PidFile")) {
m_sPidFile = sValue;
continue;
} else if (sName.Equals("Skin")) {
SetSkinName(sValue);
continue;
} else if (sName.Equals("StatusPrefix")) {
m_sStatusPrefix = sValue;
continue;
@@ -1762,24 +1751,6 @@ void CZNC::Broadcast(const CString& sMessage, bool bAdminOnly,
}
}
CModule* CZNC::FindModule(const CString& sModName, const CString& sUsername) {
if (sUsername.empty()) {
return CZNC::Get().GetModules().FindModule(sModName);
}
CUser* pUser = FindUser(sUsername);
return (!pUser) ? NULL : pUser->GetModules().FindModule(sModName);
}
CModule* CZNC::FindModule(const CString& sModName, CUser* pUser) {
if (pUser) {
return pUser->GetModules().FindModule(sModName);
}
return CZNC::Get().GetModules().FindModule(sModName);
}
CUser* CZNC::FindUser(const CString& sUsername) {
map<CString,CUser*>::iterator it = m_msUsers.find(sUsername);