X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=2e947809ac979ba0090a365030dce80a2cf663a6;hb=eacd707421be4f2612df9bde4517649061bb062e;hp=1904b3f0197cd1e3263a3dac3581e2e7b93dbca3;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 1904b3f01..2e947809a 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-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,39 +19,37 @@ 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);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnPostOper] = List[I_OnRehash] = 1;
-	}
 
 	virtual void OnRehash(User* user, const std::string &parameter)
 	{
-		DELETE(Conf);
+		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
-	
+
 	virtual ~ModuleModesOnOper()
 	{
-		DELETE(Conf);
+		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)
+
+	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>,
 		// and if they have one apply their modes. The mode string can contain +modes
@@ -59,47 +57,63 @@ class ModuleModesOnOper : public Module
 		for (int j =0; j < Conf->Enumerate("type"); j++)
 		{
 			std::string typen = Conf->ReadValue("type","name",j);
-			if (!strcmp(typen.c_str(),user->oper))
+			if (typen == user->oper)
 			{
 				std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
 				if (!ThisOpersModes.empty())
 				{
-					char first = *(ThisOpersModes.c_str());
-					if ((first != '+') && (first != '-'))
-						ThisOpersModes = "+" + ThisOpersModes;
+					ApplyModes(user, ThisOpersModes);
+				}
+				break;
+			}
+		}
 
-					std::string buf;
-					stringstream ss(ThisOpersModes);
-					vector<string> tokens;
+		if (!opername.empty()) // if user is local ..
+		{
+			for (int j = 0; j < Conf->Enumerate("oper"); j++)
+			{
+				if (opername == Conf->ReadValue("oper", "name", j))
+				{
+					std::string ThisOpersModes = Conf->ReadValue("oper", "modes", j);
+					if (!ThisOpersModes.empty())
+					{
+						ApplyModes(user, ThisOpersModes);
+					}
+					break;
+				}
+			}
+		}
+	}
 
-					// split ThisOperModes into modes and mode params
-					while (ss >> buf)
-						tokens.push_back(buf);
+	void ApplyModes(User *u, std::string &smodes)
+	{
+		char first = *(smodes.c_str());
+		if ((first != '+') && (first != '-'))
+			smodes = "+" + smodes;
 
-					int size = tokens.size() + 1;
-					const char** modes = new const char*[size];
-					modes[0] = user->nick;
+		std::string buf;
+		std::stringstream ss(smodes);
+		std::vector<std::string> tokens;
 
-					// process mode params
-					int i = 1;
-					for (unsigned int k = 0; k < tokens.size(); k++)
-					{
-						modes[i] = tokens[k].c_str();
-						i++;
-					}
+		// split into modes and mode params
+		while (ss >> buf)
+			tokens.push_back(buf);
 
-					std::deque<std::string> n;
-					Event rmode((char *)&n, NULL, "send_mode_explicit");
-					for (unsigned int j = 0; j < tokens.size(); j++)
-						n.push_back(modes[j]);
+		std::vector<std::string> modes;
+		modes.push_back(u->nick);
 
-					rmode.Send(ServerInstance);
-					ServerInstance->SendMode(modes, size, user);
-					delete [] modes;
-				}
-				break;
-			}
+		// process mode params
+		for (unsigned int k = 0; k < tokens.size(); k++)
+		{
+			modes.push_back(tokens[k]);
 		}
+
+		std::deque<std::string> n;
+		for (unsigned int j = 1; j < tokens.size(); j++)
+			n.push_back(modes[j]);
+
+		ServerInstance->PI->SendMode(u->uuid, n);
+		ServerInstance->SendMode(modes, u);
 	}
 };