X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_operprefix.cpp;h=d66f994501389ccad8e29ab6a3440d55f0047223;hb=e0931343939bc15ea9aaa884eab61d80827074c6;hp=643f09db92aad809526d3ecf1b93d47ef22460c1;hpb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 643f09db9..d66f99450 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -26,32 +26,16 @@
 
 #define OPERPREFIX_VALUE 1000000
 
-class OperPrefixMode : public ModeHandler
+class OperPrefixMode : public PrefixMode
 {
 	public:
-		OperPrefixMode(Module* Creator) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+		OperPrefixMode(Module* Creator)
+			: PrefixMode(Creator, "operprefix", 'y', OPERPREFIX_VALUE)
 		{
 			std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
-			list = true;
 			prefix = pfx.empty() ? '!' : pfx[0];
-			levelrequired = OPERPREFIX_VALUE;
-			m_paramtype = TR_NICK;
-			prefixrank = OPERPREFIX_VALUE;
+			levelrequired = INT_MAX;
 		}
-
-		ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-		{
-			if (IS_SERVER(source) || ServerInstance->ULine(source->server))
-				return MODEACTION_ALLOW;
-			else
-			{
-				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;
-			}
-		}
-
-		bool NeedsOper() { return true; }
 };
 
 class ModuleOperPrefixMode;
@@ -75,21 +59,10 @@ class ModuleOperPrefixMode : public Module
 		: opm(this), hideoperwatcher(this)
 		, hideopermode(this, "hideoper")
 	{
-	}
-
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(opm);
-
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper };
-		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.
 		 */
-
-		ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
 	}
 
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
@@ -99,18 +72,26 @@ class ModuleOperPrefixMode : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
+	void OnPostJoin(Membership* memb)
+	{
+		if ((!IS_LOCAL(memb->user)) || (!memb->user->IsOper()) || (memb->user->IsModeSet(hideopermode)))
+			return;
+
+		if (memb->HasMode(&opm))
+			return;
+
+		// The user was force joined and OnUserPreJoin() did not run. Set the operprefix now.
+		Modes::ChangeList changelist;
+		changelist.push_add(&opm, memb->user->nick);
+		ServerInstance->Modes.Process(ServerInstance->FakeClient, memb->chan, NULL, changelist);
+	}
+
 	void SetOperPrefix(User* user, bool add)
 	{
-		std::vector<std::string> modechange;
-		modechange.push_back("");
-		modechange.push_back(add ? "+" : "-");
-		modechange[1].push_back(opm.GetModeChar());
-		modechange.push_back(user->nick);
-		for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
-		{
-			modechange[0] = (*v)->name;
-			ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
-		}
+		Modes::ChangeList changelist;
+		changelist.push(&opm, add, user->nick);
+		for (User::ChanList::iterator v = user->chans.begin(); v != user->chans.end(); v++)
+			ServerInstance->Modes->Process(ServerInstance->FakeClient, (*v)->chan, NULL, changelist);
 	}
 
 	void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE
@@ -119,12 +100,6 @@ class ModuleOperPrefixMode : public Module
 			SetOperPrefix(user, true);
 	}
 
-
-	~ModuleOperPrefixMode()
-	{
-		ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
@@ -146,7 +121,8 @@ HideOperWatcher::HideOperWatcher(ModuleOperPrefixMode* parent)
 
 void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding)
 {
-	if (IS_LOCAL(dest))
+	// If hideoper is being unset because the user is deopering, don't set +y
+	if (IS_LOCAL(dest) && dest->IsOper())
 		parentmod->SetOperPrefix(dest, !adding);
 }