X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operprefix.cpp;h=25937cd6ea27cbc91b8c0dff4ac6e26bf7df9867;hb=0a8b0d317ed4adc43185c1b791bcf752115dc58e;hp=b0cb0e4e9d8876b4183528eb5bbf316adec3b61a;hpb=fda5e8d0556dadd2840909bbbfda169de29a7ccb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index b0cb0e4e9..25937cd6e 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -47,11 +47,11 @@ class OperPrefixMode : public ModeHandler
 
 		ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 		{
-			if (IS_SERVER(source) || (source && ServerInstance->ULine(source->server)))
+			if (IS_SERVER(source) || ServerInstance->ULine(source->server))
 				return MODEACTION_ALLOW;
 			else
 			{
-				if (source && channel)
+				if (channel)
 					source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only servers are permitted to change channel mode '%c'", source->nick.c_str(), channel->name.c_str(), 'y');
 				return MODEACTION_DENY;
 			}
@@ -60,13 +60,24 @@ class OperPrefixMode : public ModeHandler
 		bool NeedsOper() { return true; }
 };
 
+class ModuleOperPrefixMode;
+class HideOperWatcher : public ModeWatcher
+{
+	ModuleOperPrefixMode* parentmod;
+ public:
+	HideOperWatcher(ModuleOperPrefixMode* parent) : ModeWatcher((Module*) parent, 'H', MODETYPE_USER), parentmod(parent) {}
+	void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type);
+};
+
 class ModuleOperPrefixMode : public Module
 {
  private:
 	OperPrefixMode opm;
+	bool mw_added;
+	HideOperWatcher hideoperwatcher;
  public:
 	ModuleOperPrefixMode()
-		: opm(this)
+		: opm(this), mw_added(false), hideoperwatcher(this)
 	{
 	}
 
@@ -74,54 +85,85 @@ class ModuleOperPrefixMode : public Module
 	{
 		ServerInstance->Modules->AddService(opm);
 
-		Implementation eventlist[] = { I_OnPostJoin, I_OnOper };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper, I_OnLoadModule, I_OnUnloadModule };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+
+		/* To give clients a chance to learn about the new prefix we don't give +y to opers
+		 * right now. That means if the module was loaded after opers have joined channels
+		 * they need to rejoin them in order to get the oper prefix.
+		 */
+
+		if (ServerInstance->Modules->Find("m_hideoper.so"))
+			mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
 	}
 
-	void PushChanMode(Channel* channel, User* user)
+	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string& privs, const std::string& keygiven)
+	{
+		/* The user may have the +H umode on himself, but +H does not necessarily correspond
+		 * to the +H of m_hideoper.
+		 * However we only add the modewatcher when m_hideoper is loaded, so these
+		 * conditions (mw_added and the user being +H) together mean the user is a hidden oper.
+		 */
+
+		if (IS_OPER(user) && (!mw_added || !user->IsModeSet('H')))
+			privs.push_back('y');
+		return MOD_RES_PASSTHRU;
+	}
+
+	void SetOperPrefix(User* user, bool add)
 	{
-		char modeline[] = "+y";
 		std::vector<std::string> modechange;
-		modechange.push_back(channel->name);
-		modechange.push_back(modeline);
+		modechange.push_back("");
+		modechange.push_back(add ? "+y" : "-y");
 		modechange.push_back(user->nick);
-		ServerInstance->SendMode(modechange,ServerInstance->FakeClient);
+		for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
+		{
+			modechange[0] = (*v)->name;
+			ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient);
+		}
 	}
 
-	void OnPostJoin(Membership* memb)
+	void OnPostOper(User* user, const std::string& opername, const std::string& opertype)
 	{
-		if (IS_OPER(memb->user) && !memb->user->IsModeSet('H'))
-			PushChanMode(memb->chan, memb->user);
+		if (IS_LOCAL(user) && (!mw_added || !user->IsModeSet('H')))
+			SetOperPrefix(user, true);
 	}
 
-	// XXX: is there a better way to do this?
-	ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
+	void OnLoadModule(Module* mod)
 	{
-		/* force event propagation to its ModeHandler */
-		if (!IS_SERVER(user) && chan && (mode == 'y'))
-			return MOD_RES_ALLOW;
-		return MOD_RES_PASSTHRU;
+		if ((!mw_added) && (mod->ModuleSourceFile == "m_hideoper.so"))
+			mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
 	}
 
-	void OnOper(User *user, const std::string&)
+	void OnUnloadModule(Module* mod)
 	{
-		if (user && !user->IsModeSet('H'))
-		{
-			for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-			{
-				PushChanMode(*v, user);
-			}
-		}
+		if ((mw_added) && (mod->ModuleSourceFile == "m_hideoper.so") && (ServerInstance->Modes->DelModeWatcher(&hideoperwatcher)))
+			mw_added = false;
 	}
 
 	~ModuleOperPrefixMode()
 	{
+		if (mw_added)
+			ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
 	}
 
 	Version GetVersion()
 	{
 		return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
 	}
+
+	void Prioritize()
+	{
+		// m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case
+		Module* opermodes = ServerInstance->Modules->Find("m_opermodes.so");
+		ServerInstance->Modules->SetPriority(this, I_OnPostOper, PRIORITY_AFTER, opermodes);
+	}
 };
 
+void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding, ModeType type)
+{
+	if (IS_LOCAL(dest))
+		parentmod->SetOperPrefix(dest, !adding);
+}
+
 MODULE_INIT(ModuleOperPrefixMode)