Add const std::string &original_command to OnPreCommand and OnPostCommand, which...

[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 750f98c96afc45609aa1b5e138c714b5e3b6ab3f..67512815d356a0ef8ddfef8ecfada63c567a8979 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -5,19 +5,19 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
-extern InspIRCd* ServerInstance;
+
 
 class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
                ConfigReader* conf;
-               Server* Srv;
+               
 
                int tokenize(const string &str, std::vector<std::string> &tokens)
                {
@@ -39,11 +39,11 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin(Server* Me)
+               ModuleOperjoin(InspIRCd* Me)
                        : Module::Module(Me)
                {
-                       Srv = Me;
-                       conf = new ConfigReader;
+                       
+                       conf = new ConfigReader(ServerInstance);
                        operChan = conf->ReadValue("operjoin", "channel", 0);
                }
 
@@ -55,7 +55,7 @@ class ModuleOperjoin : public Module
                virtual void OnRehash(const std::string &parameter)
                {
                        DELETE(conf);
-                       conf = new ConfigReader;
+                       conf = new ConfigReader(ServerInstance);
                }
 
                virtual ~ModuleOperjoin()
@@ -93,7 +93,7 @@ class ModuleOperjoinFactory : public ModuleFactory
                {
                }
 
-               virtual Module * CreateModule(Server* Me)
+               virtual Module * CreateModule(InspIRCd* Me)
                {
                        return new ModuleOperjoin(Me);
                }