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

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index ed5bde76d..94a9eefe9 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -17,36 +17,25 @@
 
 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);
 	}
 
 
-	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("$Id$", 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, const std::string &opername)
@@ -54,34 +43,16 @@ class ModuleModesOnOper : public Module
 		// 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())
 		{
-			std::string typen = Conf->ReadValue("type","name",j);
-			if (typen == user->oper)
-			{
-				std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-				if (!ThisOpersModes.empty())
-				{
-					ApplyModes(user, ThisOpersModes);
-				}
-				break;
-			}
+			ApplyModes(user, ThisOpersModes);
 		}
 
-		if (!opername.empty()) // if user is local ..
+		ThisOpersModes = user->oper->getConfig("modes");
+		if (!ThisOpersModes.empty())
 		{
-			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;
-				}
-			}
+			ApplyModes(user, ThisOpersModes);
 		}
 	}
 
@@ -108,16 +79,8 @@ class ModuleModesOnOper : public Module
 			modes.push_back(tokens[k]);
 		}
 
-		std::deque<std::string> n;
-		std::deque<TranslateType> t;
-		for (unsigned int j = 1; j < tokens.size(); j++)
-		{
-			n.push_back(modes[j]);
-			t.push_back(TR_TEXT);
-		}
-
-		ServerInstance->PI->SendMode(u->uuid, n, t);
 		ServerInstance->SendMode(modes, u);
+		ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
 	}
 };