From 02beef2e07d7024a1b9de3c22872c2ec146e6ad9 Mon Sep 17 00:00:00 2001 From: psychon Date: Sat, 30 Aug 2008 09:00:21 +0000 Subject: [PATCH] Use znc.in instead of znc.com No cookie for that domain catcher at znc.com! git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1181 726aef4b-f618-498e-8847-2d620e286838 --- Chan.cpp | 4 ++-- Client.cpp | 18 +++++++++--------- Modules.h | 10 +++++----- User.cpp | 4 ++-- modules/modperl.pm | 4 ++-- modules/partyline.cpp | 12 ++++++------ modules/savebuff.cpp | 6 +++--- modules/schat.cpp | 2 +- modules/watch.cpp | 4 ++-- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Chan.cpp b/Chan.cpp index f5805ba1..a87fefca 100644 --- a/Chan.cpp +++ b/Chan.cpp @@ -585,7 +585,7 @@ void CChan::SendBuffer(CClient* pClient) { const vector& vsBuffer = GetBuffer(); if (vsBuffer.size()) { - m_pUser->PutUser(":***!znc@znc.com PRIVMSG " + GetName() + " :Buffer Playback...", pClient); + m_pUser->PutUser(":***!znc@znc.in PRIVMSG " + GetName() + " :Buffer Playback...", pClient); for (unsigned int a = 0; a < vsBuffer.size(); a++) { m_pUser->PutUser(vsBuffer[a], pClient); @@ -595,7 +595,7 @@ void CChan::SendBuffer(CClient* pClient) { ClearBuffer(); } - m_pUser->PutUser(":***!znc@znc.com PRIVMSG " + GetName() + " :Playback Complete.", pClient); + m_pUser->PutUser(":***!znc@znc.in PRIVMSG " + GetName() + " :Playback Complete.", pClient); } } } diff --git a/Client.cpp b/Client.cpp index 70124aa0..98f3ebc8 100644 --- a/Client.cpp +++ b/Client.cpp @@ -132,7 +132,7 @@ void CClient::ReadLine(const CString& sData) { if ((m_bGotPass) && (m_bGotNick)) { AuthUser(); } else if (!m_bGotPass) { - PutClient(":irc.znc.com NOTICE AUTH :*** " + PutClient(":irc.znc.in NOTICE AUTH :*** " "You need to send your password. " "Try /quote PASS :"); } @@ -174,7 +174,7 @@ void CClient::ReadLine(const CString& sData) { // If the client meant to ping us or we can be sure the server // won't answer the ping (=no server connected) -> PONG back. // else: It's the server's job to send a PONG. - if (sTarget.CaseCmp("irc.znc.com") == 0 || !m_pIRCSock) { + if (sTarget.CaseCmp("irc.znc.in") == 0 || !m_pIRCSock) { PutClient("PONG " + sLine.substr(5)); return; } @@ -441,7 +441,7 @@ void CClient::ReadLine(const CString& sData) { // Need to lookup the connection by port, filter the port, and forward to the user if (strncasecmp(sTarget.c_str(), m_pUser->GetStatusPrefix().c_str(), m_pUser->GetStatusPrefix().length()) == 0) { if ((m_pUser) && (m_pUser->ResumeFile(uResumePort, uResumeSize))) { - PutClient(":" + sTarget + "!znc@znc.com PRIVMSG " + GetNick() + " :\001DCC ACCEPT " + sFile + " " + CString(uResumePort) + " " + CString(uResumeSize) + "\001"); + PutClient(":" + sTarget + "!znc@znc.in PRIVMSG " + GetNick() + " :\001DCC ACCEPT " + sFile + " " + CString(uResumePort) + " " + CString(uResumeSize) + "\001"); } else { PutStatus("DCC -> [" + GetNick() + "][" + sFile + "] Unable to find send to initiate resume."); } @@ -648,7 +648,7 @@ void CClient::RefuseLogin(const CString& sReason) { } PutStatus("Bad username and/or password."); - PutClient(":irc.znc.com 464 " + GetNick() + " :" + sReason); + PutClient(":irc.znc.in 464 " + GetNick() + " :" + sReason); Close(); } @@ -748,8 +748,8 @@ void CClient::PutModNotice(const CString& sModule, const CString& sLine) { return; } - DEBUG_ONLY(cout << "(" << m_pUser->GetUserName() << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.com NOTICE " << GetNick() << " :" << sLine << "]" << endl); - Write(":" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.com NOTICE " + GetNick() + " :" + sLine + "\r\n"); + DEBUG_ONLY(cout << "(" << m_pUser->GetUserName() << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in NOTICE " << GetNick() << " :" << sLine << "]" << endl); + Write(":" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in NOTICE " + GetNick() + " :" + sLine + "\r\n"); } void CClient::PutModule(const CString& sModule, const CString& sLine) { @@ -757,8 +757,8 @@ void CClient::PutModule(const CString& sModule, const CString& sLine) { return; } - DEBUG_ONLY(cout << "(" << m_pUser->GetUserName() << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.com PRIVMSG " << GetNick() << " :" << sLine << "]" << endl); - Write(":" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.com PRIVMSG " + GetNick() + " :" + sLine + "\r\n"); + DEBUG_ONLY(cout << "(" << m_pUser->GetUserName() << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in PRIVMSG " << GetNick() << " :" << sLine << "]" << endl); + Write(":" + m_pUser->GetStatusPrefix() + ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in PRIVMSG " + GetNick() + " :" + sLine + "\r\n"); } CString CClient::GetNick(bool bAllowIRCNick) const { @@ -778,7 +778,7 @@ CString CClient::GetNickMask() const { CString sHost = m_pUser->GetVHost(); if (sHost.empty()) { - sHost = "irc.znc.com"; + sHost = "irc.znc.in"; } return GetNick() + "!" + m_pUser->GetIdent() + "@" + sHost; diff --git a/Modules.h b/Modules.h index 6e5d94f5..5bac94c7 100644 --- a/Modules.h +++ b/Modules.h @@ -144,8 +144,8 @@ public: virtual bool PutIRC(const CString& sLine); virtual bool PutUser(const CString& sLine); virtual bool PutStatus(const CString& sLine); - virtual bool PutModule(const CString& sLine, const CString& sIdent = "", const CString& sHost = "znc.com"); - virtual bool PutModNotice(const CString& sLine, const CString& sIdent = "", const CString& sHost = "znc.com"); + virtual bool PutModule(const CString& sLine, const CString& sIdent = "", const CString& sHost = "znc.in"); + virtual bool PutModNotice(const CString& sLine, const CString& sIdent = "", const CString& sHost = "znc.in"); // Setters void SetModule(CModule* p); @@ -282,9 +282,9 @@ public: virtual bool PutIRC(const CString& sLine); virtual bool PutUser(const CString& sLine); virtual bool PutStatus(const CString& sLine); - virtual bool PutModule(const CString& sLine, const CString& sIdent = "", const CString& sHost = "znc.com"); - virtual unsigned int PutModule(const CTable& table, const CString& sIdent = "", const CString& sHost = "znc.com"); - virtual bool PutModNotice(const CString& sLine, const CString& sIdent = "", const CString& sHost = "znc.com"); + virtual bool PutModule(const CString& sLine, const CString& sIdent = "", const CString& sHost = "znc.in"); + virtual unsigned int PutModule(const CTable& table, const CString& sIdent = "", const CString& sHost = "znc.in"); + virtual bool PutModNotice(const CString& sLine, const CString& sIdent = "", const CString& sHost = "znc.in"); const CString& GetModName() const { return m_sModName; } // This is where constant module data (e.g. webadmin skins) are saved diff --git a/User.cpp b/User.cpp index af5f974e..89fe1151 100644 --- a/User.cpp +++ b/User.cpp @@ -204,7 +204,7 @@ void CUser::UserConnected(CClient* pClient) { m_vClients.push_back(pClient); if (m_RawBuffer.IsEmpty()) { - pClient->PutClient(":irc.znc.com 001 " + pClient->GetNick() + " :- Welcome to ZNC -"); + pClient->PutClient(":irc.znc.in 001 " + pClient->GetNick() + " :- Welcome to ZNC -"); } else { unsigned int uIdx = 0; CString sLine; @@ -949,7 +949,7 @@ bool CUser::SendFile(const CString& sRemoteNick, const CString& sFileName, const unsigned short uPort = CZNC::Get().GetManager().ListenRand("DCC::LISTEN::" + sRemoteNick, GetLocalIP(), false, SOMAXCONN, pSock, 120); if (GetNick().CaseCmp(sRemoteNick) == 0) { - PutUser(":" + GetStatusPrefix() + "status!znc@znc.com PRIVMSG " + sRemoteNick + " :\001DCC SEND " + pFile->GetShortName() + " " + CString(CUtils::GetLongIP(GetLocalIP())) + " " + PutUser(":" + GetStatusPrefix() + "status!znc@znc.in PRIVMSG " + sRemoteNick + " :\001DCC SEND " + pFile->GetShortName() + " " + CString(CUtils::GetLongIP(GetLocalIP())) + " " + CString(uPort) + " " + CString(pFile->GetSize()) + "\001"); } else { PutIRC("PRIVMSG " + sRemoteNick + " :\001DCC SEND " + pFile->GetShortName() + " " + CString(CUtils::GetLongIP(GetLocalIP())) + " " diff --git a/modules/modperl.pm b/modules/modperl.pm index 580246ba..9403fdb5 100644 --- a/modules/modperl.pm +++ b/modules/modperl.pm @@ -249,7 +249,7 @@ sub PutModule } if ( !$host ) { - $host = "znc.com"; + $host = "znc.in"; } COREPutModule( "Module", $line, $ident, $host ); @@ -265,7 +265,7 @@ sub PutModNotice } if ( !$host ) { - $host = "znc.com"; + $host = "znc.in"; } COREPutModule( "ModNotice", $line, $ident, $host ); diff --git a/modules/partyline.cpp b/modules/partyline.cpp index fdb77b62..5437c2a2 100644 --- a/modules/partyline.cpp +++ b/modules/partyline.cpp @@ -181,7 +181,7 @@ public: sHost = m_pUser->GetIRCNick().GetHost(); } if (sHost.empty()) { - sHost = "znc.com"; + sHost = "znc.in"; } PutChan(ssNicks, ":?" + sNick + "!" + m_pUser->GetIdent() + "@" + sHost + " JOIN " + *a, false); pChannel->AddNick(sNick); @@ -240,19 +240,19 @@ public: PutChan(ssNicks, ":" + m_pUser->GetIRCNick().GetNickMask() + " TOPIC " + sChannel + " :" + sTopic); pChannel->SetTopic(sTopic); } else { - m_pUser->PutUser(":irc.znc.com 482 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :You're not channel operator"); + m_pUser->PutUser(":irc.znc.in 482 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :You're not channel operator"); } } else { sTopic = pChannel->GetTopic(); if (sTopic.empty()) { - m_pUser->PutUser(":irc.znc.com 331 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :No topic is set."); + m_pUser->PutUser(":irc.znc.in 331 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :No topic is set."); } else { - m_pUser->PutUser(":irc.znc.com 332 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :" + sTopic); + m_pUser->PutUser(":irc.znc.in 332 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :" + sTopic); } } } else { - m_pUser->PutUser(":irc.znc.com 442 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :You're not on that channel"); + m_pUser->PutUser(":irc.znc.in 442 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :You're not on that channel"); } return HALT; } @@ -546,7 +546,7 @@ public: if (!sServer.empty()) return sServer; - return "irc.znc.com"; + return "irc.znc.in"; } bool PutChan(const CString& sChan, const CString& sLine, bool bIncludeCurUser = true, bool bIncludeClient = true, CUser* pUser = NULL, CClient* pClient = NULL) { diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp index f8006d78..70dd2657 100644 --- a/modules/savebuff.cpp +++ b/modules/savebuff.cpp @@ -204,7 +204,7 @@ public: void Replay(const CString & sChan) { CString sFile; - PutUser(":***!znc@znc.com PRIVMSG " + sChan + " :Buffer Playback..."); + PutUser(":***!znc@znc.in PRIVMSG " + sChan + " :Buffer Playback..."); if (DecryptChannel(sChan, sFile)) { CString sLine; @@ -215,7 +215,7 @@ public: PutUser(sLine); } } - PutUser(":***!znc@znc.com PRIVMSG " + sChan + " :Playback Complete."); + PutUser(":***!znc@znc.in PRIVMSG " + sChan + " :Playback Complete."); } CString GetPath(const CString & sChannel) @@ -228,7 +228,7 @@ public: CString SpoofChanMsg(const CString & sChannel, const CString & sMesg) { - CString sReturn = ":*" + GetModName() + "!znc@znc.com PRIVMSG " + sChannel + " :" + CString(time(NULL)) + " " + sMesg; + CString sReturn = ":*" + GetModName() + "!znc@znc.in PRIVMSG " + sChannel + " :" + CString(time(NULL)) + " " + sMesg; return(sReturn); } diff --git a/modules/schat.cpp b/modules/schat.cpp index effca58c..eebda554 100644 --- a/modules/schat.cpp +++ b/modules/schat.cpp @@ -439,7 +439,7 @@ public: void SendToUser(const CString & sFrom, const CString & sText) { - //:*schat!znc@znc.com PRIVMSG Jim : + //:*schat!znc@znc.in PRIVMSG Jim : CString sSend = ":" + sFrom + " PRIVMSG " + m_pUser->GetCurNick() + " :" + sText; PutUser(sSend); } diff --git a/modules/watch.cpp b/modules/watch.cpp index e5ba799a..db19ba8d 100644 --- a/modules/watch.cpp +++ b/modules/watch.cpp @@ -280,9 +280,9 @@ private: if (WatchEntry.IsMatch(Nick, sMessage, sSource)) { if (m_pUser->IsUserAttached()) { - m_pUser->PutUser(":" + WatchEntry.GetTarget() + "!watch@znc.com PRIVMSG " + m_pUser->GetCurNick() + " :" + sMessage); + m_pUser->PutUser(":" + WatchEntry.GetTarget() + "!watch@znc.in PRIVMSG " + m_pUser->GetCurNick() + " :" + sMessage); } else { - m_Buffer.AddLine(":" + WatchEntry.GetTarget() + "!watch@znc.com PRIVMSG ", " :" + sMessage); + m_Buffer.AddLine(":" + WatchEntry.GetTarget() + "!watch@znc.in PRIVMSG ", " :" + sMessage); } } }