Force to uuid on applying a qline, rather than disconnecting

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index e801543fb4df90f49a1b8504a6f0930d7d3a3656..66f93e9d7abb73f71be98dcf9183308fd520b601 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -175,16 +175,8 @@ void               Module::ProtoSendMetaData(void*, int, void*, const std::string&, const std
 void           Module::OnWallops(User*, const std::string&) { }
 void           Module::OnChangeHost(User*, const std::string&) { }
 void           Module::OnChangeName(User*, const std::string&) { }
-void           Module::OnAddGLine(long, User*, const std::string&, const std::string&) { }
-void           Module::OnAddZLine(long, User*, const std::string&, const std::string&) { }
-void           Module::OnAddKLine(long, User*, const std::string&, const std::string&) { }
-void           Module::OnAddQLine(long, User*, const std::string&, const std::string&) { }
-void           Module::OnAddELine(long, User*, const std::string&, const std::string&) { }
-void           Module::OnDelGLine(User*, const std::string&) { }
-void           Module::OnDelZLine(User*, const std::string&) { }
-void           Module::OnDelKLine(User*, const std::string&) { }
-void           Module::OnDelQLine(User*, const std::string&) { }
-void           Module::OnDelELine(User*, const std::string&) { }
+void           Module::OnAddLine(User*, XLine*) { }
+void           Module::OnDelLine(User*, XLine*) { }
 void           Module::OnCleanup(int, void*) { }
 void           Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; }
 void           Module::OnChannelDelete(Channel*) { }
@@ -196,6 +188,7 @@ int         Module::OnWhoisLine(User*, User*, int&, std::string&) { return 0; }
 void           Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, const std::string&) { }
 void           Module::OnGarbageCollect() { }
 void           Module::OnBufferFlushed(User*) { }
+void           Module::OnText(User*, void*, int, const std::string&, char, CUList&) { }
 
 
 ModuleManager::ModuleManager(InspIRCd* Ins)
@@ -845,60 +838,6 @@ bool InspIRCd::AddResolver(Resolver* r, bool cached)
        }
 }
 
-void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
-{
-       XLines->add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-       XLines->apply_lines(APPLY_GLINES);
-}
-
-void InspIRCd::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname)
-{
-       XLines->add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
-       XLines->apply_lines(APPLY_QLINES);
-}
-
-void InspIRCd::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr)
-{
-       XLines->add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
-       XLines->apply_lines(APPLY_ZLINES);
-}
-
-void InspIRCd::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
-{
-       XLines->add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-       XLines->apply_lines(APPLY_KLINES);
-}
-
-void InspIRCd::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
-{
-       XLines->add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-}
-
-bool InspIRCd::DelGLine(const std::string &hostmask)
-{
-       return XLines->del_gline(hostmask.c_str());
-}
-
-bool InspIRCd::DelQLine(const std::string &nickname)
-{
-       return XLines->del_qline(nickname.c_str());
-}
-
-bool InspIRCd::DelZLine(const std::string &ipaddr)
-{
-       return XLines->del_zline(ipaddr.c_str());
-}
-
-bool InspIRCd::DelKLine(const std::string &hostmask)
-{
-       return XLines->del_kline(hostmask.c_str());
-}
-
-bool InspIRCd::DelELine(const std::string &hostmask)
-{
-       return XLines->del_eline(hostmask.c_str());
-}
-
 Module* ModuleManager::Find(const std::string &name)
 {
        for (int i = 0; i <= this->GetCount(); i++)