mirror of
https://github.com/znc/znc.git
synced 2026-05-03 20:12:29 +02:00
Renamed CClient::PutServ() to CClient::PutClient()
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@583 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -99,7 +99,7 @@ void CIRCSock::ReadLine(const CString& sData) {
|
||||
|
||||
if (sClientNick.CaseCmp(sNick) != 0) {
|
||||
// If they connected with a nick that doesn't match the one we got on irc, then we need to update them
|
||||
pClient->PutServ(":" + sClientNick + "!" + m_Nick.GetIdent() + "@" + m_Nick.GetHost() + " NICK :" + sNick);
|
||||
pClient->PutClient(":" + sClientNick + "!" + m_Nick.GetIdent() + "@" + m_Nick.GetHost() + " NICK :" + sNick);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
10
User.cpp
10
User.cpp
@@ -105,13 +105,13 @@ void CUser::UserConnected(CClient* pClient) {
|
||||
StartBackNickTimer();
|
||||
|
||||
if (m_RawBuffer.IsEmpty()) {
|
||||
pClient->PutServ(":irc.znc.com 001 " + pClient->GetNick() + " :- Welcome to ZNC -");
|
||||
pClient->PutClient(":irc.znc.com 001 " + pClient->GetNick() + " :- Welcome to ZNC -");
|
||||
} else {
|
||||
unsigned int uIdx = 0;
|
||||
CString sLine;
|
||||
|
||||
while (m_RawBuffer.GetLine(GetIRCNick().GetNick(), sLine, uIdx++)) {
|
||||
pClient->PutServ(sLine);
|
||||
pClient->PutClient(sLine);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -123,7 +123,7 @@ void CUser::UserConnected(CClient* pClient) {
|
||||
CString sLine;
|
||||
|
||||
while (m_MotdBuffer.GetLine(GetIRCNick().GetNick(), sLine, uIdx++)) {
|
||||
pClient->PutServ(sLine);
|
||||
pClient->PutClient(sLine);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ void CUser::UserConnected(CClient* pClient) {
|
||||
|
||||
CString sBufLine;
|
||||
while (m_QueryBuffer.GetNextLine(GetIRCNick().GetNick(), sBufLine)) {
|
||||
pClient->PutServ(sBufLine);
|
||||
pClient->PutClient(sBufLine);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -722,7 +722,7 @@ bool CUser::PutIRC(const CString& sLine) {
|
||||
bool CUser::PutUser(const CString& sLine, CClient* pClient, CClient* pSkipClient) {
|
||||
for (unsigned int a = 0; a < m_vClients.size(); a++) {
|
||||
if ((!pClient || pClient == m_vClients[a]) && pSkipClient != m_vClients[a]) {
|
||||
m_vClients[a]->PutServ(sLine);
|
||||
m_vClients[a]->PutClient(sLine);
|
||||
|
||||
if (pClient) {
|
||||
return true;
|
||||
|
||||
@@ -52,14 +52,14 @@ public:
|
||||
|
||||
virtual void OnUserAttached() {
|
||||
if (m_spInjectedPrefixes.find(m_pUser) == m_spInjectedPrefixes.end()) {
|
||||
m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 005 " + m_pUser->GetIRCNick().GetNick() + " CHANTYPES=" + m_pUser->GetChanPrefixes() + "~ :are supported by this server.");
|
||||
m_pClient->PutClient(":" + m_pUser->GetIRCServer() + " 005 " + m_pUser->GetIRCNick().GetNick() + " CHANTYPES=" + m_pUser->GetChanPrefixes() + "~ :are supported by this server.");
|
||||
}
|
||||
|
||||
for (map<CString, set<CString> >::iterator it = m_msChans.begin(); it != m_msChans.end(); it++) {
|
||||
set<CString>& ssNicks = it->second;
|
||||
|
||||
if (ssNicks.find(m_pUser->GetUserName()) != ssNicks.end()) {
|
||||
m_pClient->PutServ(":" + m_pUser->GetIRCNick().GetNickMask() + " JOIN " + it->first);
|
||||
m_pClient->PutClient(":" + m_pUser->GetIRCNick().GetNickMask() + " JOIN " + it->first);
|
||||
SendNickList(ssNicks, it->first);
|
||||
PutChan(ssNicks, ":*" + GetModName() + "!znc@rottenboy.com MODE " + it->first + " +" + CString(m_pUser->IsAdmin() ? "o" : "v") + " ?" + m_pUser->GetUserName(), true);
|
||||
}
|
||||
@@ -94,7 +94,7 @@ public:
|
||||
}
|
||||
|
||||
if (sChannel.Left(2) != "~#") {
|
||||
m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :No such channel");
|
||||
m_pClient->PutClient(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :No such channel");
|
||||
return HALT;
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ public:
|
||||
}
|
||||
|
||||
if (sChannel.Left(2) != "~#") {
|
||||
m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :Channels look like ~#znc");
|
||||
m_pClient->PutClient(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :Channels look like ~#znc");
|
||||
return HALT;
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@ public:
|
||||
|
||||
if (cPrefix == '~') {
|
||||
if (m_msChans.find(sTarget.AsLower()) == m_msChans.end()) {
|
||||
m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sTarget + " :No such channel");
|
||||
m_pClient->PutClient(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sTarget + " :No such channel");
|
||||
return HALT;
|
||||
}
|
||||
|
||||
@@ -186,7 +186,7 @@ public:
|
||||
if (pUser) {
|
||||
pUser->PutUser(":?" + m_pUser->GetUserName() + "!" + m_pUser->GetIdent() + "@" + sHost + " PRIVMSG " + pUser->GetIRCNick().GetNick() + " :" + sMessage);
|
||||
} else {
|
||||
m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sTarget + " :No such znc user: " + sNick + "");
|
||||
m_pClient->PutClient(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sTarget + " :No such znc user: " + sNick + "");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user