X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_operprefix.cpp;h=3f05dd086fe4a16f9d8beec6f5d27b5aa5c8eac8;hb=90abe2cd475c8ca2e81626f565d173e9f56d1251;hp=43346a4d033518776de9913c4c7f6dbfd66435d9;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 43346a4d0..3f05dd086 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')
 		{
 			std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
-			list = true;
 			prefix = pfx.empty() ? '!' : pfx[0];
-			levelrequired = OPERPREFIX_VALUE;
-			m_paramtype = TR_NICK;
+			levelrequired = INT_MAX;
 			prefixrank = OPERPREFIX_VALUE;
 		}
-
-		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,18 +59,10 @@ class ModuleOperPrefixMode : public Module
 		: opm(this), hideoperwatcher(this)
 		, hideopermode(this, "hideoper")
 	{
-	}
-
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(opm);
-
 		/* 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
@@ -103,9 +79,9 @@ class ModuleOperPrefixMode : public Module
 		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++)
+		for (User::ChanList::iterator v = user->chans.begin(); v != user->chans.end(); v++)
 		{
-			modechange[0] = (*v)->name;
+			modechange[0] = (*v)->chan->name;
 			ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
 		}
 	}
@@ -116,12 +92,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);
@@ -143,7 +113,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);
 }