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 bf30880533c358056b51358a7eb8b2fed2bda539..4308068e3e83aaa57b2a36744282d183fbfc9bc4 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,11 +1,20 @@
-// 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"
+#include "inspircd.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
 
@@ -13,8 +22,9 @@ class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
+               std::vector<std::string> operChans;
                ConfigReader* conf;
-               Server* Srv;
+               
 
                int tokenize(const string &str, std::vector<std::string> &tokens)
                {
@@ -36,12 +46,15 @@ class ModuleOperjoin : public Module
                }
 
        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);
+                       operChans.clear();
+                       if (!operChan.empty())
+                               tokenize(operChan,operChans);
                }
 
                void Implements(char* List)
@@ -49,10 +62,14 @@ class ModuleOperjoin : public Module
                        List[I_OnPostOper] = List[I_OnRehash] = 1;
                }
 
-               virtual void OnRehash(const std::string &parameter)
+               virtual void OnRehash(userrec* user, const std::string &parameter)
                {
                        DELETE(conf);
-                       conf = new ConfigReader;
+                       conf = new ConfigReader(ServerInstance);
+                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       operChans.clear();
+                       if (!operChan.empty())
+                               tokenize(operChan,operChans);
                }
 
                virtual ~ModuleOperjoin()
@@ -62,19 +79,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 != "")
-                       {
-                               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);
-                       }
+                       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, "");
                }
 
 };
@@ -90,7 +105,7 @@ class ModuleOperjoinFactory : public ModuleFactory
                {
                }
 
-               virtual Module * CreateModule(Server* Me)
+               virtual Module * CreateModule(InspIRCd* Me)
                {
                        return new ModuleOperjoin(Me);
                }