summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-08-05 11:30:01 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-08-05 11:30:01 +0000
commit4233ad22c0cc94c45f877b75dd964e4b7f82c516 (patch)
tree9f77e0f650d4f5d13d2c1f3e8edd86e25f4428c9
parent1913c07c2eda9c946850dfd2ebafa498ed8b2970 (diff)
Use correct method for adding extban type in m_gecosban, add 005 notification of C extban too
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10089 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/m_gecosban.cpp5
-rw-r--r--src/modules/m_noctcp.cpp22
2 files changed, 14 insertions, 13 deletions
diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index 614320623..a59508e06 100644
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -54,10 +54,7 @@ class ModuleGecosBan : public Module
virtual void On005Numeric(std::string &output)
{
- if (output.find(" EXTBAN=:") == std::string::npos)
- output.append(" EXTBAN=:r");
- else
- output.insert(output.find(" EXTBAN=:") + 9, "r");
+ ServerInstance->AddExtBanChar('r');
}
};
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index e2bc82151..3eb0bfd81 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -57,10 +57,20 @@ class ModuleNoCTCP : public Module
nc = new NoCTCP(ServerInstance);
if (!ServerInstance->Modes->AddMode(nc))
throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
+ Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
ServerInstance->Modules->Attach(eventlist, this, 2);
}
+ virtual ~ModuleNoCTCP()
+ {
+ ServerInstance->Modes->DelMode(nc);
+ delete nc;
+ }
+
+ virtual Version GetVersion()
+ {
+ return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ }
virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
@@ -93,15 +103,9 @@ class ModuleNoCTCP : public Module
return 0;
}
- virtual ~ModuleNoCTCP()
+ virtual void On005Numeric(std::string &output)
{
- ServerInstance->Modes->DelMode(nc);
- delete nc;
- }
-
- virtual Version GetVersion()
- {
- return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ ServerInstance->AddExtBanChar('C');
}
};