m_spanningtree Remove unneeded #includes

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 5b92c8a2666d82d28ac660fbf4b699113500dca7..bdd47b4bc8f0764b0563bb3c300ad7283142eee4 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -25,7 +25,7 @@
 /* $ModDesc: Provides support for ircu-style services accounts, including chmode +R, etc. */
 
 #include "inspircd.h"
-#include "account.h"
+#include "modules/account.h"
 
 /** Channel mode +r - mark a channel as identified
  */
@@ -120,22 +120,18 @@ class ModuleServicesAccount : public Module
 
        void init()
        {
-               ServerInstance->Modules->AddService(m1);
-               ServerInstance->Modules->AddService(m2);
-               ServerInstance->Modules->AddService(m3);
-               ServerInstance->Modules->AddService(m4);
-               ServerInstance->Modules->AddService(m5);
-               ServerInstance->Modules->AddService(accountname);
+               ServiceProvider* providerlist[] = { &m1, &m2, &m3, &m4, &m5, &accountname };
+               ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
                Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
                        I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick, I_OnSetConnectClass };
 
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       void On005Numeric(std::string &t)
+       void On005Numeric(std::map<std::string, std::string>& tokens)
        {
-               ServerInstance->AddExtBanChar('R');
-               ServerInstance->AddExtBanChar('U');
+               tokens["EXTBAN"].push_back('R');
+               tokens["EXTBAN"].push_back('U');
        }
 
        /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
@@ -249,7 +245,7 @@ class ModuleServicesAccount : public Module
                return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
        }
 
-       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
        {
                if (!IS_LOCAL(user))
                        return MOD_RES_PASSTHRU;
@@ -323,3 +319,4 @@ class ModuleServicesAccount : public Module
 };
 
 MODULE_INIT(ModuleServicesAccount)
+