X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operjoin.cpp;h=469bb6a2c0765770fec190dd65f2431efefb1a8a;hb=a30abe26fc803900eaf5dc4c08a31aa1d3c9c89f;hp=b0976b1cc35536eaa1ef82d0bb6bab386178f2ae;hpb=7d7250484c352c13830e63ae41ee8faae40a9bd5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index b0976b1cc..469bb6a2c 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 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.
@@ -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);
-    
-			operChan = conf->ReadValue("operjoin", "channel", 0);
-			override = conf->ReadFlag("operjoin", "override", "0", 0);
+			ConfigReader conf;
+
+			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(1,2,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, 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());
 					}
 				}
 			}