Some more to fix still, modules probably wont load correctly atm

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

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 5576fd3f9afdbd9f6860eb07a0094052838d80cd..f0f98ea004b8a357903d2f7570bc30fccd240d0f 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
@@ -47,6 +44,8 @@ class ModuleOperjoin : public Module
                ModuleOperjoin(InspIRCd* Me) : Module(Me)
                {
                        OnRehash(NULL, "");
+               Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
                void Implements(char* List)
@@ -54,7 +53,7 @@ class ModuleOperjoin : public Module
                        List[I_OnPostOper] = List[I_OnRehash] = 1;
                }
 
-               virtual void OnRehash(userrec* user, const std::string &parameter)
+               virtual void OnRehash(User* user, const std::string &parameter)
                {
                        ConfigReader* conf = new ConfigReader(ServerInstance);
 
@@ -63,7 +62,7 @@ class ModuleOperjoin : public Module
                        if (!operChan.empty())
                                tokenize(operChan,operChans);
 
-                       DELETE(conf);
+                       delete conf;
                }
 
                virtual ~ModuleOperjoin()
@@ -75,36 +74,16 @@ class ModuleOperjoin : public Module
                        return Version(1,1,0,1,VF_VENDOR,API_VERSION);
                }
 
-               virtual void OnPostOper(userrec* user, const std::string &opertype)
+               virtual void OnPostOper(User* user, const std::string &opertype)
                {
                        if (!IS_LOCAL(user))
                                return;
 
                        for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
                                if (ServerInstance->IsChannel(it->c_str()))
-                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
+                                       Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
                }
 
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-       public:
-               ModuleOperjoinFactory()
-               {
-               }
-
-               ~ModuleOperjoinFactory()
-               {
-               }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleOperjoin(Me);
-               }
-};
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)