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 7cf1089c8c3697b051defe220a9ffb2354dcfebd..469bb6a2c0765770fec190dd65f2431efefb1a8a 100644 (file)
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -43,37 +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);
-                       override = conf->ReadFlag("operjoin", "override", "0", 0);
+                       operChan = conf.ReadValue("operjoin", "channel", 0);
+                       override = conf.ReadFlag("operjoin", "override", "0", 0);
                        operChans.clear();
                        if (!operChan.empty())
                                tokenize(operChan,operChans);
 
                        std::map<std::string, std::vector<std::string> >().swap(operTypeChans);
 
-                       int olines = conf->Enumerate("type");
+                       int olines = conf.Enumerate("type");
                        for (int index = 0; index < olines; ++index)
                        {
-                               std::string chanList = conf->ReadValue("type", "autojoin", index);
+                               std::string chanList = conf.ReadValue("type", "autojoin", index);
                                if (!chanList.empty())
                                {
-                                       tokenize(chanList, operTypeChans[conf->ReadValue("type", "name", index)]);
+                                       tokenize(chanList, operTypeChans[conf.ReadValue("type", "name", index)]);
                                }
                        }
-
-                       delete conf;
                }
 
                virtual ~ModuleOperjoin()
@@ -82,7 +80,7 @@ class ModuleOperjoin : public Module
 
                virtual Version GetVersion()
                {
-                       return Version("$Id$", 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, const std::string &opername)
@@ -92,9 +90,9 @@ class ModuleOperjoin : public Module
 
                        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(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
+                                       Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
 
-                       std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper);
+                       std::map<std::string, std::vector<std::string> >::iterator i = operTypeChans.find(user->oper->name);
 
                        if (i != operTypeChans.end())
                        {
@@ -103,7 +101,7 @@ class ModuleOperjoin : public Module
                                {
                                        if (ServerInstance->IsChannel(it->c_str(), ServerInstance->Config->Limits.ChanMax))
                                        {
-                                               Channel::JoinUser(ServerInstance, user, it->c_str(), override, "", false, ServerInstance->Time());
+                                               Channel::JoinUser(user, it->c_str(), override, "", false, ServerInstance->Time());
                                        }
                                }
                        }