Updates, should be able to safely unload client modules with queries in progress...

[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 1e767bd860468bfd8385ccd113b4f51f06d0205a..a0a81f7ed8c5e78b87dfc49999e47e6d5078e6fd 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -7,7 +7,7 @@ using namespace std;
 #include "modules.h"
 #include "helperfuncs.h"
 
-/* $ModDesc: Forces opers to join a specified channel on oper-up */
+/* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
 class ModuleOperjoin : public Module
 {
@@ -16,6 +16,25 @@ class ModuleOperjoin : public Module
                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)
                        : Module::Module(Me)
@@ -27,12 +46,18 @@ class ModuleOperjoin : public Module
 
                void Implements(char* List)
                {
-                       List[I_OnOper] = 1;
+                       List[I_OnPostOper] = List[I_OnRehash] = 1;
+               }
+
+               virtual void OnRehash(const std::string &parameter)
+               {
+                       DELETE(conf);
+                       conf = new ConfigReader;
                }
 
                virtual ~ModuleOperjoin()
                {
-                       delete conf;
+                       DELETE(conf);
                }
 
                virtual Version GetVersion()
@@ -40,11 +65,16 @@ class ModuleOperjoin : public Module
                        return Version(1,0,0,1,VF_VENDOR);
                }
 
-               virtual void OnOper(userrec* user, std::string opertype)
+               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++)
+                               {
+                                       Srv->JoinUserToChannel(user,(*it),"");
+                               }
                        }
 
                }
@@ -54,22 +84,21 @@ class ModuleOperjoin : public Module
 class ModuleOperjoinFactory : public ModuleFactory
 {
        public:
-               ModuleOperjoinFactory()
-               {
-               }
-
-               ~ModuleOperjoinFactory()
-               {
-               }
-
-               virtual Module * CreateModule(Server* Me)
-               {
-                       return new ModuleOperjoin(Me);
-               }
+               ModuleOperjoinFactory()
+               {
+               }
+
+               ~ModuleOperjoinFactory()
+               {
+               }
+
+               virtual Module * CreateModule(Server* Me)
+               {
+                       return new ModuleOperjoin(Me);
+               }
 };
 
 extern "C" void * init_module( void )
 {
-        return new ModuleOperjoinFactory;
+       return new ModuleOperjoinFactory;
 }
-