X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=94a9eefe901b232c301dc88d52673b79bc29df3b;hb=b43fc66c17c2bef6dca66a966676b8128d5774ee;hp=5841f36fd0ffc906a82aa9198506b605a20447c1;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 5841f36fd..94a9eefe9 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.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.
@@ -17,92 +17,71 @@
 
 class ModuleModesOnOper : public Module
 {
- private:
-
-	
-	ConfigReader *Conf;
-
  public:
-	ModuleModesOnOper(InspIRCd* Me)
-		: Module(Me)
+	ModuleModesOnOper()
 	{
-		
-		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)
+	virtual void OnRehash(User* user)
 	{
-		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("Sets (and unsets) modes on opers when they 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)
 	{
 		// 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
 		// to add modes to the user or -modes to take modes from the user.
-		for (int j =0; j < Conf->Enumerate("type"); j++)
+		std::string ThisOpersModes = user->oper->getConfig("modes");
+		if (!ThisOpersModes.empty())
+		{
+			ApplyModes(user, ThisOpersModes);
+		}
+
+		ThisOpersModes = user->oper->getConfig("modes");
+		if (!ThisOpersModes.empty())
 		{
-			std::string typen = Conf->ReadValue("type","name",j);
-			if (!strcmp(typen.c_str(),user->oper))
-			{
-				std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-				if (!ThisOpersModes.empty())
-				{
-					char first = *(ThisOpersModes.c_str());
-					if ((first != '+') && (first != '-'))
-						ThisOpersModes = "+" + ThisOpersModes;
-
-					std::string buf;
-					stringstream ss(ThisOpersModes);
-					vector<string> tokens;
-
-					// split ThisOperModes 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] = user->nick;
-
-					// process mode params
-					int i = 1;
-					for (unsigned int k = 0; k < tokens.size(); k++)
-					{
-						modes[i] = tokens[k].c_str();
-						i++;
-					}
-
-					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]);
-
-					rmode.Send(ServerInstance);
-					ServerInstance->SendMode(modes, size, user);
-					delete [] modes;
-				}
-				break;
-			}
+			ApplyModes(user, ThisOpersModes);
 		}
 	}
+
+	void ApplyModes(User *u, std::string &smodes)
+	{
+		char first = *(smodes.c_str());
+		if ((first != '+') && (first != '-'))
+			smodes = "+" + smodes;
+
+		std::string buf;
+		std::stringstream ss(smodes);
+		std::vector<std::string> tokens;
+
+		// split into modes and mode params
+		while (ss >> buf)
+			tokens.push_back(buf);
+
+		std::vector<std::string> modes;
+		modes.push_back(u->nick);
+
+		// process mode params
+		for (unsigned int k = 0; k < tokens.size(); k++)
+		{
+			modes.push_back(tokens[k]);
+		}
+
+		ServerInstance->SendMode(modes, u);
+		ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+	}
 };
 
 MODULE_INIT(ModuleModesOnOper)