WHEEEEE!!!!!

[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 587793acb7628f5b7eead9179da4779bf572f498..bf30880533c358056b51358a7eb8b2fed2bda539 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,50 +1,78 @@
 // 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 {
+/* $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() {
-
-                       Srv = new Server;
+               ModuleOperjoin(Server* Me)
+                       : Module::Module(Me)
+               {
+                       Srv = Me;
                        conf = new ConfigReader;
-
                        operChan = conf->ReadValue("operjoin", "channel", 0);
-
                }
 
-               virtual ~ModuleOperjoin() {
-
-                       delete Srv;
-                       delete conf;
-
+               void Implements(char* List)
+               {
+                       List[I_OnPostOper] = List[I_OnRehash] = 1;
                }
 
-               virtual Version GetVersion() {
-
-                       return Version(1,0,0,1);
-
+               virtual void OnRehash(const std::string &parameter)
+               {
+                       DELETE(conf);
+                       conf = new ConfigReader;
                }
 
-               virtual void OnOper(userrec* user) {
-
-                       if(operChan != "") {
+               virtual ~ModuleOperjoin()
+               {
+                       DELETE(conf);
+               }
 
-                               Srv->JoinUserToChannel(user,operChan,"");
+               virtual Version GetVersion()
+               {
+                       return Version(1,0,0,1,VF_VENDOR);
+               }
 
+               virtual void OnPostOper(userrec* user, const std::string &opertype)
+               {
+                       if(operChan != "")
+                       {
+                               std::vector<std::string> operChans;
+                               tokenize(operChan,operChans);
+                               for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
+                                       chanrec::JoinUser(user, it->c_str(), false);
                        }
 
                }
@@ -53,24 +81,22 @@ class ModuleOperjoin : public Module {
 
 class ModuleOperjoinFactory : public ModuleFactory
 {
- public:
-        ModuleOperjoinFactory()
-        {
-        }
-
-        ~ModuleOperjoinFactory()
-        {
-        }
+       public:
+               ModuleOperjoinFactory()
+               {
+               }
 
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperjoin;
-        }
+               ~ModuleOperjoinFactory()
+               {
+               }
 
+               virtual Module * CreateModule(Server* Me)
+               {
+                       return new ModuleOperjoin(Me);
+               }
 };
 
 extern "C" void * init_module( void )
 {
-        return new ModuleOperjoinFactory;
+       return new ModuleOperjoinFactory;
 }
-