Untested! New m_watch that should be hundreds of times faster (im not joking either)

[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 c334009544c103e00256fa3f8aa097caae68fdbe..5df02da1ef172fd606043b896b412cc6053eca65 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -5,23 +5,45 @@ 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 */
+#include "inspircd.h"
+
+/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
+
+
 
 class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
                ConfigReader* conf;
-               Server* Srv;
+               
+
+               int tokenize(const string &str, std::vector<std::string> &tokens)
+               {
+                       // skip delimiters at beginning.
+                       string::size_type lastPos = str.find_first_not_of(",", 0);
+                       // find first "non-delimiter".
+                       string::size_type pos = str.find_first_of(",", lastPos);
+
+                       while (string::npos != pos || string::npos != lastPos)
+                       {
+                               // found a token, add it to the vector.
+                               tokens.push_back(str.substr(lastPos, pos - lastPos));
+                               // skip delimiters. Note the "not_of"
+                               lastPos = str.find_first_not_of(",", pos);
+                               // find next "non-delimiter"
+                               pos = str.find_first_of(",", lastPos);
+                       }
+                       return tokens.size();
+               }
 
        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);
                }
 
@@ -33,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()
@@ -43,14 +65,17 @@ class ModuleOperjoin : public Module
 
                virtual Version GetVersion()
                {
-                       return Version(1,0,0,1,VF_VENDOR);
+                       return Version(1,1,0,1,VF_VENDOR,API_VERSION);
                }
 
                virtual void OnPostOper(userrec* user, const std::string &opertype)
                {
                        if(operChan != "")
                        {
-                               Srv->JoinUserToChannel(user,operChan,"");
+                               std::vector<std::string> operChans;
+                               tokenize(operChan,operChans);
+                               for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
+                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false);
                        }
 
                }
@@ -68,7 +93,7 @@ class ModuleOperjoinFactory : public ModuleFactory
                {
                }
 
-               virtual Module * CreateModule(Server* Me)
+               virtual Module * CreateModule(InspIRCd* Me)
                {
                        return new ModuleOperjoin(Me);
                }
@@ -78,4 +103,3 @@ extern "C" void * init_module( void )
 {
        return new ModuleOperjoinFactory;
 }
-