(Bigger than it looks, i did this with perl inplace edit) -- commands now take an...

[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 056b9e18130eaaf970d640e5fc9ef9cfc81ceb5b..aa4e777729f596ce1c94fa657a1718bb2d13e21f 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -6,15 +6,18 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 
-/* $ModDesc: Forces opers to join a specified channel on oper-up */
+/* $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)
                {
@@ -36,10 +39,10 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin(Server* Me)
+               ModuleOperjoin(InspIRCd* Me)
                        : Module::Module(Me)
                {
-                       Srv = Me;
+                       
                        conf = new ConfigReader;
                        operChan = conf->ReadValue("operjoin", "channel", 0);
                }
@@ -72,9 +75,7 @@ class ModuleOperjoin : public Module
                                std::vector<std::string> operChans;
                                tokenize(operChan,operChans);
                                for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-                               {
-                                       Srv->JoinUserToChannel(user,(*it),"");
-                               }
+                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
                        }
 
                }
@@ -92,7 +93,7 @@ class ModuleOperjoinFactory : public ModuleFactory
                {
                }
 
-               virtual Module * CreateModule(Server* Me)
+               virtual Module * CreateModule(InspIRCd* Me)
                {
                        return new ModuleOperjoin(Me);
                }
@@ -102,4 +103,3 @@ extern "C" void * init_module( void )
 {
        return new ModuleOperjoinFactory;
 }
-