Decide that it wasn't quite appropriate :(

[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 02a42b9772492bfb70db0baa835a4f5db2355e5b..ee237f6359b930fa94f55213163418fd8b4d8a96 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,50 +1,56 @@
 // operjoin module by typobox43
 
+using namespace std;
+
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Forces opers to join a specified channel on oper-up */
 
-Server *Srv;
-
-class ModuleOperjoin : public Module {
-
+class ModuleOperjoin : public Module
+{
        private:
-
                std::string operChan;
                ConfigReader* conf;
+               Server* Srv;
 
        public:
-
-               ModuleOperjoin() {
-
-                       Srv = new Server;
+               ModuleOperjoin(Server* Me)
+                       : Module::Module(Me)
+               {
+                       Srv = Me;
                        conf = new ConfigReader;
-
                        operChan = conf->ReadValue("operjoin", "channel", 0);
-
                }
 
-               virtual ~ModuleOperjoin() {
+               void Implements(char* List)
+               {
+                       List[I_OnPostOper] = List[I_OnRehash] = 1;
+               }
 
-                       delete Srv;
+               virtual void OnRehash(std::string parameter)
+               {
                        delete conf;
-
+                       conf = new ConfigReader;
                }
 
-               virtual Version GetVersion() {
+               virtual ~ModuleOperjoin()
+               {
+                       delete conf;
+               }
 
+               virtual Version GetVersion()
+               {
                        return Version(1,0,0,1,VF_VENDOR);
-
                }
 
-               virtual void OnOper(userrec* user) {
-
-                       if(operChan != "") {
-
+               virtual void OnPostOper(userrec* user, std::string opertype)
+               {
+                       if(operChan != "")
+                       {
                                Srv->JoinUserToChannel(user,operChan,"");
-
                        }
 
                }
@@ -53,20 +59,19 @@ class ModuleOperjoin : public Module {
 
 class ModuleOperjoinFactory : public ModuleFactory
 {
- public:
-        ModuleOperjoinFactory()
-        {
-        }
-
-        ~ModuleOperjoinFactory()
-        {
-        }
-
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperjoin;
-        }
-
+       public:
+               ModuleOperjoinFactory()
+               {
+               }
+
+               ~ModuleOperjoinFactory()
+               {
+               }
+
+               virtual Module * CreateModule(Server* Me)
+               {
+                       return new ModuleOperjoin(Me);
+               }
 };
 
 extern "C" void * init_module( void )