Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

[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 3609350a2dbe159e65b9fdffdc1753efc3342d53..4308068e3e83aaa57b2a36744282d183fbfc9bc4 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,79 +1,117 @@
-// operjoin module by typobox43
-
-using namespace std;
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
 #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"
 
-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;
+               std::vector<std::string> operChans;
                ConfigReader* conf;
+               
+
+               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;
-                       conf = new ConfigReader;
-
+               ModuleOperjoin(InspIRCd* Me)
+                       : Module::Module(Me)
+               {
+                       
+                       conf = new ConfigReader(ServerInstance);
                        operChan = conf->ReadValue("operjoin", "channel", 0);
-
+                       operChans.clear();
+                       if (!operChan.empty())
+                               tokenize(operChan,operChans);
                }
 
-               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,VF_VENDOR);
-
+               virtual void OnRehash(userrec* user, const std::string &parameter)
+               {
+                       DELETE(conf);
+                       conf = new ConfigReader(ServerInstance);
+                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       operChans.clear();
+                       if (!operChan.empty())
+                               tokenize(operChan,operChans);
                }
 
-               virtual void OnOper(userrec* user, std::string opertype) {
-
-                       if(operChan != "") {
+               virtual ~ModuleOperjoin()
+               {
+                       DELETE(conf);
+               }
 
-                               Srv->JoinUserToChannel(user,operChan,"");
+               virtual Version GetVersion()
+               {
+                       return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               }
 
-                       }
+               virtual void OnPostOper(userrec* user, const std::string &opertype)
+               {
+                       if (!IS_LOCAL(user))
+                               return;
 
+                       for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
+                               if (ServerInstance->IsChannel(it->c_str()))
+                                       chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "");
                }
 
 };
 
 class ModuleOperjoinFactory : public ModuleFactory
 {
- public:
-        ModuleOperjoinFactory()
-        {
-        }
-
-        ~ModuleOperjoinFactory()
-        {
-        }
+       public:
+               ModuleOperjoinFactory()
+               {
+               }
 
-        virtual Module * CreateModule()
-        {
-                return new ModuleOperjoin;
-        }
+               ~ModuleOperjoinFactory()
+               {
+               }
 
+               virtual Module * CreateModule(InspIRCd* Me)
+               {
+                       return new ModuleOperjoin(Me);
+               }
 };
 
 extern "C" void * init_module( void )
 {
-        return new ModuleOperjoinFactory;
+       return new ModuleOperjoinFactory;
 }
-