m_spanningtree Remove unneeded #includes

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

diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index 541a56e5491c7116324ac74af8e4376766578aa0..7ed663b20061c902bd53577489428c3e95ef52dc 100644 (file)
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.cpp
@@ -23,15 +23,11 @@
 
 class ModuleServerBan : public Module
 {
- private:
  public:
-       ModuleServerBan()       {
-               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-       }
-
-       ~ModuleServerBan()
+       void init()
        {
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        Version GetVersion()
@@ -41,7 +37,7 @@ class ModuleServerBan : public Module
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               if (mask[0] == 's' && mask[1] == ':')
+               if ((mask.length() > 2) && (mask[0] == 's') && (mask[1] == ':'))
                {
                        if (InspIRCd::Match(user->server, mask.substr(2)))
                                return MOD_RES_DENY;
@@ -49,12 +45,10 @@ class ModuleServerBan : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens)
        {
-               ServerInstance->AddExtBanChar('s');
+               tokens["EXTBAN"].push_back('s');
        }
 };
 
-
 MODULE_INIT(ModuleServerBan)
-