MetaData rework

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

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 452f1539a9c26c6b35bcb26e932bb9ed5b6303ae..11bd32c8a03cdf484c975a0701a855829f50087f 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -156,25 +156,23 @@ class CommandCBan : public Command
 
 class ModuleCBan : public Module
 {
-       CommandCBan* mycommand;
-       CBanFactory *f;
+       CommandCBan mycommand;
+       CBanFactory f;
 
  public:
-       ModuleCBan(InspIRCd* Me) : Module(Me)
+       ModuleCBan(InspIRCd* Me) : Module(Me), mycommand(Me), f(Me)
        {
-               f = new CBanFactory(ServerInstance);
-               ServerInstance->XLines->RegisterFactory(f);
+               ServerInstance->XLines->RegisterFactory(&f);
 
-               mycommand = new CommandCBan(Me);
-               ServerInstance->AddCommand(mycommand);
-               Implementation eventlist[] = { I_OnUserPreJoin, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnStats };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               ServerInstance->AddCommand(&mycommand);
+               Implementation eventlist[] = { I_OnUserPreJoin, I_OnStats };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleCBan()
        {
                ServerInstance->XLines->DelAll("CBAN");
-               ServerInstance->XLines->UnregisterFactory(f);
+               ServerInstance->XLines->UnregisterFactory(&f);
        }
 
        virtual int OnStats(char symbol, User* user, string_list &out)
@@ -194,7 +192,7 @@ class ModuleCBan : public Module
                {
                        // Channel is banned.
                        user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason);
-                       ServerInstance->SNO->WriteToSnoMask('A', "%s tried to join %s which is CBANed (%s)", user->nick.c_str(), cname, rl->reason);
+                       ServerInstance->SNO->WriteToSnoMask('a', "%s tried to join %s which is CBANed (%s)", user->nick.c_str(), cname, rl->reason);
                        ServerInstance->PI->SendSNONotice("A", user->nick + " tried to join " + std::string(cname) + " which is CBANed (" + std::string(rl->reason) + ")");
                        return 1;
                }