Change User::oper to an OperInfo reference

[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 243c329c89e5c347d061256bd65464431a9bb0dd..469bb6a2c0765770fec190dd65f2431efefb1a8a 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -19,16 +19,18 @@ class ModuleOperjoin : public Module
 {
        private:
                std::string operChan;
-               std::vector<std::string> operChans;             
+               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));
@@ -41,24 +43,35 @@ class ModuleOperjoin : public Module
                }
 
        public:
-               ModuleOperjoin(InspIRCd* Me) : Module(Me)
+               ModuleOperjoin()
                {
-                       OnRehash(NULL, "");
-               Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+                       OnRehash(NULL);
+                       Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
+                       ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
 
-               virtual void OnRehash(User* user, const std::string &parameter)
+               virtual void OnRehash(User* user)
                {
-                       ConfigReader* conf = new ConfigReader(ServerInstance);
+                       ConfigReader conf;
 
-                       operChan = conf->ReadValue("operjoin", "channel", 0);
+                       operChan = conf.ReadValue("operjoin", "channel", 0);
+                       override = conf.ReadFlag("operjoin", "override", "0", 0);
                        operChans.clear();
                        if (!operChan.empty())
                                tokenize(operChan,operChans);
 
-                       delete conf;
+                       std::map<std::string, std::vector<std::string> >().swap(operTypeChans);
+
+                       int olines = conf.Enumerate("type");
+                       for (int index = 0; index < olines; ++index)
+                       {
+                               std::string chanList = conf.ReadValue("type", "autojoin", index);
+                               if (!chanList.empty())
+                               {
+                                       tokenize(chanList, operTypeChans[conf.ReadValue("type", "name", index)]);
+                               }
+                       }
                }
 
                virtual ~ModuleOperjoin()
@@ -67,17 +80,31 @@ class ModuleOperjoin : public Module
 
                virtual Version GetVersion()
                {
-                       return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+                       return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
                }
 
-               virtual void OnPostOper(User* user, const std::string &opertype)
+               virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
                {
                        if (!IS_LOCAL(user))
                                return;
 
                        for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
-                               if (ServerInstance->IsChannel(it->c_str()))
-                                       Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
+                               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->name);
+
+                       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());
+                                       }
+                               }
+                       }
                }
 
 };