Remove InspIRCd* parameters and fields

[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 aa4e777729f596ce1c94fa657a1718bb2d13e21f..ac4aab54851a3551f2438422843d8658058fa61a 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -1,32 +1,36 @@
-// operjoin module by typobox43
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-using namespace std;
-
-#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 */
 
-extern InspIRCd* ServerInstance;
-
 class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
-               ConfigReader* conf;
-               
+               std::vector<std::string> operChans;
+               std::map<std::string, std::vector<std::string> > operTypeChans; // Channels specific to an oper type.
+               bool override;
 
-               int tokenize(const string &str, std::vector<std::string> &tokens)
+               int tokenize(const std::string &str, std::vector<std::string> &tokens)
                {
                        // skip delimiters at beginning.
-                       string::size_type lastPos = str.find_first_not_of(",", 0);
+                       std::string::size_type lastPos = str.find_first_not_of(",", 0);
                        // find first "non-delimiter".
-                       string::size_type pos = str.find_first_of(",", lastPos);
+                       std::string::size_type pos = str.find_first_of(",", lastPos);
 
-                       while (string::npos != pos || string::npos != lastPos)
+                       while (std::string::npos != pos || std::string::npos != lastPos)
                        {
                                // found a token, add it to the vector.
                                tokens.push_back(str.substr(lastPos, pos - lastPos));
@@ -39,67 +43,71 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin(InspIRCd* Me)
-                       : Module::Module(Me)
-               {
-                       
-                       conf = new ConfigReader;
-                       operChan = conf->ReadValue("operjoin", "channel", 0);
+               ModuleOperjoin()                {
+                       OnRehash(NULL);
+               Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
-               void Implements(char* List)
-               {
-                       List[I_OnPostOper] = List[I_OnRehash] = 1;
-               }
 
-               virtual void OnRehash(const std::string &parameter)
+               virtual void OnRehash(User* user)
                {
-                       DELETE(conf);
-                       conf = new ConfigReader;
-               }
+                       ConfigReader* conf = new ConfigReader;
 
-               virtual ~ModuleOperjoin()
-               {
-                       DELETE(conf);
-               }
+                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       override = conf->ReadFlag("operjoin", "override", "0", 0);
+                       operChans.clear();
+                       if (!operChan.empty())
+                               tokenize(operChan,operChans);
 
-               virtual Version GetVersion()
-               {
-                       return Version(1,0,0,1,VF_VENDOR);
-               }
+                       std::map<std::string, std::vector<std::string> >().swap(operTypeChans);
 
-               virtual void OnPostOper(userrec* user, const std::string &opertype)
-               {
-                       if(operChan != "")
+                       int olines = conf->Enumerate("type");
+                       for (int index = 0; index < olines; ++index)
                        {
-                               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);
+                               std::string chanList = conf->ReadValue("type", "autojoin", index);
+                               if (!chanList.empty())
+                               {
+                                       tokenize(chanList, operTypeChans[conf->ReadValue("type", "name", index)]);
+                               }
                        }
 
+                       delete conf;
                }
 
-};
-
-class ModuleOperjoinFactory : public ModuleFactory
-{
-       public:
-               ModuleOperjoinFactory()
+               virtual ~ModuleOperjoin()
                {
                }
 
-               ~ModuleOperjoinFactory()
+               virtual Version GetVersion()
                {
+                       return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR, API_VERSION);
                }
 
-               virtual Module * CreateModule(InspIRCd* Me)
+               virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
                {
-                       return new ModuleOperjoin(Me);
+                       if (!IS_LOCAL(user))
+                               return;
+
+                       for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
+                               if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+                                       Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
+
+                       std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper);
+
+                       if (i != operTypeChans.end())
+                       {
+                               const std::vector<std::string>& list = i->second;
+                               for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+                               {
+                                       if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
+                                       {
+                                               Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
+                                       }
+                               }
+                       }
                }
+
 };
 
-extern "C" void * init_module( void )
-{
-       return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin)