X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=8b116aed8db667a8ca33123a6224ffcc3bd69743;hb=697098bb47651b40ed9c768361d1a3b1ca452856;hp=545a3f103d5738c5078cbe655c45104bb97e0960;hpb=495261d7ad50c108aa09af2525bace2655aae58e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 545a3f103..8b116aed8 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,14 +19,14 @@ class ModuleModesOnOper : public Module
 {
  private:
 
-	
+
 	ConfigReader *Conf;
 
  public:
 	ModuleModesOnOper(InspIRCd* Me)
 		: Module(Me)
 	{
-		
+
 		Conf = new ConfigReader(ServerInstance);
 		Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -38,17 +38,17 @@ class ModuleModesOnOper : public Module
 		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
-	
+
 	virtual ~ModuleModesOnOper()
 	{
 		delete Conf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
-	
+
 	virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
 	{
 		// whenever a user opers, go through the oper types, find their <type:modes>,
@@ -92,33 +92,28 @@ class ModuleModesOnOper : public Module
 			smodes = "+" + smodes;
 
 		std::string buf;
-		stringstream ss(smodes);
-		vector<string> tokens;
+		std::stringstream ss(smodes);
+		std::vector<std::string> tokens;
 
 		// split into modes and mode params
 		while (ss >> buf)
 			tokens.push_back(buf);
 
-		int size = tokens.size() + 1;
-		const char** modes = new const char*[size];
-		modes[0] = u->nick;
+		std::vector<std::string> modes;
+		modes.push_back(u->nick);
 
 		// process mode params
-		int i = 1;
 		for (unsigned int k = 0; k < tokens.size(); k++)
 		{
-			modes[i] = tokens[k].c_str();
-			i++;
+			modes.push_back(tokens[k]);
 		}
 
 		std::deque<std::string> n;
-		Event rmode((char *)&n, NULL, "send_mode_explicit");
-		for (unsigned int j = 0; j < tokens.size(); j++)
+		for (unsigned int j = 1; j < tokens.size(); j++)
 			n.push_back(modes[j]);
 
-		rmode.Send(ServerInstance);
-		ServerInstance->SendMode(modes, size, u);
-		delete [] modes;
+		ServerInstance->PI->SendMode(u->uuid, n);
+		ServerInstance->SendMode(modes, u);
 	}
 };