mirror of
https://github.com/znc/znc.git
synced 2026-08-08 01:43:03 +02:00
Added flag to CChan to tell whether chan is in the config or not
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@427 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
+1
-1
@@ -442,7 +442,7 @@ void CIRCSock::ReadLine(const CString& sData) {
|
||||
}
|
||||
|
||||
if (sNick.CaseCmp(GetNick()) == 0) {
|
||||
m_pUser->AddChan(sChan);
|
||||
m_pUser->AddChan(sChan, false);
|
||||
}
|
||||
|
||||
CChan* pChan = m_pUser->FindChan(sChan);
|
||||
|
||||
+6
-2
@@ -246,7 +246,11 @@ bool CAdminSock::UserPage(CString& sPageRet, CUser* pUser) {
|
||||
|
||||
const vector<CChan*>& vChans = pUser->GetChans();
|
||||
for (unsigned int b = 0; b < vChans.size(); b++) {
|
||||
sChans += vChans[b]->GetName() + "\r\n";
|
||||
CChan* pChan = vChans[b];
|
||||
|
||||
if (pChan->InConfig()) {
|
||||
sChans += vChans[b]->GetName() + "\r\n";
|
||||
}
|
||||
}
|
||||
const MCString& msCTCPReplies = pUser->GetCTCPReplies();
|
||||
for (MCString::const_iterator it2 = msCTCPReplies.begin(); it2 != msCTCPReplies.end(); it2++) {
|
||||
@@ -446,7 +450,7 @@ CUser* CAdminSock::GetNewUser(CString& sPageRet) {
|
||||
GetParam("channels").Split("\n", vsArgs);
|
||||
|
||||
for (a = 0; a < vsArgs.size(); a++) {
|
||||
pNewUser->AddChan(vsArgs[a].TrimRight_n("\r"));
|
||||
pNewUser->AddChan(vsArgs[a].TrimRight_n("\r"), true);
|
||||
}
|
||||
|
||||
return pNewUser;
|
||||
|
||||
@@ -50,7 +50,7 @@ public:
|
||||
{
|
||||
if ( !m_pUser->FindChan( it->first ) )
|
||||
{
|
||||
CChan *pChan = new CChan( it->first, m_pUser );
|
||||
CChan *pChan = new CChan( it->first, m_pUser, true );
|
||||
if ( !it->second.empty() )
|
||||
pChan->SetKey( it->second );
|
||||
m_pUser->AddChan( pChan );
|
||||
|
||||
@@ -690,7 +690,7 @@ bool CZNC::ParseConfig(const CString& sConfig) {
|
||||
return false;
|
||||
}
|
||||
|
||||
pChan = new CChan(sValue, pUser);
|
||||
pChan = new CChan(sValue, pUser, true);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -800,7 +800,7 @@ bool CZNC::ParseConfig(const CString& sConfig) {
|
||||
CUtils::PrintStatus(pUser->AddServer(sValue));
|
||||
continue;
|
||||
} else if (sName.CaseCmp("Chan") == 0) {
|
||||
pUser->AddChan(sValue);
|
||||
pUser->AddChan(sValue, true);
|
||||
continue;
|
||||
} else if (sName.CaseCmp("LoadModule") == 0) {
|
||||
CString sModName = sValue.Token(0);
|
||||
|
||||
Reference in New Issue
Block a user